[fixes #1265] don’t diverge the promise chain (we must wait for the u…

…pdate to occur)

also some MISC refactoring

lib/tasks/update.js

@@ -5,8 +5,15 @@ var chalk    = require('chalk');
 var Task     = require('../models/task');
 var fs       = require('fs');
 
+function npmInstall(npm) {
+  return Promise.denodeify(npm.commands.install)(['ember-cli']);
+}
+
 module.exports = Task.extend({
   run: function(options, updateInfo) {
+    var env = options.environment || 'development';
+    process.env.EMBER_ENV = process.env.EMBER_ENV || env;
+
     this.ui.write(chalk.yellow('\nA new version of ember-cli is available (' +
       updateInfo.newestVersion + ').\n'));
 
@@ -22,26 +29,29 @@ module.exports = Task.extend({
 
     return this.ui.prompt(updatePrompt).then(function(response) {
       if (response.answer === true) {
-        this.runNpmUpdate(updateInfo.newestVersion);
+        return this.runNpmUpdate(updateInfo.newestVersion);
       }
     }.bind(this));
   },
-  init: function() {
-    this.npm = this.npm || require('npm');
-    this.loadNPM = Promise.denodeify(this.npm.load);
-  },
 
   runNpmUpdate: function(newestVersion) {
     this.ui.pleasantProgress.start(chalk.green('Updating ember-cli'), chalk.green('.'));
 
-    this.loadNPM({
-      loglevel: 'silent',
-      global: true
-    })
-    .then(function(npm) {
-      return Promise.denodeify(npm.commands.install)(['ember-cli']);
-    }.bind(this))
-    .then(function() {
+    // first, run `npm install -g ember-cli`
+    var npm = require('npm');
+    var loadNPM = Promise.denodeify(npm.load);
+
+    var stopProgress (function() {
+      this.ui.pleasantProgress.stop();
+    }.bind(this));
+
+    var reportFailure = (function() {
+      this.ui.write('There was an error – possibly a permissions issue. You ' +
+                    'may need to manually run ' +
+                    chalk.green('npm install -g ember-cli') + '.\n');
+    }.bind(this));
+
+    var updateDependencies = (function() {
       // update project's package.json file manually
       var packageFilePath = this.project.root + '/package.json';
 
@@ -57,15 +67,16 @@ module.exports = Task.extend({
       fs.writeFileSync(packageFilePath, JSON.stringify(jsonContent, null, 2));
       this.ui.write(chalk.green('\n✓ ember-cli was successfully updated!\n'));
       this.showEmberInitPrompt();
-    }.bind(this))
-    .catch(function() {
-      this.ui.write('There was an error – possibly a permissions issue. You ' +
-        'may need to manually run ' +
-        chalk.green('npm install -g ember-cli') + '.\n');
-    }.bind(this))
-    .finally(function() {
-      this.ui.pleasantProgress.stop();
     }.bind(this));
+
+    return loadNPM({
+        loglevel: 'silent',
+        global: true
+      })
+      .then(npmInstall)
+      .then(updateDependencies)
+      .catch(reportFailure)
+      .finally(stopProgress);
   },
 
   showEmberInitPrompt: function() {
@@ -97,5 +108,4 @@ module.exports = Task.extend({
       }
     }.bind(this));
   }
-
 });