Fix commands running even with pretend enabled

Author: DuoSRX

lib/thor/actions.rb

@@ -251,7 +251,9 @@ def run(command, config = {})
 
       say_status :run, desc, config.fetch(:verbose, true)
 
-      !options[:pretend] && config[:capture] ? `#{command}` : system(command.to_s)
+      unless options[:pretend]
+        config[:capture] ? `#{command}` : system(command.to_s)
+      end
     end
 
     # Executes a ruby script (taking into account WIN32 platform quirks).

spec/actions_spec.rb

@@ -253,25 +253,35 @@ def file
   end
 
   describe "#run" do
-    before do
-      expect(runner).to receive(:system).with("ls")
-    end
+    describe "when not pretending" do
+      before do
+        expect(runner).to receive(:system).with("ls")
+      end
 
-    it "executes the command given" do
-      action :run, "ls"
-    end
+      it "executes the command given" do
+        action :run, "ls"
+      end
 
-    it "logs status" do
-      expect(action(:run, "ls")).to eq("         run  ls from \".\"\n")
-    end
+      it "logs status" do
+        expect(action(:run, "ls")).to eq("         run  ls from \".\"\n")
+      end
 
-    it "does not log status if required" do
-      expect(action(:run, "ls", :verbose => false)).to be_empty
+      it "does not log status if required" do
+        expect(action(:run, "ls", :verbose => false)).to be_empty
+      end
+
+      it "accepts a color as status" do
+        expect(runner.shell).to receive(:say_status).with(:run, 'ls from "."', :yellow)
+        action :run, "ls", :verbose => :yellow
+      end
     end
 
-    it "accepts a color as status" do
-      expect(runner.shell).to receive(:say_status).with(:run, 'ls from "."', :yellow)
-      action :run, "ls", :verbose => :yellow
+    describe "when pretending" do
+      it "doesn't execute the command" do
+        runner = MyCounter.new([1], %w(--pretend))
+        expect(runner).not_to receive(:system)
+        runner.run("ls", :verbose => false)
+      end
     end
   end