Merge branch 'master' into feature/3.1.0

Author: iyerrama29

LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2016 built.io
+Copyright (c) 2018 Contentstack
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -93,8 +93,8 @@ $ contentstack plugin create YOUR_PLUGIN_NAME
 Once the plugin is created, you can activate it in config/all.js file.
 
 ## Links
- - [Website](https://www.built.io/products/contentstack/overview)
- - [Official Documentation](https://contentstackdocs.built.io/developer/web/framework-cli)
+ - [Website](https://www.contentstack.com/)
+ - [Official Documentation](https://www.contentstack.com/docs/)
 
 ### License
 Copyright © 2018 [Contentstack](https://www.contentstack.com/). All Rights Reserved.

lib/publish.js

@@ -246,7 +246,7 @@ Publish.prototype.init = function() {
               }
             });
             if (envNotPresent.length > 0) {
-              return cb(`The following environments were not found in the stack!\n${envNotPresent}`);
+              return cb(`The following environments were not found in the stack: ${JSON.stringify(envNotPresent)}!`);
             }
             return cb(null);
           }

lib/request.js

@@ -11,14 +11,8 @@
  */
 var request = require('request');
 var chalk = require('chalk');
-// var config = require('./config').config();
+var debug = require('debug')('request');
 var pkg = require('../package');
-
-var warning = chalk.yellow;
-var succcess = chalk.green;
-var error = chalk.red;
-var info = chalk.blue;
-var log = console.log;
 var MAX_RETRY_LIMIT = 5;
 
 function validate(req, cb) {
@@ -53,34 +47,34 @@ var makeCall = module.exports = function(req, cb, RETRY) {
     } else if (RETRY > MAX_RETRY_LIMIT) {
       return cb(new Error('Max retry limit exceeded!'));
     }
+    debug(`Requesting API\n${JSON.stringify(req, null, 2)}`);
     return request(req, function(err, response, body) {
       if (err) {
-        log(error(err));
         return cb(err);
       }
       var timeDelay;
       if (response.statusCode >= 200 && response.statusCode <= 399) {
-        log(succcess(`${req.method}: ${req.uri || req.url} completed succcessfully with ${response.statusCode} statusCode!`));
+        debug(`${req.method}: ${req.uri || req.url} completed succcessfully with ${response.statusCode} statusCode!`);
         return cb(null, body);
       } else if (response.statusCode === 429) {
         timeDelay = Math.pow(Math.SQRT2, RETRY) * 100;
-        log(warning(`API rate limit exceeded.\nReceived ${response.statusCode} status\nBody ${JSON.stringify(body)}`));
-        log(warning(`Retrying ${req.uri || req.url} with ${timeDelay} sec delay`));
+        debug(`API rate limit exceeded.\nReceived ${response.statusCode} status\nBody ${JSON.stringify(body)}`);
+        debug(`Retrying ${req.uri || req.url} with ${timeDelay} sec delay`);
         return setTimeout(function (req, cb, RETRY) {
           return makeCall(req, cb, RETRY);
         }, timeDelay, req, cb, RETRY);
       } else if (response.statusCode >= 500) {
         // retry, with delay
         timeDelay = Math.pow(Math.SQRT2, RETRY) * 100;
-        log(warning(`SERVER ERROR\nRecevied ${response.statusCode} status from Contentstack!\nBody ${JSON.stringify(body)}`));
-        log(warning(`Retrying ${req.uri || req.url} with ${timeDelay} sec delay`));
+        debug(`SERVER ERROR\nRecevied ${response.statusCode} status from Contentstack!\nBody ${JSON.stringify(body)}`);
+        debug(`Retrying ${req.uri || req.url} with ${timeDelay} sec delay`);
         RETRY++;
         return setTimeout(function (req, cb, RETRY) {
           return makeCall(req, cb, RETRY);
         }, timeDelay, req, cb, RETRY);
       } else {
-        log(error(`Request failed\n${JSON.stringify(req)}`));
-        log(error(`Response received\n${JSON.stringify(body)}`));
+        debug(`Request failed\n${JSON.stringify(req)}`);
+        debug(`Response received\n${JSON.stringify(body)}`);
         return cb(body);
       }
     });