thor-addons 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d5a1da1f817c7446be1005a04ca36b5435476d81abfaf964e4cf207a88d503a9
-  data.tar.gz: 9417c7ebb9447112b44c2b1e738dbe6936893e6ff979e902d121ff0cd67623fd
+  metadata.gz: 7bd656f336a408fa69a9cda65493fb7d9c3d8b3bba39d01c28af7c82a565a04d
+  data.tar.gz: 67638ae62b9ae368c9d97a3c929dab7600bf4b28e6a9da2d70ef4f53573666c2
 SHA512:
-  metadata.gz: 99427fd7c696e271917a9a4cb5572f093a6854ed7ed51d897231fe075f2c6d4497eac5d77c54b9d1e32a5f73e579c6229b2485bf80140b9a138a46cf151f7b83
-  data.tar.gz: 13a639ea0c4fbb72facf520d8250b6b82bde195ae04e89dd11e736e7ca99938a7d173aadfa22b78a45ba0950831838c2b1eacb894d42ae6164b4657ce759de07
+  metadata.gz: 207fdff2a961cdeba426b9906f547adf02d5e7ce9122464c2c4be337721fa003335925b6c6fcfef2aa787346d17c58c6043344d08136ad5a6569ecaf52f8a48d
+  data.tar.gz: a6f49a41898b3323cba5fd15d89eff699723eb9166760f1af9235fc79dcfbc206bc8ac2dd04f4ff5e73c7832326954fc0f619a7ca5eb1a7db59a85cd06425fcb

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+1.0.3 (22/04/2018)
+
+BUG FIXES:
+
+ * Fix config parsing selecting only the called commands ([#20](https://github.com/eredi93/thor-addons/pull/20))
+
 1.0.2 (17/04/2018)
 
 BUG FIXES:

data/lib/thor-addons/helpers/options_config_file.rb

@@ -11,29 +11,23 @@ module ThorAddons
       end
 
       def self.extract_command_data(data, command)
-        data_hash = data["global"] || {}
-
-        return data_hash if command.nil? || data[command].nil?
-
-        data_hash.merge(data[command])
+        [data.fetch("global", {}), data.fetch(command, {})]
       end
 
       def self.get_command_config_data(data, invocations, current_command_name)
         invocations ||= {}
         commands = (invocations.values.flatten << current_command_name)
 
-        command_options = extract_command_data(data, commands.shift)
+        global_options, cmd_options = extract_command_data(data, commands.shift)
 
         commands.each do |cmd|
-          should_break = command_options[cmd].nil?
-          command_options.merge!(extract_command_data(command_options, cmd))
-
-          %W[#{cmd} global].each { |k| command_options.delete(k) }
+          break if cmd_options[cmd].nil?
 
-          break if should_break
+          global, cmd_options = extract_command_data(cmd_options, cmd)
+          global_options.merge!(global)
         end
 
-        command_options
+        global_options.merge(cmd_options)
       end
 
       def self.parse(config_file, invocations, current_command_name, defaults)

data/lib/thor-addons/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ThorAddons
-  VERSION = "1.0.2"
+  VERSION = "1.0.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: thor-addons
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Jacopo Scrinzi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-17 00:00:00.000000000 Z
+date: 2018-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: symbolized