hiera-eyaml 1.3.3 → 1.3.4

data/README.md

@@ -43,24 +43,28 @@ This creates a public and private key with default names in the default location
 
 ### Encryption
 
-    To encrypt something, you only need the public_key, so distribute that to people creating hiera properties
+To encrypt something, you only need the public_key, so distribute that to people creating hiera properties
 
     $ eyaml -e -f filename            # Encrypt a file
     $ eyaml -e -s 'hello there'       # Encrypt a string
     $ eyaml -e -p                     # Encrypt a password (prompt for it)
 
+Use the -l parameter to pass in a label for the encrypted value
+
+    $ eyaml -e -l 'my-secret-key' -s 'very secret stuffs'
+
 ### Decryption
 
-    To decrypt something, you need the public_key and the private_key.
+To decrypt something, you need the public_key and the private_key.
 
-    To test decryption you can also use the eyaml tool if you have both keys
+To test decryption you can also use the eyaml tool if you have both keys
 
     $ eyaml -d -f filename               # Decrypt a file
     $ eyaml -d -s 'ENC[PKCS7,.....]'     # Decrypt a string
 
-### EYaml files
+### eYaml files
 
-    Once you have created a few eyaml files, with a mixture of encrypted and non-encrypted properties, you can edit the encrypted values in place, using the special edit mode of the eyaml utility
+Once you have created a few eyaml files, with a mixture of encrypted and non-encrypted properties, you can edit the encrypted values in place, using the special edit mode of the eyaml utility
 
     $ eyaml -i filename.eyaml         # Edit an eyaml file in place
 
@@ -151,6 +155,18 @@ things:
         - nested thing 2.1
 </pre>
 
+Tests
+=====
+
+In order to run the tests, simply run `cucumber` in the top level directory of the project.
+
+You'll need to have a few requirements installed:
+
+  * `expect` (via yum/apt-get or system package)
+  * `aruba` (gem)
+  * `cucumber` (gem)
+  * `puppet` (gem)
+
 Notes
 =====
 

data/lib/hiera/backend/eyaml.rb

@@ -2,7 +2,7 @@ class Hiera
   module Backend
     module Eyaml
 
-      VERSION = "1.3.3"
+      VERSION = "1.3.4"
 
       def self.default_encryption_scheme= new_encryption
         @@default_encryption_scheme = new_encryption

data/lib/hiera/backend/eyaml/actions/encrypt_action.rb

@@ -12,7 +12,7 @@ class Hiera
 
           def self.execute 
 
-            output_data = case Eyaml::Options[:source]
+            case Eyaml::Options[:source]
             when :eyaml
               encryptions = []
 
@@ -26,7 +26,7 @@ class Hiera
               }
 
               # strings
-              output.gsub!( REGEX_DECRYPTED_STRING ) { |match|
+              output.gsub( REGEX_DECRYPTED_STRING ) { |match|
                 encryption_scheme = parse_encryption_scheme( $1 )
                 encryptor = Encryptor.find encryption_scheme
                 ciphertext = encryptor.encode( encryptor.encrypt($2) ).gsub(/\n/, "")
@@ -36,11 +36,9 @@ class Hiera
             else
               encryptor = Encryptor.find
               ciphertext = encryptor.encode( encryptor.encrypt(Eyaml::Options[:input_data]) )
-              "ENC[#{encryptor.tag},#{ciphertext}]"
+              self.format :data => "ENC[#{encryptor.tag},#{ciphertext}]", :structure => Eyaml::Options[:output], :label => Eyaml::Options[:label]
             end
 
-            self.format :data => output_data, :structure => Eyaml::Options[:output], :label => Eyaml::Options[:label]
-
           end
 
           protected

data/lib/hiera/backend/eyaml/encryptor.rb

@@ -38,13 +38,15 @@ class Hiera
 
         protected
 
+          def self.plugin_classname
+            self.to_s.split("::").last.downcase
+          end
+
           def self.register
-            plugin_classname = self.to_s.split("::").last.downcase
             Hiera::Backend::Eyaml::Plugins.register_options :options => self.options, :plugin => plugin_classname
           end
 
           def self.option name
-            plugin_classname = self.to_s.split("::").last.downcase
             Eyaml::Options[ "#{plugin_classname}_#{name}" ] || self.options[ "#{plugin_classname}_#{name}" ]
           end
 
@@ -63,6 +65,30 @@ class Hiera
             end
           end
 
+          def self.hiera?
+            "hiera".eql? Eyaml::Options[:source]
+          end
+
+          def self.format_message msg
+            "[eyaml_#{plugin_classname}]:  #{msg}"
+          end
+
+          def self.debug msg
+            if self.hiera?
+              Hiera.debug format_message msg
+            else
+              STDERR.puts format_message msg
+            end
+          end
+
+          def self.warn msg
+            if self.hiera?
+              Hiera.warn format_message msg
+            else
+              STDERR.puts format_message msg
+            end
+          end
+
       end
 
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hiera-eyaml
 version: !ruby/object:Gem::Version
-  version: 1.3.3
+  version: 1.3.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-04 00:00:00.000000000 Z
+date: 2013-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trollop