Merge pull request #651 from hibariya/abort-run-on-failure

Abort if the command for `run` fails and `exit_on_failure?` is true

Author: rafaelfranca

lib/thor/actions.rb

@@ -269,7 +269,7 @@ def run(command, config = {})
         success = result
       end
 
-      abort if config[:abort_on_failure] && !success
+      abort if !success && config.fetch(:abort_on_failure, self.class.exit_on_failure?)
 
       result
     end

lib/thor/base.rb

@@ -509,6 +509,12 @@ def handle_argument_error(command, error, args, arity) #:nodoc:
         raise InvocationError, msg
       end
 
+      # A flag that makes the process exit with status 1 if any error happens.
+      def exit_on_failure?
+        Thor.deprecation_warning "Thor exit with status 0 on errors. To keep this behavior, you must define `exit_on_failure?` in `#{self.name}`"
+        false
+      end
+
     protected
 
       # Prints the class options per group. If an option does not belong to
@@ -646,12 +652,6 @@ def from_superclass(method, default = nil)
         end
       end
 
-      # A flag that makes the process exit with status 1 if any error happens.
-      def exit_on_failure?
-        Thor.deprecation_warning 'Thor exit with status 0 on errors. To keep this behavior, you must define `exit_on_failure?`'
-        false
-      end
-
       #
       # The basename of the program invoking the thor class.
       #

spec/actions_spec.rb

@@ -328,6 +328,20 @@ def file
         end
       end
     end
+
+    context "exit_on_failure? is true" do
+      before do
+        allow(MyCounter).to receive(:exit_on_failure?).and_return(true)
+      end
+
+      it "aborts when command fails even if abort_on_failure is not given" do
+        expect { action :run, "false" }.to raise_error(SystemExit)
+      end
+
+      it "does not abort when abort_on_failure is false even if the command fails" do
+        expect { action :run, "false", :abort_on_failure => false }.not_to raise_error
+      end
+    end
   end
 
   describe "#run_ruby_script" do

spec/fixtures/group.thor

@@ -2,6 +2,10 @@ class MyCounter < Thor::Group
   include Thor::Actions
   add_runtime_options!
 
+  def self.exit_on_failure?
+    false
+  end
+
   def self.get_from_super
     from_superclass(:get_from_super, 13)
   end