gli 2.6.1 → 2.6.2

data/features/todo.feature

@@ -175,6 +175,7 @@ Feature: The todo app has a nice user interface
       | help list       |
       | list -h         |
       | list --help     |
+      | --help list     |
 
 
   Scenario: Getting Help for a top level command of todo with no command options

data/lib/gli/app_support.rb

@@ -61,7 +61,7 @@ module GLI
       begin
         override_defaults_based_on_config(parse_config)
 
-        add_help_switch_if_needed(switches)
+        add_help_switch_if_needed(self)
 
         gli_option_parser = GLIOptionParser.new(commands,
                                                 flags,
@@ -79,7 +79,7 @@ module GLI
           call_command(parsing_result) 
           0
         else
-          exit_now!(nil,65)
+          raise PreconditionFailed, "preconditions failed"
         end
       rescue Exception => ex
         if the_command.nil? && ex.respond_to?(:command_in_context)
@@ -231,15 +231,13 @@ module GLI
 
     end
 
-    def add_help_switch_if_needed(switches)
-      help_switch_exists = switches.values.find { |switch| 
-        (Array(switch.aliases) + [switch.name]).find { |an_alias| 
-          an_alias.to_s == 'help' 
-        } 
+    def add_help_switch_if_needed(target)
+      help_switch_exists = target.switches.values.find { |switch| 
+        switch.names_and_aliases.map(&:to_s).find { |an_alias| an_alias == 'help' } 
       }
       unless help_switch_exists
-        desc 'Show this message'
-        switch :help, :negatable => false
+        target.desc 'Show this message'
+        target.switch :help, :negatable => false
       end
     end
 

data/lib/gli/exceptions.rb

@@ -11,6 +11,11 @@ module GLI
     def exit_code; 64; end
   end
 
+  class PreconditionFailed < StandardError
+    include StandardException
+    def exit_code; 65; end
+  end
+
   # Indicates the bad command line was an unknown command
   class UnknownCommand < BadCommandLine
   end

data/lib/gli/gli_option_parser.rb

@@ -28,8 +28,12 @@ module GLI
 
       def parse!(parsing_result)
         parsing_result.arguments      = GLIOptionBlockParser.new(@option_parser_factory,UnknownGlobalArgument).parse!(parsing_result.arguments)
-        command_name                  = parsing_result.arguments.shift
         parsing_result.global_options = @option_parser_factory.options_hash_with_defaults_set!
+        command_name = if parsing_result.global_options[:help]
+                         "help"
+                       else
+                         parsing_result.arguments.shift
+                       end
         parsing_result.command        = @command_finder.find_command(command_name)
         parsing_result
       end

data/lib/gli/version.rb

@@ -1,5 +1,5 @@
 module GLI
   unless const_defined? :VERSION
-    VERSION = '2.6.1'
+    VERSION = '2.6.2'
   end
 end

data/test/tc_command.rb

@@ -355,7 +355,7 @@ class TC_testCommand < Clean::Test::TestCase
     @app.pre { |*| false }
 
     assert_equal 65,@app.run(["bs"]) # BSD for "input data incorrect in some way"
-    assert_equal '',@fake_stderr.to_s
+    assert_equal 'error: preconditions failed',@fake_stderr.to_s
     assert_equal '',@fake_stdout.to_s
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gli
 version: !ruby/object:Gem::Version
-  version: 2.6.1
+  version: 2.6.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-26 00:00:00.000000000 Z
+date: 2013-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake