kitchen-itamae 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 46c279608ea63243b1bb1d83d737e3852e8457a2
-  data.tar.gz: 76ef0e7c3d65219028ce778fedcbcc83636949d9
+  metadata.gz: c7e3e1aa4c7ba1ee5928e94eede7f4c370adf0e6
+  data.tar.gz: 399f22d96967edf51efdd81f4d589481dd202421
 SHA512:
-  metadata.gz: 8939cc3fc63f01d209182d433269f94be518f2f99d8a69c3271d3b641e461990c06943cd6f149d48ddda693060a7f63093775235a6f0345b09bbd952c238facd
-  data.tar.gz: 8c391542a73ff0cad8aee3b947ca4606383f7f86d74d7938dc69042c72b5e1f6f975eade9813f12728bedc68caa256a9b50b9b1450e0eecf4a77f14d3cb3b061
+  metadata.gz: 4740ab9c5802e1de67fee3c9019fd58868a5d41ab4483833c386eedf19893bc94e21b0f3ed51b8ad184c9ad91d8e0285ee188af06e99bdd6102fcc4dc24f0935
+  data.tar.gz: b4f0bf64645253e3205ebe6ff44eda9751a58d449a4f1947aa4c510c500b5e98dcf3d2789807328930bcd87569981f81695777f6890f442b4f599c675acf6341

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 CHANGELOG of Itamae::Kitchen
 
+## 0.1.1
+
+- Plugin shoud work under bundler.
+    - if exist Gemfile in Kitchen/, itamae run under bundler.
+
 ## 0.1.0
 
 - Use run_list instead of recipe_list.

data/lib/kitchen-itamae/version.rb

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

data/lib/kitchen/provisioner/itamae.rb

@@ -21,7 +21,10 @@ module Kitchen
       default_config :node_json, nil
       default_config :with_ohai, false
       default_config :itamae_option, nil
-      default_config :itamae_plugins, []
+      default_config :use_bundler do |provisioner|
+        config = provisioner.instance_variable_get(:@config)
+        File.exists?(File.join(config[:itamae_root], 'Gemfile'))
+      end
 
       # (see Base#create_sandbox)
       def create_sandbox
@@ -34,17 +37,31 @@ module Kitchen
         cmd = []
         cmd << "#{sudo("rm")} -rf #{config[:root_path]} ; mkdir -p #{config[:root_path]}"
         debug("Cleanup Kitchen Root")
-        config[:itamae_plugins].map do |plugin|
-          cmd << %Q{#{sudo('chef-apply')} -e "chef_gem %Q{itamae-plugin-recipe-#{plugin}} do action :upgrade end"}
-        end
+        Util.wrap_command(cmd.join("\n"))
+      end
+
+      # (see Base#init_command)
+      def prepare_command
+        return nil unless config[:use_bundler]
+        debug("Prepare Bundler")
+        cmd = ["cd #{config[:root_path]};"]
+        cmd << "if [ -f Gemfile ] ;then"
+        cmd << "#{sudo("/opt/chef/embedded/bin/bundle")} install --binstubs"
+        cmd << "fi"
         Util.wrap_command(cmd.join("\n"))
       end
 
       # (see Base#run_command)
       def run_command
         debug(JSON.pretty_generate(config))
-        runlist = config[:run_list].map do |recipe|
-          cmd = ["cd #{config[:root_path]};", sudo('/opt/chef/bin/itamae')]
+        lines = config[:run_list].map do |recipe|
+          cmd = ["cd #{config[:root_path]} ;"]
+          if config[:use_bundler]
+            cmd << sudo(File.join(config[:chef_omnibus_bin_dir], 'ruby'))
+            cmd << './bin/itamae'
+          else
+            cmd << sudo('/opt/chef/bin/itamae')
+          end
           cmd << 'local'
           cmd << '--ohai' if config[:with_ohai]
           cmd << config[:itamae_option]
@@ -52,8 +69,8 @@ module Kitchen
           cmd << recipe
           cmd.join(" ")
         end
-        debug(runlist.join("\n"))
-        Util.wrap_command(runlist.join("\n"))
+        debug(lines.join("\n"))
+        Util.wrap_command(lines.join("\n"))
       end
 
 
@@ -104,10 +121,10 @@ module Kitchen
       def itamae_install_function
         <<-INSTALL_ITAMAE
         cat <<EOL > /tmp/install_itamae.sh
-        %Q{#{sudo('chef-apply')} -e "chef_gem %Q{itamae} do action :upgrade end"}
-        ln -sf /opt/chef/embedded/bin/itamae /opt/chef/bin/itamae
+          #{sudo('chef-apply')} -e "chef_gem %Q{itamae} do action :upgrade end"
+          ln -sf /opt/chef/embedded/bin/itamae /opt/chef/bin/itamae
 EOL
-        #{sudo("sh")} /tmp/install_itamae.sh
+          #{sudo("sh")} /tmp/install_itamae.sh
         INSTALL_ITAMAE
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-itamae
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - sawanoboly