pec 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3104c9b6a47858913071b4043cc30518e06fd4e3
-  data.tar.gz: e86b65d8429f153dc74a36e519c2ac8380ea9f70
+  metadata.gz: ae9991c84cf924eeded0c16490deff591c71818d
+  data.tar.gz: b98a208107bef4732f3e4d48c17655f7d06de6bc
 SHA512:
-  metadata.gz: 8454514856ad2304674d4feede2de13b4538deb8f6229f703ff56330a05d7dfc308ed538fd3ea3dc504ba182fc3c32ed7d95d561e04c87f29765ee6febf63dd4
-  data.tar.gz: 3b1ff24df7b0bfa7bc2163db8777fe7f2e1236c331d140038740e8596dc97da26a2ba31c727172f80806d353f849da1b53de88f499706e0670ddb78b3491f346
+  metadata.gz: 2f56a90b1cbfeeeff1654ff0cd6e7a6cd625976aa49cd438f848ba0f8998c47281eec54429f678bd07cf3459a49b188da59a59d23439a32223c480830936d8b4
+  data.tar.gz: 2059f9a12057dbb4c64bbb31bdd88298df94b4da33db613598a3710cfb6fb1de3fe2ae53b9e4512fcb4d1d66e4c1b462c47a9bb7ce64af29683b6d44fff82226

data/Gemfile

@@ -2,5 +2,4 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in pec.gemspec
 gemspec
-gem 'fog', :git => 'https://github.com/fog/fog.git'
 gem "codeclimate-test-reporter", group: :test, require: nil

data/lib/pec.rb

@@ -31,3 +31,13 @@ require "pec/cli"
 module Pec
 end
 
+class ::Hash
+    def deep_merge(second)
+        merger = proc { |key, v1, v2| Hash === v1 && Hash === v2 ? v1.merge(v2, &merger) : Array === v1 && Array === v2 ? v1 | v2 : [:undefined, nil, :nil].include?(v2) ? v1 : v2 }
+        self.merge(second.to_h, &merger)
+    end
+    def deep_merge!(second)
+        merger = proc { |key, v1, v2| Hash === v1 && Hash === v2 ? v1.merge(v2, &merger) : Array === v1 && Array === v2 ? v1 | v2 : [:undefined, nil, :nil].include?(v2) ? v1 : v2 }
+        self.merge!(second.to_h, &merger)
+    end
+end

data/lib/pec/configure/user_data.rb

@@ -6,8 +6,8 @@ module Pec
         def make(config, ports)
           user_data = {}
           user_data["write_files"] = make_port_content(config, ports) if ports
-          user_data.merge!(config.user_data) if config.user_data
-          user_data.merge!(get_template(config)) if get_template(config)
+          user_data.deep_merge!(config.user_data) if config.user_data
+          user_data.deep_merge!(get_template(config)) if get_template(config)
           Base64.encode64("#cloud-config\n" + user_data.to_yaml)
         end
 
@@ -15,7 +15,7 @@ module Pec
           config.templates.inject({}) do |merge_template, template|
             template.to_s.concat('.yaml') unless template.to_s.match(/.*\.yaml/)
             raise(Pec::Errors::UserData, "template:#{template} is not fond!") unless FileTest.exist?("user_datas/#{template}")
-            merge_template.merge!(YAML.load_file("user_datas/#{template}").to_hash)
+            merge_template.deep_merge!(YAML.load_file("user_datas/#{template}").to_hash)
           end if config.templates
         end
 
@@ -34,3 +34,4 @@ module Pec
     end
   end
 end
+

data/lib/pec/version.rb

@@ -1,3 +1,3 @@
 module Pec
-  VERSION = "0.3.2"
+  VERSION = "0.3.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pec
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - kazuhiko yamashita
@@ -190,7 +190,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: openstack vm booter.