s3crets 0.0.3 → 0.0.4

data/lib/s3crets/version.rb

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

data/lib/s3crets.rb

@@ -9,7 +9,6 @@ module S3crets
     require "fileutils"
     require "pathname"
     require "pp"
-    require "s3crets_dig"
     require "s3crets_merge"
     require "rainbow"
 end

data/lib/s3crets_merge.rb

@@ -1,6 +1,6 @@
 class Configuratron
 
-    attr_reader :overwrite, :files_updated
+    attr_reader :keys, :overwrite, :files_updated
 
     def initialize(opts={})
         if opts[:secrets_file]
@@ -22,41 +22,55 @@ class Configuratron
     end
 
     def replace_config(dir)
-        search_folder  =  File.expand_path(dir)
-        files          =  Dir.glob(search_folder + "/*.json")
+
+        search_folder = File.expand_path(dir)
+        files =  Dir.glob(search_folder + "/*.json")
 
         if files.empty?
             puts "Was unable to find any JSON files [#{search_folder}]"
         else
-
             Dir.glob(File.expand_path(dir) + "/*.json") do |json_file|
 
                 next if json_file =~ /.new./
 
-                begin
-                    node_data  =  JSON.parse(File.read(json_file))
-                rescue JSON::ParserError => e
-                    raise RuntimeError, "JSON Parse error -> #{json_file}"
-                end
+                node_data =  JSON.parse(File.read(json_file))
 
-                # See if keys have intersection
-                unless (@secrets.keys & node_data.keys).empty?
-                    node_data.merge! @secrets.select { |k| node_data.keys.include? k }
-                    file_to_write = get_file_name(json_file)
-                    write_file(file_to_write,node_data)
+                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
                 end
+
             end
         end
     end
 
     private
 
-    def write_file(file,data)
-        @files_updated << file
-        File.open(file, 'w') do |fh|
-            fh.puts JSON.pretty_generate(data)
-            fh.close
+    # Merge source into destination in-place
+    # Only where they have keys in common
+    # Taking care not to lose keys in destination but not source
+    def merge_hashes(source, destination)
+      source.each_key do |key|
+
+        if destination.has_key?(key)
+
+          case source[key]
+          when Hash
+           merge_hashes( source[key], destination[key] )
+          when String
+            destination[key] = source[key]
+          else
+            puts "Searching through source hash for a string but found #{source[key].class}"
+            exit 1
+          end
+
         end
+
+      end
     end
 
     def get_file_name(json_file)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: s3crets
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-09 00:00:00.000000000 Z
+date: 2013-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -75,7 +75,6 @@ files:
 - bin/s3crets
 - lib/s3crets.rb
 - lib/s3crets/version.rb
-- lib/s3crets_dig.rb
 - lib/s3crets_merge.rb
 - s3crets.gemspec
 homepage: ''
@@ -93,7 +92,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -385047288439108485
+      hash: -2921035769767889780
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -102,7 +101,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -385047288439108485
+      hash: -2921035769767889780
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23

data/lib/s3crets_dig.rb

@@ -1,7 +0,0 @@
-    class Hash
-        def dig(*path)
-            path.inject(self) do |location, key|
-                location.respond_to?(:keys) ? location[key] : nil
-            end
-        end
-    end