gli 2.17.0 → 2.17.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f63a411c5190a93b4b9d1b8e1516a2eadbb219e7
-  data.tar.gz: 56b7d99d7b11c9e03818f3b8a72b160a61d9a6ed
+  metadata.gz: 7a448f8a1c652b6ad37a81580150ffed9ac987cc
+  data.tar.gz: 8f56c2d35469a6a256d9d47742a7cc5bb0328570
 SHA512:
-  metadata.gz: 3e9081d9bfed8dd504d2b377641222d7b721a777e811bca6151da19ab37c50fcadfc97cc7bee0cc36652a94d482bd5f57ca0564488f4d00b20cd30a4726abb45
-  data.tar.gz: 2ac18e6236e208bb0113fdac94176b60274857f4df86c4c917ff730145119f51d79b3d33a2994b033346e3e9bed0dab75598ccca405c9ddf7bcf0b3da2c81c6f
+  metadata.gz: 792cb23e23fdcc8eccb0397bc3ee194c57f4512f40d2bf9b1ca078579aef3522d5759c19d948a101eec6df8fc464d19307ed0a2c5f557d85616ce052f395ef4b
+  data.tar.gz: 9a60484551e346cf98c32b786d7955211125bc936cfd131e57ccd828cecb13613b82a53b9d08a1e1e3edcfbd78ff7ee9452d92d00dcbcaa31b0c755901023552

data/.gitignore

@@ -12,3 +12,4 @@ Gemfile.lock
 results.html
 .rbx
 .DS_Store
+Session.vim

data/lib/gli/command.rb

@@ -30,8 +30,16 @@ module GLI
     include DSL
     include CommandSupport
 
-    # Key in an options hash to find the parent's parsed options
-    PARENT = Object.new 
+    class ParentKey
+      def to_sym
+        "__parent__".to_sym
+      end
+    end
+
+    # Key in an options hash to find the parent's parsed options.  Note that if you are
+    # using openstruct, e.g. via `use_openstruct true` in your app setup, you will need
+    # to use the method `__parent__` to access parent parsed options.
+    PARENT = ParentKey.new
 
     # Create a new command.
     #

data/lib/gli/version.rb

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

data/test/tc_command.rb

@@ -40,8 +40,6 @@ class TC_testCommand < Clean::Test::TestCase
 
   def test_basic_command
     [false,true].each do |openstruct|
-    end
-    [true].each do |openstruct|
       create_app(openstruct)
       openstruct_message = openstruct ? ", with use_openstruct" : ""
       args_args = [%w(-g basic -v -c foo bar baz quux), %w(-g basic -v --configure=foo bar baz quux)]
@@ -61,6 +59,12 @@ class TC_testCommand < Clean::Test::TestCase
     end
   end
 
+  def test_openstruct_with_nested_commands
+    create_app(true)
+    @app.run(["top","nested"])
+    assert(!@error_called,"Error block should not have been called: #{@exception_caught.inspect}")
+  end
+
   def test_around_filter
     @around_block_called = false
     @app.around do |global_options, command, options, arguments, code|
@@ -459,9 +463,10 @@ class TC_testCommand < Clean::Test::TestCase
     @pre_called = false
     @post_called = false
     @error_called = false
+    @exception_caught = nil
     @app.pre { |g,c,o,a| @pre_called = true }
     @app.post { |g,c,o,a| @post_called = true }
-    @app.on_error { |g,c,o,a| @error_called = true }
+    @app.on_error { |exception| @error_called = true; @exception_caught = exception }
     @glob = nil
     @verbose = nil
     @glob_verbose = nil
@@ -503,6 +508,14 @@ class TC_testCommand < Clean::Test::TestCase
     @app.command [:test_wrap] do |c|
       c.action {}
     end
+
+    @app.desc "A top-level command"
+    @app.command [:top] do |c|
+      c.desc "A nested command"
+      c.command [:nested] do |nested|
+        nested.action {}
+      end
+    end
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gli
 version: !ruby/object:Gem::Version
-  version: 2.17.0
+  version: 2.17.1
 platform: ruby
 authors:
 - David Copeland
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-22 00:00:00.000000000 Z
+date: 2017-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake