Merge pull request #174 from resin-io/jviotti/feature/confirm-abortion

Add `Aborted` error message when not accepting a confirmation

build/actions/app.js

@@ -80,10 +80,7 @@
     options: [commandOptions.yes],
     permission: 'user',
     action: function(params, options, done) {
-      return helpers.confirm(option.yes, 'Are you sure you want to delete the application?').then(function(confirmed) {
+      return helpers.confirm(options.yes, 'Are you sure you want to delete the application?').then(function() {
-        if (!confirmed) {
-          return;
-        }
         return resin.models.application.remove(params.name);
       }).nodeify(done);
     }
@@ -106,10 +103,7 @@
         var message;
         message = "Are you sure you want to associate " + currentDirectory + " with " + params.name + "?";
         return helpers.confirm(options.yes, message);
-      }).then(function(confirmed) {
+      }).then(function() {
-        if (!confirmed) {
-          return;
-        }
         return resin.models.application.get(params.name).get('git_repository').then(function(gitRepository) {
           return vcs.initialize(currentDirectory).then(function() {
             return vcs.associate(currentDirectory, gitRepository);

build/actions/device.js

@@ -75,10 +75,7 @@
     options: [commandOptions.yes],
     permission: 'user',
     action: function(params, options, done) {
-      return helpers.confirm(options.yes, 'Are you sure you want to delete the device?').then(function(confirmed) {
+      return helpers.confirm(options.yes, 'Are you sure you want to delete the device?').then(function() {
-        if (!confirmed) {
-          return;
-        }
         return resin.models.device.remove(params.uuid);
       }).nodeify(done);
     }

build/actions/environment-variables.js

@@ -56,10 +56,7 @@
     options: [commandOptions.yes, commandOptions.booleanDevice],
     permission: 'user',
     action: function(params, options, done) {
-      return helpers.confirm(options.yes, 'Are you sure you want to delete the environment variable?').then(function(confirmed) {
+      return helpers.confirm(options.yes, 'Are you sure you want to delete the environment variable?').then(function() {
-        if (!confirmed) {
-          return;
-        }
         if (options.device) {
           return resin.models.environmentVariables.device.remove(params.id);
         } else {

build/actions/keys.js

@@ -49,10 +49,7 @@
     options: [commandOptions.yes],
     permission: 'user',
     action: function(params, options, done) {
-      return helpers.confirm(options.yes, 'Are you sure you want to delete the key?').then(function(confirmed) {
+      return helpers.confirm(options.yes, 'Are you sure you want to delete the key?').then(function() {
-        if (!confirmed) {
-          return;
-        }
         return resin.models.key.remove(params.id);
       }).nodeify(done);
     }

build/utils/helpers.js

@@ -23,6 +23,10 @@
         type: 'confirm',
         "default": false
       });
+    }).then(function(confirmed) {
+      if (!confirmed) {
+        throw new Error('Aborted');
+      }
     });
   };
 

lib/actions/app.coffee

@@ -125,8 +125,7 @@ exports.remove =
 	options: [ commandOptions.yes ]
 	permission: 'user'
 	action: (params, options, done) ->
-		helpers.confirm(option.yes, 'Are you sure you want to delete the application?').then (confirmed) ->
+		helpers.confirm(options.yes, 'Are you sure you want to delete the application?').then ->
-			return if not confirmed
 			resin.models.application.remove(params.name)
 		.nodeify(done)
 
@@ -157,9 +156,7 @@ exports.associate =
 		.then ->
 			message = "Are you sure you want to associate #{currentDirectory} with #{params.name}?"
 			helpers.confirm(options.yes, message)
-
+		.then ->
-		.then (confirmed) ->
-			return if not confirmed
 
 			resin.models.application.get(params.name).get('git_repository').then (gitRepository) ->
 				vcs.initialize(currentDirectory).then ->

lib/actions/device.coffee

@@ -105,8 +105,7 @@ exports.remove =
 	options: [ commandOptions.yes ]
 	permission: 'user'
 	action: (params, options, done) ->
-		helpers.confirm(options.yes, 'Are you sure you want to delete the device?').then (confirmed) ->
+		helpers.confirm(options.yes, 'Are you sure you want to delete the device?').then ->
-			return if not confirmed
 			resin.models.device.remove(params.uuid)
 		.nodeify(done)
 

lib/actions/environment-variables.coffee

@@ -82,9 +82,7 @@ exports.remove =
 	]
 	permission: 'user'
 	action: (params, options, done) ->
-		helpers.confirm(options.yes, 'Are you sure you want to delete the environment variable?').then (confirmed) ->
+		helpers.confirm(options.yes, 'Are you sure you want to delete the environment variable?').then ->
-			return if not confirmed
-
 			if options.device
 				resin.models.environmentVariables.device.remove(params.id)
 			else

lib/actions/keys.coffee

@@ -67,8 +67,7 @@ exports.remove =
 	options: [ commandOptions.yes ]
 	permission: 'user'
 	action: (params, options, done) ->
-		helpers.confirm(options.yes, 'Are you sure you want to delete the key?').then (confirmed) ->
+		helpers.confirm(options.yes, 'Are you sure you want to delete the key?').then ->
-			return if not confirmed
 			resin.models.key.remove(params.id)
 		.nodeify(done)
 

lib/utils/helpers.coffee

@@ -21,3 +21,6 @@ exports.confirm = (yesOption, message) ->
 			message: message
 			type: 'confirm'
 			default: false
+	.then (confirmed) ->
+		if not confirmed
+			throw new Error('Aborted')