test-kitchen 1.4.0.beta.2 → 1.4.0.rc.1

data/lib/kitchen/verifier/busser.rb

@@ -32,6 +32,10 @@ module Kitchen
     # @author Fletcher Nichol <fnichol@nichol.ca>
     class Busser < Kitchen::Verifier::Base
 
+      kitchen_verifier_api_version 1
+
+      plugin_version Kitchen::VERSION
+
       default_config :busser_bin do |verifier|
         verifier.
           remote_path_join(%W[#{verifier[:root_path]} bin busser]).

data/lib/kitchen/verifier/dummy.rb

@@ -30,6 +30,10 @@ module Kitchen
     # @author Fletcher Nichol <fnichol@nichol.ca>
     class Dummy < Kitchen::Verifier::Base
 
+      kitchen_verifier_api_version 1
+
+      plugin_version Kitchen::VERSION
+
       default_config :sleep, 0
       default_config :random_failure, false
 

data/lib/kitchen/version.rb

@@ -18,5 +18,5 @@
 
 module Kitchen
 
-  VERSION = "1.4.0.beta.2"
+  VERSION = "1.4.0.rc.1"
 end

data/spec/kitchen/configurable_spec.rb

@@ -39,6 +39,11 @@ module Kitchen
       end
     end
 
+    class Versioned < Tiny
+
+      plugin_version "1.8.17"
+    end
+
     class StaticDefaults
 
       include Kitchen::Configurable
@@ -339,6 +344,18 @@ describe Kitchen::Configurable do
 
         subject[:complex_path].must_equal "/tmp/yo/self/complex"
       end
+
+      it "leaves a nil config value as nil" do
+        config[:success_path] = nil
+
+        subject[:success_path].must_equal nil
+      end
+
+      it "leaves a false config value as false" do
+        config[:success_path] = false
+
+        subject[:success_path].must_equal false
+      end
     end
 
     describe "using inherited static expand_path_for statements" do
@@ -392,6 +409,24 @@ describe Kitchen::Configurable do
     end
   end
 
+  describe "#diagnose_plugin" do
+
+    it "returns a plugin hash for a plugin without version" do
+      subject.diagnose_plugin.must_equal(
+        :name => "Tiny", :class => "Kitchen::Thing::Tiny",
+        :version => nil, :api_version => nil
+      )
+    end
+
+    it "returns a plugin hash for a plugin with version" do
+      subject = Kitchen::Thing::Versioned.new(config).finalize_config!(instance)
+      subject.diagnose_plugin.must_equal(
+        :name => "Versioned", :class => "Kitchen::Thing::Versioned",
+        :version => "1.8.17", :api_version => nil
+      )
+    end
+  end
+
   describe "#calculate_path" do
 
     let(:config) do

data/spec/kitchen/diagnostic_spec.rb

@@ -28,8 +28,26 @@ describe Kitchen::Diagnostic do
 
   let(:instances) do
     [
-      stub(:name => "i1", :diagnose => { :stuff => "sup" }),
-      stub(:name => "i2", :diagnose => { :stuff => "yo" })
+      stub(
+        :name => "i1",
+        :diagnose => { :stuff => "sup" },
+        :diagnose_plugins => {
+          :driver => { :name => "driva", :a => "b" },
+          :provisioner => { :name => "prov", :c => "d" },
+          :transport => { :name => "transa", :e => "f" },
+          :verifier => { :name => "verve", :g => "h" }
+        }
+      ),
+      stub(
+        :name => "i2",
+        :diagnose => { :stuff => "yo" },
+        :diagnose_plugins => {
+          :driver => { :name => "driva", :a => "b" },
+          :provisioner => { :name => "presto", :i => "j" },
+          :transport => { :name => "tressa", :k => "l" },
+          :verifier => { :name => "verve", :g => "h" }
+        }
+      )
     ]
   end
 
@@ -62,10 +80,42 @@ describe Kitchen::Diagnostic do
       read["loader"].must_equal("error" => "damn")
   end
 
-  it "#read returns an empty hash if no instances were given" do
+  it "#read returns the unique set of plugins' diagnose hash if :plugins is set" do
+    Kitchen::Diagnostic.new(:instances => instances, :plugins => true).
+      read["plugins"].
+      must_equal(
+        "driver" => {
+          "driva" => { "a" => "b" }
+        },
+        "provisioner" => {
+          "prov" => { "c" => "d" },
+          "presto" => { "i" => "j" }
+        },
+        "transport" => {
+          "transa" => { "e" => "f" },
+          "tressa" => { "k" => "l" }
+        },
+        "verifier" => {
+          "verve" => { "g" => "h" }
+        }
+      )
+  end
+
+  it "#read returns an empty plugins hash if no instances were given" do
+    Kitchen::Diagnostic.new(:plugins => true).
+      read["plugins"].must_equal Hash.new
+  end
+
+  it "#read returns an empty instances hash if no instances were given" do
     Kitchen::Diagnostic.new.read["instances"].must_equal Hash.new
   end
 
+  it "#read returns an error hash for plugins if error hash is passed in" do
+    Kitchen::Diagnostic.new(
+      :instances => { :error => "shoot" }, :plugins => true
+    ).read["plugins"].must_equal("error" => "shoot")
+  end
+
   it "#read returns the instances' diganose hashes if instances are present" do
     Kitchen::Diagnostic.new(:instances => instances).
       read["instances"].

data/spec/kitchen/driver/dummy_spec.rb

@@ -37,6 +37,14 @@ describe Kitchen::Driver::Dummy do
     Kitchen::Driver::Dummy.new(config).finalize_config!(instance)
   end
 
+  it "driver api_version is 2" do
+    driver.diagnose_plugin[:api_version].must_equal 2
+  end
+
+  it "plugin_version is set to Kitchen::VERSION" do
+    driver.diagnose_plugin[:version].must_equal Kitchen::VERSION
+  end
+
   describe "default_config" do
 
     it "sets :sleep to 0 by default" do

data/spec/kitchen/driver/proxy_spec.rb

@@ -38,6 +38,10 @@ describe Kitchen::Driver::Proxy do
     Kitchen::Driver::Proxy.new(config).finalize_config!(instance)
   end
 
+  it "plugin_version is set to Kitchen::VERSION" do
+    driver.diagnose_plugin[:version].must_equal Kitchen::VERSION
+  end
+
   describe "non-parallel action" do
 
     it "create must be serially executed" do

data/spec/kitchen/driver/ssh_base_spec.rb

@@ -109,6 +109,10 @@ describe Kitchen::Driver::SSHBase do
     Kitchen::Driver::SSHBase.new(config).finalize_config!(instance)
   end
 
+  it "plugin_version is not set" do
+    driver.diagnose_plugin[:version].must_equal nil
+  end
+
   describe "configuration" do
 
     it ":sudo defaults to true" do

data/spec/kitchen/instance_spec.rb

@@ -384,6 +384,81 @@ describe Kitchen::Instance do
     end
   end
 
+  describe "#diagnose_plugins" do
+
+    it "returns a hash" do
+      instance.diagnose_plugins.must_be_instance_of Hash
+    end
+
+    it "sets :driver key to driver's plugin_diagnose info" do
+      driver.class.stubs(:diagnose).returns(:a => "b")
+
+      instance.diagnose_plugins[:driver].must_equal(
+        :name => "Dummy",
+        :a => "b"
+      )
+    end
+
+    it "sets :driver key to :unknown if class doesn't have #diagnose" do
+      opts[:driver] = Class.new(driver.class) {
+        undef_method :diagnose_plugin
+      }.new({})
+
+      instance.diagnose_plugins[:driver].must_equal(:unknown)
+    end
+
+    it "sets :provisioner key to provisioner's plugin_diagnose info" do
+      provisioner.class.stubs(:diagnose).returns(:a => "b")
+
+      instance.diagnose_plugins[:provisioner].must_equal(
+        :name => "Dummy",
+        :a => "b"
+      )
+    end
+
+    it "sets :provisioner key to :unknown if class doesn't have #diagnose" do
+      opts[:provisioner] = Class.new(driver.class) {
+        undef_method :diagnose_plugin
+      }.new({})
+
+      instance.diagnose_plugins[:provisioner].must_equal(:unknown)
+    end
+
+    it "sets :verifier key to verifier's plugin_diagnose info" do
+      verifier.class.stubs(:diagnose).returns(:a => "b")
+
+      instance.diagnose_plugins[:verifier].must_equal(
+        :name => "Dummy",
+        :a => "b"
+      )
+    end
+
+    it "sets :verifier key to :unknown if class doesn't have #diagnose" do
+      opts[:verifier] = Class.new(verifier.class) {
+        undef_method :diagnose_plugin
+      }.new({})
+
+      instance.diagnose_plugins[:verifier].must_equal(:unknown)
+    end
+
+    it "sets :transport key to transport's plugin_diagnose info" do
+      transport.class.stubs(:diagnose).returns(:a => "b")
+
+      instance.diagnose_plugins[:transport].must_equal(
+        :name => "Dummy",
+        :a => "b"
+      )
+    end
+
+    it "sets :transport key to :unknown if class doesn't have #diagnose" do
+      opts[:transport] = Class.new(transport.class) {
+        undef_method :diagnose_plugin
+      }.new({})
+
+      instance.diagnose_plugins[:transport].must_equal(:unknown)
+    end
+  end
+
   describe "performing actions" do
 
     describe "#create" do

data/spec/kitchen/provisioner/base_spec.rb

@@ -101,6 +101,10 @@ describe Kitchen::Provisioner::Base do
       it ":sudo defaults to true" do
         provisioner[:sudo].must_equal true
       end
+
+      it ":sudo_command defaults to sudo -E" do
+        provisioner[:sudo_command].must_equal "sudo -E"
+      end
     end
 
     describe "for windows operating systems" do
@@ -114,6 +118,10 @@ describe Kitchen::Provisioner::Base do
       it ":sudo defaults to nil" do
         provisioner[:sudo].must_equal nil
       end
+
+      it ":sudo_command defaults to nil" do
+        provisioner[:sudo_command].must_equal nil
+      end
     end
 
     it ":http_proxy defaults to nil" do
@@ -287,16 +295,34 @@ describe Kitchen::Provisioner::Base do
 
   describe "#sudo" do
 
-    it "if :sudo is set, prepend sudo command" do
-      config[:sudo] = true
+    describe "with :sudo set" do
+
+      before { config[:sudo] = true }
+
+      it "prepends sudo command" do
+        provisioner.send(:sudo, "wakka").must_equal("sudo -E wakka")
+      end
+
+      it "customizes sudo when :sudo_command is set" do
+        config[:sudo_command] = "blueto -Ohai"
 
-      provisioner.send(:sudo, "wakka").must_equal("sudo -E wakka")
+        provisioner.send(:sudo, "wakka").must_equal("blueto -Ohai wakka")
+      end
     end
 
-    it "if :sudo is falsy, do not include sudo command" do
-      config[:sudo] = false
+    describe "with :sudo falsey" do
 
-      provisioner.send(:sudo, "wakka").must_equal("wakka")
+      before { config[:sudo] = false }
+
+      it "does not include sudo command" do
+        provisioner.send(:sudo, "wakka").must_equal("wakka")
+      end
+
+      it "does not include sudo command, even when :sudo_command is set" do
+        config[:sudo_command] = "blueto -Ohai"
+
+        provisioner.send(:sudo, "wakka").must_equal("wakka")
+      end
     end
   end
 end

data/spec/kitchen/provisioner/chef_base_spec.rb

@@ -529,7 +529,7 @@ describe Kitchen::Provisioner::ChefBase do
         config[:root_path] = "/route"
         dirs = %W[
           /route/clients /route/cookbooks /route/data /route/data_bags
-          /route/environments /route/roles
+          /route/encrypted_data_bag_secret /route/environments /route/roles
         ].join(" ")
 
         cmd.must_match regexify(%{dirs="#{dirs}"})
@@ -583,7 +583,8 @@ describe Kitchen::Provisioner::ChefBase do
         config[:root_path] = "\\route"
         dirs = %W[
           "\\route\\clients" "\\route\\cookbooks" "\\route\\data"
-          "\\route\\data_bags" "\\route\\environments" "\\route\\roles"
+          "\\route\\data_bags" "\\route\\encrypted_data_bag_secret"
+          "\\route\\environments" "\\route\\roles"
         ].join(", ")
 
         cmd.must_match regexify(%{$dirs = @(#{dirs})})

data/spec/kitchen/provisioner/chef_solo_spec.rb

@@ -45,6 +45,14 @@ describe Kitchen::Provisioner::ChefSolo do
     Kitchen::Provisioner::ChefSolo.new(config).finalize_config!(instance)
   end
 
+  it "provisioner api_version is 2" do
+    provisioner.diagnose_plugin[:api_version].must_equal 2
+  end
+
+  it "plugin_version is set to Kitchen::VERSION" do
+    provisioner.diagnose_plugin[:version].must_equal Kitchen::VERSION
+  end
+
   describe "default config" do
 
     describe "for unix operating systems" do
@@ -258,9 +266,9 @@ describe Kitchen::Provisioner::ChefSolo do
         file.must_include %{foo 7}
       end
 
-      it "formats symbol values correctly" do
+      it "formats symbol-looking string values correctly" do
         config[:solo_rb] = {
-          :foo => :bar
+          :foo => ":bar"
         }
         provisioner.create_sandbox
 

data/spec/kitchen/provisioner/chef_zero_spec.rb

@@ -45,6 +45,14 @@ describe Kitchen::Provisioner::ChefZero do
     Kitchen::Provisioner::ChefZero.new(config).finalize_config!(instance)
   end
 
+  it "provisioner api_version is 2" do
+    provisioner.diagnose_plugin[:api_version].must_equal 2
+  end
+
+  it "plugin_version is set to Kitchen::VERSION" do
+    provisioner.diagnose_plugin[:version].must_equal Kitchen::VERSION
+  end
+
   describe "default config" do
 
     describe "for unix operating systems" do
@@ -283,9 +291,9 @@ describe Kitchen::Provisioner::ChefZero do
         file.must_include %{foo 7}
       end
 
-      it "formats symbol values correctly" do
+      it "formats symbol-looking string values correctly" do
         config[:client_rb] = {
-          :foo => :bar
+          :foo => ":bar"
         }
         provisioner.create_sandbox
 
@@ -337,6 +345,20 @@ describe Kitchen::Provisioner::ChefZero do
 
           sandbox_path("chef-client-zero.rb").file?.must_equal false
         end
+
+        it "a version of '11' is still considered modern" do
+          config[:require_chef_omnibus] = "11"
+          provisioner.create_sandbox
+
+          sandbox_path("chef-client-zero.rb").file?.must_equal false
+        end
+
+        it "a version of 11 is still considered modern" do
+          config[:require_chef_omnibus] = 11
+          provisioner.create_sandbox
+
+          sandbox_path("chef-client-zero.rb").file?.must_equal false
+        end
       end
 
       describe "for old Chef versions" do

data/spec/kitchen/provisioner/dummy_spec.rb

@@ -49,6 +49,14 @@ describe Kitchen::Provisioner::Dummy do
     Kitchen::Provisioner::Dummy.new(config).finalize_config!(instance)
   end
 
+  it "provisioner api_version is 2" do
+    provisioner.diagnose_plugin[:api_version].must_equal 2
+  end
+
+  it "plugin_version is set to Kitchen::VERSION" do
+    provisioner.diagnose_plugin[:version].must_equal Kitchen::VERSION
+  end
+
   describe "configuration" do
 
     it "sets :sleep to 0 by default" do