s3crets 0.0.1 → 0.0.2

data/lib/s3crets/version.rb

@@ -1,3 +1,3 @@
 module S3crets
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/lib/s3crets_merge.rb

@@ -22,34 +22,29 @@ class Configuratron
     end
 
     def replace_config(dir)
-
-        search_folder = File.expand_path(dir)
-        files =  Dir.glob(search_folder + "/*.json")
+        counter = 0
+        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./
 
-                @secrets.keys.each do |k|
-
-                    node_data =  JSON.parse(File.read(json_file))
-
-                    if node_data.dig(k)
-
-                        json = node_data.merge({
-                                    k => node_data[k].merge!(@secrets[k])
-                                })
+                begin
+                    node_data  =  JSON.parse(File.read(json_file)+".")
+                rescue JSON::ParserError => e
+                    raise RuntimeError, "JSON Parse error -> #{json_file}"
+                end
 
-                        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(json)
-                           fh.close
-                        end
-                    end
+                # 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)
                 end
             end
         end
@@ -57,6 +52,14 @@ class Configuratron
 
     private
 
+    def write_file(file,data)
+        @files_updated << file
+        File.open(file, 'w') do |fh|
+            fh.puts JSON.pretty_generate(data)
+            fh.close
+        end
+    end
+
     def get_file_name(json_file)
         f = File.split(json_file)
         path = f[0]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: s3crets
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-07 00:00:00.000000000 Z
+date: 2013-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -93,7 +93,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3663029455517111644
+      hash: 929723293801486723
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -102,7 +102,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3663029455517111644
+      hash: 929723293801486723
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23