test-kitchen 1.21.2 → 1.22.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8cf4b7df39c3ddbc02aabf0e3456a08f1ea38f48b516499f60460e5a412f0bda
-  data.tar.gz: d5e26f7ca219d4a029066ebb83903ef57da5c40941645dd7261fed39ff395fa2
+  metadata.gz: ff85b0760e18dd6dc096340fe2f0e25e2afb81a3effe86abffb3bcb693c69691
+  data.tar.gz: 5726b42fa3dd0be71cdaf302a9fbb22eb411d81a2d1ec0112e31efc33b90b32a
 SHA512:
-  metadata.gz: 2f411954ed9d5731087a7d9266cf2f4b840509c9044732febd6728bf47d8f0d8c8c14a5fc6db64c9d567a8a5a647211869a9401e5a76b1431cfabd0a404dfdd5
-  data.tar.gz: 6b4e13ba9d11104ddff4c39ad749f773afcd4dfa7d25056a00fd29dd9a7944e1a1926dc4346920afaaf3a150bd96610bf78516dbbc7aaaafe976cb42194c573f
+  metadata.gz: 1b69d8edbe1552f5aa6a1148140073eb05fd263ddb39ef8ef388f36cd57063693c4ab12e9f71ef9dfebd40fcee2a69078beb670300ef9294c65c3303e59b85cc
+  data.tar.gz: 585a3924350b34e45a573bb8c7d11d606bc47f3b4f9a5fcf0e974443686c22d540ce9b06f450890affbb680e91e27f93abecd3cbee52558e63db970ebe3d644b

data/.gitignore

@@ -25,5 +25,7 @@ tmp
 .kitchen/
 .kitchen.yml
 .kitchen.local.yml
+kitchen.yml
+kitchen.local.yml
 Berksfile.lock
 *.swp

data/.kitchen.dokken.yml

@@ -13,9 +13,9 @@ verifier:
   name: inspec
 
 platforms:
-- name: ubuntu-16.04
+- name: ubuntu-18.04
   driver:
-    image: dokken/ubuntu-16.04
+    image: dokken/ubuntu-18.04
     pid_one_command: /bin/systemd
     intermediate_instructions:
       - RUN /usr/bin/apt-get update

data/.travis.yml

@@ -5,8 +5,9 @@ services: docker
 language: ruby
 
 rvm:
-  - 2.3.6
-  - 2.4.3
+  - 2.3.7
+  - 2.4.4
+  - 2.5.1
   - ruby-head
 
 
@@ -26,11 +27,11 @@ branches:
 
 matrix:
   include:
-    - rvm: 2.5.0
+    - rvm: 2.5.1
       before_install:
       # https://github.com/travis-ci/travis-ci/issues/8978
       - gem update --system
-    - rvm: 2.4
+    - rvm: 2.4.4
       # To run the proxy tests we need additional gems than what Test Kitchen normally uses
       # for testing
       gemfile: Gemfile.proxy_tests

data/CHANGELOG.md

@@ -1,9 +1,15 @@
 # Change Log
+
+## [v1.22.0](https://github.com/test-kitchen/test-kitchen/tree/v1.22.0) (2018-06-28)
+[Full Changelog](https://github.com/test-kitchen/test-kitchen/compare/v1.21.2...v1.22.0)
+
+- Add the ssh_gateway_port config in ssh transport [#1421](https://github.com/test-kitchen/test-kitchen/pull/1421) ([sjeandeaux](https://github.com/sjeandeaux))
+- Shell Provisioner: make script executable [#1381](https://github.com/test-kitchen/test-kitchen/pull/1381) ([thewyzard44](https://github.com/thewyzard44))
+- Stop calling the Chef packages omnibus packages [#1425](https://github.com/test-kitchen/test-kitchen/pull/1425) ([tas50](https://github.com/tas50))
+
 ## [v1.21.2](https://github.com/test-kitchen/test-kitchen/tree/v1.21.2) (2018-05-07)
 [Full Changelog](https://github.com/test-kitchen/test-kitchen/compare/v1.21.1...v1.21.2)
 
-**Merged pull requests:**
-
 - Removing thor upper bound in step with berks [\#1410](https://github.com/test-kitchen/test-kitchen/pull/1410) ([cheeseplus](https://github.com/cheeseplus)
 )
 
@@ -11,7 +17,6 @@
 ## [v1.21.1](https://github.com/test-kitchen/test-kitchen/tree/v1.21.1) (2018-04-18)
 [Full Changelog](https://github.com/test-kitchen/test-kitchen/compare/v1.21.0...v1.21.1)
 
-**Merged pull requests:**
 
 - Revert: honor root\_path for location of chef installer script [\#1369]
 

data/appveyor.yml

@@ -8,7 +8,7 @@ environment:
   machine_user: test_user
   machine_pass: Pass@word1
   machine_port: 5985
-  KITCHEN_YAML: .kitchen.ci.yml
+  KITCHEN_YAML: .kitchen.appveyor.yml
   SSL_CERT_FILE: c:\projects\test_kitchen\certs.pem
 
   matrix:

data/lib/kitchen/provisioner/shell.rb

@@ -77,6 +77,22 @@ module Kitchen
         prefix_command(wrap_shell_code(code))
       end
 
+      # (see Base#prepare_command)
+      def prepare_command
+        # On a windows host, the supplied script does not get marked as executable
+        # due to windows not having the concept of an executable flag
+        #
+        # When the guest instance is *nix, `chmod +x` the script in the guest, prior to executing
+        return unless unix_os? && config[:script] && !config[:command]
+
+        debug "Marking script as executable"
+        script = remote_path_join(
+          config[:root_path],
+          File.basename(config[:script])
+        )
+        prefix_command(wrap_shell_code(sudo("chmod +x #{script}")))
+      end
+
       # (see Base#run_command)
       def run_command
         return prefix_command(wrap_shell_code(config[:command])) if config[:command]
@@ -126,8 +142,6 @@ module Kitchen
         if config[:script]
           debug("Using script from #{config[:script]}")
           FileUtils.cp_r(config[:script], sandbox_path)
-          FileUtils.chmod(0755,
-                          File.join(sandbox_path, File.basename(config[:script])))
         else
           info("No provisioner script file specified, skipping")
         end

data/lib/kitchen/transport/ssh.rb

@@ -54,6 +54,7 @@ module Kitchen
       default_config :max_wait_until_ready, 600
 
       default_config :ssh_gateway, nil
+      default_config :ssh_gateway_port, 22
       default_config :ssh_gateway_username, nil
 
       default_config :ssh_http_proxy, nil
@@ -157,8 +158,7 @@ module Kitchen
           end
           if ssh_gateway
             gateway_command = "ssh -q #{ssh_gateway_username}@#{ssh_gateway} nc #{hostname} #{port}"
-            # Should support other ports than 22 for ssh gateways
-            args += %W{ -o ProxyCommand=#{gateway_command} -p 22 }
+            args += %W{ -o ProxyCommand=#{gateway_command} -p #{ssh_gateway_port} }
           end
           Array(options[:keys]).each { |ssh_key| args += %W{ -i #{ssh_key} } }
           args += %W{ -p #{port} }
@@ -277,6 +277,10 @@ module Kitchen
         # @api private
         attr_reader :ssh_gateway_username
 
+        # @return [Integer] The port to use when using an ssh gateway
+        # @api private
+        attr_reader :ssh_gateway_port
+
         # @return [String] The kitchen ssh proxy to use when connecting to the
         #   remote SSH host via http proxy
         # @api private
@@ -310,8 +314,9 @@ module Kitchen
         # @api private
         def establish_connection_via_gateway(opts)
           retry_connection(opts) do
+            gateway_options = options.merge(:port => ssh_gateway_port)
             Net::SSH::Gateway.new(ssh_gateway,
-                                  ssh_gateway_username, options).ssh(hostname, username, options)
+                                  ssh_gateway_username, gateway_options).ssh(hostname, username, options)
           end
         end
 
@@ -345,7 +350,7 @@ module Kitchen
         # @api private
         def retry_connection(opts)
           log_msg = "[SSH] opening connection to #{self}"
-          log_msg += " via #{ssh_gateway_username}@#{ssh_gateway}" if ssh_gateway
+          log_msg += " via #{ssh_gateway_username}@#{ssh_gateway}:#{ssh_gateway_port}" if ssh_gateway
           logger.debug(log_msg)
           yield
         rescue *RESCUE_EXCEPTIONS_ON_ESTABLISH => e
@@ -406,6 +411,7 @@ module Kitchen
           @max_wait_until_ready    = @options.delete(:max_wait_until_ready)
           @ssh_gateway             = @options.delete(:ssh_gateway)
           @ssh_gateway_username    = @options.delete(:ssh_gateway_username)
+          @ssh_gateway_port        = @options.delete(:ssh_gateway_port)
           @ssh_http_proxy          = @options.delete(:ssh_http_proxy)
           @ssh_http_proxy_user     = @options.delete(:ssh_http_proxy_user)
           @ssh_http_proxy_password = @options.delete(:ssh_http_proxy_password)
@@ -468,6 +474,7 @@ module Kitchen
           max_wait_until_ready: data[:max_wait_until_ready],
           ssh_gateway: data[:ssh_gateway],
           ssh_gateway_username: data[:ssh_gateway_username],
+          ssh_gateway_port: data[:ssh_gateway_port],
         }
 
         if data[:ssh_key] && !data[:password]

data/lib/kitchen/version.rb

@@ -17,5 +17,5 @@
 # limitations under the License.
 
 module Kitchen
-  VERSION = "1.21.2".freeze
+  VERSION = "1.22.0".freeze
 end

data/spec/kitchen/provisioner/chef_solo_spec.rb

@@ -367,7 +367,7 @@ describe Kitchen::Provisioner::ChefSolo do
                                         ])
       end
 
-      it "does no powershell PATH reloading for older chef omnibus packages" do
+      it "does no powershell PATH reloading for older chef packages" do
         cmd.wont_match regexify(%{[System.Environment]::})
       end
 
@@ -520,7 +520,7 @@ describe Kitchen::Provisioner::ChefSolo do
                                         ])
       end
 
-      it "reloads PATH for older chef omnibus packages" do
+      it "reloads PATH for older chef packages" do
         cmd.must_match regexify("$env:PATH = try {\n" \
         "[System.Environment]::GetEnvironmentVariable('PATH','Machine')\n" \
         "} catch { $env:PATH }")

data/spec/kitchen/provisioner/chef_zero_spec.rb

@@ -754,7 +754,7 @@ describe Kitchen::Provisioner::ChefZero do
                                           ])
         end
 
-        it "does no powershell PATH reloading for older chef omnibus packages" do
+        it "does no powershell PATH reloading for older chef packages" do
           cmd.wont_match regexify(%{[System.Environment]::})
         end
 
@@ -829,7 +829,7 @@ describe Kitchen::Provisioner::ChefZero do
                                           ])
         end
 
-        it "reloads PATH for older chef omnibus packages" do
+        it "reloads PATH for older chef packages" do
           cmd.must_match regexify("$env:PATH = try {\n" \
           "[System.Environment]::GetEnvironmentVariable('PATH','Machine')\n" \
           "} catch { $env:PATH }")
@@ -934,7 +934,7 @@ describe Kitchen::Provisioner::ChefZero do
             %{GEM_CACHE="/r/chef-client-zero-gems/cache"; export GEM_CACHE})
         end
 
-        it "does no powershell PATH reloading for older chef omnibus packages" do
+        it "does no powershell PATH reloading for older chef packages" do
           cmd.wont_match regexify(%{[System.Environment]::})
         end
       end
@@ -988,7 +988,7 @@ describe Kitchen::Provisioner::ChefZero do
             %{$env:GEM_CACHE = "\\r\\chef-client-zero-gems\\cache"})
         end
 
-        it "reloads PATH for older chef omnibus packages" do
+        it "reloads PATH for older chef packages" do
           cmd.must_match regexify("$env:PATH = try {\n" \
           "[System.Environment]::GetEnvironmentVariable('PATH','Machine')\n" \
           "} catch { $env:PATH }")

data/spec/kitchen/provisioner/shell_spec.rb

@@ -241,6 +241,69 @@ describe Kitchen::Provisioner::Shell do
     end
   end
 
+  describe "#prepare_command" do
+    let(:cmd) { provisioner.prepare_command }
+
+    describe "for bourne shells" do
+      before { platform.stubs(:shell_type).returns("bourne") }
+
+      it "uses bourne shell" do
+        cmd.must_match(/\Ash -c '$/)
+        cmd.must_match(/'\Z/)
+      end
+
+      it "ends with a single quote" do
+        cmd.must_match(/'\Z/)
+      end
+
+      it "uses sudo for script when configured" do
+        config[:root_path] = "/r"
+        config[:sudo] = true
+
+        cmd.must_match regexify("sudo -E chmod +x /r/bootstrap.sh", :partial_line)
+      end
+
+      it "does not use sudo for script when configured" do
+        config[:root_path] = "/r"
+        config[:sudo] = false
+
+        cmd.must_match regexify("chmod +x /r/bootstrap.sh", :partial_line)
+        cmd.wont_match regexify("sudo -E chmod +x /r/bootstrap.sh", :partial_line)
+      end
+
+      it "uses command_prefix for script when configured" do
+        config[:command_prefix] = "TEST=yes"
+        config[:root_path] = "/r"
+        config[:sudo] = false
+
+        cmd.must_match(/^TEST=yes/)
+      end
+
+      it "respects command" do
+        config[:command] = "dothingy.rb"
+
+        cmd.must_be_nil
+      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 "does nothing when given a script" do
+        cmd.must_be_nil
+      end
+
+      it "respects command" do
+        config[:command] = "dothingy.rb"
+
+        cmd.must_be_nil
+      end
+    end
+  end
+
   describe "#run_command" do
     let(:cmd) { provisioner.run_command }
 
@@ -457,10 +520,6 @@ describe Kitchen::Provisioner::Shell do
           provisioner.create_sandbox
 
           sandbox_path("my_script").file?.must_equal true
-          unless running_tests_on_windows?
-            # Windows doesn't have the concept of executable
-            sandbox_path("my_script").executable?.must_equal true
-          end
           IO.read(sandbox_path("my_script")).must_equal "gonuts"
         end
 

data/spec/kitchen/transport/ssh_spec.rb

@@ -136,6 +136,18 @@ describe Kitchen::Transport::Ssh do
     it "sets :ssh_http_proxy_password to nil by default" do
       transport[:ssh_http_proxy_password].must_be_nil
     end
+
+    it "sets :ssh_gateway to nil by default" do
+      transport[:ssh_gateway].must_be_nil
+    end
+
+    it "sets :ssh_gateway_username to nil by default" do
+      transport[:ssh_gateway_username].must_be_nil
+    end
+
+    it "sets :ssh_gateway_port to 22 by default" do
+      transport[:ssh_gateway_port].must_equal 22
+    end
   end
 
   describe "#connection" do

data/support/chef_base_install_command.ps1

@@ -44,7 +44,7 @@ Function Download-Chef($md_url, $dst) {
 }
 
 Function Install-Chef($msi) {
-  Log "Installing Chef Omnibus package $msi"
+  Log "Installing Chef package $msi"
   $p = Start-Process -FilePath "msiexec.exe" -ArgumentList "/qn /i $msi" -Passthru -Wait
 
   if ($p.ExitCode -ne 0) { throw "msiexec was not successful. Received exit code $($p.ExitCode)" }
@@ -73,11 +73,11 @@ Try {
   $msi = Unresolve-Path $msi
 
   if (Check-UpdateChef $chef_omnibus_root $version) {
-    Write-Host "-----> Installing Chef Omnibus ($pretty_version)`n"
+    Write-Host "-----> Installing Chef package ($pretty_version)`n"
     Download-Chef "$chef_metadata_url" $msi
     Install-Chef $msi
   } else {
-    Write-Host "-----> Chef Omnibus installation detected ($pretty_version)`n"
+    Write-Host "-----> Chef package installation detected ($pretty_version)`n"
 }
 Catch {
   Write-Error ($_ | ft -Property * | out-string) -ErrorAction Continue

data/support/chef_base_install_command.sh

@@ -206,7 +206,7 @@ unable_to_download() {
 main() {
   should_update_chef "$chef_omnibus_root" "$version"
   if test $? -eq 0; then
-    echo "-----> Installing Chef Omnibus (${pretty_version})";
+    echo "-----> Installing Chef package (${pretty_version})";
 
     # solaris 10 lacks recent enough credentials, so http url is used
     platform="`/usr/bin/uname -s 2>/dev/null`";
@@ -218,7 +218,7 @@ main() {
     do_download "$chef_omnibus_url" /tmp/install.sh;
     $sudo_sh /tmp/install.sh $install_flags;
   else
-    echo "-----> Chef Omnibus installation detected (${pretty_version})";
+    echo "-----> Chef package installation detected (${pretty_version})";
   fi
 }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: test-kitchen
 version: !ruby/object:Gem::Version
-  version: 1.21.2
+  version: 1.22.0
 platform: ruby
 authors:
 - Fletcher Nichol
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-07 00:00:00.000000000 Z
+date: 2018-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout
@@ -320,7 +320,7 @@ files:
 - ".gitattributes"
 - ".github/ISSUE_TEMPLATE.md"
 - ".gitignore"
-- ".kitchen.ci.yml"
+- ".kitchen.appveyor.yml"
 - ".kitchen.dokken.yml"
 - ".kitchen.proxy.yml"
 - ".rubocop.yml"
@@ -525,7 +525,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.5
 signing_key: 
 specification_version: 4
 summary: Test Kitchen is an integration tool for developing and testing infrastructure