diff options
author | Thom May <thom@may.lt> | 2017-01-24 16:37:28 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-01-24 16:37:28 +0000 |
commit | 3ef28d0d48defd673cb73dc837053ca158c93194 (patch) | |
tree | 4143b6a79e1cade46078f1fa3a017ee21ca2c96d | |
parent | f06f65889cae8c56f22957fa0cd7d8387a4738eb (diff) | |
parent | 37b300dd011efea9b51adf9cd3b1a1bfce3f4d09 (diff) | |
download | chef-3ef28d0d48defd673cb73dc837053ca158c93194.tar.gz |
Merge pull request #5751 from chef/tduffield/fix-syntax
Ruby 2.3 doesn't have casecmp?. Use casecmp instead
-rw-r--r-- | Gemfile.lock | 20 | ||||
-rw-r--r-- | acceptance/Gemfile.lock | 12 | ||||
-rw-r--r-- | appveyor.yml | 7 | ||||
-rw-r--r-- | kitchen-tests/Gemfile.lock | 14 | ||||
-rw-r--r-- | omnibus/Gemfile.lock | 18 | ||||
-rw-r--r-- | omnibus/omnibus.rb | 2 |
6 files changed, 37 insertions, 36 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 94af77be57..ba34f8f6d5 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,6 +1,6 @@ GIT remote: https://github.com/chef/chef-server - revision: e32b083df4820d8d78ad92094aa2b209e08d3f31 + revision: 6309e94fe200090acbde23e5ab70bdcbf8f31410 specs: oc-chef-pedant (2.2.0) activesupport (>= 4.2.7.1, < 6.0) @@ -139,13 +139,13 @@ GEM mixlib-cli (~> 1.4) artifactory (2.5.1) ast (2.3.0) - aws-sdk (2.6.48) - aws-sdk-resources (= 2.6.48) - aws-sdk-core (2.6.48) + aws-sdk (2.7.0) + aws-sdk-resources (= 2.7.0) + aws-sdk-core (2.7.0) aws-sigv4 (~> 1.0) jmespath (~> 1.0) - aws-sdk-resources (2.6.48) - aws-sdk-core (= 2.6.48) + aws-sdk-resources (2.7.0) + aws-sdk-core (= 2.7.0) aws-sigv4 (1.0.0) backports (3.6.8) binding_of_caller (0.7.2) @@ -164,7 +164,7 @@ GEM net-ssh-gateway (~> 1.2) winrm-fs (~> 1.0) chef-sugar (3.4.0) - chef-zero (5.1.1) + chef-zero (5.2.0) ffi-yajl (~> 2.2) hashie (>= 2.0, < 4.0) mixlib-log (~> 1.3) @@ -209,7 +209,7 @@ GEM multipart-post (>= 1.2, < 3) faraday-http-cache (2.0.0) faraday (~> 0.8) - faraday_middleware (0.11.0) + faraday_middleware (0.11.0.1) faraday (>= 0.7.4, < 1.0) fauxhai (3.10.0) net-ssh @@ -268,7 +268,7 @@ GEM multi_json retryable (~> 2.0) test-kitchen (~> 1.4, >= 1.4.1) - kitchen-sync (2.1.1) + kitchen-sync (2.1.2) net-sftp test-kitchen (>= 1.0.0) kitchen-vagrant (1.0.0) @@ -296,7 +296,7 @@ GEM mixlib-log mixlib-cli (1.7.0) mixlib-config (2.2.4) - mixlib-install (2.1.9) + mixlib-install (2.1.10) artifactory mixlib-shellout mixlib-versioning diff --git a/acceptance/Gemfile.lock b/acceptance/Gemfile.lock index d137f6aa94..b52a1c7a29 100644 --- a/acceptance/Gemfile.lock +++ b/acceptance/Gemfile.lock @@ -12,13 +12,13 @@ GEM addressable (2.5.0) public_suffix (~> 2.0, >= 2.0.2) artifactory (2.5.1) - aws-sdk (2.6.49) - aws-sdk-resources (= 2.6.49) - aws-sdk-core (2.6.49) + aws-sdk (2.7.0) + aws-sdk-resources (= 2.7.0) + aws-sdk-core (2.7.0) aws-sigv4 (~> 1.0) jmespath (~> 1.0) - aws-sdk-resources (2.6.49) - aws-sdk-core (= 2.6.49) + aws-sdk-resources (2.7.0) + aws-sdk-core (= 2.7.0) aws-sigv4 (1.0.0) berkshelf (4.3.5) addressable (~> 2.3, >= 2.3.4) @@ -56,7 +56,7 @@ GEM celluloid-io (0.16.2) celluloid (>= 0.16.0) nio4r (>= 1.1.0) - chef-config (12.17.44) + chef-config (12.18.31) addressable fuzzyurl mixlib-config (~> 2.0) diff --git a/appveyor.yml b/appveyor.yml index 08756d98ad..e3bf174e01 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -20,11 +20,12 @@ 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% - ruby --version - - gem update --system || gem update --system || gem update --system - - gem install bundler --quiet --no-ri --no-rdoc || gem install bundler --quiet --no-ri --no-rdoc || gem install bundler --quiet --no-ri --no-rdoc - - update_rubygems + - 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 --version - bundler --version - SET BUNDLE_IGNORE_CONFIG=true diff --git a/kitchen-tests/Gemfile.lock b/kitchen-tests/Gemfile.lock index 86aa1f9aec..ec235ebcb8 100644 --- a/kitchen-tests/Gemfile.lock +++ b/kitchen-tests/Gemfile.lock @@ -4,13 +4,13 @@ GEM addressable (2.5.0) public_suffix (~> 2.0, >= 2.0.2) artifactory (2.5.1) - aws-sdk (2.6.48) - aws-sdk-resources (= 2.6.48) - aws-sdk-core (2.6.48) + aws-sdk (2.7.0) + aws-sdk-resources (= 2.7.0) + aws-sdk-core (2.7.0) aws-sigv4 (~> 1.0) jmespath (~> 1.0) - aws-sdk-resources (2.6.48) - aws-sdk-core (= 2.6.48) + aws-sdk-resources (2.7.0) + aws-sdk-core (= 2.7.0) aws-sigv4 (1.0.0) berkshelf (5.4.0) addressable (~> 2.3, >= 2.3.4) @@ -46,7 +46,7 @@ GEM celluloid-io (0.16.2) celluloid (>= 0.16.0) nio4r (>= 1.1.0) - chef-config (12.17.44) + chef-config (12.18.31) addressable fuzzyurl mixlib-config (~> 2.0) @@ -116,7 +116,7 @@ GEM mixlib-authentication (1.4.1) mixlib-log mixlib-config (2.2.4) - mixlib-install (2.1.9) + mixlib-install (2.1.10) artifactory mixlib-shellout mixlib-versioning diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock index 8454d6aed4..a60b85d84a 100644 --- a/omnibus/Gemfile.lock +++ b/omnibus/Gemfile.lock @@ -1,6 +1,6 @@ GIT remote: git://github.com/chef/license_scout.git - revision: 4bf6f5cf21bc0ff8de327dfc0a245b625134d6b0 + revision: 383ad28edeea0f587aee57b969c77a21b7909e77 specs: license_scout (0.1.2) ffi-yajl (~> 2.2) @@ -8,7 +8,7 @@ GIT GIT remote: git://github.com/chef/omnibus-software.git - revision: f4b1c0f2682907967d10c64850f9c607070697dd + revision: 086710002ec0054b3d240d14ca04d11163f528aa branch: shain/ruby_windows_monster specs: omnibus-software (4.0.0) @@ -39,13 +39,13 @@ GEM public_suffix (~> 2.0, >= 2.0.2) artifactory (2.5.1) awesome_print (1.7.0) - aws-sdk (2.6.48) - aws-sdk-resources (= 2.6.48) - aws-sdk-core (2.6.48) + aws-sdk (2.7.0) + aws-sdk-resources (= 2.7.0) + aws-sdk-core (2.7.0) aws-sigv4 (~> 1.0) jmespath (~> 1.0) - aws-sdk-resources (2.6.48) - aws-sdk-core (= 2.6.48) + aws-sdk-resources (2.7.0) + aws-sdk-core (= 2.7.0) aws-sigv4 (1.0.0) berkshelf (4.3.5) addressable (~> 2.3, >= 2.3.4) @@ -86,7 +86,7 @@ GEM celluloid-io (0.16.2) celluloid (>= 0.16.0) nio4r (>= 1.1.0) - chef-config (12.17.44) + chef-config (12.18.31) addressable fuzzyurl mixlib-config (~> 2.0) @@ -130,7 +130,7 @@ GEM mixlib-log mixlib-cli (1.7.0) mixlib-config (2.2.4) - mixlib-install (2.1.9) + mixlib-install (2.1.10) artifactory mixlib-shellout mixlib-versioning diff --git a/omnibus/omnibus.rb b/omnibus/omnibus.rb index 5bf50f98f9..dfbd2bc338 100644 --- a/omnibus/omnibus.rb +++ b/omnibus/omnibus.rb @@ -52,4 +52,4 @@ fetcher_read_timeout 120 # local_software_dirs ['/path/to/local/software'] fatal_transitive_dependency_licensing_warnings true -fips_mode (ENV["OMNIBUS_FIPS_MODE"] || "").casecmp?("true") +fips_mode (ENV["OMNIBUS_FIPS_MODE"] || "").casecmp("true") >= 0 |