s3crets 0.0.4 → 0.0.5

data/lib/s3crets/version.rb

@@ -1,3 +1,3 @@
 module S3crets
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/lib/s3crets_merge.rb

@@ -35,13 +35,15 @@ class Configuratron
 
                 node_data =  JSON.parse(File.read(json_file))
 
-                merge_hashes(@secrets, node_data)
-
-                file_to_write = get_file_name(json_file)
-                files_updated << file_to_write
-                File.open(file_to_write, 'w') do |fh|
-                   fh.puts JSON.pretty_generate(node_data)
-                   fh.close
+                modified = merge_hashes(@secrets, node_data)
+
+                if modified
+                  file_to_write = get_file_name(json_file)
+                  files_updated << file_to_write
+                  File.open(file_to_write, 'w') do |fh|
+                     fh.puts JSON.pretty_generate(node_data)
+                     fh.close
+                  end
                 end
 
             end
@@ -53,24 +55,32 @@ class Configuratron
     # Merge source into destination in-place
     # Only where they have keys in common
     # Taking care not to lose keys in destination but not source
+    # Returns whether or not destination was modified
     def merge_hashes(source, destination)
-      source.each_key do |key|
 
-        if destination.has_key?(key)
+      modified = false
 
+      source.each_key do |key|
+        if destination.has_key?(key)
           case source[key]
           when Hash
-           merge_hashes( source[key], destination[key] )
+           modified = merge_hashes( source[key], destination[key] )
           when String
             destination[key] = source[key]
+            modified = true
           else
             puts "Searching through source hash for a string but found #{source[key].class}"
             exit 1
           end
-
         end
+      end
 
+      if modified
+        return true
+      else
+        return false
       end
+
     end
 
     def get_file_name(json_file)

data/test/expected_output.json

@@ -0,0 +1,9 @@
+{
+  "awesome_service": {
+    "password": "123",
+    "db": {
+      "hostname": "example.com",
+      "password": "abc"
+    }
+  }
+}

data/test/input/node.json

@@ -0,0 +1,9 @@
+{
+  "awesome_service": {
+    "password": "PLACEHOLDER",
+    "db": {
+      "hostname": "example.com",
+      "password": "PLACEHOLDER"
+    }
+  }
+}

data/test/input/secrets

@@ -0,0 +1,7 @@
+---
+awesome_service:
+  password: '123'
+  db:
+    password: abc
+another_service:
+  username: dfg

data/test/run_tests.sh

@@ -0,0 +1,5 @@
+#!/bin/sh
+s3crets -s input/secrets -j input/
+echo "\nShowing expected output on the left and actual output on the right\n"
+diff -y expected_output.json input/node.new.json 
+rm input/node.new.json

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: s3crets
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-12 00:00:00.000000000 Z
+date: 2013-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -77,6 +77,10 @@ files:
 - lib/s3crets/version.rb
 - lib/s3crets_merge.rb
 - s3crets.gemspec
+- test/expected_output.json
+- test/input/node.json
+- test/input/secrets
+- test/run_tests.sh
 homepage: ''
 licenses: []
 post_install_message: 
@@ -92,7 +96,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2921035769767889780
+      hash: -1215962576813344020
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -101,7 +105,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2921035769767889780
+      hash: -1215962576813344020
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -112,4 +116,8 @@ summary: s3crets looks for a YAML config file and performs a deep merge against
   JSON file.  This ensures your secrets are only merged into the files you intended.  The
   purpose of s3crets was to help us keep secrets out of configuration JSON, which
   is kept in source control.
-test_files: []
+test_files:
+- test/expected_output.json
+- test/input/node.json
+- test/input/secrets
+- test/run_tests.sh