kitchen-zcloudjp 0.2.2 → 0.3.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    N2E0MjFjNDM4NjNkNmQ5OTc0Mjg0ZWMzMDlmNDI0NjgyMDAwNWY0YQ==
+    NGY2ZmU2YmEwMTI2MzE4Y2Q3ODA5ZGM1NDgyYjBjMjdjMzdiYmI4Nw==
   data.tar.gz: !binary |-
-    NDIzYjAwYjg3YmJiYmRhYWExM2FiMGI1ODY3MjM2MGI1ZjY1YTY5NQ==
+    Y2E5MzVjNzhkOTcyNjQ2NzEzNmRlYTc1ZThmYmRlNWU4Y2E3NmI3OQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ZWU3MTU4N2YwNDhlYjA1NjVlM2ZjNDMxOGVlOTJkNmE2NmRjZWM3MGFkYjhh
-    MmIzMzM0ODkyMWYzNDcxYmZkNTA0NTRlNmM3MTg5YjQ1MjI2MTg1ODg4N2Zh
-    MDdmMWZjM2Y0ODgzYTQxMWJmZjFhN2FjMWU4MWUwYjUxN2UwMmY=
+    NDIzOGVjYzMzZDBmZjZmODQzZDQ2NDcxNmU5NjdmOWE1ZTkwNmQ1OWIxMDUw
+    ZDA5MzVhYTNmYzU2NWJjOGFjNmFkOTdiYWM2ZmJiMjJhMjczN2U1NzFjOTMw
+    NWU0NmM3OWUyY2E1Nzk1NDNjNTY3YmIyODEwNzI3MWY2MTY3N2Y=
   data.tar.gz: !binary |-
-    M2UwZDllNzE3YTk1MWY2OGM2ZTU1MTZmZGZhNTZmMmQ2NWRkMTkxNWUzYTQy
-    NGU4MDY2MDU3ZTI4Nzg5NzY2MzQ4OTJiYzM3NzU4NmI0NTA3OTA4OTkwMjA5
-    MmJhNzFlZTI2MTk4YjhkZTY2ZjhiYTEyNzE2Njc0ZjJhOWNhYTk=
+    YTZkMDk0YzI0NGY4YWE1MzI2OThmNzY3OWFiODAxNzkzNWUxNGUyNjcyNWRh
+    MjJjNTY2MGM0YTg2ZTFhMDlkNzcwNjcxYTNkMjEyZThjYmQ1NTk0MmRhOWJi
+    MzViMDIwNTE0MWJiMWExNTMwMTE2MTkzMTA5Nzg3N2U1OGZlMDE=

data/kitchen-zcloudjp.gemspec

@@ -18,7 +18,7 @@ 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.alpha.3'
+  spec.add_dependency 'test-kitchen', '~> 1.0.0.beta'
   spec.add_dependency 'zcloudjp'
 
   spec.add_development_dependency 'bundler', '~> 1.3'

data/lib/kitchen/driver/zcloudjp.rb

@@ -38,11 +38,14 @@ module Kitchen
         state[:server_id] = server.id
 
         info("SmartMachine <#{state[:server_id]}> created.")
+        debug(server)
         server.wait_for { print "."; ready? } ; print "(provision queued)"
         state[:hostname] = server.ips.first
-        wait_for_sshd(state[:hostname])      ; print "(first reboot)\n"
+        ssh_args = build_ssh_args(state)
+        wait_for_sshd_vm(ssh_args)      ; print "(first reboot)\n"
         sleep 10
-        wait_for_sshd(state[:hostname])      ; print "(second reboot)\n"
+        debug("waiting for second")
+        wait_for_sshd_vm(ssh_args)      ; print "(second reboot)\n"
         sleep 10
 
         unless server.os == "SmartOS"
@@ -53,12 +56,13 @@ module Kitchen
           ## Override ruby_binpath to default
           ::Kitchen::Busser.const_set(:DEFAULT_RUBY_BINPATH, '/opt/chef/embedded/bin')
         else
-          wait_for_sshd(state[:hostname])      ; print "(ssh ready)\n"
+          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
 
+
       def destroy(state)
         return if state[:server_id].nil?
         server = client.machine.show(:id => state[:server_id])
@@ -75,9 +79,8 @@ module Kitchen
         state.delete(:hostname)
       end
 
-      def setup(state)
-        ssh_args = build_ssh_args(state)
 
+      def setup(state)
         server = client.machine.show(:id => state[:server_id])
         unless server.os == "SmartOS"
           ## Override ruby_binpath to default
@@ -87,13 +90,16 @@ module Kitchen
           ::Kitchen::Busser.const_set(:DEFAULT_RUBY_BINPATH, '/opt/local/bin')
         end
 
-        if busser_setup_cmd
-          ssh(ssh_args, busser_setup_cmd)
+        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
+
         server = client.machine.show(:id => state[:server_id])
         info("--> Updating metadata...")
         server.metadata.update(:metadata => build_metadata)
@@ -103,11 +109,18 @@ module Kitchen
           install_chef_for_smartos(ssh_args)
         else
           fix_monkey_dataset(ssh_args)
-          install_omnibus(ssh_args) if config[:require_chef_omnibus]
+          # install_omnibus(ssh_args) if config[:require_chef_omnibus]
+        end
+
+        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)
+          run_remote(provisioner.prepare_command, conn)
+          run_remote(provisioner.run_command, conn)
         end
-        prepare_chef_home(ssh_args)
-        upload_chef_data(ssh_args)
-        run_chef_solo(ssh_args)
+      ensure
+        provisioner && provisioner.cleanup_sandbox
       end
 
       def client

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.2.2"
+    ZCLOUDJP_VERSION = "0.3.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-zcloudjp
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - sawanoboly
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-19 00:00:00.000000000 Z
+date: 2013-07-26 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.0.0.alpha.3
+        version: 1.0.0.beta
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0.alpha.3
+        version: 1.0.0.beta
 - !ruby/object:Gem::Dependency
   name: zcloudjp
   requirement: !ruby/object:Gem::Requirement