Had a finally instead of a then, fixes #5

- Small messaging change to a warning
ember-cli · Apr 3, 2015 · 0600431 · 0600431
1 parent bc2aba7
commit 0600431
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/lib/tasks/try.js b/lib/tasks/try.js
@@ -10,7 +10,7 @@ module.exports = Task.extend({
     var task = this;
 
     process.on('SIGINT', function() {
-      console.log( "\nGracefully shutting down from SIGINT (Ctrl-C)" );
+      task.ui.writeLine( "\nGracefully shutting down from SIGINT (Ctrl-C)" );
       BowerHelpers.cleanup(task.project.root).then(function(){
         process.exit( );
       });
@@ -27,7 +27,7 @@ module.exports = Task.extend({
             return RSVP.resolve(false);
           });
       })
-      .finally(function(result){
+      .then(function(result){
         return BowerHelpers.cleanup(task.project.root).then(function(){
           if(!result){
             task.ui.writeLine('');
@@ -38,6 +38,11 @@ module.exports = Task.extend({
             process.exit(0);
           }
         });
+      })
+      .catch(function(err){
+        task.ui.writeLine(err);
+        task.ui.writeLine(err.stack);
+        process.exit(1);
       });
   }
 });
diff --git a/lib/utils/scenario-manager.js b/lib/utils/scenario-manager.js
@@ -36,7 +36,7 @@ module.exports = CoreObject.extend({
       actualVersion = BowerHelpers.findVersion(dep, manager.project.root);
       expectedVersion = scenario.dependencies[dep];
       if(actualVersion !== expectedVersion) {
-        manager.ui.writeLine(Chalk.yellow("Versions do not match: Expected: " + expectedVersion + " but saw " + actualVersion));
+        manager.ui.writeLine(Chalk.yellow("Versions do not match: Expected: " + expectedVersion + " but saw " + actualVersion + " This might be ok, depending on the scenario"));
       }
       manager.ui.writeLine("  " + dep + " " + actualVersion);
     });