kitchen-zcloudjp 0.5.1 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d836cf1f441befe7b4898766426218672ac01001
-  data.tar.gz: 1688e90f07c4d871c35006460dcf5baab96b1784
+  metadata.gz: b1a0334a8af29b86bf5275166ac376a18b03f4f4
+  data.tar.gz: 35b9cb9d0da85f6ad823ba07604cf9912a37e899
 SHA512:
-  metadata.gz: ed59a558fca70f5af150b041474533484e45f93d3bd525d3c89fc6386014de698f77f1df4a83d6c625fa7158b69a5eb98e1e2d44aa04d4881225ce4bef5303b9
-  data.tar.gz: 55c20b559456644eb38266692fa7899682ae15ff0a8b32c284bc9956d389bf1a5c8bb64ff13bb60f14e20fdc510a3426718ae44764c0ef949142abd51bbb8a38
+  metadata.gz: 81113fc229504165e9a58e6cb1ecc3ee5e4263ffc3c41b1a8ddac5f8707ecdd92f3b5781fe350c88c441976bc3c87e750da7372627cefea923beed90d078e9a1
+  data.tar.gz: 43ae5f9524e30a016c95c316cea7f7e0f445257f47eab18e9dc2d25f8d853db49b86ed4c0950eb94efd0da2235bb226141faeaba7498450b1c8ae0ce63ff787e

data/.gitignore

@@ -21,3 +21,4 @@ tmp
 .kitchen.yml
 foo.json
 cookbooks/
+.envrc

data/CANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog for kitchen-zcloudjp
 
+## 0.6.0
+
+- update gem test-kitchen to ~> 1.4.0
+
 ## 0.5.0
 
 - update gem test-kitchen to ~> 1.2.0

data/kitchen-zcloudjp.gemspec

@@ -18,10 +18,10 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'test-kitchen', '~> 1.2.0'
+  spec.add_dependency 'test-kitchen', '~> 1.4.0'
   spec.add_dependency 'zcloudjp'
 
-  spec.add_development_dependency 'bundler', '~> 1.5'
+  spec.add_development_dependency 'bundler', '~> 1.9'
   spec.add_development_dependency 'rake'
 
   spec.add_development_dependency 'cane'

data/lib/kitchen/driver/zcloudjp.rb

@@ -17,17 +17,17 @@
 # limitations under the License.
 
 
+require 'active_support'
 require 'zcloudjp'
 
 require 'benchmark'
 require 'kitchen'
-require 'kitchen/busser'
-
 
 module Kitchen
-
   module Driver
     class Zcloudjp < Kitchen::Driver::SSHBase
+      # kitchen_driver_api_version 2
+
       default_config :dataset, 'sdc:sdc:base64:13.4.2' # base64 image
       default_config :package, 'Small_1GB'
       default_config :with_gcc, true
@@ -59,7 +59,6 @@ module Kitchen
         end
       end
 
-
       def destroy(state)
         return if state[:server_id].nil?
         server = client.machine.show(:id => state[:server_id])
@@ -76,37 +75,42 @@ module Kitchen
         state.delete(:hostname)
       end
 
-
       def converge(state)
-        provisioner = instance.provisioner
-        provisioner.create_sandbox
-        sandbox_dirs = Dir.glob("#{provisioner.sandbox_path}/*")
-
         server = client.machine.show(:id => state[:server_id])
         info("--> Updating metadata...")
         server.metadata.update(:metadata => build_metadata)
-        ssh_args = build_ssh_args(state)
-
         if server.os == "SmartOS"
-          install_chef_for_smartos(ssh_args)
+          overrides_p =  instance.provisioner.instance_variable_get(:@config)
+          overrides_p[:require_chef_omnibus] = false
+          overrides_p[:ohai_version] = config[:ohai_version] ||= "7.0.4"
+          overrides_p[:chef_version] = config[:chef_version] ||= "11.4"
+          overrides_p[:chef_solo_path] = config[:chef_solo_path] ||= "/opt/local/bin/chef-solo"
+          overrides_p[:client_path] = config[:client_path] ||= "/opt/local/bin/chef-client"
+          instance.provisioner.instance_variable_set(:@config, overrides_p)
+
+          ## Install chef to smartos
+          instance.transport.connection(backcompat_merged_state(state)) do |conn|
+            conn.execute(env_cmd(install_chef_for_smartos))
+          end
         else
-          fix_monkey_dataset(ssh_args)
-          # install_omnibus(ssh_args) if config[:require_chef_omnibus]
+          instance.transport.connection(backcompat_merged_state(state)) do |conn|
+            conn.execute(env_cmd("sudo chmod 01777 /tmp"))
+          end
         end
+        super
+      end
 
-        Kitchen::SSH.new(*build_ssh_args(state)) do |conn|
-          run_remote(provisioner.install_command, conn)
-          run_remote(provisioner.init_command, conn)
-          transfer_path(sandbox_dirs, provisioner[:root_path], conn)
-          run_remote(provisioner.prepare_command, conn)
-          puts provisioner[:test_base_path]
-          puts '-------------'
-          run_remote(provisioner.run_command, conn)
+      def setup(state)
+        server = client.machine.show(:id => state[:server_id])
+        if server.os == "SmartOS"
+          overrides_v =  instance.verifier.instance_variable_get(:@config)
+          overrides_v[:ruby_bindir] = config[:ruby_bindir] ||= "/opt/local/bin"
+          instance.provisioner.instance_variable_set(:@config, overrides_v)
         end
-      ensure
-        provisioner && provisioner.cleanup_sandbox
+        super
       end
 
+      private
       def client
         ::Zcloudjp::Client.new(
           :api_key => config[:api_key]
@@ -132,34 +136,23 @@ module Kitchen
         end
       end
 
-      def install_chef_for_smartos(ssh_args)
+      def install_chef_for_smartos
         if config[:with_gcc]
           install_pkgs = "gcc47 gcc47-runtime scmgit-base scmgit-docs gmake ruby193-base ruby193-yajl ruby193-nokogiri ruby193-readline pkg-config"
         else
           install_pkgs = "scmgit-base scmgit-docs ruby193-base ruby193-yajl ruby193-nokogiri ruby193-readline"
         end
 
-        ssh(ssh_args, <<-INSTALL.gsub(/^ {10}/, ''))
-          if [ ! -f /opt/local/bin/chef-client ]; then
-            pkgin -y install #{install_pkgs}
-
-          ## for smf cookbook
-            pkgin -y install libxslt
-
-          ## install chef
-            gem update --system --no-ri --no-rdoc
-            gem install -f --no-ri --no-rdoc ohai #{config[:ohai_version] ? '--version ' + %Q{'=  #{config[:ohai_version]}'} : nil }
-            gem install -f --no-ri --no-rdoc chef #{config[:chef_version] ? '--version ' + %Q{'=  #{config[:chef_version]}'} : nil }
-            gem install -f --no-ri --no-rdoc rb-readline
-          fi
-        INSTALL
-      end
-
-      def fix_monkey_dataset(ssh_args)
-        ssh(ssh_args, <<-__PATCH__.gsub(/^ {10}/, ''))
-          ## set sticky bit for /tmp
-          chmod 01777 /tmp
-        __PATCH__
+        install_cmd = []
+        install_cmd <<  "if [ ! -f /opt/local/bin/chef-client ]; then"
+        install_cmd <<  "   pkgin -y install #{install_pkgs}"
+        install_cmd <<  "   pkgin -y install libxslt"
+        install_cmd <<  "   gem update --system --no-ri --no-rdoc"
+        install_cmd <<  "   gem install -f --no-ri --no-rdoc ohai #{config[:ohai_version] ? %Q{--version "#{config[:ohai_version]}"} : nil }"
+        install_cmd <<  "   gem install -f --no-ri --no-rdoc chef #{config[:chef_version] ? %Q{--version "#{config[:chef_version]}"} : nil }"
+        install_cmd <<  "   gem install -f --no-ri --no-rdoc rb-readline"
+        install_cmd <<  "fi"
+        "sh -c '#{install_cmd.join("\n")}'"
       end
 
       def wait_for_sshd_vm(ssh_args)
@@ -176,29 +169,3 @@ module Kitchen
     end
   end
 end
-
-
-module Kitchen
-  class Busser
-    class_eval do
-      alias :orig_setup_cmd :setup_cmd
-      def setup_cmd
-        @setup_cmd ||= if local_suite_files.empty?
-          nil
-        else
-          setup_cmd  = []
-          setup_cmd << busser_setup_env
-          setup_cmd << "if ! #{sudo}#{config[:ruby_bindir]}/gem list busser -i >/dev/null"
-          setup_cmd << "then #{sudo}#{config[:ruby_bindir]}/gem install #{gem_install_args}"
-          setup_cmd << "fi"
-          setup_cmd << "gem_bindir=`#{config[:ruby_bindir]}/ruby -rrubygems -e \"puts Gem.bindir\"`"
-          setup_cmd << "#{sudo}${gem_bindir}/busser setup"
-          setup_cmd << "#{sudo}sed -e 's@sh@bash@' #{config[:busser_bin]} -i"
-          setup_cmd << "#{sudo}#{config[:busser_bin]} plugin install #{plugins.join(' ')}"
-
-          "bash -c '#{setup_cmd.join('; ')}'"
-        end
-      end
-    end
-  end
-end

data/lib/kitchen/driver/zcloudjp_version.rb

@@ -19,6 +19,6 @@
 module Kitchen
   module Driver
     # Version string for Zcloudjp Test Kitchen driver
-    ZCLOUDJP_VERSION = "0.5.1"
+    ZCLOUDJP_VERSION = "0.6.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-zcloudjp
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.0
 platform: ruby
 authors:
 - sawanoboly
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-06 00:00:00.000000000 Z
+date: 2015-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.4.0
 - !ruby/object:Gem::Dependency
   name: zcloudjp
   requirement: !ruby/object:Gem::Requirement
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '1.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '1.9'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement