Merge pull request #5936 from chef/tm/rubby_241

Use the ruby 2.4.1 release

6 files changed, 44 insertions, 42 deletions

diff --git a/.travis.yml b/.travis.yml
index 3afe4670c2..30e0756539 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -34,30 +34,25 @@ env:
 
 matrix:
   include:
-  - rvm: 2.2.6
-    sudo: true
-    script: sudo -E $(which bundle) exec rake spec;
-    # also remove integration / external tests
-    bundler_args: --without ci development docgen guard integration maintenance omnibus_package tools aix bsd mac_os_x solaris windows --frozen
   - rvm: 2.3.3
     sudo: true
     script: sudo -E $(which bundle) exec rake spec;
     # also remove integration / external tests
     bundler_args: --without ci development docgen guard integration maintenance omnibus_package tools aix bsd mac_os_x solaris windows --frozen
-  - rvm: 2.4.0
+  - rvm: 2.4.1
     sudo: true
     script: sudo -E $(which bundle) exec rake spec;
     # also remove integration / external tests
     bundler_args: --without ci development docgen guard integration maintenance omnibus_package tools aix bsd mac_os_x solaris windows --frozen
   - env:
       CHEFSTYLE: 1
-    rvm: 2.3.3
+    rvm: 2.4.1
     script: bundle exec rake style
     # also remove integration / external tests
     bundler_args: --without ci development docgen guard integration maintenance omnibus_package tools aix bsd mac_os_x solaris windows --frozen
   - env:
       AUDIT_CHECK: 1
-    rvm: 2.3.3
+    rvm: 2.4.1
     script: bundle exec bundle-audit check --update
     # also remove integration / external tests
     bundler_args: --without ci development docgen guard integration maintenance omnibus_package tools aix bsd mac_os_x solaris windows --frozen
@@ -67,15 +62,15 @@ matrix:
   - env:
       TEST_GEM: chef-sugar
     script: tasks/bin/run_external_test $TEST_GEM rake
-    rvm: 2.3.3
+    rvm: 2.4.1
   - env:
       - TEST_GEM: chef-zero
     script: tasks/bin/run_external_test $TEST_GEM rake spec cheffs
-    rvm: 2.3.3
+    rvm: 2.4.1
   - env:
       TEST_GEM: cheffish
     script: tasks/bin/run_external_test $TEST_GEM rake spec
-    rvm: 2.3.3
+    rvm: 2.4.1
     #- env:
     #  TEST_GEM: chefspec
     ## The chefspec tests + bundler cache + "gem update --system" interact badly :/
@@ -86,29 +81,29 @@ 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.3
+    #rvm: 2.4.1
   - env:
       TEST_GEM: foodcritic
     script: tasks/bin/run_external_test $TEST_GEM rake test
-    rvm: 2.3.3
+    rvm: 2.4.1
   - env:
       TEST_GEM: halite
     script: tasks/bin/run_external_test $TEST_GEM rake spec
-    rvm: 2.3.3
+    rvm: 2.4.1
     # this has been broken for some time and running incorrectly, see:
     #
     # see https://github.com/chef/knife-windows/pull/421
     #- env:
     #  TEST_GEM: knife-windows
     #script: tasks/bin/run_external_test $TEST_GEM rake unit_spec
-    #rvm: 2.3.3
+    #rvm: 2.4.1
   - env:
       TEST_GEM: poise
     script: tasks/bin/run_external_test $TEST_GEM rake spec
-    rvm: 2.3.3
+    rvm: 2.4.1
   ### START TEST KITCHEN ONLY ###
   #
-  - rvm: 2.3.3
+  - rvm: 2.4.1
     services: docker
     sudo: required
     gemfile: kitchen-tests/Gemfile
@@ -126,7 +121,7 @@ matrix:
     env:
       - UBUNTU=12.04
       - KITCHEN_YAML=.kitchen.travis.yml
-  - rvm: 2.3.3
+  - rvm: 2.4.1
     services: docker
     sudo: required
     gemfile: kitchen-tests/Gemfile
@@ -144,7 +139,7 @@ matrix:
     env:
       - UBUNTU=14.04
       - KITCHEN_YAML=.kitchen.travis.yml
-  - rvm: 2.3.3
+  - rvm: 2.4.1
     services: docker
     sudo: required
     gemfile: kitchen-tests/Gemfile
@@ -162,7 +157,7 @@ matrix:
     env:
       - UBUNTU=16.04
       - KITCHEN_YAML=.kitchen.travis.yml
-  - rvm: 2.3.3
+  - rvm: 2.4.1
     services: docker
     sudo: required
     gemfile: kitchen-tests/Gemfile
@@ -180,7 +175,7 @@ matrix:
     env:
       - DEBIAN=7
       - KITCHEN_YAML=.kitchen.travis.yml
-  - rvm: 2.3.3
+  - rvm: 2.4.1
     services: docker
     sudo: required
     gemfile: kitchen-tests/Gemfile
@@ -199,7 +194,7 @@ matrix:
     env:
       - DEBIAN=8
       - KITCHEN_YAML=.kitchen.travis.yml
-  - rvm: 2.3.3
+  - rvm: 2.4.1
     services: docker
     sudo: required
     gemfile: kitchen-tests/Gemfile
@@ -217,7 +212,7 @@ matrix:
     env:
       - CENTOS=6
       - KITCHEN_YAML=.kitchen.travis.yml
-  - rvm: 2.3.3
+  - rvm: 2.4.1
     services: docker
     sudo: required
     gemfile: kitchen-tests/Gemfile
@@ -235,7 +230,7 @@ matrix:
     env:
       - CENTOS=7
       - KITCHEN_YAML=.kitchen.travis.yml
-# - rvm: 2.3.3
+# - rvm: 2.4.1
 #    services: docker
 #    sudo: required
 #    gemfile: kitchen-tests/Gemfile
@@ -253,7 +248,7 @@ matrix:
 #    env:
 #      - FEDORA=latest
 #      - KITCHEN_YAML=.kitchen.travis.yml
-  - rvm: 2.3.3
+  - rvm: 2.4.1
     services: docker
     sudo: required
     gemfile: kitchen-tests/Gemfile
@@ -271,7 +266,7 @@ matrix:
     env:
       - AMAZONLINUX=LATEST
       - KITCHEN_YAML=.kitchen.travis.yml
-#  - rvm: 2.3.3
+#  - rvm: 2.4.1
 #    services: docker
 #    sudo: required
 #    gemfile: kitchen-tests/Gemfile
@@ -289,7 +284,7 @@ matrix:
 #    env:
 #      - AWESOME_CUSTOMERS_UBUNTU=1
 #      - KITCHEN_YAML=.kitchen.travis.yml
-#  - rvm: 2.3.3
+#  - rvm: 2.4.1
 #    services: docker
 #    sudo: required
 #    gemfile: kitchen-tests/Gemfile
@@ -308,7 +303,7 @@ matrix:
 #      - AWESOME_CUSTOMERS_RHEL=1
 #      - KITCHEN_YAML=.kitchen.travis.yml
 #    ### END TEST KITCHEN ONLY ###
-  - rvm: 2.3.3
+  - rvm: 2.4.1
     sudo: required
     dist: trusty
     before_install:
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index 5118ce9031..4e3c7dd050 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -137,3 +137,8 @@ The Python `easy_install` package installer has been deprecated for many years,
 so we have removed support for it. No specific replacement for `pip` is being
 included with Chef at this time, but a `pip`-based `python_package` resource is
 available in the [`poise-python`](https://github.com/poise/poise-python) cookbooks.
+
+### Ruby version upgraded to 2.4.1
+
+We've upgraded to the latest stable release of the Ruby programming
+language.
diff --git a/appveyor.yml b/appveyor.yml
index 2ea59184a6..bb15c065a7 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -20,13 +20,15 @@ install:
   - systeminfo
   - winrm quickconfig -q
   - SET PATH=C:\Ruby%ruby_version%\bin;%PATH%
-  - ps: $env:RUBYGEMS_VERSION=$(findstr rubygems omnibus_overrides.rb | %{ $_.split(" ")[3] })
-  - ps: $env:BUNDLER_VERSION=$(findstr bundler omnibus_overrides.rb | %{ $_.split(" ")[3] })
   - echo %PATH%
+  - ps: $env:OMNIBUS_RUBYGEMS=$(findstr rubygems omnibus_overrides.rb | %{ $_.split(" ")[3] })
+  - echo %OMNIBUS_RUBYGEMS%
+  - ps: $env:OMNIBUS_BUNDLER=$(findstr bundler omnibus_overrides.rb | %{ $_.split(" ")[3] })
+  - echo %OMNIBUS_BUNDLER%
   - ruby --version
   - gem uninstall bundler -a -x
-  - gem update --system %RUBYGEMS_VERSION% || gem update --system %RUBYGEMS_VERSION% || gem update --system %RUBYGEMS_VERSION%
-  - gem install bundler -v %BUNDLER_VERSION% --quiet --no-ri --no-rdoc || gem install bundler -v %BUNDLER_VERSION% --quiet --no-ri --no-rdoc || gem install bundler -v %BUNDLER_VERSION% --quiet --no-ri --no-rdoc
+  - gem update --system %OMNIBUS_RUBYGEMS% || gem update --system %OMNIBUS_RUBYGEMS% || gem update --system %OMNIBUS_RUBYGEMS%
+  - gem install bundler -v %OMNIBUS_BUNDLER% --quiet --no-ri --no-rdoc || gem install bundler -v %OMNIBUS_BUNDLER% --quiet --no-ri --no-rdoc || gem install bundler -v %OMNIBUS_BUNDLER% --quiet --no-ri --no-rdoc
   - gem --version
   - bundler --version
   - SET BUNDLE_IGNORE_CONFIG=true
diff --git a/chef.gemspec b/chef.gemspec
index 36387f91b0..a44c882089 100644
--- a/chef.gemspec
+++ b/chef.gemspec
@@ -13,7 +13,7 @@ Gem::Specification.new do |s|
   s.email = "adam@chef.io"
   s.homepage = "https://www.chef.io"
 
-  s.required_ruby_version = ">= 2.2.2"
+  s.required_ruby_version = ">= 2.3.0"
 
   s.add_dependency "chef-config", "= #{Chef::VERSION}"
 
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
index 04324ad1e6..7f456c8eec 100644
--- a/omnibus/Gemfile.lock
+++ b/omnibus/Gemfile.lock
@@ -1,6 +1,6 @@
 GIT
   remote: https://github.com/chef/license_scout
-  revision: 544a9335549148037a4161ff4c6c9d9a71e39660
+  revision: 2cf81860f92d4f2df4444341048b8aeec2da0cfa
   specs:
     license_scout (0.1.2)
       ffi-yajl (~> 2.2)
@@ -8,7 +8,7 @@ GIT
 
 GIT
   remote: https://github.com/chef/omnibus
-  revision: 443f42abe0b791b132fb27aa85448bb691af9102
+  revision: ced452379e27b85b9958421f258b5fbe22e3760a
   specs:
     omnibus (5.5.0)
       aws-sdk (~> 2)
@@ -25,7 +25,7 @@ GIT
 
 GIT
   remote: https://github.com/chef/omnibus-software
-  revision: 703ecb80af7897a6a85a7340f9b280f757f3372f
+  revision: 6a56be11bfbf871147b00d32d3b1368800e68107
   specs:
     omnibus-software (4.0.0)
       chef-sugar (>= 3.4.0)
@@ -38,13 +38,13 @@ GEM
       public_suffix (~> 2.0, >= 2.0.2)
     artifactory (2.7.0)
     awesome_print (1.7.0)
-    aws-sdk (2.8.7)
-      aws-sdk-resources (= 2.8.7)
-    aws-sdk-core (2.8.7)
+    aws-sdk (2.8.10)
+      aws-sdk-resources (= 2.8.10)
+    aws-sdk-core (2.8.10)
       aws-sigv4 (~> 1.0)
       jmespath (~> 1.0)
-    aws-sdk-resources (2.8.7)
-      aws-sdk-core (= 2.8.7)
+    aws-sdk-resources (2.8.10)
+      aws-sdk-core (= 2.8.10)
     aws-sigv4 (1.0.0)
     berkshelf (4.3.5)
       addressable (~> 2.3, >= 2.3.4)
diff --git a/omnibus_overrides.rb b/omnibus_overrides.rb
index 6cf6dc7ece..e05cb0c5f6 100644
--- a/omnibus_overrides.rb
+++ b/omnibus_overrides.rb
@@ -11,7 +11,7 @@ override "libyaml", version: "0.1.6"
 override "makedepend", version: "1.0.5"
 override "ncurses", version: "5.9"
 override "pkg-config-lite", version: "0.28-1"
-override "ruby", version: "2.3.3"
+override "ruby", version: "2.4.1"
 override "ruby-windows-devkit-bash", version: "3.1.23-4-msys-1.0.18"
 override "util-macros", version: "1.19.0"
 override "xproto", version: "7.0.28"