mup - npm Package Compare versions

Comparing version 0.1.6 to 0.1.7

example/mup.json

@@ -21,4 +21,8 @@ {
   "env": {
-    "ROOT_URL": "http://supersite.com"
-  }
+    "ROOT_URL": "http://myapp.com"
+  },
+
+  //meteor-up checks if the app comes online just after the deployment
+  //before mup checks that, it will wait for no. of seconds configured below
+  "deployCheckWaitTime": 5
 }

lib/actions.js

@@ -14,4 +14,9 @@ var nodemiral = require('nodemiral');
   this.config = config;
+  this.sessions = this._createSession(config);
 
-  this.sessions = this._createSession(config);
+  //get settings.json into env
+  var setttingsJsonPath = path.resolve(this.cwd, 'settings.json');
+  if(fs.existsSync(setttingsJsonPath)) {
+    this.config.env['METEOR_SETTINGS'] = "'" + JSON.stringify(require(setttingsJsonPath)) + "'";
+  }
 }
@@ -50,2 +55,3 @@
   var options = {cwd: this.config.app};
+  var deployCheckWaitTime = this.config.deployCheckWaitTime;
 
@@ -62,3 +68,3 @@ console.log('Bundling Started: ' + this.config.app);
     } else {
-      var taskList = taskLists.deploy(bundlePath, self.cwd, self.config.env);
+      var taskList = taskLists.deploy(bundlePath, self.config.env, deployCheckWaitTime);
       taskList.run(self.sessions, afterCompleted);
@@ -74,5 +80,3 @@ }
 Actions.prototype.reconfig = function() {
-  var env = this.config.env;
-
-  var taskList = taskLists.reconfig(this.cwd, env);
+  var taskList = taskLists.reconfig(this.config.env);
   taskList.run(this.sessions);
@@ -79,0 +83,0 @@ };

lib/config.js

@@ -38,2 +38,5 @@ var cjson = require('cjson');
 
+    //initialize env
+    mupJson.env = mupJson.env || {};
+
     return mupJson;
@@ -40,0 +43,0 @@ } else {

lib/taskLists.js

@@ -41,11 +41,6 @@ var nodemiral = require('nodemiral');
 
-  taskList.copy('setttings up deployment', {
-    src: path.resolve(TEMPLATES_DIR, 'deploy.sh'),
-    dest: '/opt/meteor/deploy.sh'
-  });
-
   return taskList;
 };
 
-exports.deploy = function(bundlePath, cwd, env) {
+exports.deploy = function(bundlePath, env, deployCheckWaitTime) {
   var taskList = nodemiral.taskList("Deploying App");
@@ -66,17 +61,6 @@
 
-  var setttingsJsonPath = path.resolve(cwd, 'settings.json');
-  if(fs.existsSync(setttingsJsonPath)) {
-    taskList.copy('uploading settings.json', {
-      src: setttingsJsonPath,
-      dest: '/opt/meteor/config/settings.json'
-    });
-  } else {
-    taskList.execute('cleaning up old settings.json', {
-      command: 'sudo rm /opt/meteor/config/settings.json || :'
-    });
-  }
-
   //deploying
-  taskList.execute('calling deploy script', {
-    command: 'sudo bash /opt/meteor/deploy.sh'
+  taskList.executeScript('invoking deployment process', {
+    script: path.resolve(TEMPLATES_DIR, 'deploy.sh'),
+    vars: {deployCheckWaitTime: deployCheckWaitTime || 10}
   });
@@ -87,3 +71,3 @@
 
-exports.reconfig = function(cwd, env) {
+exports.reconfig = function(env) {
   var taskList = nodemiral.taskList("Updating Configurations");
@@ -99,17 +83,5 @@
 
-  var setttingsJsonPath = path.resolve(cwd, 'settings.json');
-  if(fs.existsSync(setttingsJsonPath)) {
-    taskList.copy('uploading settings.json', {
-      src: setttingsJsonPath,
-      dest: '/opt/meteor/config/settings.json'
-    });
-  } else {
-    taskList.execute('cleaning up old settings.json', {
-      command: 'sudo rm /opt/meteor/config/settings.json || :'
-    });
-  }
-
   //deploying
-  taskList.execute('calling deploy script', {
-    command: 'sudo bash /opt/meteor/deploy.sh'
+  taskList.execute('restarting the app', {
+    command: '(sudo stop meteor || :) && (sudo start meteor)'
   });
@@ -116,0 +88,0 @@

package.json

 {
   "name": "mup",
-  "version": "0.1.6",
+  "version": "0.1.7",
   "description": "Production Quality Meteor Deplouments",
@@ -5,0 +5,0 @@ "dependencies": {

README.md

@@ -64,3 +64,3 @@ # Meteor UP
 
-After you've edit configurations or settings.json, you can reconfigure the app without deploying again. Use following command for that.
+After you've edit environmental variables or settings.json, you can reconfigure the app without deploying again. Use following command for that.
 
@@ -80,2 +80,2 @@ mup reconfig
 
-for more information see [`lib/taskLists.js`](https://github.com/arunoda/meteor-up/blob/master/lib/taskLists.js)
+for more information see [`lib/taskLists.js`](https://github.com/arunoda/meteor-up/blob/master/lib/taskLists.js)

New alerts

Dynamic require

Supply chain risk

Dynamic require can indicate the package is performing dangerous or unsafe dynamic code execution.

Found 1 instance in 1 package

Improved metrics

Number of lines in readme file

80

increased by1.27%

Worsened metrics

Total package byte prevSize

16608

decreased by-1.59%

Lines of code

254

decreased by-5.58%

Number of low supply chain risk alerts

5

increased by25%

No dependency changes