yaml_recrypt 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0e91d7a37558ba9e0cbb20e94c31079132ff99f3
-  data.tar.gz: 486f5289d1bde4ed28713a42251077f2d1a7eef8
+  metadata.gz: 993dd38106efacbb1c8c4731530e26c1371e54f8
+  data.tar.gz: 49b122c98081b5652a28d04bc25804e99140fb9b
 SHA512:
-  metadata.gz: 3d4f528ce2ba54c675c99b06f1a31502348b0403f122be1284285f4e71465536be4aba1115f134b328f2d748f4a1635f54c5866e1af89efdae848461914f8552
-  data.tar.gz: b4284b06d3216514307773bd72ff8274786b8900bbaefac2a2342e62a38060e7ab4f3905843e62eaa470a7407e22e79a2aef2a410ad74ed5d7cfabfb9fc2433a
+  metadata.gz: 590e02f006361e4615faa34f2ae5d2ee006d8a2449412478f6395a974c470096d431c4d4a24ac930acc1e819695e2275a361d329a245d1046902d7a150dfb94a
+  data.tar.gz: 29be00a39d71597ded0cd1f20c2090ad278b0cb750a256b9b4983a90765ac26ee0bb787f83227aaf37717e238a70326b59d9b2329d0c6512f6c2f2ea07fd531f

data/README.md

@@ -50,6 +50,13 @@ A conversion workflow should look something like this:
 5.  Check results and commit changed data back to git
 6.  When happy with conversion results, don't forget to remove the old GPG keychain files from your system - it's a security risk, to leave they lying around
 
+## Cleaning up the `.orig` files
+`yaml_recrypt` will create a `.orig` file for every file it changes "just in case" (TM).  Once your happy everything worked correctly, the following command will delete them all from the current directory downwards:
+
+```shell
+find . -name '*.orig' -exec rm {} \;
+  ```
+
 ## Development and Contributing
 There are a few additional things this codebase could be extended to cover if there's interest:
 * hiera-gpg (whole file encrypted) to hiera-eyaml

data/lib/yaml_recrypt.rb

@@ -22,7 +22,8 @@ module YamlRecrypt
     Escort::Logger.output.puts "Processing #{filename}"
 
     # load the yaml into a hash
-    hash_wip  = YAML.load(File.readlines(filename).join("\n"))
+    raw_data = File.open(filename, 'r') { |f| f.read }
+    hash_wip  = YAML.load(raw_data)
 
     # descend every key until a string (or terminal) is reached
     replaced, converted = descend(gpg_home, eyaml_pub_key, hash_wip)
@@ -78,18 +79,28 @@ module YamlRecrypt
 
   def self.process_value(value, gpg_home, eyaml_pub_key)
     changed = 0
+
+    # fix ascii text blocks that have been corrupted by extra newlines
+
+    #end
     if value.class == String and ! value.empty?
       split = value.split("\n")
 
-      # PGP values are always broken onto newlines
-      if split[0].strip == '' and split[1].strip == GPG_MAGIC
-
-        # yaml and its crazy space encoding rules mean that sometimes you may
-        # get double whitespace IF you've done something clever like put the
-        # gpg version in your ascii armor.  See:
-        # http://stackoverflow.com/a/21699210/3441106
-        # for the gory details
-        value = value.gsub(/\n\n/,"\n")
+      # scan the entire block looking for the magic marker to fix variable
+      # leading whitespace breaking detection
+      gpg_value = false
+      i = 0
+      while ! gpg_value and i < split.size
+        if split[i].strip == GPG_MAGIC
+          gpg_value = true
+        elsif split[i] =~ /[^\s]+/
+          # we found non-whitespace before our magic marker, this isn't GPG data
+          # so break out of the loop
+          i = split.size
+        end
+        i += 1
+      end
+      if gpg_value
         value = recrypt(value, gpg_home, eyaml_pub_key)
         changed = 1
       end

data/lib/yaml_recrypt/version.rb

@@ -1,3 +1,3 @@
 module YamlRecrypt
-  VERSION = "0.1.7"
+  VERSION = "0.1.8"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yaml_recrypt
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Geoff Williams