choosy 0.4.8 → 0.4.9

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    choosy (0.4.3)
+    choosy (0.4.8)
 
 GEM
   remote: http://rubygems.org/
@@ -25,8 +25,8 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  ZenTest (>= 4.5.0)
+  ZenTest
   autotest
   autotest-notification
   choosy!
-  rspec (~> 2.5)
+  rspec

data/lib/VERSION.yml

@@ -1,6 +1,6 @@
 --- 
-date: 31/03/2011
+date: 07/04/2011
 version: 
-  tiny: 8
+  tiny: 9
   major: 0
   minor: 4

data/lib/choosy/printing/help_printer.rb

@@ -74,11 +74,19 @@ module Choosy::Printing
 
     protected
     def highlight_begin
-      @highlight_begin ||= color.multiple(nil, option_styles)
+      @highlight_begin ||= if color.disabled?
+                             ''
+                           else
+                             color.multiple(nil, option_styles)
+                           end
     end
 
     def highlight_end
-      color.reset
+      if color.disabled?
+        ''
+      else
+        color.reset 
+      end
     end
 
     def nl

data/lib/choosy/super_parser.rb

@@ -52,8 +52,6 @@ module Choosy
     end
 
     def parse_globals(args)
-      count = args.count
-
       result = SuperParseResult.new(@super_command)
       parser = Parser.new(@super_command, true, [])
       parser.parse!(args, result)
@@ -61,7 +59,7 @@ module Choosy
 
       # if we found a global action, we should have hit it by now...
       if result.unparsed.length == 0
-        if count == 0 && @super_command.has_default?
+        if @super_command.has_default?
           result.unparsed << @super_command.default_command.to_s
         elsif @super_command.command_builders[Choosy::DSL::SuperCommandBuilder::HELP]
           raise Choosy::HelpCalled.new(Choosy::DSL::SuperCommandBuilder::SUPER)

data/spec/choosy/printing/help_printer_spec.rb

@@ -106,5 +106,14 @@ module Choosy::Printing
          whole screen at least once, so that I can test whether it's
          properly formatted\n")
     end
+
+    it "should format a regular option with color, when not disabled" do
+      @h.regular_option(@c.listing[5]).should eql("    \e[1m--count\e[0m COUNT")
+    end
+
+    it "should format a regular option without color when color is disabled" do
+      @h.color.disable!
+      @h.regular_option(@c.listing[5]).should eql("    --count COUNT")
+    end
   end
 end

data/spec/integration/supercommand-C_spec.rb

@@ -5,9 +5,11 @@ describe "SuperCommand C" do
   class SuperCommandC
     def super_command
       Choosy::SuperCommand.new :super do
+        default :subA
 
         command subA
         command subB
+        command :help
 
         boolean :option, "Option" do
           desc option_name
@@ -33,13 +35,19 @@ describe "SuperCommand C" do
     end
   end
 
+  before :each do
+    @sup = SuperCommandC.new.super_command
+  end
+
   it "should set the option name correctly" do
-    sup = SuperCommandC.new.super_command
-    sup.option_builders[:option].entity.description.should eql("an option name")
+    @sup.option_builders[:option].entity.description.should eql("an option name")
   end
 
   it "should set the sub-option name correctly" do
-    sup = SuperCommandC.new.super_command
-    sup.command_builders[:subA].entity.option_builders[:sub_option].entity.description.should eql("an option name")
+    @sup.command_builders[:subA].entity.option_builders[:sub_option].entity.description.should eql("an option name")
+  end
+
+  it "should return the default command on parse" do
+    @sup.parse!(['-o'], true).subresults[0].command.name.should eql(:subA)
   end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 4
-  - 8
-  version: 0.4.8
+  - 9
+  version: 0.4.9
 platform: ruby
 authors: 
 - Gabe McArthur
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-31 00:00:00 -07:00
+date: 2011-04-07 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency