Allow --no-foo to be given as --skip-foo.

rails · Jun 26, 2009 · 392cd4a · 392cd4a
1 parent 8cc72b2
commit 392cd4a
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/lib/thor/options.rb b/lib/thor/options.rb
@@ -153,7 +153,7 @@ def switch?(arg)
       # Returns the option object for the given switch.
       #
       def switch_option(arg)
-        if arg =~ /^--no-(\w+)$/
+        if arg =~ /^--(no|skip)-(\w+)$/
           @switches[arg] || @switches["--#{$1}"]
         else
           @switches[arg]
@@ -177,7 +177,7 @@ def parse_option(switch, option, hash)
           when :default
             hash[human_name] = peek.nil? || peek.to_s =~ /^-/ || shift
           when :boolean
-            if !@switches.key?(switch) && switch =~ /^--no-(\w+)$/
+            if !@switches.key?(switch) && switch =~ /^--(no|skip)-(\w+)$/
               hash[$1] = false
             else
               hash[human_name] = true

diff --git a/spec/options_spec.rb b/spec/options_spec.rb
@@ -257,10 +257,19 @@ def sorted_usage
         parse("--no-foo")["foo"].must == false
       end
 
+      it "accepts --[skip-]opt variant, setting false for value" do
+        parse("--skip-foo")["foo"].must == false
+      end
+
       it "will prefer 'no-opt' variant over inverting 'opt' if explicitly set" do
         create "--no-foo" => true
         parse("--no-foo")["no-foo"].must == true
       end
+
+      it "will prefer 'skip-opt' variant over inverting 'opt' if explicitly set" do
+        create "--skip-foo" => true
+        parse("--skip-foo")["skip-foo"].must == true
+      end
     end
 
     describe "with :hash type" do