thor-addons 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 57bc529d64b5258fc3371a119e2fb77c09a0a688
-  data.tar.gz: b8fc11c322e1b4a133d51345671c16050ac36ab1
+SHA256:
+  metadata.gz: 0637e70de16cdaca1968148540bc7919e001497e8c60d5212a6a5cc2bc760678
+  data.tar.gz: 1f53c76ebc9e27064fb9660c7123a740420ebe4e186884995bb4c694f0dbc66e
 SHA512:
-  metadata.gz: a5df9d9d73797fb81bef0688560d6487ca06abc93000acfa38683bfd1f86c7ba619e5f43adbdbf050dca435e893c960518e94b95f2a7d5c9e63c2ba6db03a93e
-  data.tar.gz: 38b29725e9138527a2b177a800b353827ae4e43628f3e8b27deaeab43b7da7c2f89b842618c69bbc0acefa1352d9d7c037db18c44603768e25f010b09a4376da
+  metadata.gz: 0bbd51f8c4ff0a3ca464f3e3f3d6fa45053b20d874f4f094338d9743135749eec3e0fa3fa222cb4d78e7ae8d5a954e23d221caa7c2dd6b326e5c3c97be7f4cfb
+  data.tar.gz: 5af2e01103e9fa9b2603303260b873fddf52a3da26a7cb02b59bfbabb0a88d245a153bcbc8b4a0b1c0efe692e34ceea005c0738161030e27589a935b1de74e9f

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+0.1.5 (13/03/2018)
+
+BUG FIXES:
+
+ * Fix incorrectly parsing options from config ([#11](https://github.com/eredi93/thor-addons/pull/11))
+
 0.1.5 (22/09/2017)
 
 BUG FIXES:

data/lib/thor-addons/options.rb

@@ -81,13 +81,19 @@ module ThorAddons
       return hash_with_indifferent_access(global) if current_command_name.nil?
 
       if invoked_via_subcommand
-        invocations.map { |k,v| v }.flatten.each do |subcommand|
-          next if data[subcommand].nil? || data[subcommand][current_command_name].nil?
+        first_invoked, *remaining_invoked = invocations.values.flatten
+        command_options = data[first_invoked] unless data[first_invoked].nil?
 
-          command_options.merge!(data[subcommand][current_command_name])
+        remaining_invoked.each do |subcommand|
+          break if command_options[subcommand].nil?
+
+          subcommand_data = command_options[subcommand]
+
+          command_options.delete(subcommand)
+          command_options.merge!(subcommand_data)
         end
       else
-        command_options.merge!(data[current_command_name]) unless data[current_command_name].nil?
+        command_options = data[current_command_name] unless data[current_command_name].nil?
       end
 
       hash_with_indifferent_access(global.merge(command_options))
@@ -122,7 +128,7 @@ module ThorAddons
         begin
           memo[key] = value.default
         rescue NoMethodError
-          memo[key] = nil 
+          memo[key] = nil
         end
 
         memo

data/lib/thor-addons/version.rb

@@ -1,3 +1,3 @@
 module ThorAddons
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: thor-addons
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Jacopo Scrinzi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-22 00:00:00.000000000 Z
+date: 2018-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -120,7 +120,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Thor CLI Add-ons