thor-addons 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 823a3001351110a2e13396c42de0450a29bb715e
-  data.tar.gz: b2271ad7c3d0984426354c2668626fd15feab155
+  metadata.gz: fe504337d71eb421b7e686edcaaf999deafb7628
+  data.tar.gz: 6289a2a15f4d44a9e69680834f8fffc4b9a7c7c3
 SHA512:
-  metadata.gz: a4550e2a28fa23e26f8adb39773a671ef9133765f214f61f01e0b4850f3a7d499cfd5e51e0ba590de1928c5129d6117d773d8380754458a2097c312a8a49e85a
-  data.tar.gz: 07db6721c767a1078a86ff8c8905793058b4277f633dd87d1e81ad68f5c493360c48ce00cac2cf3cd3d23cbeb6805dc8d1b9ea0dfd516876b048f895190af829
+  metadata.gz: a7c1f13322c537f4302ece4d3b051ba4bd1e6d5edb1e1be3a7f4dd2c6f68a0c02db6073f39e44b519caad44560112ade00fdfdc902a5d60b92a6a8af6a0ef337
+  data.tar.gz: ba538f94df0b4df7ef4f781eccdb5c89f912a8fd2b4ba2679ee6ebb753e986f21e6b320e07a46c79b53165f68ce18fe0ee3d62f4aca20a047f5fa21d1dea8356

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+0.1.3 (08/08/2017)
+
+BUG FIXES:
+
+ * Fix initialization bug #2 ([#4](https://github.com/eredi93/thor-addons/pull/4))
+
 0.1.2 (05/08/2017)
 
 BUG FIXES:

data/lib/thor_addons/options.rb

@@ -3,7 +3,7 @@ module ThorAddons
     attr_reader :current_command_name, :defaults, :invoked_via_subcommand, :invocations
 
     def initialize(args = [], local_options = {}, config = {})
-      @current_command_name = config[:current_command].name
+      @current_command_name = config[:current_command] ? config[:current_command].name : nil
       @defaults = load_defaults(config.dup)
       @invoked_via_subcommand = config[:invoked_via_subcommand]
       @invocations = config[:invocations]
@@ -35,7 +35,7 @@ module ThorAddons
         merge(new_options, options_from_env)
       end
 
-      ::Thor::CoreExt::HashWithIndifferentAccess.new(add_defaults(new_options))
+      hash_with_indifferent_access(add_defaults(new_options))
     end
 
     private
@@ -55,16 +55,17 @@ module ThorAddons
     end
 
     def options_from_env
+      opts = {}
       defaults.keys.inject({}) do |memo, option|
         env = option.to_s.upcase
-        memo[option] = ENV[env] unless ENV[env].nil?
+        opts[option] = ENV[env] unless ENV[env].nil?
 
-        if envs_aliases.keys.include?(env) && memo[option].nil?
-          memo[option] = ENV[envs_aliases[env]] unless ENV[envs_aliases[env]].nil?
-        end
+        next unless envs_aliases.keys.include?(env) && opts[option].nil? && ENV[envs_aliases[env]]
 
-        memo
+        opts[option] = ENV[envs_aliases[env]]
       end
+
+      hash_with_indifferent_access(opts)
     end
 
     def options_from_config(config_file)
@@ -75,17 +76,21 @@ module ThorAddons
 
       data = YAML.load_file(config_file)
       command_options = {}
+      global = data["global"] || {}
+
+      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?
 
           command_options.merge!(data[subcommand][current_command_name])
         end
+      else
+        command_options.merge!(data[current_command_name]) unless data[current_command_name].nil?
       end
 
-      global = data["global"] || {}
-
-      ::Thor::CoreExt::HashWithIndifferentAccess.new(global.merge(command_options))
+      hash_with_indifferent_access(global.merge(command_options))
     end
 
     def add_defaults(hash)
@@ -123,5 +128,9 @@ module ThorAddons
         memo
       end
     end
+
+    def hash_with_indifferent_access(hash)
+      ::Thor::CoreExt::HashWithIndifferentAccess.new(hash)
+    end
   end
 end

data/lib/thor_addons/version.rb

@@ -1,3 +1,3 @@
 module ThorAddons
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: thor-addons
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Jacopo Scrinzi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-05 00:00:00.000000000 Z
+date: 2017-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor