Merge pull request #682 from deivid-rodriguez/ammend_no_or_skip_with_trailing_option_fix

Amend `--skip-foo` fix with a trailing option

Author: rafaelfranca

lib/thor/parser/options.rb

@@ -171,7 +171,7 @@ def current_is_value?
     end
 
     def switch?(arg)
-      switch_option(normalize_switch(arg))
+      !switch_option(normalize_switch(arg)).nil?
     end
 
     def switch_option(arg)
@@ -196,21 +196,18 @@ def parsing_options?
     # Parse boolean values which can be given as --foo=true, --foo or --no-foo.
     #
     def parse_boolean(switch)
-      no_or_skip = no_or_skip?(switch)
-      if no_or_skip
-        @switches.key?(switch) || !no_or_skip
-      elsif current_is_value?
+      if 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
+          @switches.key?(switch) || !no_or_skip?(switch)
         end
       else
-        @switches.key?(switch) || !no_or_skip
+        @switches.key?(switch) || !no_or_skip?(switch)
       end
     end
 

spec/parser/options_spec.rb

@@ -356,6 +356,14 @@ def remaining
         expect(parse("--skip-foo", "asdf")["skip-foo"]).to eq(true)
       end
 
+      it "will prefer 'skip-opt' variant over inverting 'opt' if explicitly set, and given a value" do
+        create "--skip-foo" => true
+        expect(parse("--skip-foo=f")["skip-foo"]).to eq(false)
+        expect(parse("--skip-foo=false")["skip-foo"]).to eq(false)
+        expect(parse("--skip-foo=t")["skip-foo"]).to eq(true)
+        expect(parse("--skip-foo=true")["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)