cliutils 2.2.2 → 2.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 724a3b34821219924e9ef1b69acd822df4c09c50
-  data.tar.gz: cb71d1de33c349b0fd7f41eff987fa1fcfa07ece
+  metadata.gz: 74dcd411f3846055d59b17657ce5fc4664abca70
+  data.tar.gz: 85d369daafb30cf5f5a0110b783928a00ebd4f90
 SHA512:
-  metadata.gz: 8842f7bf8ce1f372a7e8fd76c3b98d3d89c6ce1f977fe85c53a750cb2e2ac2e71e6a7f35273f7feeaaba85927706828e9845e83ec4f829991da1506d60bc496e
-  data.tar.gz: 688a45b787a2ae8b98dcfe2c05fdba5eea23f56c6a59430b97bbce6be259e77d9216cb7b09109f792daf9d06c21e67da37d0cca29a59be03fc9d5c44393e68d0
+  metadata.gz: 99aeb8fcb77f0cfdc5bad45727ad37861bb454e5e8442d2fd8c6fd3c0eefacd3f0229da51dcbf1a93f8b1dbb3eb1c419de6af15ed422d149810bf2737a23862b
+  data.tar.gz: 829b1e7e5275f456effead9406e9d04241b321d40791d77c37b5715e9ee4ea031ed30e81d6352533a68109fcb35dd61045946bfd8c01f8168fb286dfe6101473

data/HISTORY.md

@@ -1,3 +1,9 @@
+# 2.2.3 (2014-05-04)
+
+* Changed Messenger `debug` method to be conditional
+* Fixed a few bugs in Pref Actions
+* Fixed Pref spec
+
 # 2.2.2 (2014-05-04)
 
 * Added dot-notation syntax for Hash extensions

data/lib/cliutils/constants.rb

@@ -8,5 +8,5 @@ module CLIUtils
   SUMMARY = 'Sugary goodness for Ruby CLI apps.'
 
   # The current version of the gem
-  VERSION = '2.2.2'
+  VERSION = '2.2.3'
 end

data/lib/cliutils/messenger.rb

@@ -23,7 +23,7 @@ module CLIUtils
     # only send it to the Logger targets.
     # @return [void]
     def debug(m)
-      @targets.each { |_, t| t.debug(m) }
+      @targets.each { |_, t| t.debug { m } }
     end
 
     # Detaches a delegation target.

data/lib/cliutils/prefs/pref.rb

@@ -187,39 +187,35 @@ module CLIUtils
       ret
     end
 
-    # Evaluates the pre-prompt Hash and does the right thing. :)
-    # @return [void]
-    def _eval_pre
-      messenger.info(@pre[:message])
+    def _eval_action(type = 'pre')
+      messenger.info(instance_variable_get("@#{ type }")[:message])
       messenger.prompt('Press enter to continue')
 
-      if (@pre[:action])
-        action_obj = _init_action(@pre[:action])
+      if instance_variable_get("@#{ type }")[:action]
+        action_obj = _init_action(instance_variable_get("@#{ type }")[:action])
         action_obj.run if action_obj
       end
     end
 
+    # Evaluates the pre-prompt Hash and does the right thing. :)
+    # @return [void]
+    def _eval_pre
+      _eval_action('pre')
+    end
+
     # Evaluates the post-prompt Hash and does the right thing. :)
     # @return [void]
     def _eval_post
-      messenger.info(@post[:message])
-      messenger.prompt('Press enter to continue')
-
-      if (@post[:action])
-        action_obj = _init_action(@post[:action])
-        action_obj.run if action_obj
-      end
+      _eval_action('post')
     end
 
     # Attempts to instantiate a Pre or Post Action based on name; if
     # successful, the new object gets placed in @validator_objects
-    # @param [String] path_or_name The path to or name of the Action
+    # @param [Hash] action_hash The hash of action data (name, params, etc.)
     # @return [void]
-    def _init_action(path_or_name)
-      obj = _load_asset(ASSET_TYPE_ACTION, path_or_name)
-      unless obj.nil? || @pre[:parameters].nil?
-        obj.parameters = @pre[:parameters]
-      end
+    def _init_action(action_hash)
+      obj = _load_asset(ASSET_TYPE_ACTION, action_hash[:name])
+      obj.parameters = action_hash[:parameters]
       obj
     end
 
@@ -254,6 +250,7 @@ module CLIUtils
     # @return [Object]
     def _load_asset(type, path_or_name)
       asset_found = false
+
       if File.file?(File.expand_path(path_or_name))
         # If the file exists, we're assuming that the user
         # passed a filepath.

data/spec/pref_spec.rb

@@ -20,14 +20,18 @@ describe CLIUtils::Pref do
       options: ['bachya'],
       pre: {
         message: 'Test pre message',
-        action: "#{ File.join(base_path, 'test_action.rb') }",
-        parameters: {
-          param1: 'value1'
+        action: {
+          name: "#{ File.join(base_path, 'test_action.rb') }",
+          parameters: {
+            param1: 'value1'
+          }
         }
       },
       post: {
         message: 'Test post message',
-        action: "#{ File.join(base_path, 'test_action.rb') }"
+        action: {
+          name: "#{ File.join(base_path, 'test_action.rb') }"
+        }
       },
       prereqs: [
         { config_section: 'section' },
@@ -47,14 +51,18 @@ describe CLIUtils::Pref do
       options: ['bachya'],
       pre: {
         message: 'Test pre message',
-        action: 'test',
-        parameters: {
-          param1: 'value1'
+        action: {
+          name: 'test',
+          parameters: {
+            param1: 'value1'
+          }
         }
       },
       post: {
         message: 'Test post message',
-        action: 'test'
+        action: {
+          name: 'test'
+        }
       },
       prereqs: [
         { config_section: 'section' },
@@ -94,8 +102,8 @@ describe CLIUtils::Pref do
     expect(pref.default).to eq(pref_data[:default])
     expect(pref.last_error_message).to eq(nil)
     expect(pref.options).to eq(['bachya'])
-    expect(pref.post).to eq({ message: 'Test post message', action: "#{ File.join(base_path, 'test_action.rb') }" })
-    expect(pref.pre).to eq({message: 'Test pre message', action: "#{ File.join(base_path, 'test_action.rb') }", parameters: { param1: 'value1' } })
+    expect(pref.post).to eq({message: 'Test post message', action: { name: '/Users/abach/Git/cliutils/spec/../support/test_action.rb' } })
+    expect(pref.pre).to eq({message: 'Test pre message', action: { name: '/Users/abach/Git/cliutils/spec/../support/test_action.rb', parameters: { param1: 'value1'} } })
     expect(pref.prereqs).to eq([{ config_section: 'section' }, { config_value: 'value' }])
     expect(pref.validator_objects[0].class).to eq(CLIUtils::TestValidator)
     expect(pref.validators).to eq([File.join(base_path, 'test_validator.rb')])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cliutils
 version: !ruby/object:Gem::Version
-  version: 2.2.2
+  version: 2.2.3
 platform: ruby
 authors:
 - Aaron Bach