kitchen-itamae 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c7e3e1aa4c7ba1ee5928e94eede7f4c370adf0e6
-  data.tar.gz: 399f22d96967edf51efdd81f4d589481dd202421
+  metadata.gz: 59dec5d7ae3c30539b9bb71086ce2eb8059f053f
+  data.tar.gz: b7279dc56d493105d640166023c837de4fbb457b
 SHA512:
-  metadata.gz: 4740ab9c5802e1de67fee3c9019fd58868a5d41ab4483833c386eedf19893bc94e21b0f3ed51b8ad184c9ad91d8e0285ee188af06e99bdd6102fcc4dc24f0935
-  data.tar.gz: b4f0bf64645253e3205ebe6ff44eda9751a58d449a4f1947aa4c510c500b5e98dcf3d2789807328930bcd87569981f81695777f6890f442b4f599c675acf6341
+  metadata.gz: 37bda91c8d41082c5f8b307b4d1dd203f9f2d7826e003d218aaa6e186932d21b5d9ae505b1d7eb4bb5823ced62ab627f1abadbd06551891a325f4c15660169ab
+  data.tar.gz: 6b7b3a5c4406628f0befb4af2bdc82a4327626aede201645060dd992aaad98fb4b5598b79370d3fbfaa0d9d89b78d5dcfc59164c0a783d0da934d11b8928bcab

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 CHANGELOG of Itamae::Kitchen
 
+## 0.2.0
+
+- Feature: support attributes.
+    - attributes will merge with node_json.
+
 ## 0.1.1
 
 - Plugin shoud work under bundler.

data/lib/kitchen/provisioner/itamae.rb

@@ -19,6 +19,7 @@ module Kitchen
       expand_path_for :itamae_root
 
       default_config :node_json, nil
+      default_config :attributes, {}
       default_config :with_ohai, false
       default_config :itamae_option, nil
       default_config :use_bundler do |provisioner|
@@ -29,6 +30,7 @@ module Kitchen
       # (see Base#create_sandbox)
       def create_sandbox
         super
+        prepare_json
         FileUtils.cp_r(Dir.glob("#{config[:itamae_root]}/*"), sandbox_path)
       end
 
@@ -65,7 +67,7 @@ module Kitchen
           cmd << 'local'
           cmd << '--ohai' if config[:with_ohai]
           cmd << config[:itamae_option]
-          cmd << "-j #{config[:node_json]}" if config[:node_json]
+          cmd << "-j dna.json"
           cmd << recipe
           cmd.join(" ")
         end
@@ -83,7 +85,6 @@ module Kitchen
 
       private
       # (see ChefBase private)
-
       def download_helpers
         IO.read(
           Gem.find_files_from_load_path('../support/download_helpers.sh').first
@@ -127,6 +128,20 @@ EOL
           #{sudo("sh")} /tmp/install_itamae.sh
         INSTALL_ITAMAE
       end
+
+      # (see ChefBase#prepare_json)
+      def prepare_json
+        dna = {}
+        dna.merge!(JSON.parse(File.read(File.join(config[:itamae_root], config[:node_json])))) if config[:node_json]
+        dna.rmerge!(config[:attributes])
+
+        info("Preparing dna.json")
+        debug("Creating dna.json from #{dna.inspect}")
+
+        File.open(File.join(sandbox_path, "dna.json"), "wb") do |file|
+          file.write(dna.to_json)
+        end
+      end
     end
   end
 end

data/lib/kitchen-itamae/version.rb

@@ -1,5 +1,5 @@
 module Kitchen
   module Itamae
-    VERSION = "0.1.1"
+    VERSION = "0.2.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-itamae
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - sawanoboly
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-26 00:00:00.000000000 Z
+date: 2015-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen