test-kitchen 1.4.2 → 1.5.0.rc.1

data/spec/kitchen/lazy_hash_spec.rb

@@ -87,4 +87,31 @@ describe Kitchen::LazyHash do
       converted.fetch(:genre).must_equal "heavy metal"
     end
   end
+
+  describe "select" do
+    it "calls Procs when appropriate" do
+      Kitchen::LazyHash.new(hash_obj, context).select { |_, _| true }.
+        must_equal :shed_color => "blue", :barn => "locked", :genre => "heavy metal"
+    end
+  end
+
+  describe "enumerable" do
+    it "is an Enumerable" do
+      assert Kitchen::LazyHash.new(hash_obj, context).is_a? Enumerable
+    end
+
+    it "returns an Enumerator from each() if no block given" do
+      e = Kitchen::LazyHash.new(hash_obj, context).each
+      e.is_a? Enumerator
+      e.next.must_equal [:shed_color, "blue"]
+      e.next.must_equal [:barn, "locked"]
+      e.next.must_equal [:genre, "heavy metal"]
+    end
+
+    it "yields each item to the block if a block is given to each()" do
+      items = []
+      Kitchen::LazyHash.new(hash_obj, context).each { |i| items << i }
+      items.must_equal [[:shed_color, "blue"], [:barn, "locked"], [:genre, "heavy metal"]]
+    end
+  end
 end

data/spec/kitchen/provisioner/base_spec.rb

@@ -131,6 +131,10 @@ describe Kitchen::Provisioner::Base do
     it ":http_proxys defaults to nil" do
       provisioner[:https_proxy].must_equal nil
     end
+
+    it ":ftp_proxy defaults to nil" do
+      provisioner[:ftp_proxy].must_equal nil
+    end
   end
 
   describe "#call" do
@@ -325,4 +329,25 @@ describe Kitchen::Provisioner::Base do
       end
     end
   end
+
+  describe "#prefix_command" do
+
+    describe "with :command_prefix set" do
+
+      before { config[:command_prefix] = "my_prefix" }
+
+      it "prepends the command with the prefix" do
+        provisioner.send(:prefix_command, "my_command").must_equal("my_prefix my_command")
+      end
+    end
+
+    describe "with :command_prefix unset" do
+
+      before { config[:command_prefix] = nil }
+
+      it "returns an unaltered command" do
+        provisioner.send(:prefix_command, "my_command").must_equal("my_command")
+      end
+    end
+  end
 end

data/spec/kitchen/provisioner/chef_base_spec.rb

@@ -27,6 +27,7 @@ describe Kitchen::Provisioner::ChefBase do
   let(:logger)          { Logger.new(logged_output) }
   let(:platform)        { stub(:os_type => nil) }
   let(:suite)           { stub(:name => "fries") }
+  let(:default_version) { "" }
 
   let(:config) do
     { :test_base_path => "/basist", :kitchen_root => "/rooty" }
@@ -55,10 +56,6 @@ describe Kitchen::Provisioner::ChefBase do
 
       before { platform.stubs(:os_type).returns("unix") }
 
-      it ":chef_omnibus_root has a default" do
-        provisioner[:chef_omnibus_root].must_equal "/opt/chef"
-      end
-
       it ":chef_omnibus_url has a default" do
         provisioner[:chef_omnibus_url].
           must_equal "https://www.chef.io/chef/install.sh"
@@ -73,109 +70,11 @@ describe Kitchen::Provisioner::ChefBase do
 
       before { platform.stubs(:os_type).returns("windows") }
 
-      it ":chef_omnibus_root has a default" do
-        provisioner[:chef_omnibus_root].
-          must_equal "$env:systemdrive\\opscode\\chef"
-      end
-
       it ":chef_omnibus_url has a default" do
         provisioner[:chef_omnibus_url].
           must_equal "https://www.chef.io/chef/install.sh"
       end
 
-      describe ":chef_metadata_url" do
-
-        let(:base_url) { "https://www.chef.io/chef/metadata" }
-
-        it "uses :chef_omnibus_url as url base if it ends in install.sh" do
-          config[:chef_omnibus_url] = "https://woot/install.sh"
-
-          provisioner[:chef_metadata_url].must_equal(
-            "https://woot/metadata?p=windows&m=x86_64&pv=2008r2&v=latest"
-          )
-        end
-
-        it "ignores :chef_omnibus_url if it doesn't end in install.sh" do
-          config[:chef_omnibus_url] = "https://woot/other"
-
-          provisioner[:chef_metadata_url].
-            must_equal "#{base_url}?p=windows&m=x86_64&pv=2008r2&v=latest"
-        end
-
-        it "defaults to latest package with :require_chef_omnibus = true" do
-          config[:require_chef_omnibus] = true
-
-          provisioner[:chef_metadata_url].
-            must_equal "#{base_url}?p=windows&m=x86_64&pv=2008r2&v=latest"
-        end
-
-        it "defaults to latest package with :require_chef_omnibus = latest" do
-          config[:require_chef_omnibus] = "latest"
-
-          provisioner[:chef_metadata_url].
-            must_equal "#{base_url}?p=windows&m=x86_64&pv=2008r2&v=latest"
-        end
-
-        it "defaults to a specific package from :require_chef_omnibus" do
-          config[:require_chef_omnibus] = "11.12.13"
-
-          provisioner[:chef_metadata_url].
-            must_equal "#{base_url}?p=windows&m=x86_64&pv=2008r2&v=11.12.13"
-        end
-
-        it "defaults to a maj/min version package from :require_chef_omnibus" do
-          config[:require_chef_omnibus] = 12.1
-
-          provisioner[:chef_metadata_url].
-            must_equal "#{base_url}?p=windows&m=x86_64&pv=2008r2&v=12.1"
-        end
-
-        it "defaults to a major package version from :require_chef_omnibus" do
-          config[:require_chef_omnibus] = "16"
-
-          provisioner[:chef_metadata_url].
-            must_equal "#{base_url}?p=windows&m=x86_64&pv=2008r2&v=16"
-        end
-
-        it "defaults to a prerelease package from :require_chef_omnibus" do
-          config[:require_chef_omnibus] = "11.6.0.RC.1"
-
-          provisioner[:chef_metadata_url].
-            must_equal "#{base_url}?p=windows&m=x86_64&pv=2008r2&v=11.6.0.rc.1"
-        end
-
-        it "defaults to a nightly package from :require_chef_omnibus" do
-          config[:require_chef_omnibus] = "12.5.0-current.0+20150721082808.git.14.c91b337-1"
-
-          provisioner[:chef_metadata_url].
-            must_equal "#{base_url}?p=windows&m=x86_64&pv=2008r2&" \
-              "v=12.5.0-current.0%2B20150721082808.git.14.c91b337-1"
-        end
-
-        it "defaults to a chefdk package from :chef_omnibus_install_options" do
-          config[:require_chef_omnibus] = true
-          config[:chef_omnibus_install_options] = "-P chefdk"
-
-          provisioner[:chef_metadata_url].
-            must_equal "#{base_url}-chefdk?p=windows&m=x86_64&pv=2008r2&v=latest"
-        end
-
-        it "defaults to a specfic chefdk from :chef_omnibus_install_options" do
-          config[:require_chef_omnibus] = "0.3.6"
-          config[:chef_omnibus_install_options] = "-a other -P chefdk -B okay"
-
-          provisioner[:chef_metadata_url].
-            must_equal "#{base_url}-chefdk?p=windows&m=x86_64&pv=2008r2&v=0.3.6"
-        end
-
-        it "defaults to a maj/min chefdk from :chef_omnibus_install_options" do
-          config[:require_chef_omnibus] = "0.3"
-          config[:chef_omnibus_install_options] = "-P chefdk -B okay"
-
-          provisioner[:chef_metadata_url].
-            must_equal "#{base_url}-chefdk?p=windows&m=x86_64&pv=2008r2&v=0.3"
-        end
-      end
     end
 
     it ":require_chef_omnibus defaults to true" do
@@ -240,259 +139,241 @@ describe Kitchen::Provisioner::ChefBase do
 
   describe "#install_command" do
 
-    let(:cmd) { provisioner.install_command }
+    before do
+      platform.stubs(:shell_type).returns("bourne")
+      Mixlib::Install.stubs(:new).returns(installer)
+    end
 
-    describe "for bourne shells" do
+    let(:installer) { stub(:root => "/rooty", :install_command => "make_it_so") }
 
-      before { platform.stubs(:shell_type).returns("bourne") }
+    let(:cmd) { provisioner.install_command }
 
-      it "returns nil if :require_chef_omnibus is falsey" do
-        config[:require_chef_omnibus] = false
+    let(:install_opts) {
+      { :omnibus_url => "https://www.chef.io/chef/install.sh",
+        :project => nil, :install_flags => nil, :http_proxy => nil,
+        :https_proxy => nil }
+    }
 
-        cmd.must_equal nil
-      end
+    it "returns nil if :require_chef_omnibus is falsey" do
+      config[:require_chef_omnibus] = false
 
-      it "uses bourne shell (sh)" do
-        cmd.must_match(/\Ash -c '$/)
+      installer.expects(:root).never
+      installer.expects(:install_command).never
+      cmd.must_equal nil
+    end
+
+    describe "common behaviour" do
+      before do
+        installer.expects(:root).at_least_once.returns("/opt/chef")
+        installer.expects(:install_command)
       end
 
-      it "ends with a single quote" do
-        cmd.must_match(/'\Z/)
+      it "passes sensible defaults" do
+        Mixlib::Install.expects(:new).
+          with(default_version, false, install_opts).returns(installer)
+        cmd
       end
 
       it "exports http_proxy & HTTP_PROXY when :http_proxy is set" do
         config[:http_proxy] = "http://proxy"
+        install_opts[:http_proxy] = "http://proxy"
 
-        cmd.lines.to_a[1..2].must_equal([
-          %{http_proxy="http://proxy"; export http_proxy\n},
-          %{HTTP_PROXY="http://proxy"; export HTTP_PROXY\n}
-        ])
+        Mixlib::Install.expects(:new).
+          with(default_version, false, install_opts).returns(installer)
+        cmd
       end
 
       it "exports https_proxy & HTTPS_PROXY when :https_proxy is set" do
         config[:https_proxy] = "https://proxy"
+        install_opts[:https_proxy] = "https://proxy"
 
-        cmd.lines.to_a[1..2].must_equal([
-          %{https_proxy="https://proxy"; export https_proxy\n},
-          %{HTTPS_PROXY="https://proxy"; export HTTPS_PROXY\n}
-        ])
+        Mixlib::Install.expects(:new).
+          with(default_version, false, install_opts).returns(installer)
+        cmd
       end
 
       it "exports all http proxy variables when both are set" do
         config[:http_proxy] = "http://proxy"
         config[:https_proxy] = "https://proxy"
+        install_opts[:http_proxy] = "http://proxy"
+        install_opts[:https_proxy] = "https://proxy"
 
-        cmd.lines.to_a[1..4].must_equal([
-          %{http_proxy="http://proxy"; export http_proxy\n},
-          %{HTTP_PROXY="http://proxy"; export HTTP_PROXY\n},
-          %{https_proxy="https://proxy"; export https_proxy\n},
-          %{HTTPS_PROXY="https://proxy"; export HTTPS_PROXY\n}
-        ])
+        Mixlib::Install.expects(:new).
+          with(default_version, false, install_opts).returns(installer)
+        cmd
       end
 
       it "installs chef using :chef_omnibus_url, if necessary" do
         config[:chef_omnibus_url] = "FROM_HERE"
+        install_opts[:omnibus_url] = "FROM_HERE"
 
-        cmd.must_match regexify(%{chef_omnibus_url="FROM_HERE"})
+        Mixlib::Install.expects(:new).
+          with(default_version, false, install_opts).returns(installer)
+        cmd
       end
 
       it "will install a specific version of chef, if necessary" do
         config[:require_chef_omnibus] = "1.2.3"
 
-        cmd.must_match regexify(%{install_flags="-v 1.2.3"})
-        cmd.must_match regexify(%{pretty_version="1.2.3"})
-        cmd.must_match regexify(%{version="1.2.3"})
+        Mixlib::Install.expects(:new).
+          with("1.2.3", false, install_opts).returns(installer)
+        cmd
       end
 
       it "will install a major/minor version of chef, if necessary" do
         config[:require_chef_omnibus] = "11.10"
 
-        cmd.must_match regexify(%{install_flags="-v 11.10"})
-        cmd.must_match regexify(%{pretty_version="11.10"})
-        cmd.must_match regexify(%{version="11.10"})
+        Mixlib::Install.expects(:new).
+          with("11.10", false, install_opts).returns(installer)
+        cmd
       end
 
       it "will install a major version of chef, if necessary" do
         config[:require_chef_omnibus] = "12"
 
-        cmd.must_match regexify(%{install_flags="-v 12"})
-        cmd.must_match regexify(%{pretty_version="12"})
-        cmd.must_match regexify(%{version="12"})
+        Mixlib::Install.expects(:new).
+          with("12", false, install_opts).returns(installer)
+        cmd
       end
 
       it "will install a downcaased version string of chef, if necessary" do
         config[:require_chef_omnibus] = "10.1.0.RC.1"
 
-        cmd.must_match regexify(%{install_flags="-v 10.1.0.rc.1"})
-        cmd.must_match regexify(%{pretty_version="10.1.0.rc.1"})
-        cmd.must_match regexify(%{version="10.1.0.rc.1"})
+        Mixlib::Install.expects(:new).
+          with("10.1.0.rc.1", false, install_opts).returns(installer)
+        cmd
       end
 
       it "will install a nightly, if necessary" do
-        config[:require_chef_omnibus] = "12.5.0-current.0+20150721082808.git.14.c91b337-1"
+        config[:require_chef_omnibus] =
+          "12.5.0-current.0+20150721082808.git.14.c91b337-1"
 
-        cmd.must_match(
-          regexify(%{install_flags="-v 12.5.0-current.0%2B20150721082808.git.14.c91b337-1"}))
-        cmd.must_match(
-          regexify(%{pretty_version="12.5.0-current.0+20150721082808.git.14.c91b337-1"}))
-        cmd.must_match(
-          regexify(%{version="12.5.0-current.0+20150721082808.git.14.c91b337-1"}))
+        Mixlib::Install.expects(:new).with(
+          "12.5.0-current.0+20150721082808.git.14.c91b337-1",
+          false,
+          install_opts
+        ).returns(installer)
+        cmd
       end
 
-      it "will install the latest of chef, if necessary" do
+      it "will install the latest chef, if necessary" do
         config[:require_chef_omnibus] = "latest"
 
-        cmd.must_match regexify(%{install_flags=""})
-        cmd.must_match regexify(%{pretty_version="always install latest version"})
-        cmd.must_match regexify(%{version="latest"})
+        Mixlib::Install.expects(:new).
+          with("latest", false, install_opts).returns(installer)
+        cmd
       end
 
-      it "will install a of chef, unless it exists" do
+      it "will install a version of chef, unless it exists" do
         config[:require_chef_omnibus] = true
 
-        cmd.must_match regexify(%{install_flags=""})
-        cmd.must_match regexify(%{pretty_version="install only if missing"})
-        cmd.must_match regexify(%{version="true"})
+        Mixlib::Install.expects(:new).
+          with(default_version, false, install_opts).returns(installer)
+        cmd
       end
 
-      it "will pass install options, when given" do
+      it "will pass a project, when given" do
         config[:chef_omnibus_install_options] = "-P chefdk"
+        install_opts[:install_flags] = "-P chefdk"
+        install_opts[:project] = "chefdk"
 
-        cmd.must_match regexify(%{install_flags="-P chefdk"})
-        cmd.must_match regexify(%{pretty_version="install only if missing"})
-        cmd.must_match regexify(%{version="true"})
+        Mixlib::Install.expects(:new).
+          with(default_version, false, install_opts).returns(installer)
+        cmd
       end
 
       it "will pass install options and version info, when given" do
         config[:require_chef_omnibus] = "11"
         config[:chef_omnibus_install_options] = "-d /tmp/place"
+        install_opts[:install_flags] = "-d /tmp/place"
 
-        cmd.must_match regexify(%{install_flags="-v 11 -d /tmp/place"})
-        cmd.must_match regexify(%{pretty_version="11"})
-        cmd.must_match regexify(%{version="11"})
+        Mixlib::Install.expects(:new).
+          with("11", false, install_opts).returns(installer)
+        cmd
       end
 
-      it "prepends sudo for sh commands when :sudo is set" do
-        config[:sudo] = true
+      it "will set the install root" do
+        config[:chef_omnibus_root] = "/tmp/test"
+        install_opts[:root] = "/tmp/test"
 
-        cmd.must_match regexify(%{sudo_sh="sudo -E sh"})
+        Mixlib::Install.expects(:new).
+          with(default_version, false, install_opts).returns(installer)
+        cmd
       end
 
-      it "does not sudo for sh commands when :sudo is falsey" do
-        config[:sudo] = false
+      it "prefixs the whole command with the command_prefix if set" do
+        config[:command_prefix] = "my_prefix"
 
-        cmd.must_match regexify(%{sudo_sh="sh"})
+        cmd.must_match(/\Amy_prefix /)
       end
-    end
 
-    describe "for powershell shells on windows os types" do
-
-      before do
-        platform.stubs(:shell_type).returns("powershell")
-        platform.stubs(:os_type).returns("windows")
-      end
-
-      it "exports http_proxy & HTTP_PROXY when :http_proxy is set" do
-        config[:http_proxy] = "http://proxy"
-
-        cmd.lines.to_a[0..1].must_equal([
-          %{$env:http_proxy = "http://proxy"\n},
-          %{$env:HTTP_PROXY = "http://proxy"\n}
-        ])
-      end
-
-      it "exports https_proxy & HTTPS_PROXY when :https_proxy is set" do
-        config[:https_proxy] = "https://proxy"
-
-        cmd.lines.to_a[0..1].must_equal([
-          %{$env:https_proxy = "https://proxy"\n},
-          %{$env:HTTPS_PROXY = "https://proxy"\n}
-        ])
-      end
-
-      it "exports all http proxy variables when both are set" do
-        config[:http_proxy] = "http://proxy"
-        config[:https_proxy] = "https://proxy"
-
-        cmd.lines.to_a[0..3].must_equal([
-          %{$env:http_proxy = "http://proxy"\n},
-          %{$env:HTTP_PROXY = "http://proxy"\n},
-          %{$env:https_proxy = "https://proxy"\n},
-          %{$env:HTTPS_PROXY = "https://proxy"\n}
-        ])
-      end
-
-      it "returns nil if :require_chef_omnibus is falsey" do
-        config[:require_chef_omnibus] = false
+      it "does not prefix the command if command_prefix is not set" do
+        config[:command_prefix] = nil
 
-        cmd.must_equal nil
+        cmd.wont_match(/\Amy_prefix /)
       end
+    end
 
-      it "installs chef using :chef_metadata_url, if necessary" do
-        config[:chef_metadata_url] = "FROM_HERE"
-
-        cmd.must_match regexify(%{$chef_metadata_url = "FROM_HERE"})
+    describe "for bourne shells" do
+      before do
+        installer.expects(:root).at_least_once.returns("/opt/chef")
+        installer.expects(:install_command).returns("my_install_command")
       end
 
-      it "sets an root path from :chef_omnibus_root" do
-        config[:chef_omnibus_root] = "\\a\\b"
+      it "prepends sudo for sh commands when :sudo is set" do
+        config[:sudo] = true
+        config[:sudo_command] = "my_sudo_command"
 
-        cmd.must_match regexify(%{$chef_omnibus_root = "\\a\\b"})
+        Mixlib::Install.expects(:new).
+          with(default_version, false, install_opts).returns(installer)
+        cmd.must_equal "my_sudo_command my_install_command"
       end
 
-      it "sets a path for the msi pacakge based on version" do
-        config[:require_chef_omnibus] = "1.2.3"
+      it "does not sudo for sh commands when :sudo is falsey" do
+        config[:sudo] = false
 
-        cmd.must_match regexify(%{$msi = "$env:TEMP\\chef-1.2.3.msi"})
+        Mixlib::Install.expects(:new).
+          with(default_version, false, install_opts).returns(installer)
+        cmd.must_equal "my_install_command"
       end
+    end
 
-      it "will install a specific version of chef, if necessary" do
-        config[:require_chef_omnibus] = "1.2.3"
-
-        cmd.must_match regexify(%{$pretty_version = "1.2.3"})
-        cmd.must_match regexify(%{$version = "1.2.3"})
+    describe "for powershell shells on windows os types" do
+      before do
+        installer.expects(:root).at_least_once.returns("/opt/chef")
+        installer.expects(:install_command)
+        platform.stubs(:shell_type).returns("powershell")
+        platform.stubs(:os_type).returns("windows")
       end
 
-      it "will install a major/minor version of chef, if necessary" do
-        config[:require_chef_omnibus] = "11.10"
-
-        cmd.must_match regexify(%{$pretty_version = "11.10"})
-        cmd.must_match regexify(%{$version = "11.10"})
+      it "sets the powershell flag for Mixlib::Install" do
+        Mixlib::Install.expects(:new).
+          with(default_version, true, install_opts).returns(installer)
+        cmd
       end
+    end
+  end
 
-      it "will install a major version of chef, if necessary" do
-        config[:require_chef_omnibus] = "12"
+  describe "#init_command" do
 
-        cmd.must_match regexify(%{$pretty_version = "12"})
-        cmd.must_match regexify(%{$version = "12"})
-      end
+    let(:cmd) { provisioner.init_command }
 
-      it "will install a downcaased version string of chef, if necessary" do
-        config[:require_chef_omnibus] = "10.1.0.RC.1"
+    describe "common behavior" do
 
-        cmd.must_match regexify(%{$pretty_version = "10.1.0.rc.1"})
-        cmd.must_match regexify(%{$version = "10.1.0.rc.1"})
-      end
+      before { platform.stubs(:shell_type).returns("fake") }
 
-      it "will install the latest of chef, if necessary" do
-        config[:require_chef_omnibus] = "latest"
+      it "prefixs the whole command with the command_prefix if set" do
+        config[:command_prefix] = "my_prefix"
 
-        cmd.must_match regexify(%{$pretty_version = "always install latest version"})
-        cmd.must_match regexify(%{$version = "latest"})
+        cmd.must_match(/\Amy_prefix /)
       end
 
-      it "will install a of chef, unless it exists" do
-        config[:require_chef_omnibus] = true
+      it "does not prefix the command if command_prefix is not set" do
+        config[:command_prefix] = nil
 
-        cmd.must_match regexify(%{$pretty_version = "install only if missing"})
-        cmd.must_match regexify(%{$version = "true"})
+        cmd.wont_match(/\Amy_prefix /)
       end
     end
-  end
-
-  describe "#init_command" do
-
-    let(:cmd) { provisioner.init_command }
 
     describe "for bourne shells" do