gli 2.6.2 → 2.7.0

data/lib/gli/app_support.rb

@@ -211,6 +211,8 @@ module GLI
             commands[:help].execute({},{},command.nil? ? [] : [command.name.to_s])
           end
         end
+      elsif ENV['GLI_DEBUG'] == 'true'
+        stderr.puts "Custom error handler exited false, skipping normal error handling"
       end
 
       raise ex if ENV['GLI_DEBUG'] == 'true'
@@ -254,7 +256,8 @@ module GLI
     # Returns true if we should proceed with GLI's basic error handling.
     # This calls the error block if the user provided one
     def regular_error_handling?(ex) #:nodoc:
-      if @error_block
+      if @error_block 
+        return true if (ex.respond_to?(:exit_code) && ex.exit_code == 0)
         @error_block.call(ex)
       else
         true

data/lib/gli/dsl.rb

@@ -157,20 +157,25 @@ module GLI
         :skips_post => @skips_post,
         :skips_around => @skips_around,
       }
+      @commands_declaration_order ||= []
       if names.first.kind_of? Hash
         command = GLI::Commands::CompoundCommand.new(self,
                                                      names.first,
                                                      command_options)
         command.parent = self
         commands[command.name] = command
+        @commands_declaration_order << command
       else
-        command = Command.new(command_options.merge(:names => [names].flatten))
-        command.parent = self
-        commands[command.name] = command
+        new_command = Command.new(command_options.merge(:names => [names].flatten))
+        command = commands[new_command.name]
+        if command.nil?
+          command = new_command
+          command.parent = self
+          commands[command.name] = command
+          @commands_declaration_order << command
+        end
         yield command
       end
-      @commands_declaration_order ||= []
-      @commands_declaration_order << command
       clear_nexts
     end
     alias :c :command

data/lib/gli/version.rb

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

data/test/tc_command.rb

@@ -206,6 +206,48 @@ class TC_testCommand < Clean::Test::TestCase
     assert_contained(@fake_stdout,/SYNOPSIS/)
   end
 
+  def test_error_handler_prints_that_its_skipping_when_gli_debug_is_set
+    ENV["GLI_DEBUG"] = 'true'
+    @app.on_error do
+      false
+    end
+    @app.command :blah do |c|
+      c.action do |*|
+        raise 'wtf'
+      end
+    end
+
+    assert_raises(RuntimeError) {
+      @app.run(['blah'])
+    }
+    assert_contained(@fake_stderr,/Custom error handler exited false, skipping normal error handling/)
+  end
+
+  def test_error_handler_should_be_called_on_help_now
+    @app.command :blah do |c|
+      c.action do |*|
+        help_now!
+      end
+    end
+    @app.run(["blah"])
+    assert @error_called
+  end
+
+  def test_error_handler_shouldnt_be_called_on_help_from_command_line
+    @app.command :blah do |c|
+      c.action do |*|
+      end
+    end
+    [
+      ["--help", "blah"],
+      ["blah", "--help"],
+    ].each do |args|
+      args_copy = args.clone
+      @app.run(args)
+      assert !@error_called, "for args #{args_copy.inspect}"
+    end
+  end
+
   def test_command_skips_pre
     @app.skips_pre
     @app.skips_post

data/test/tc_subcommands.rb

@@ -45,6 +45,67 @@ class TC_testSubCommand < Clean::Test::TestCase
                                        :args => ['bar'])
   end
 
+  test_that "we can reopen commands to add new subcommands" do
+    Given {
+      @app.command :remote do |p|
+        p.command :add do |c|
+          c.action do |global_options,command_options,args|
+            @ran_command = :add
+          end
+        end
+      end
+      @app.command :remote do |p|
+        p.command :new do |c|
+          c.action do |global_options,command_options,args|
+            @ran_command = :new
+          end
+        end
+      end
+    }
+    When run_app('remote','new')
+    Then { assert_equal(@ran_command, :new) }
+    When run_app('remote', 'add')
+    Then { assert_equal(@ran_command, :add) }
+  end
+
+  test_that "reopening commands doesn't re-add them to the output" do
+    Given {
+      @app.command :remote do |p|
+        p.command(:add) { }
+      end
+      @app.command :remote do |p|
+        p.command(:new) { }
+      end
+    }
+    command_names = @app.instance_variable_get("@commands_declaration_order").collect { |c| c.name }
+    assert_equal 1, command_names.grep(:remote).size
+  end
+
+
+  test_that "we can reopen commands doesn't cause conflicts" do
+    Given {
+      @app.command :remote do |p|
+        p.command :add do |c|
+          c.action do |global_options,command_options,args|
+            @ran_command = :remote_add
+          end
+        end
+      end
+      @app.command :local do |p|
+        p.command :add do |c|
+          c.action do |global_options,command_options,args|
+            @ran_command = :local_add
+          end
+        end
+      end
+    }
+    When run_app('remote','add')
+    Then { assert_equal(@ran_command, :remote_add) }
+    When run_app('local', 'add')
+    Then { assert_equal(@ran_command, :local_add) }
+  end
+
+
   test_that "we can nest subcommands very deep" do
     Given {
       @run_results = { :add => nil, :rename => nil, :base => nil }

metadata

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