fuelcell 0.2.3 → 0.2.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    M2VlMjQzMGQwOGNjYTA1MmY4YjhlMTkzNzc2YWExMzBlMGNhNjFkNw==
+    OGE4NmQxNjBhMzYzOTVlYjYxNzhiOWFlNWZkYjhiOGFkNzhkOTc3Yw==
   data.tar.gz: !binary |-
-    NmNmMGQzNTE4NDU2NmI1M2MwNTMyMThmMTczYzg0NjY0NDRmOGIwMA==
+    MDc3YTgxMDVjNGRkMjFmNTEyOGZlOTZkMDA4ODE5ZWZhMGFmMTQwNA==
 SHA512:
   metadata.gz: !binary |-
-    MWQzNGRjNGI5NTRiNDExZTVhMmM1Mzc0NzM2MDJkNGI4ZWZjMjA0YTc5ZjY0
-    YTdhYmZlMjZiZjVmMjJkOTMxYmY4NjZiNDJmMGYwMDhiZDY3YjY0OWE3ZDhl
-    ZjlmNzk1MTliZTk4NTcxZmE4NzhiODA2YWQyZmU2OTg0NjEwYTI=
+    MmM3YmJkNzdmZGUzNDU3NjAxMmMxNmFjNGUwMDA0MGE5ZDc3N2VmYWJkOTUw
+    MWE5N2QzMmY3MzRmOWU3MzMxYjM1ZTgxNmUyMjA1NmQ1YzdjMjE4YzE1NTFk
+    N2Q3YTIyMzJjZTI3MWIxMTQ4MThkYTc5OTE2ZTA5NzA4MTU5Y2I=
   data.tar.gz: !binary |-
-    OGQxNzc4NDRlNDY1NDRlMTM5NmVkOTBjMjI3OTAxNGQ0N2JiMjc4NTNhYzFm
-    MmNlNGRjNmQzNDYzYTM5ZTAxZTQ0ZWVkNGY1YWM0ZWY1YjRhOTdlMWEwNDRk
-    NjI4ZWMyZWU0YTkxY2JjNWRmMTRmMjBkOTI0MGY3NDYxZWI2Mjc=
+    ZTVmY2E1OWUxYmY0OWI0M2JmYTM4YjE5OGFiOWM0NWIyMmM5NmQxNjdhZDY2
+    YzRmZDRkMWQ3YTA4ZjNkZDVkZmZhYThkMGZiYjA4YTE2NWJjY2VmNGE1ZGUz
+    MTIwNzMzMWZhNDRjMzIwNTYxYzEzNWFlYWE4M2JmNjM5MmY2Zjg=

data/lib/fuelcell/action/command.rb

@@ -64,7 +64,10 @@ module Fuelcell
       # @param cmd [Fuelcell::Action::Command]
       # @return [Fuelcell::Action::Command]
       def add_global_options(cmd)
-        global_options.each { |_key, opt_definition| cmd.opt opt_definition }
+        return cmd if self === cmd
+        global_options(cmd).each do |_key, opt_definition|
+          cmd.opt opt_definition
+        end
         cmd
       end
     end

data/lib/fuelcell/action/root.rb

@@ -50,11 +50,6 @@ module Fuelcell
         create_tree(self, cmd_args)
       end
 
-      def add_global_options(cmd)
-        return cmd if cmd.is_a?(self.class)
-        super
-      end
-
       private
 
       def script_name

data/lib/fuelcell/action/subcommands.rb

@@ -33,8 +33,8 @@ module Fuelcell
       # command in the Hierarchy
       #
       # @return [Hash]
-      def global_options
-        collect_global_options(self, {})
+      def global_options(target)
+        collect_global_options(target, self, {})
       end
 
       protected
@@ -65,14 +65,16 @@ module Fuelcell
         child
       end
 
-      def collect_global_options(cmd, list)
+      def collect_global_options(target, cmd, list)
+        return list if target === cmd
+
         globals = cmd.opts.globals
         list.merge!(globals)
 
         return list if cmd.empty?
 
         cmd.each do |_, subcommand|
-          collect_global_options(subcommand, list)
+          collect_global_options(target, subcommand, list)
         end
         list
       end

data/lib/fuelcell/version.rb

@@ -1,3 +1,3 @@
 module Fuelcell
-  VERSION = "0.2.3"
+  VERSION = "0.2.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fuelcell
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Robert Scott-Buccleuch
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-02-25 00:00:00.000000000 Z
+date: 2016-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler