kitchen-dokken 2.0.15 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4ea658582d40c59d0d4c3b6a3c9e01891ab040fd
-  data.tar.gz: ee80b003cabe762511bb860eeaed930929200c66
+  metadata.gz: ae03351629cd98963f4235e2aeeeded8e100d404
+  data.tar.gz: 92d2e6f1d1d377023fc76b8580a0701813ac0e8f
 SHA512:
-  metadata.gz: 753bc2011e71b6a336c38e1235f6674b7c76454394e801ec444dc97a6f0ab91448641694c435529bb936f12131044484ca801156ba27d6a2835fc66b7646d8c8
-  data.tar.gz: 44de7645a8171f9bb87ee903c0d6f595f93d965023611ccf62c11e535e2325b737085cd0af90b24a896aeb6f3da766df01e6ee03e978a8429e8db0984baca1dc
+  metadata.gz: 3552cfc7d31dfaae91ed8d3119cdc1f13d40c03bd59f9ddf0adc2bd9c3d0068723e8f513f17bce299ff218aa1525ed49f669e4ba697bc596226127c5919ebd2c
+  data.tar.gz: 611860a71e2ca679a19c09251b5b26924f9e08e5c645abb5c62e08871ba33d139460e8f130ae77dd5ba17e41d6a204ee3cb0b2db5ba6c5810d1f197e02e6a176

data/lib/kitchen/driver/dokken.rb

@@ -201,7 +201,8 @@ module Kitchen
 
       def dokken_binds
         ret = []
-        ret << "#{dokken_sandbox_path}:/opt/kitchen" unless dokken_sandbox_path.nil?
+        ret << "#{dokken_kitchen_sandbox}:/opt/kitchen" unless dokken_kitchen_sandbox.nil?
+        ret << "#{dokken_verifier_sandbox}:/opt/verifier" unless dokken_verifier_sandbox.nil?
         ret << Array(config[:binds]) unless config[:binds].nil?
         ret.flatten
       end

data/lib/kitchen/driver/dokken_version.rb

@@ -19,6 +19,6 @@
 module Kitchen
   module Driver
     # Version string for Dokken Kitchen driver
-    DOKKEN_VERSION = '2.0.15'.freeze
+    DOKKEN_VERSION = '2.1.0'.freeze
   end
 end

data/lib/kitchen/helpers.rb

@@ -89,28 +89,48 @@ EOF
     end
 
     def dokken_create_sandbox
-      info("Creating local sandbox at #{dokken_sandbox_path}")
-      FileUtils.mkdir_p(dokken_sandbox_path)
-      File.chmod(0755, dokken_sandbox_path)
+      info("Creating kitchen sandbox at #{dokken_kitchen_sandbox}")
+      FileUtils.mkdir_p(dokken_kitchen_sandbox)
+      File.chmod(0755, dokken_kitchen_sandbox)
+
+      info("Creating verifier sandbox at #{dokken_verifier_sandbox}")
+      FileUtils.mkdir_p(dokken_verifier_sandbox)
+      File.chmod(0755, dokken_verifier_sandbox)
     end
 
     def dokken_delete_sandbox
-      info("Deleting local sandbox at #{dokken_sandbox_path}")
+      info("Deleting kitchen sandbox at #{dokken_kitchen_sandbox}")
+      begin
+        FileUtils.rm_rf(dokken_kitchen_sandbox)
+      rescue Errno::ENOENT
+        debug("Cannot delete #{dokken_kitchen_sandbox}. Does not exist")
+      end
+
+      info("Deleting verifier sandbox at #{dokken_verifier_sandbox}")
       begin
-        FileUtils.rm_rf(dokken_sandbox_path)
+        FileUtils.rm_rf(dokken_verifier_sandbox)
       rescue Errno::ENOENT
-        debug("Cannot delete #{dokken_sandbox_path}. Does not exist")
+        debug("Cannot delete #{dokken_verifier_sandbox}. Does not exist")
       end
     end
 
-    def dokken_sandbox_path
-      "#{Dir.home}/.dokken/sandbox/#{instance_name}"
+    def dokken_kitchen_sandbox
+      "#{Dir.home}/.dokken/kitchen_sandbox/#{instance_name}"
+    end
+
+    def dokken_verifier_sandbox
+      "#{Dir.home}/.dokken/verifier_sandbox/#{instance_name}"
     end
 
     def instance_name
       prefix = (Digest::SHA2.hexdigest FileUtils.pwd)[0, 10]
       "#{prefix}-#{instance.name}"
     end
+
+    def remote_docker_host?
+      return true if config[:docker_host_url] =~ /^tcp:/
+      false
+    end
   end
 end
 
@@ -118,13 +138,14 @@ module Kitchen
   module Provisioner
     class Base
       def create_sandbox
-        info("Creating local sandbox in #{sandbox_path}")
+        info("Creating kitchen sandbox in #{sandbox_path}")
         FileUtils.mkdir_p(sandbox_path)
         File.chmod(0755, sandbox_path)
       end
 
+      # this MUST be named 'sandbox_path' because ruby.
       def sandbox_path
-        "#{Dir.home}/.dokken/sandbox/#{instance_name}"
+        "#{Dir.home}/.dokken/kitchen_sandbox/#{instance_name}"
       end
 
       def instance_name
@@ -134,3 +155,36 @@ module Kitchen
     end
   end
 end
+
+module Kitchen
+  module Verifier
+    class Base
+      def create_sandbox
+        info("Creating kitchen sandbox in #{sandbox_path}")
+        FileUtils.mkdir_p(sandbox_path)
+        File.chmod(0755, sandbox_path)
+      end
+
+      def sandbox_path
+        "#{Dir.home}/.dokken/verifier_sandbox/#{instance_name}"
+      end
+
+      def instance_name
+        prefix = (Digest::SHA2.hexdigest FileUtils.pwd)[0, 10]
+        "#{prefix}-#{instance.name}"
+      end
+
+      def call(state)
+        instance.transport.connection(state) do |conn|
+          conn.execute(install_command)
+          conn.execute(prepare_command)
+          conn.execute(run_command)
+        end
+      rescue Kitchen::Transport::TransportFailed => ex
+        raise ActionFailed, ex.message
+      ensure
+        cleanup_sandbox
+      end
+    end
+  end
+end

data/lib/kitchen/provisioner/dokken.rb

@@ -62,12 +62,8 @@ module Kitchen
 
         # if the user wants to be funny and pass empty strings
         # just use the defaults
-        if config[:chef_log_level].empty?
-          config[:chef_log_level] = 'warn'
-        end
-        if config[:chef_output_format].empty?
-          config[:chef_output_format] = 'doc'
-        end
+        config[:chef_log_level] = 'warn' if config[:chef_log_level].empty?
+        config[:chef_output_format] = 'doc' if config[:chef_output_format].empty?
       end
 
       private

data/lib/kitchen/transport/dokken.rb

@@ -96,9 +96,9 @@ module Kitchen
           end
 
           tmpdir = Dir.tmpdir + '/dokken/'
-          FileUtils.mkdir_p "#{tmpdir}", :mode => 0777
+          FileUtils.mkdir_p tmpdir.to_s, mode: 0777
           tmpdir += Process.uid.to_s
-          FileUtils.mkdir_p "#{tmpdir}"
+          FileUtils.mkdir_p tmpdir.to_s
           File.write("#{tmpdir}/id_rsa", insecure_ssh_private_key)
           FileUtils.chmod(0600, "#{tmpdir}/id_rsa")
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-dokken
 version: !ruby/object:Gem::Version
-  version: 2.0.15
+  version: 2.1.0
 platform: ruby
 authors:
 - Sean OMeara
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-15 00:00:00.000000000 Z
+date: 2017-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen