kondate 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9b4da7ca37a8a499eb627e22c30c879d0b001433
-  data.tar.gz: 530957c521d781d58baa0fd2a6fe17711d0ac2e6
+  metadata.gz: 38db840e774d8575edff8aa3dbbd3d90d46e9dbb
+  data.tar.gz: 4988f05f9ff465ead90e59abc233c6101f46d0f7
 SHA512:
-  metadata.gz: 10db83b8b9862625811e18ea88e31c483b4cf1ab2956fe25a37fed61da23cab6951c70ca3a4e3693285ae460cc82e6f46b63c9478f2b8659efa848f6fe436698
-  data.tar.gz: bb83dc554b26890de637ec05f870af4d9a79d9450cea4c723a615847424bee8c3937ec32ba294e3b946e6f0174e50648fa467c19f6ca0306811923e89eddbfd4
+  metadata.gz: dcfa3c75c22e6915c0fe3f234b9c1046476ebcf311a346e5f029eeb9fb9722f63d0f8862513af02147127ab8eadf0920660a9ebfe9c4786967bc9d73d7fea988
+  data.tar.gz: 9caa081558c981e425fbb34d567b7be60bc1ccd7e7dd2f7a60c5951ad0e7c1eec07ec821ff920f729376bebd257a26d4680c24759ab6523036f7e05bdf577d40

data/.gitignore

@@ -16,3 +16,4 @@
 /hosts.yml
 .ruby-version
 /kondate/
+.vagrant

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+# 0.1.1 (2015/11/24)
+
+Changes:
+
+* Do not open Hash class to add deep_merge, instead use own HashExt class.
+
 # 0.1.0 (2015/11/23)
 
 first version
+

data/README.md

@@ -223,6 +223,8 @@ set :set_property, YAML.load_file(ENV['TARGET_NODE_FILE'])
 
 because these ENVs are passed by `kondate serverspec`. 
 
+See [templates/spec/spec_helper.rb](./lib/kondate/templates/spec/spec_helper.rb) for an example.
+
 ## Host Plugin
 
 The default reads `hosts.yml` to resolve roles of a host, but 
@@ -281,6 +283,18 @@ host_plugin:
 
 `config.type` and `config.path` is available in the above config.
 
+## Development
+
+```
+bundle exec exe/kondate generate
+vagrant up
+```
+
+```
+bundle exec exe/kondate itamae vagrant-centos --role sample
+bundle exec exe/kondate serverspec vagrant-centos --role sample
+```
+
 ## ToDo
 
 write tests

data/lib/kondate.rb

@@ -1,8 +1,10 @@
-HOKKE_GEM_ROOT = File.expand_path('..', File.dirname(__FILE__)) unless defined?(HOKKE_GEM_ROOT)
+module Kondate
+  ROOT = File.expand_path('../..', __FILE__)
+end
 
 require "kondate/version"
 require "kondate/config"
 require "kondate/property_builder"
-require "ext/hash/deep_merge"
+require "kondate/hash_ext"
 require "kondate/string_util"
 require "kondate/error"

data/lib/kondate/cli.rb

@@ -31,7 +31,7 @@ module Kondate
         FileUtils.mkdir_p(File.join(target_dir, dir)) unless @options[:dry_run]
       end
 
-      templates_dir = File.join(HOKKE_GEM_ROOT, 'lib', 'kondate', 'templates')
+      templates_dir = File.join(Kondate::ROOT, 'lib', 'kondate', 'templates')
       templates_dir_length = templates_dir.length
       Find.find(templates_dir).select {|f| File.file?(f) }.each do |src|
         dst = File.join(target_dir, src[templates_dir_length+1 .. -1])

data/lib/kondate/hash_ext.rb

@@ -0,0 +1,42 @@
+# activesupport/core_ext/hash/deep_merge.rb
+module Kondate
+  class HashExt < ::Hash
+    # Returns a new hash with +self+ and +other_hash+ merged recursively.
+    #
+    #   h1 = { a: true, b: { c: [1, 2, 3] } }
+    #   h2 = { a: false, b: { x: [3, 4, 5] } }
+    #
+    #   h1.deep_merge(h2) #=> { a: false, b: { c: [1, 2, 3], x: [3, 4, 5] } }
+    #
+    # Like with Hash#merge in the standard library, a block can be provided
+    # to merge values:
+    #
+    #   h1 = { a: 100, b: 200, c: { c1: 100 } }
+    #   h2 = { b: 250, c: { c1: 200 } }
+    #   h1.deep_merge(h2) { |key, this_val, other_val| this_val + other_val }
+    #   # => { a: 100, b: 450, c: { c1: 300 } }
+    def deep_merge(other_hash, &block)
+      dup.deep_merge!(other_hash, &block)
+    end
+
+    # Same as +deep_merge+, but modifies +self+.
+    def deep_merge!(other_hash, &block)
+      other_hash.each_pair do |current_key, other_value|
+        this_value = self[current_key]
+
+        self[current_key] = if this_value.is_a?(Hash) && other_value.is_a?(Hash)
+          _this_value = HashExt.new.replace(this_value)
+          _this_value.deep_merge(other_value, &block).to_h
+        else
+          if block_given? && key?(current_key)
+            block.call(current_key, this_value, other_value)
+          else
+            other_value
+          end
+        end
+      end
+
+      self
+    end
+  end
+end

data/lib/kondate/property_builder.rb

@@ -74,14 +74,14 @@ module Kondate
       role_property        = get_content(role_file(role))
       secret_role_property = get_content(secret_role_file(role))
 
-      property = {
+      property = HashExt.new.deep_merge!({
         'role'  => role,
         'roles' => roles,
         'attributes' => {},
-      }.deep_merge!(role_property).
+      }).deep_merge!(role_property).
       deep_merge!(secret_role_property).
       deep_merge!(node_property).
-      deep_merge!(secret_node_property)
+      deep_merge!(secret_node_property).to_h
 
       # filter out the recipe
       if filter_recipes and !filter_recipes.empty?

data/lib/kondate/version.rb

@@ -1,3 +1,3 @@
 module Kondate
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kondate
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - sonots
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-11-23 00:00:00.000000000 Z
+date: 2015-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: itamae
@@ -133,7 +133,6 @@ files:
 - exe/kondate
 - exe/serverspec-kondate
 - kondate.gemspec
-- lib/ext/hash/deep_merge.rb
 - lib/ext/itamae/attributes.rb
 - lib/ext/itamae/kondate.rb
 - lib/ext/serverspec/attributes.rb
@@ -142,6 +141,7 @@ files:
 - lib/kondate/cli.rb
 - lib/kondate/config.rb
 - lib/kondate/error.rb
+- lib/kondate/hash_ext.rb
 - lib/kondate/host_plugin/file.rb
 - lib/kondate/property_builder.rb
 - lib/kondate/string_util.rb

data/lib/ext/hash/deep_merge.rb

@@ -1,39 +0,0 @@
-# activesupport/core_ext/hash/deep_merge.rb
-class Hash
-  # Returns a new hash with +self+ and +other_hash+ merged recursively.
-  #
-  #   h1 = { a: true, b: { c: [1, 2, 3] } }
-  #   h2 = { a: false, b: { x: [3, 4, 5] } }
-  #
-  #   h1.deep_merge(h2) #=> { a: false, b: { c: [1, 2, 3], x: [3, 4, 5] } }
-  #
-  # Like with Hash#merge in the standard library, a block can be provided
-  # to merge values:
-  #
-  #   h1 = { a: 100, b: 200, c: { c1: 100 } }
-  #   h2 = { b: 250, c: { c1: 200 } }
-  #   h1.deep_merge(h2) { |key, this_val, other_val| this_val + other_val }
-  #   # => { a: 100, b: 450, c: { c1: 300 } }
-  def deep_merge(other_hash, &block)
-    dup.deep_merge!(other_hash, &block)
-  end
-
-  # Same as +deep_merge+, but modifies +self+.
-  def deep_merge!(other_hash, &block)
-    other_hash.each_pair do |current_key, other_value|
-      this_value = self[current_key]
-
-      self[current_key] = if this_value.is_a?(Hash) && other_value.is_a?(Hash)
-        this_value.deep_merge(other_value, &block)
-      else
-        if block_given? && key?(current_key)
-          block.call(current_key, this_value, other_value)
-        else
-          other_value
-        end
-      end
-    end
-
-    self
-  end
-end