kitchen-zcloudjp 0.3.3 → 0.4.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    Y2NmMzcxZjY5ZDUxZGE3OWUyMDg1YjE2ZmRhNGRjYWFiMjQyN2FjYg==
+    NDI5Mzk1ZTRhN2QxNjg0YjA5M2I2ZWIwNDFlZmZjZjRjNGI3YTNlNg==
   data.tar.gz: !binary |-
-    MjhhNGI5Mjg1OTZlZTBlNGEwYWY3YjdlOWUyN2Q0Njg2NDg2NzMxYQ==
+    ZjI2NzUyY2M2MDFiMzZjYjFlZDMwZjlhNjZjN2I4YWQxNmUwZWFmMg==
 SHA512:
   metadata.gz: !binary |-
-    MzU1ZDYwMjg0OTVlOWFiZmE3NDQwYjAzODEyNzM5ZGJkMjY1Yzg4ZDRmZGYw
-    MWQ3M2E5MzU4NzdkZGMxNzdlM2NkMWVkYWIzZjU5OTIwMjlmMTMxZGMwY2Zm
-    NzBiMmY4NDIyODE1MTZmZTIyZTM1ZjlmOTA5NWZjNWVlMmQ0MDM=
+    MjljOWExNWI1YTcwNWZjZmM3Nzc2ZjkxYjRhYzMyOTBhMTIzMTE5OTFlM2Q2
+    MzYwOGJhNzU5MjNlN2ZjOGM3NzE1MTNiNmMwYmZiMTY3ZjdmZmQwODQ4MjE3
+    Y2MxODA0YzYyOTNhM2ZiNzdmYzg3OGEwNzJhYTFiMzQ1NmY1ZjM=
   data.tar.gz: !binary |-
-    ZjMyMTYzNDE0MDQyYWYyNzIwZjg5YzZkZjJiNDhlMThiZGQyOTk5MmNjYWU2
-    YWNlOGI5NmY0NDE0MWQxNWZkNGI4NzYyZmI2ODNhN2VlYmEyNTdiODk3NDkx
-    OWZkYTFhOGNiZmYwNjE4ZTk0ZDcxMTZjNzkyYTg5YzkyNDBiMjg=
+    NmY1MjYyY2FkMGUxYWVhMjkyMTU5MmI4YmM0ODRiM2UzOWY5MDAxY2VhMTYy
+    N2Y4YjM2NGEwNjVjYTA2OTY3MGQ4MDg2N2EyNjZkY2Q0ZmMyNjU2YWIyYjlh
+    MWI3NzdiNmZmYTZhNmUyMzU3NzMxZTA4NmVjYzQ4NTMwOTBmZjA=

data/.gitignore

@@ -17,3 +17,7 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+.kitchen/
+.kitchen.yml
+foo.json
+cookbooks/

data/CANGELOG.md

@@ -0,0 +1,7 @@
+# Changelog for kitchen-zcloudjp
+
+## 0.4.0
+
+- update gem test-kitchen to ~> 1.1.0
+- change default value of `with_gcc` to true
+- create CHANGELOG

data/README.md

@@ -89,6 +89,9 @@ platforms:
 - name: smartos-base64
   driver_config:
     metadata_file: foo.json
+    require_chef_omnibus: false
+  busser:
+    ruby_bindir: /opt/local/bin
 - name: ubuntu12
   driver_config:
     require_chef_omnibus: true

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.0.0.beta.2'
+  spec.add_dependency 'test-kitchen', '~> 1.1.0'
   spec.add_dependency 'zcloudjp'
 
-  spec.add_development_dependency 'bundler', '~> 1.3'
+  spec.add_development_dependency 'bundler', '~> 1.5'
   spec.add_development_dependency 'rake'
 
   spec.add_development_dependency 'cane'

data/lib/kitchen/driver/zcloudjp.rb

@@ -23,13 +23,14 @@ require 'benchmark'
 require 'kitchen'
 require 'kitchen/busser'
 
+
 module Kitchen
 
   module Driver
     class Zcloudjp < Kitchen::Driver::SSHBase
       default_config :dataset, 'sdc:sdc:base64:13.1.0' # base64 image
       default_config :package, 'Small_1GB'
-      default_config :with_gcc, false
+      default_config :with_gcc, true
 
       required_config :api_key
 
@@ -53,12 +54,8 @@ module Kitchen
           ssh_args = build_ssh_args(state)
           sleep 5 until wait_for_sshd_vm(ssh_args)
           print "(ssh ready)\n"
-          ## Override ruby_binpath to default
-          ::Kitchen::Busser.const_set(:DEFAULT_RUBY_BINPATH, '/opt/chef/embedded/bin')
         else
           wait_for_sshd_vm(ssh_args)      ; print "(ssh ready)\n"
-          ## Override ruby_binpath
-          ::Kitchen::Busser.const_set(:DEFAULT_RUBY_BINPATH, '/opt/local/bin')
         end
       end
 
@@ -80,25 +77,9 @@ module Kitchen
       end
 
 
-      def setup(state)
-        server = client.machine.show(:id => state[:server_id])
-        unless server.os == "SmartOS"
-          ## Override ruby_binpath to default
-          ::Kitchen::Busser.const_set(:DEFAULT_RUBY_BINPATH, '/opt/chef/embedded/bin')
-        else
-          ## Override ruby_binpath
-          ::Kitchen::Busser.const_set(:DEFAULT_RUBY_BINPATH, '/opt/local/bin')
-        end
-
-        Kitchen::SSH.new(*build_ssh_args(state)) do |conn|
-          debug(busser_setup_cmd)
-          run_remote(busser_setup_cmd, conn)
-        end
-      end
-
-
       def converge(state)
-        provisioner = new_provisioner
+        provisioner = instance.provisioner
+        sandbox_dirs = Dir.glob("#{provisioner.create_sandbox}/*")
 
         server = client.machine.show(:id => state[:server_id])
         info("--> Updating metadata...")
@@ -115,8 +96,10 @@ module Kitchen
         Kitchen::SSH.new(*build_ssh_args(state)) do |conn|
           run_remote(provisioner.install_command, conn)
           run_remote(provisioner.init_command, conn)
-          transfer_path(provisioner.create_sandbox, provisioner.home_path, 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)
         end
       ensure
@@ -192,3 +175,29 @@ 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.3.3"
+    ZCLOUDJP_VERSION = "0.4.0"
   end
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-zcloudjp
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.4.0
 platform: ruby
 authors:
 - sawanoboly
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-05 00:00:00.000000000 Z
+date: 2014-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0.beta.2
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0.beta.2
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: zcloudjp
   requirement: !ruby/object:Gem::Requirement
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.5'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -116,6 +116,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- CANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md