Merge pull request #679 from deivid-rodriguez/fix_skip_args_issue

Fix `--skip-foo` switches when there's a trailing non-switch

Author: rafaelfranca

lib/thor/parser/options.rb

@@ -196,18 +196,21 @@ def parsing_options?
     # Parse boolean values which can be given as --foo=true, --foo or --no-foo.
     #
     def parse_boolean(switch)
-      if current_is_value?
+      no_or_skip = no_or_skip?(switch)
+      if no_or_skip
+        @switches.key?(switch) || !no_or_skip
+      elsif current_is_value?
         if ["true", "TRUE", "t", "T", true].include?(peek)
           shift
           true
         elsif ["false", "FALSE", "f", "F", false].include?(peek)
           shift
           false
         else
-          !no_or_skip?(switch)
+          !no_or_skip
         end
       else
-        @switches.key?(switch) || !no_or_skip?(switch)
+        @switches.key?(switch) || !no_or_skip
       end
     end
 

spec/parser/options_spec.rb

@@ -337,6 +337,10 @@ def remaining
         expect(parse("--skip-foo")["foo"]).to eq(false)
       end
 
+      it "accepts --[skip-]opt variant, setting false for value, even if there's a trailing non-switch" do
+        expect(parse("--skip-foo", "asdf")["foo"]).to eq(false)
+      end
+
       it "will prefer 'no-opt' variant over inverting 'opt' if explicitly set" do
         create "--no-foo" => true
         expect(parse("--no-foo")["no-foo"]).to eq(true)
@@ -347,6 +351,11 @@ def remaining
         expect(parse("--skip-foo")["skip-foo"]).to eq(true)
       end
 
+      it "will prefer 'skip-opt' variant over inverting 'opt' if explicitly set, even if there's a trailing non-switch" do
+        create "--skip-foo" => true
+        expect(parse("--skip-foo", "asdf")["skip-foo"]).to eq(true)
+      end
+
       it "accepts inputs in the human name format" do
         create :foo_bar => :boolean
         expect(parse("--foo-bar")["foo_bar"]).to eq(true)