hiera-eyaml 1.1.3 → 1.1.4

data/README.md

@@ -51,6 +51,18 @@ This creates a public and private key with default names in the default location
     $ eyaml -e -s text                # Encrypt some text
     $ eyaml -e -p                     # Encrypt a password (prompt for it)
 
+    You can also specify the name of the value and the output style (block or string) so that you can
+    redirect the output directly to a file:
+
+    $ eyaml -e -n my-secret -s "Secret Text" -o block
+
+    returns:
+
+    $ my-secret: >
+    $   ENC[...
+    $   .......
+    $   ......]
+
 ### Decryption
 
     To decrypt something, you need the public_key and the private_key on the puppet master.

data/bin/eyaml

@@ -107,7 +107,8 @@ Usage:
   opt :string, "Encrypt a string provided on the command line", :short => 's', :type => :string 
   opt :private_key, "Filename of the private_key", :type => :string, :default => "/etc/hiera/keys/private_key.pem"
   opt :public_key, "Filename of the public_key", :type => :string, :default => "/etc/hiera/keys/public_key.pem"
-  opt :output, "Output mode to use when encrypting (examples, block or string)", :type => :string, :default => "examples"
+  opt :output, "Output mode to use when encrypting (examples, block or string)", :short => 'o', :type => :string, :default => "examples"
+  opt :name, "Add the name for the eyaml key (example, myvar: )", :short => 'n', :type => :string
 end
 
 main_option_count = 0
@@ -191,7 +192,7 @@ if options[:eyaml]
 
     eyaml = get_file_input options
     cipher_eyaml = encrypt_yaml(public_key, eyaml)
-    
+
     puts eyaml
     exit
   end
@@ -214,13 +215,31 @@ else
 
     case options[:output]
     when "examples"
+      if options[:name].nil?
       puts "string: ENC[#{ciphertext_as_string}]\n\nOR\n\n"
       puts "block: >"
       puts "    ENC[" + ciphertext_as_block.gsub(/\n/, "\n    ") + "]"
+      else
+      puts options[:name] + ": ENC[#{ciphertext_as_string}]\n\nOR\n\n"
+      puts options[:name] +": >"
+      puts "    ENC[" + ciphertext_as_block.gsub(/\n/, "\n    ") + "]" 
+      puts
+      end
     when "block"
+      if options[:name].nil?
       puts "ENC[" + ciphertext_as_block + "]"
+      else
+      puts options[:name] + ": >"
+      puts "    ENC[" + ciphertext_as_block.gsub(/\n/, "\n    ") + "]"
+      puts
+      end
     when "string"
+      if options[:name].nil?
       puts "ENC[#{ciphertext_as_string}]"
+      else
+      puts options[:name] + ": ENC[#{ciphertext_as_string}]"
+      puts
+      end
     else
       $stderr.puts "Unknown output option: " + options[:output]
       exit 1

data/lib/hiera/backend/version.rb

@@ -1,7 +1,7 @@
 module Hiera
   module Backend
     module Eyaml
-      VERSION = "1.1.3"
+      VERSION = "1.1.4"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hiera-eyaml
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-22 00:00:00.000000000 Z
+date: 2013-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trollop