choosy 0.4.2 → 0.4.3

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.4.3 (March 29, 2011)
+
+Fixes:
+
+  - The 'parsimonious' operation on SuperCommands now allows 'help' to take an argument.
+
 ## 0.4.0 (March 28, 2011)
 
 Fixes:

data/lib/VERSION.yml

@@ -1,6 +1,6 @@
 --- 
-date: 28/03/2011
+date: 29/03/2011
 version: 
-  tiny: 2
+  tiny: 3
   major: 0
   minor: 4

data/lib/choosy/super_parser.rb

@@ -75,7 +75,8 @@ module Choosy
 
     def parse_command(args, terminals)
       command_name = args.shift
-      command_builder = @super_command.command_builders[command_name.to_sym]
+      command_sym = command_name.to_sym
+      command_builder = @super_command.command_builders[command_sym]
       if command_builder.nil?
         if command_name =~ /^-/
           raise Choosy::SuperParseError.new("unrecognized option: '#{command_name}'")
@@ -85,7 +86,11 @@ module Choosy
       end
 
       command = command_builder.entity
-      parser = Parser.new(command, false, terminals)
+      parser = if command_sym == :help
+                 Parser.new(command, false, [])
+               else
+                 Parser.new(command, false, terminals)
+               end
       command_result = Choosy::ParseResult.new(command, true)
       parser.parse!(args, command_result)
 

data/spec/choosy/super_parser_spec.rb

@@ -128,6 +128,16 @@ module Choosy
             @p.command(:bar).parse!('bar', '--version')
           }.should raise_error(Choosy::VersionCalled)
         end
+
+        it "should call 'help' with the appropriate args when defined" do
+          @p.super.alter do
+            command :help
+          end
+
+          attempting {
+            @p.command(:bar).parse!('help', 'bar')
+          }.should raise_error(Choosy::HelpCalled, :bar)
+        end
       end
     end
   end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 4
-  - 2
-  version: 0.4.2
+  - 3
+  version: 0.4.3
 platform: ruby
 authors: 
 - Gabe McArthur
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-28 00:00:00 -07:00
+date: 2011-03-29 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency