diff options
| -rw-r--r-- | .travis.yml | 50 | ||||
| -rw-r--r-- | CHANGELOG.md | 5 | ||||
| -rw-r--r-- | Gemfile.lock | 10 | ||||
| -rw-r--r-- | VERSION | 2 | ||||
| -rw-r--r-- | chef-config/lib/chef-config/version.rb | 2 | ||||
| -rw-r--r-- | lib/chef/http/json_input.rb | 4 | ||||
| -rw-r--r-- | lib/chef/knife.rb | 2 | ||||
| -rw-r--r-- | lib/chef/provider/env/windows.rb | 2 | ||||
| -rw-r--r-- | lib/chef/provider/package/freebsd/base.rb | 2 | ||||
| -rw-r--r-- | lib/chef/provider/package/freebsd/pkgng.rb | 2 | ||||
| -rw-r--r-- | lib/chef/provider/package/windows.rb | 2 | ||||
| -rw-r--r-- | lib/chef/provider/service/macosx.rb | 2 | ||||
| -rw-r--r-- | lib/chef/version.rb | 2 | ||||
| -rw-r--r-- | omnibus/resources/chef/msi/source.wxs.erb | 4 |
14 files changed, 46 insertions, 45 deletions
diff --git a/.travis.yml b/.travis.yml index 0ebfa995e6..d2e7e91e6c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -30,12 +30,12 @@ env: matrix: include: - - rvm: 2.2.5 + - rvm: 2.2.6 sudo: true script: sudo -E $(which bundle) exec rake spec; # also remove integration / external tests bundler_args: --without changelog development docgen guard integration maintenance omnibus_package tools aix bsd mac_os_x solaris windows --frozen - - rvm: 2.3.1 + - rvm: 2.3.3 sudo: true script: sudo -E $(which bundle) exec rake spec; # also remove integration / external tests @@ -47,13 +47,13 @@ matrix: bundler_args: --without changelog development docgen guard integration maintenance omnibus_package tools aix bsd mac_os_x solaris windows --frozen - env: CHEFSTYLE: 1 - rvm: 2.3.1 + rvm: 2.3.3 script: bundle exec rake style # also remove integration / external tests bundler_args: --without changelog development docgen guard integration maintenance omnibus_package tools aix bsd mac_os_x solaris windows --frozen - env: AUDIT_CHECK: 1 - rvm: 2.3.1 + rvm: 2.3.3 script: bundle exec bundle-audit check --update # also remove integration / external tests bundler_args: --without changelog development docgen guard integration maintenance omnibus_package tools aix bsd mac_os_x solaris windows --frozen @@ -63,19 +63,19 @@ matrix: - env: TEST_GEM: chef-provisioning script: tasks/bin/run_external_test $TEST_GEM rake spec - rvm: 2.3.1 + rvm: 2.3.3 - env: TEST_GEM: chef-sugar script: tasks/bin/run_external_test $TEST_GEM rake - rvm: 2.3.1 + rvm: 2.3.3 - env: - TEST_GEM: chef-zero script: tasks/bin/run_external_test $TEST_GEM rake spec cheffs - rvm: 2.3.1 + rvm: 2.3.3 - env: TEST_GEM: cheffish script: tasks/bin/run_external_test $TEST_GEM rake spec - rvm: 2.3.1 + rvm: 2.3.3 - env: TEST_GEM: chefspec # The chefspec tests + bundler cache + "gem update --system" interact badly :/ @@ -84,26 +84,26 @@ matrix: - gem install bundler -v $(grep bundler omnibus_overrides.rb | cut -d'"' -f2) - bundle config --local without server:docgen:maintenance:omnibus_package:development:ruby_prof:pry script: tasks/bin/run_external_test $TEST_GEM rake - rvm: 2.3.1 + rvm: 2.3.3 - env: TEST_GEM: foodcritic script: tasks/bin/run_external_test $TEST_GEM rake test - rvm: 2.3.1 + rvm: 2.3.3 - env: TEST_GEM: halite script: tasks/bin/run_external_test $TEST_GEM rake spec - rvm: 2.3.1 + rvm: 2.3.3 - env: TEST_GEM: knife-windows script: tasks/bin/run_external_test $TEST_GEM rake unit_spec - rvm: 2.3.1 + rvm: 2.3.3 - env: TEST_GEM: poise script: tasks/bin/run_external_test $TEST_GEM rake spec - rvm: 2.3.1 + rvm: 2.3.3 ### START TEST KITCHEN ONLY ### # - - rvm: 2.3.1 + - rvm: 2.3.3 services: docker sudo: required gemfile: kitchen-tests/Gemfile @@ -121,7 +121,7 @@ matrix: env: - UBUNTU=12.04 - KITCHEN_YAML=.kitchen.travis.yml - - rvm: 2.3.1 + - rvm: 2.3.3 services: docker sudo: required gemfile: kitchen-tests/Gemfile @@ -139,7 +139,7 @@ matrix: env: - UBUNTU=14.04 - KITCHEN_YAML=.kitchen.travis.yml - - rvm: 2.3.1 + - rvm: 2.3.3 services: docker sudo: required gemfile: kitchen-tests/Gemfile @@ -157,7 +157,7 @@ matrix: env: - UBUNTU=16.04 - KITCHEN_YAML=.kitchen.travis.yml - - rvm: 2.3.1 + - rvm: 2.3.3 services: docker sudo: required gemfile: kitchen-tests/Gemfile @@ -175,7 +175,7 @@ matrix: env: - DEBIAN=7 - KITCHEN_YAML=.kitchen.travis.yml - - rvm: 2.3.1 + - rvm: 2.3.3 services: docker sudo: required gemfile: kitchen-tests/Gemfile @@ -194,7 +194,7 @@ matrix: env: - DEBIAN=8 - KITCHEN_YAML=.kitchen.travis.yml - - rvm: 2.3.1 + - rvm: 2.3.3 services: docker sudo: required gemfile: kitchen-tests/Gemfile @@ -212,7 +212,7 @@ matrix: env: - CENTOS=6 - KITCHEN_YAML=.kitchen.travis.yml - - rvm: 2.3.1 + - rvm: 2.3.3 services: docker sudo: required gemfile: kitchen-tests/Gemfile @@ -230,7 +230,7 @@ matrix: env: - CENTOS=7 - KITCHEN_YAML=.kitchen.travis.yml - - rvm: 2.3.1 + - rvm: 2.3.3 services: docker sudo: required gemfile: kitchen-tests/Gemfile @@ -248,7 +248,7 @@ matrix: env: - FEDORA=latest - KITCHEN_YAML=.kitchen.travis.yml - - rvm: 2.3.1 + - rvm: 2.3.3 services: docker sudo: required gemfile: kitchen-tests/Gemfile @@ -266,7 +266,7 @@ matrix: env: - AMAZONLINUX=LATEST - KITCHEN_YAML=.kitchen.travis.yml - - rvm: 2.3.1 + - rvm: 2.3.3 services: docker sudo: required gemfile: kitchen-tests/Gemfile @@ -284,7 +284,7 @@ matrix: env: - AWESOME_CUSTOMERS_UBUNTU=1 - KITCHEN_YAML=.kitchen.travis.yml - - rvm: 2.3.1 + - rvm: 2.3.3 services: docker sudo: required gemfile: kitchen-tests/Gemfile @@ -303,7 +303,7 @@ matrix: - AWESOME_CUSTOMERS_RHEL=1 - KITCHEN_YAML=.kitchen.travis.yml ### END TEST KITCHEN ONLY ### - - rvm: 2.3.1 + - rvm: 2.3.3 sudo: required dist: trusty before_install: diff --git a/CHANGELOG.md b/CHANGELOG.md index 03253ed1fa..1580840999 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,10 +1,11 @@ This changelog reflects the current state of chef's master branch on github and may not reflect the current released version of chef, which is [](https://badge.fury.io/rb/chef). -## [v12.18.6](https://github.com/chef/chef/tree/v12.18.6) (2016-12-21) -[Full Changelog](https://github.com/chef/chef/compare/v12.17.44...v12.18.6) +## [v12.18.10](https://github.com/chef/chef/tree/v12.18.10) (2016-12-22) +[Full Changelog](https://github.com/chef/chef/compare/v12.17.44...v12.18.10) **Implemented enhancements:** +- Use the same task name used by the chef-client cookbook so that the task can be managed by its task recipie [\#5657](https://github.com/chef/chef/pull/5657) ([mwrock](https://github.com/mwrock)) - remove Chef::Platform::HandlerMap [\#5636](https://github.com/chef/chef/pull/5636) ([lamont-granquist](https://github.com/lamont-granquist)) - Core: Properly deprecate old Chef::Platform methods [\#5631](https://github.com/chef/chef/pull/5631) ([lamont-granquist](https://github.com/lamont-granquist)) - Windows: PowerShell module output pass through [\#5549](https://github.com/chef/chef/pull/5549) ([coolmacool](https://github.com/coolmacool)) diff --git a/Gemfile.lock b/Gemfile.lock index c1c65e4e9c..15426cff91 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -47,10 +47,10 @@ GIT PATH remote: . specs: - chef (12.18.6) + chef (12.18.10) addressable bundler (>= 1.10) - chef-config (= 12.18.6) + chef-config (= 12.18.10) chef-zero (>= 4.8) diff-lcs (~> 1.2, >= 1.2.4) erubis (~> 2.7) @@ -76,10 +76,10 @@ PATH specinfra (~> 2.10) syslog-logger (~> 1.6) uuidtools (~> 2.1.5) - chef (12.18.6-universal-mingw32) + chef (12.18.10-universal-mingw32) addressable bundler (>= 1.10) - chef-config (= 12.18.6) + chef-config (= 12.18.10) chef-zero (>= 4.8) diff-lcs (~> 1.2, >= 1.2.4) erubis (~> 2.7) @@ -120,7 +120,7 @@ PATH PATH remote: chef-config specs: - chef-config (12.18.6) + chef-config (12.18.10) addressable fuzzyurl mixlib-config (~> 2.0) @@ -1 +1 @@ -12.18.6
\ No newline at end of file +12.18.10
\ No newline at end of file diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb index f1298f1558..6b4b36d8b1 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 = "12.18.6" + VERSION = "12.18.10" end # diff --git a/lib/chef/http/json_input.rb b/lib/chef/http/json_input.rb index 4cc1aa2e10..7cf2e4012f 100644 --- a/lib/chef/http/json_input.rb +++ b/lib/chef/http/json_input.rb @@ -33,7 +33,7 @@ class Chef def handle_request(method, url, headers = {}, data = false) if data && should_encode_as_json?(headers) - headers.delete_if { |key, _value| key.casecmp("content-type").zero? } + headers.delete_if { |key, _value| key.casecmp("content-type") == 0 } headers["Content-Type"] = "application/json" json_opts = {} json_opts[:validate_utf8] = opts[:validate_utf8] if opts.has_key?(:validate_utf8) @@ -64,7 +64,7 @@ class Chef # ruby/Net::HTTP don't enforce capitalized headers (it normalizes them # for you before sending the request), so we have to account for all # the variations we might find - requested_content_type = headers.find { |k, v| k.casecmp("content-type").zero? } + requested_content_type = headers.find { |k, v| k.casecmp("content-type") == 0 } requested_content_type.nil? || requested_content_type.last.include?("json") end diff --git a/lib/chef/knife.rb b/lib/chef/knife.rb index 8d40e06a43..f8d56a43c2 100644 --- a/lib/chef/knife.rb +++ b/lib/chef/knife.rb @@ -145,7 +145,7 @@ class Chef end def self.subcommand_class_from(args) - if args.size == 1 && args[0].strip.casecmp("rehash").zero? + if args.size == 1 && args[0].strip.casecmp("rehash") == 0 # To prevent issues with the rehash file not pointing to the correct plugins, # we always use the glob loader when regenerating the rehash file @subcommand_loader = Chef::Knife::SubcommandLoader.gem_glob_loader(chef_config_dir) diff --git a/lib/chef/provider/env/windows.rb b/lib/chef/provider/env/windows.rb index a68c8276e0..a217590af5 100644 --- a/lib/chef/provider/env/windows.rb +++ b/lib/chef/provider/env/windows.rb @@ -36,7 +36,7 @@ class Chef obj.variablevalue = @new_resource.value obj.put_ value = @new_resource.value - value = expand_path(value) if @new_resource.key_name.casecmp("PATH").zero? + value = expand_path(value) if @new_resource.key_name.casecmp("PATH") == 0 ENV[@new_resource.key_name] = value broadcast_env_change end diff --git a/lib/chef/provider/package/freebsd/base.rb b/lib/chef/provider/package/freebsd/base.rb index 7104a71f70..0996a38c75 100644 --- a/lib/chef/provider/package/freebsd/base.rb +++ b/lib/chef/provider/package/freebsd/base.rb @@ -58,7 +58,7 @@ class Chef def makefile_variable_value(variable, dir = nil) options = dir ? { :cwd => dir } : {} make_v = shell_out_with_timeout!("make -V #{variable}", options.merge!(:env => nil, :returns => [0, 1])) - make_v.exitstatus.zero? ? make_v.stdout.strip.split($\).first : nil # $\ is the line separator, i.e. newline. + make_v.exitstatus == 0 ? make_v.stdout.strip.split($\).first : nil # $\ is the line separator, i.e. newline. end end diff --git a/lib/chef/provider/package/freebsd/pkgng.rb b/lib/chef/provider/package/freebsd/pkgng.rb index de7bea6387..56e87f6be9 100644 --- a/lib/chef/provider/package/freebsd/pkgng.rb +++ b/lib/chef/provider/package/freebsd/pkgng.rb @@ -64,7 +64,7 @@ class Chef end pkg_query = shell_out_with_timeout!("pkg rquery#{expand_options(options)} '%v' #{@new_resource.package_name}", :env => nil) - pkg_query.exitstatus.zero? ? pkg_query.stdout.strip.split(/\n/).last : nil + pkg_query.exitstatus == 0 ? pkg_query.stdout.strip.split(/\n/).last : nil end def repo_regex diff --git a/lib/chef/provider/package/windows.rb b/lib/chef/provider/package/windows.rb index b11bcf5192..504d5d394a 100644 --- a/lib/chef/provider/package/windows.rb +++ b/lib/chef/provider/package/windows.rb @@ -262,7 +262,7 @@ class Chef if source_location.nil? inferred_registry_type == :msi else - ::File.extname(source_location).casecmp(".msi").zero? + ::File.extname(source_location).casecmp(".msi") == 0 end end end diff --git a/lib/chef/provider/service/macosx.rb b/lib/chef/provider/service/macosx.rb index 8663e7eabf..4056b72649 100644 --- a/lib/chef/provider/service/macosx.rb +++ b/lib/chef/provider/service/macosx.rb @@ -197,7 +197,7 @@ class Chef case line.downcase when /\s+\"pid\"\s+=\s+(\d+).*/ pid = $1 - @current_resource.running(!pid.to_i.zero?) + @current_resource.running(pid.to_i != 0) Chef::Log.debug("Current PID for #{@service_label} is #{pid}") end end diff --git a/lib/chef/version.rb b/lib/chef/version.rb index aae1508dcf..88319a601e 100644 --- a/lib/chef/version.rb +++ b/lib/chef/version.rb @@ -21,7 +21,7 @@ class Chef CHEF_ROOT = File.expand_path("../..", __FILE__) - VERSION = "12.18.6" + VERSION = "12.18.10" end # diff --git a/omnibus/resources/chef/msi/source.wxs.erb b/omnibus/resources/chef/msi/source.wxs.erb index 9bd13ff499..c49a8324f9 100644 --- a/omnibus/resources/chef/msi/source.wxs.erb +++ b/omnibus/resources/chef/msi/source.wxs.erb @@ -71,14 +71,14 @@ <CustomAction Id="CreateChefClientScheduledTask" Directory="TARGETDIR" - ExeCommand=""[SystemFolder]SCHTASKS.EXE" /CREATE /TN "ChefClientSchTask" /SC "MINUTE" /MO "30" /F /TR "cmd /c \"[EMBEDDEDBIN]ruby.exe [PROJECTLOCATIONBIN]chef-client -L [CONFIGLOCATION]chef-client.log -c [CONFIGLOCATION]client.rb\"" /RU "NT Authority\System" /RP /RL "HIGHEST"" + ExeCommand=""[SystemFolder]SCHTASKS.EXE" /CREATE /TN "chef-client" /SC "MINUTE" /MO "30" /F /TR "cmd /c \"[EMBEDDEDBIN]ruby.exe [PROJECTLOCATIONBIN]chef-client -L [CONFIGLOCATION]chef-client.log -c [CONFIGLOCATION]client.rb\"" /RU "NT Authority\System" /RP /RL "HIGHEST"" Execute="deferred" Impersonate="no" Return="check" /> <CustomAction Id="RemoveChefClientScheduledTask" Directory="TARGETDIR" - ExeCommand=""[SystemFolder]SCHTASKS.EXE" /DELETE /TN "ChefClientSchTask" /F" + ExeCommand=""[SystemFolder]SCHTASKS.EXE" /DELETE /TN "chef-client" /F" Execute="deferred" Impersonate="no" Return="ignore" /> |