bogo-cli 0.2.2 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 92b58b5c767135d9451ed4230b6e4a0bdd5476a5
-  data.tar.gz: 3d8c6aa78a970f40cf81ec487db49b33839aeb9a
+  metadata.gz: a77d58ef44d10c09753d741e6df3685d339a8854
+  data.tar.gz: c49e3cb0a4292501d3bcd3119107c5e9f9c4b260
 SHA512:
-  metadata.gz: 4bf019f2e81b6d2315b02b970396a7a599aaf6eacc718847183bd72cfa53772fb13094c1b5e3000be633e87db09610fd311b820b8aa763ccd25969ee2263683a
-  data.tar.gz: 05f495f97664d00e93b1953929bfacbf90caea4caff2dc37ce78745abcb9b1e448d7a766f7eeca7187ea64e915eba159a7a37ffa762e06a8ad6dc98f4ee8c2ee
+  metadata.gz: cdc721de56ab47a5c56233923485f776051739ed6420a3df629f6de270331690d5be9e7b40d965cbbe8d593d7cc99077636afe1d95b4923c5e3cc5285bf68b6b
+  data.tar.gz: ca27ba9741ce92d57569e6449729d0492f7889cbb901c2e4748783708d10a270e80d51ef533efceda1908e22f290365c5c8a862a2659266ad4f07b82ebfddce7

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# v0.2.4
+* Prevent defaults from overwriting configuration file values (#8)
+* Ensure CLI defaults have precedence over configuration class defaults (#8)
+
 # v0.2.2
 * Process CLI values prior to configuration merge (#7)
 

data/lib/bogo-cli/command.rb

@@ -93,8 +93,26 @@ module Bogo
         end
         if(config_inst)
           options.delete(:config)
-          defaults_inst = config_class.new(defaults.to_smash)
-          options_inst = config_class.new(options.to_smash)
+          defaults_inst = Smash[
+            config_class.new(
+              defaults.to_smash
+            ).to_smash.find_all do |key, value|
+              defaults.key?(key)
+            end
+          ]
+          config_data = config_inst.load!
+          config_inst = Smash[
+            config_inst.to_smash.find_all do |key, value|
+              config_data.key?(key)
+            end
+          ]
+          options_inst = Smash[
+            config_class.new(
+              options.to_smash
+            ).to_smash.find_all do |key, value|
+              options.key?(key)
+            end
+          ]
           @options = config_class.new(
             defaults_inst.to_smash.deep_merge(
               config_inst.to_smash.deep_merge(

data/lib/bogo-cli/version.rb

@@ -1,6 +1,6 @@
 module Bogo
   module Cli
     # Current library version
-    VERSION = Gem::Version.new('0.2.2')
+    VERSION = Gem::Version.new('0.2.4')
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bogo-cli
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.4
 platform: ruby
 authors:
 - Chris Roberts
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-19 00:00:00.000000000 Z
+date: 2016-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bogo