diff options
| -rw-r--r-- | CHANGELOG.md | 7 | ||||
| -rw-r--r-- | Gemfile.lock | 10 | ||||
| -rw-r--r-- | VERSION | 2 | ||||
| -rw-r--r-- | appveyor.yml | 20 | ||||
| -rw-r--r-- | chef-config/lib/chef-config/version.rb | 2 | ||||
| -rw-r--r-- | distro/powershell/chef/chef.psm1 | 6 | ||||
| -rw-r--r-- | lib/chef/version.rb | 2 |
7 files changed, 26 insertions, 23 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index f209c3b9e3..1994f17c36 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,15 +1,16 @@ <!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ --> -<!-- latest_release 13.6.53 --> -## [v13.6.53](https://github.com/chef/chef/tree/v13.6.53) (2017-12-21) +<!-- latest_release 13.6.54 --> +## [v13.6.54](https://github.com/chef/chef/tree/v13.6.54) (2017-12-21) #### Merged Pull Requests -- Escape single-quoted strings from the context in knife bootstrap [#6695](https://github.com/chef/chef/pull/6695) ([aespinosa](https://github.com/aespinosa)) +- [MSYS-692] Fix issue with PowerShell function buffer [#6664](https://github.com/chef/chef/pull/6664) ([TheLunaticScripter](https://github.com/TheLunaticScripter)) <!-- latest_release --> <!-- release_rollup since=13.6.4 --> ### Changes since 13.6.4 release #### Merged Pull Requests +- [MSYS-692] Fix issue with PowerShell function buffer [#6664](https://github.com/chef/chef/pull/6664) ([TheLunaticScripter](https://github.com/TheLunaticScripter)) <!-- 13.6.54 --> - Escape single-quoted strings from the context in knife bootstrap [#6695](https://github.com/chef/chef/pull/6695) ([aespinosa](https://github.com/aespinosa)) <!-- 13.6.53 --> - Allow injecting tempfiles into Chef::HTTP [#6701](https://github.com/chef/chef/pull/6701) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 13.6.52 --> - Modernize launchd resource [#6698](https://github.com/chef/chef/pull/6698) ([tas50](https://github.com/tas50)) <!-- 13.6.51 --> diff --git a/Gemfile.lock b/Gemfile.lock index e2ca2a965d..976b28a87d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -17,10 +17,10 @@ GIT PATH remote: . specs: - chef (13.6.53) + chef (13.6.54) addressable bundler (>= 1.10) - chef-config (= 13.6.53) + chef-config (= 13.6.54) chef-zero (>= 13.0) diff-lcs (~> 1.2, >= 1.2.4) erubis (~> 2.7) @@ -47,10 +47,10 @@ PATH specinfra (~> 2.10) syslog-logger (~> 1.6) uuidtools (~> 2.1.5) - chef (13.6.53-universal-mingw32) + chef (13.6.54-universal-mingw32) addressable bundler (>= 1.10) - chef-config (= 13.6.53) + chef-config (= 13.6.54) chef-zero (>= 13.0) diff-lcs (~> 1.2, >= 1.2.4) erubis (~> 2.7) @@ -92,7 +92,7 @@ PATH PATH remote: chef-config specs: - chef-config (13.6.53) + chef-config (13.6.54) addressable fuzzyurl mixlib-config (~> 2.0) @@ -1 +1 @@ -13.6.53
\ No newline at end of file +13.6.54
\ No newline at end of file diff --git a/appveyor.yml b/appveyor.yml index 959c8e616c..aa9fb93902 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -4,6 +4,9 @@ os: Visual Studio 2015 platform: - x64 +cache: +- vendor/bundle + environment: matrix: - ruby_version: "24-x64" @@ -26,19 +29,22 @@ install: - echo %OMNIBUS_RUBYGEMS% - ps: $env:OMNIBUS_BUNDLER=$(findstr bundler omnibus_overrides.rb | %{ $_.split(" ")[3] }) - echo %OMNIBUS_BUNDLER% - - ruby --version - gem --version - gem update --system %OMNIBUS_RUBYGEMS% || gem update --system %OMNIBUS_RUBYGEMS% || gem update --system %OMNIBUS_RUBYGEMS% - - gem --version - - bundler --version - - SET BUNDLE_WITHOUT=server:docgen:maintenance:pry:travis:integration:ci - appveyor DownloadFile http://curl.haxx.se/ca/cacert.pem -FileName C:\cacert.pem - set SSL_CERT_FILE=C:\cacert.pem - - bundle env - -build_script: + - SET BUNDLE_WITHOUT=server:docgen:maintenance:pry:travis:integration:ci + - bundle config --local path vendor/bundle # use the cache we define above - bundle install || bundle install || bundle install +build: off + +before_test: + - ruby --version + - gem --version + - bundler --version + - bundle env + test_script: - SET SPEC_OPTS=--format progress - bundle exec rake spec diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb index 293d4a6c10..8912760655 100644 --- a/chef-config/lib/chef-config/version.rb +++ b/chef-config/lib/chef-config/version.rb @@ -21,7 +21,7 @@ module ChefConfig CHEFCONFIG_ROOT = File.expand_path("../..", __FILE__) - VERSION = "13.6.53" + VERSION = "13.6.54" end # diff --git a/distro/powershell/chef/chef.psm1 b/distro/powershell/chef/chef.psm1 index 1a5e2cc5eb..05fee05e5e 100644 --- a/distro/powershell/chef/chef.psm1 +++ b/distro/powershell/chef/chef.psm1 @@ -236,7 +236,6 @@ function Run-ExecutableAndWait($AppPath, $ArgumentString) { throw "Unable to create process [$ArgumentString]. Error code $reason." } - $sb = New-Object System.Text.StringBuilder $buffer = New-Object byte[] 1024 # Initialize reference variables @@ -270,7 +269,7 @@ function Run-ExecutableAndWait($AppPath, $ArgumentString) { while ([Chef.Kernel32]::ReadFile($hReadOut, $buffer, $buffer.Length, [ref] $bytesRead, 0)) { $output = [Text.Encoding]::UTF8.GetString($buffer, 0, $bytesRead) if ($output) { - [void]$sb.Append($output) + $output } if ($bytesRead -lt $buffer.Length) { # Partial buffer indicating the end of stream, break out of ReadFile loop @@ -307,9 +306,6 @@ function Run-ExecutableAndWait($AppPath, $ArgumentString) { } } - # Return output obtained from child process stdout/stderr - $sb.ToString() - # Cleanup handles $success = [Chef.Kernel32]::CloseHandle($pi.hProcess) if (-Not $success) { diff --git a/lib/chef/version.rb b/lib/chef/version.rb index 5e51574d8d..d0a89a6997 100644 --- a/lib/chef/version.rb +++ b/lib/chef/version.rb @@ -23,7 +23,7 @@ require "chef/version_string" class Chef CHEF_ROOT = File.expand_path("../..", __FILE__) - VERSION = Chef::VersionString.new("13.6.53") + VERSION = Chef::VersionString.new("13.6.54") end # |