Merge pull request #6838 from chef/revert-6773-revert-6770-tm/ruby_25

Bump to ruby 2.5.0

6 files changed, 15 insertions, 15 deletions

diff --git a/Gemfile.lock b/Gemfile.lock
index cc76b709eb..8e555281ac 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -141,7 +141,7 @@ GEM
     debug_inspector (0.0.3)
     diff-lcs (1.3)
     docile (1.1.5)
-    docker-api (1.34.0)
+    docker-api (1.34.1)
       excon (>= 0.47.0)
       multi_json
     erubis (2.7.0)
diff --git a/appveyor.yml b/appveyor.yml
index 19b127fa98..f825cd8768 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -9,7 +9,7 @@ cache:
 
 environment:
   matrix:
-    - ruby_version: "24-x64"
+    - ruby_version: "25-x64"
 
 clone_folder: c:\projects\chef
 clone_depth: 1
diff --git a/lib/chef/chef_fs/path_utils.rb b/lib/chef/chef_fs/path_utils.rb
index 7b2de5e3e0..4de23f8266 100644
--- a/lib/chef/chef_fs/path_utils.rb
+++ b/lib/chef/chef_fs/path_utils.rb
@@ -1,6 +1,6 @@
 #
 # Author:: John Keiser (<jkeiser@chef.io>)
-# Copyright:: Copyright 2012-2016, Chef Software Inc.
+# Copyright:: Copyright 2012-2018, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -90,7 +90,7 @@ class Chef
           begin
             path = File.realpath(path)
             break
-          rescue Errno::ENOENT
+          rescue Errno::ENOENT, Errno::EINVAL
             suffix << File.basename(path)
             path = parent_path
             parent_path = File.dirname(path)
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
index 4ca8eb4536..ab1b8e2163 100644
--- a/omnibus/Gemfile.lock
+++ b/omnibus/Gemfile.lock
@@ -18,7 +18,7 @@ GIT
 
 GIT
   remote: https://github.com/chef/omnibus-software
-  revision: f0c34cd3a21c4da6207721914213ac775b44570f
+  revision: 33a94bf000d2f6eb0f738041be38f3e5e00a594e
   branch: master
   specs:
     omnibus-software (4.0.0)
@@ -31,13 +31,13 @@ GEM
     addressable (2.5.2)
       public_suffix (>= 2.0.2, < 4.0)
     awesome_print (1.8.0)
-    aws-sdk (2.11.7)
-      aws-sdk-resources (= 2.11.7)
-    aws-sdk-core (2.11.7)
+    aws-sdk (2.11.11)
+      aws-sdk-resources (= 2.11.11)
+    aws-sdk-core (2.11.11)
       aws-sigv4 (~> 1.0)
       jmespath (~> 1.0)
-    aws-sdk-resources (2.11.7)
-      aws-sdk-core (= 2.11.7)
+    aws-sdk-resources (2.11.11)
+      aws-sdk-core (= 2.11.11)
     aws-sigv4 (1.0.2)
     berkshelf (4.3.5)
       addressable (~> 2.3, >= 2.3.4)
@@ -78,7 +78,7 @@ GEM
     celluloid-io (0.16.2)
       celluloid (>= 0.16.0)
       nio4r (>= 1.1.0)
-    chef-config (13.8.0)
+    chef-config (13.8.5)
       addressable
       fuzzyurl
       mixlib-config (~> 2.0)
@@ -150,7 +150,7 @@ GEM
     nori (2.6.0)
     octokit (4.8.0)
       sawyer (~> 0.8.0, >= 0.5.3)
-    ohai (13.7.1)
+    ohai (13.8.0)
       chef-config (>= 12.5.0.alpha.1, < 14)
       ffi (~> 1.9)
       ffi-yajl (~> 2.2)
diff --git a/omnibus_overrides.rb b/omnibus_overrides.rb
index 51c5df4a01..66b17933d0 100644
--- a/omnibus_overrides.rb
+++ b/omnibus_overrides.rb
@@ -3,7 +3,7 @@
 # try to keep it machine-parsable.
 override :rubygems, version: "2.7.6"
 override :bundler, version: "1.16.1"
-override "nokogiri", version: "1.8.1"
+override "nokogiri", version: "1.8.2"
 override "libffi", version: "3.2.1"
 override "libiconv", version: "1.15"
 override "liblzma", version: "5.2.3"
@@ -14,7 +14,7 @@ override "libyaml", version: "0.1.7"
 override "makedepend", version: "1.0.5"
 override "ncurses", version: "5.9"
 override "pkg-config-lite", version: "0.28-1"
-override "ruby", version: "2.4.3"
+override "ruby", version: "2.5.0"
 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"
diff --git a/spec/unit/win32/security_spec.rb b/spec/unit/win32/security_spec.rb
index 9d98ccdf49..b5e441f2a0 100644
--- a/spec/unit/win32/security_spec.rb
+++ b/spec/unit/win32/security_spec.rb
@@ -59,7 +59,7 @@ describe "Chef::Win32::Security", :windows_only do
         expect(Chef::ReservedNames::Win32::Security).to receive(:SetNamedSecurityInfoW).and_return(
           Chef::ReservedNames::Win32::API::Error::ERROR_USER_NOT_FOUND
         )
-        expect { Chef::ReservedNames::Win32::Security.set_named_security_info "/temp_path", :SE_FILE_OBJECT, {} }.to raise_error Chef::Exceptions::Chef::Exceptions::UserIDNotFound
+        expect { Chef::ReservedNames::Win32::Security.set_named_security_info "/temp_path", :SE_FILE_OBJECT, {} }.to raise_error Chef::Exceptions::UserIDNotFound
       end
     end
   end