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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 882640379092b0732cc6d313bad0789817f6ad6a
-  data.tar.gz: 3bc38f11004420059c9674972e6f4205508b55bf
+  metadata.gz: 9849b2009d2b085667f5ec14e164878bcd272579
+  data.tar.gz: 2b8a47abba8c594d1a4365f21b335778b70a95dc
 SHA512:
-  metadata.gz: 898fe17d662c7b9af006bd9b711a3e0305b2bebe8e1aaa5b2ea91ae8c9b73dc7f7ed7bcaa7721888e20a6cae1b90f79431033d4cefb079f88c1b7772dcd036cd
-  data.tar.gz: 7f8eff2f17d9796033dca9f6bc8e9f71fdddc7d3386d2c788573920cb4c0e297abc23e18958bfbd6de6d7f4b103bf64984f7a41ec485255a04e195b60417c65b
+  metadata.gz: 410c8df130d1b1ff99110b24ea196d665ec13a9a971ebfd05da44057f2166dd34d3761031c27519682d18ab8d49bb4bbc512cd379d0648305e12bfdbd1e99262
+  data.tar.gz: bcc27fddd397449694927037eafc5966757a462843afdf574338b860bfbf180bec21cca9da208cbfe83d2106d17da73c636c4d9e824e70c4204db86a7c30b19a

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+## 1.4.0.beta.2 / 2015-03-25
+
+### Potentially breaking changes
+
+* Pull request [#649][]: Preserve Busser's #setup_cmd, #run_cmd, & #sync_cmd for better backwards compatibility. ([@fnichol][])
+
+### Bug fixes
+
+* Pull request [#648][]: Transport::Winrm: Truncate destination file for overwriting. ([@fnichol][])
+
+
 ## 1.4.0.beta.1 / 2015-03-24
 
 ### Potentially breaking changes
@@ -615,6 +626,8 @@ The initial release.
 [#588]: https://github.com/test-kitchen/test-kitchen/issues/588
 [#600]: https://github.com/test-kitchen/test-kitchen/issues/600
 [#633]: https://github.com/test-kitchen/test-kitchen/issues/633
+[#648]: https://github.com/test-kitchen/test-kitchen/issues/648
+[#649]: https://github.com/test-kitchen/test-kitchen/issues/649
 [@ChrisLundquist]: https://github.com/ChrisLundquist
 [@MarkGibbons]: https://github.com/MarkGibbons
 [@adamhjk]: https://github.com/adamhjk

data/lib/kitchen/provisioner/shell.rb

@@ -50,7 +50,7 @@ module Kitchen
         root = config[:root_path]
         data = remote_path_join(root, "data")
 
-        if powershell_shell?
+        code = if powershell_shell?
           Util.outdent!(<<-POWERSHELL)
             if (Test-Path "#{data}") {
               Remove-Item "#{data}" -Recurse -Force
@@ -60,10 +60,10 @@ module Kitchen
             }
           POWERSHELL
         else
-          cmd = "#{sudo("rm")} -rf #{data} ; mkdir -p #{root}"
-
-          Util.wrap_command(cmd)
+          "#{sudo("rm")} -rf #{data} ; mkdir -p #{root}"
         end
+
+        wrap_shell_code(code)
       end
 
       # (see Base#run_command)
@@ -72,12 +72,9 @@ module Kitchen
           config[:root_path],
           File.basename(config[:script])
         )
+        code = powershell_shell? ? %{& "#{script}"} : sudo(script)
 
-        if powershell_shell?
-          %{& "#{script}"}
-        else
-          Util.wrap_command(sudo(script))
-        end
+        wrap_shell_code(code)
       end
 
       private

data/lib/kitchen/version.rb

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

data/spec/kitchen/provisioner/shell_spec.rb

@@ -87,6 +87,40 @@ describe Kitchen::Provisioner::Shell do
         cmd.must_match(/'\Z/)
       end
 
+      it "ends with a single quote" do
+        cmd.must_match(/'\Z/)
+      end
+
+      it "exports http_proxy & HTTP_PROXY when :http_proxy is set" do
+        config[: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}
+        ])
+      end
+
+      it "exports https_proxy & HTTPS_PROXY when :https_proxy is set" do
+        config[: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}
+        ])
+      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[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}
+        ])
+      end
+
       it "uses sudo for rm when configured" do
         config[:sudo] = true
 
@@ -122,6 +156,36 @@ describe Kitchen::Provisioner::Shell do
         platform.stubs(:shell_type).returns("powershell")
       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 "removes the data directory" do
         config[:root_path] = "\\route"
 
@@ -157,6 +221,40 @@ describe Kitchen::Provisioner::Shell do
         cmd.must_match(/'\Z/)
       end
 
+      it "ends with a single quote" do
+        cmd.must_match(/'\Z/)
+      end
+
+      it "exports http_proxy & HTTP_PROXY when :http_proxy is set" do
+        config[: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}
+        ])
+      end
+
+      it "exports https_proxy & HTTPS_PROXY when :https_proxy is set" do
+        config[: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}
+        ])
+      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[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}
+        ])
+      end
+
       it "uses sudo for script when configured" do
         config[:root_path] = "/r"
         config[:sudo] = true
@@ -180,10 +278,40 @@ describe Kitchen::Provisioner::Shell do
         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 "invokes the bootstrap.ps1 script" do
         config[:root_path] = "\\r"
 
-        cmd.must_equal %{& "\\r\\bootstrap.ps1"}
+        cmd.must_match regexify(%{& "\\r\\bootstrap.ps1"})
       end
     end
   end

data/support/decode_files.ps1.erb

@@ -8,6 +8,7 @@ Function Decode-Base64File($src, $dst) {
     $b64 = New-Object -TypeName System.Security.Cryptography.FromBase64Transform
     $m = [System.Security.Cryptography.CryptoStreamMode]::Read
     $d = New-Object -TypeName System.Security.Cryptography.CryptoStream $in,$b64,$m
+    echo $null > $dst
     Copy-Stream $d ($out = [System.IO.File]::OpenWrite($dst))
   } Finally { Cleanup $in; Cleanup $out; Cleanup $d }
 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: test-kitchen
 version: !ruby/object:Gem::Version
-  version: 1.4.0.beta.1
+  version: 1.4.0.beta.2
 platform: ruby
 authors:
 - Fletcher Nichol
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-24 00:00:00.000000000 Z
+date: 2015-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout