cliutils 1.2.2 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1854c822720ec6193e9973bdf56d912e6060b4ec
-  data.tar.gz: d3e7066e5cc1bc7252520122e05475c6e0dd787d
+  metadata.gz: f8d4b5956a8169f6d9921d0ed268188a65578fc9
+  data.tar.gz: fc2066b9c99902a3db434abceb0811ce6285eae5
 SHA512:
-  metadata.gz: affe0adf4c8debf539318464cd12a82dc67801da37cabdbf9fd0c594acf828d658e9da5145c91c2eaee20c06be71054209dff296e9c1f7a7602ae38a752fd6b9
-  data.tar.gz: bda380364bb52f92110f4f7827461910472022cb1ad087be42ffc34bff3f50cd5db3dd491de7acc648b84b8db50054dfef57476d8d968c15dca52bf85b83ad8c
+  metadata.gz: 746e189a28faa6d4cc66653bfab9bd4c804bac063516432c2ebfb214fa10ed178f371e44f86ba223ac4ce84d881d5fca43c2daa3a809a066381772e5930c3280
+  data.tar.gz: 1cb57fd665d770383fca928c5aa7951e8a635e4f082d445649633e90873717b2ef0ae145459c093ae09bc1d838a4ece89daae44f3b19661c104f57e573f0c731

data/HISTORY.md

@@ -1,14 +1,20 @@
-# 1.1.1 (2014-04-03)
+# 1.2.3 (2014-04-05)
+
+* Fixed a bug in ingest_prefs
+* Fixed a bug in pref prompting
+* Fixed a bug with including a Configurator in prefs
+
+# 1.2.2 (2014-04-03)
 
 * Modified loading of configuration values
 * Updated documentation
 
-# 1.1.1 (2014-04-03)
+# 1.2.1 (2014-04-03)
 
 * Updated documentation
 * Added additional testing
 
-# 1.1.0 (2014-04-03)
+# 1.2.0 (2014-04-03)
 
 * Changed Requirements => Prerequisites in Prefs
 * Added Validators to Prefs

data/README.md

@@ -220,7 +220,7 @@ include CLIUtils::Configuration
 ### Loading a Configuration File
 
 ```Ruby
-CLIUtils::Configuration.configuration = ('~/.my-app-config')
+CLIUtils::Configuration.configuration = '~/.my-app-config'
 ```
 
 If there's data in there, it will be consumed into `configuration`'s `data` property.

data/lib/cliutils/configurator.rb

@@ -55,10 +55,10 @@ module CLIUtils
     # @param [Prefs] prefs The Prefs class to examine
     # @return [void]
     def ingest_prefs(prefs)
-      fail 'Invaid Prefs class' if !prefs.kind_of?(Prefs) || prefs.answers.nil?
-      prefs.answers.each do |p|
-        add_section(p[:section].to_sym) unless @data.key?(p[:section].to_sym)
-        @data[p[:section].to_sym].merge!(p[:key].to_sym => p[:answer])
+      fail 'Invaid Prefs class' if !prefs.kind_of?(Prefs)
+      prefs.prompts.each do |p|
+        add_section(p.config_section.to_sym) unless @data.key?(p.config_section.to_sym)
+        @data[p.config_section.to_sym].merge!(p.config_key.to_sym => p.answer)
       end
     end
 

data/lib/cliutils/prefs.rb

@@ -16,7 +16,7 @@ module CLIUtils
     
     # Stores answers to prompt questions.
     # @return [Array]
-    attr_reader :prefs
+    attr_reader :prompts
 
     # Reads prompt data from and stores it.
     # @param [<String, Hash, Array>] data Filepath to YAML, Hash, or Array
@@ -25,14 +25,14 @@ module CLIUtils
     def initialize(data, configurator = nil)
       @answers = []
       @configurator = configurator
-      @prefs = []
+      @prompts = []
 
       case data
       when String
         if File.exists?(data)
           @config_path = data
           data = YAML::load_file(data).deep_symbolize_keys
-          @prefs = _generate_prefs(data)
+          @prompts = _generate_prefs(data)
         else
           fail "Invalid configuration file: #{ data }" 
         end
@@ -40,11 +40,11 @@ module CLIUtils
         @config_path = nil
         data = {:prompts => data} unless data.keys[0] == :prompts
         data.deep_symbolize_keys!
-        @prefs = _generate_prefs(data)
+        @prompts = _generate_prefs(data)
       when Array
         @config_path = nil
         data = {:prompts => data}.deep_symbolize_keys
-        @prefs = _generate_prefs(data)
+        @prompts = _generate_prefs(data)
       else
         fail 'Invalid configuration data'
       end
@@ -56,11 +56,11 @@ module CLIUtils
     # complete, questions w/ prerequisites are examined.
     # @return [void]
     def ask
-      @prefs.reject { |p| p.prereqs }.each do |p|
+      @prompts.reject { |p| p.prereqs }.each do |p|
         _deliver_prompt(p)
       end
       
-      @prefs.find_all { |p| p.prereqs }.each do |p|
+      @prompts.find_all { |p| p.prereqs }.each do |p|
         _deliver_prompt(p) if _prereqs_fulfilled?(p)
       end
     end
@@ -73,9 +73,9 @@ module CLIUtils
     # @return [void]
     def _deliver_prompt(p)
       default = p.default
-      
+
       unless @configurator.nil?
-        unless @configurator.data[p.section.to_sym].nil?
+        unless @configurator.data[p.config_section.to_sym].nil?
           config_val = @configurator.data[p.config_section.to_sym][p.config_key.to_sym]
           default = config_val unless config_val.nil?
         end
@@ -109,7 +109,7 @@ module CLIUtils
     def _prereqs_fulfilled?(p)
       ret = true
       p.prereqs.each do |req|
-        a = @prefs.detect do |answer|
+        a = @prompts.detect do |answer|
           answer.config_key == req[:config_key] &&
           answer.answer == req[:config_value]
         end

data/lib/cliutils/version.rb

@@ -1,4 +1,4 @@
 module CLIUtils
   # The current version of the gem
-  VERSION = '1.2.2'
+  VERSION = '1.2.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cliutils
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.3
 platform: ruby
 authors:
 - Aaron Bach
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-05 00:00:00.000000000 Z
+date: 2014-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler