yaml_recrypt 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 706a7b37ab2e8fa258932696bf423a90eff36ba5
-  data.tar.gz: 3e98b9b601e5174e2406e5741463d34f7a9e6668
+  metadata.gz: f16d4e879ea73da0905ca4dbb84722491a8bfaf4
+  data.tar.gz: 97c6b54e0bdb44b94977e29968a624e646ad1364
 SHA512:
-  metadata.gz: 9ba6efca12ddc88d3e81938232eed6e367602937e8bf7f4add01e25ab18be6a02366b485e547c00f3abe4c785ae674942442dce71e56a4754dfe2ea9bf199d1c
-  data.tar.gz: c81e67c223ab326fb5c5fc4f336794a92432831cd6334bae3849806b0e519a05595d8608bae310eec979bcc2d89b3c96d5b33eb5c84ad80d325fa7d427e137d4
+  metadata.gz: 584f03df9db3301acef41bb8efb9917fb70f45669257828c863f27ed808e61c768cb675f81ca8e0ff0a8c5ee9cf3c04ad0887c85bc9b8588e63c5dcd7f8fd516
+  data.tar.gz: b65779783c65631418d3503f25c76f9b132d7240eefa3b00c62057cffd663f9d0abe0382a2a560c899f91f908f2dbd18942c8123aeef81a99582646fa37724e2

data/README.md

@@ -29,7 +29,7 @@ To do this, `yaml_recrypt` needs:
 * Your GPG PKI (directory of gpg keychains, etc - usually at `~/.gpg`)
 * Your hiera-eyaml public key (usually at `/etc/puppetlabs/puppet/keys`)
 
-`yaml_recrypt` should not be run inside the `/etc/puppet*` directory to avoid the risk of updating files which are currently in use.  Ideally, data should be copied off the puppet server for rencryption (eg a workstation - must be running Linux) as:
+`yaml_recrypt` should not be run inside the `/etc/puppet*` directory to avoid the risk of updating files which are currently in use.  Ideally, data should be copied off the puppet server for re-encryption (eg a workstation - must be running Linux) as:
 * This prevents altering the `gems` installed on the production master
 * The conversion can be done in a safe and controlled environment
 * Files can be easilty deleted afterwards

data/exe/yaml_recrypt

@@ -5,7 +5,7 @@ require 'yaml_recrypt/version'
 
 # help message if nothing selected
 if ARGV.size == 0
-  ARGV.unshift('help')
+  ARGV.unshift('--help')
 end
 Escort::App.create do |app|
   app.version YamlRecrypt::VERSION
@@ -30,7 +30,7 @@ Escort::App.create do |app|
       eyaml_pub_key   = options[:global][:commands][:convert][:options][:eyaml_pub_key]
       gpg_home = options[:global][:commands][:convert][:options][:gpg_home]
       if eyaml_pub_key == nil or gpg_home == nil
-        raise "Both --eyaml-pub-key and --gpg-private-key must be specified"
+        raise "Both --eyaml-pub-key and --gpg-home must be specified"
       else
         puts YamlRecrypt::recrypt_r(Dir.pwd, gpg_home, eyaml_pub_key)
       end

data/lib/yaml_recrypt.rb

@@ -45,18 +45,23 @@ module YamlRecrypt
   def self.descend(gpg_home, eyaml_pub_key, value)
     replaced = 0
     if value.class == Array
-      value = value.map { |e|
-        r, newvalue = process_value(e, gpg_home, eyaml_pub_key)
-        replaced += r
-
-        newvalue
+      i = 0
+      value.each { |v|
+        begin
+          r, subtree  = descend(gpg_home, eyaml_pub_key, v)
+          value[i]    = subtree
+          replaced    += r
+        rescue GPGME::Error::NoData
+          raise("Invalid GPG data detected in element #{i}")
+        end
+        i += 1
       }
     elsif value.class == Hash
       value.each { |k,v|
         begin
-          r, subtree = descend(gpg_home, eyaml_pub_key, v)
-          value[k] = subtree
-          replaced += r
+          r, subtree  = descend(gpg_home, eyaml_pub_key, v)
+          value[k]    = subtree
+          replaced    += r
         rescue GPGME::Error::NoData
           raise("Invalid GPG data detected in key #{k}")
         end

data/lib/yaml_recrypt/version.rb

@@ -1,3 +1,3 @@
 module YamlRecrypt
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yaml_recrypt
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Geoff Williams
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-04-12 00:00:00.000000000 Z
+date: 2017-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler