thor 0.14.2 → 0.14.3

data/lib/thor/parser/options.rb

@@ -50,10 +50,12 @@ class Thor
     end
 
     def parse(args)
-      @pile = except_underscores(args.dup)
+      @pile = args.dup
 
       while peek
-        if current_is_switch?
+        match, is_switch = current_is_switch?
+
+        if is_switch
           case shift
             when SHORT_SQ_RE
               unshift($1.split('').map { |f| "-#{f}" })
@@ -68,7 +70,7 @@ class Thor
           switch = normalize_switch(switch)
           option = switch_option(switch)
           @assigns[option.human_name] = parse_peek(switch, option)
-        elsif current_is_switch_formatted?
+        elsif match
           @unknown << shift
         else
           shift
@@ -92,15 +94,17 @@ class Thor
       #
       def current_is_switch?
         case peek
-          when LONG_RE, SHORT_RE, EQ_RE, SHORT_NUM
-            switch?($1)
-          when SHORT_SQ_RE
-            $1.split('').any? { |f| switch?("-#{f}") }
+        when LONG_RE, SHORT_RE, EQ_RE, SHORT_NUM
+          [true, switch?($1)]
+        when SHORT_SQ_RE
+          [true, $1.split('').any? { |f| switch?("-#{f}") }]
+        else
+          [false, false]
         end
       end
 
-      def switch_formatted?(arg)
-        case arg
+      def current_is_switch_formatted?
+        case peek
         when LONG_RE, SHORT_RE, EQ_RE, SHORT_NUM, SHORT_SQ_RE
           true
         else
@@ -108,12 +112,8 @@ class Thor
         end
       end
 
-      def current_is_switch_formatted?
-        switch_formatted? peek
-      end
-
       def switch?(arg)
-        switch_option(arg) || @shorts.key?(arg)
+        switch_option(normalize_switch(arg))
       end
 
       def switch_option(arg)
@@ -127,7 +127,7 @@ class Thor
       # Check if the given argument is actually a shortcut.
       #
       def normalize_switch(arg)
-        @shorts.key?(arg) ? @shorts[arg] : arg
+        (@shorts[arg] || arg).tr('_', '-')
       end
 
       # Parse boolean values which can be given as --foo=true, --foo or --no-foo.
@@ -169,12 +169,5 @@ class Thor
         @non_assigned_required.delete(option)
         send(:"parse_#{option.type}", switch)
       end
-      
-      # Except underscores in commandline switches
-      def except_underscores(args)
-        args.map {|x| x =~ /^--/ ? x.gsub('_', '-') : x }
-      end
-      
-
   end
 end

data/lib/thor/version.rb

@@ -1,3 +1,3 @@
 class Thor
-  VERSION = "0.14.2".freeze
+  VERSION = "0.14.3".freeze
 end

data/spec/parser/options_spec.rb

@@ -132,7 +132,6 @@ describe Thor::Options do
       parse("--foo_bar", "baz")["foo_bar"].must == "baz"
       parse("--baz_foo", "foo bar")["baz_foo"].must == "foo bar"
     end
-    
 
     describe "with no input" do
       it "and no switches returns an empty hash" do
@@ -188,6 +187,11 @@ describe Thor::Options do
         parse("--foo=12")["foo"].must == "12"
         parse("--foo=bar=baz")["foo"].must == "bar=baz"
       end
+      
+      it "must accept underscores switch=value assignment" do
+        create :foo_bar => :required
+        parse("--foo_bar=http://example.com/under_score/")["foo_bar"].must == "http://example.com/under_score/"
+      end
 
       it "accepts a --no-switch format" do
         create "--foo" => "bar"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: thor
 version: !ruby/object:Gem::Version 
-  hash: 35
+  hash: 33
   prerelease: false
   segments: 
   - 0
   - 14
-  - 2
-  version: 0.14.2
+  - 3
+  version: 0.14.3
 platform: ruby
 authors: 
 - Yehuda Katz
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-24 00:00:00 +02:00
+date: 2010-10-04 00:00:00 +02:00
 default_executable: 
 dependencies: []