summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Gemfile.lock32
-rw-r--r--acceptance/Gemfile.lock26
-rw-r--r--kitchen-tests/Berksfile.lock16
-rw-r--r--kitchen-tests/Gemfile.lock28
-rw-r--r--omnibus/Gemfile.lock12
-rw-r--r--omnibus_overrides.rb2
-rw-r--r--tasks/bundle.rb40
-rw-r--r--version_policy.rb4
8 files changed, 84 insertions, 76 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 21c2d3dc69..32b79873f8 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,6 +1,6 @@
GIT
remote: https://github.com/chef/chef-server
- revision: 847eaefa52e105a8e3c94a530f63b74bcbab6931
+ revision: aa0ee4ec5538ef5f4842b3ea0bd089714c8d2c72
specs:
oc-chef-pedant (2.2.0)
activesupport (>= 4.2.7.1, < 6.0)
@@ -37,7 +37,7 @@ GIT
GIT
remote: https://github.com/chef/ohai.git
- revision: cab56af9f8e096f8ce0053e24d8f488c79708824
+ revision: bda5683231607ef55df0264dd6ed0af04c74c6b4
specs:
ohai (13.0.0)
chef-config (>= 12.5.0.alpha.1, < 14)
@@ -64,7 +64,7 @@ GIT
GIT
remote: https://github.com/poise/poise-boiler.git
- revision: 409326e84519cf1a212073aed2f5cd3a6963d347
+ revision: dedd08087d65830e7c7dd0d6c8daa964cfb33999
specs:
poise-boiler (1.13.3.pre)
bundler
@@ -97,7 +97,7 @@ GIT
GIT
remote: https://github.com/poise/poise.git
- revision: 1aa3a6b7c5b3fe0c357e2f3fcc50080790772ccb
+ revision: 9e953bb04e86e3d5e52619951b7c754b85ac022b
specs:
poise (2.7.3.pre)
halite (~> 1.0)
@@ -203,17 +203,17 @@ GEM
addressable (2.4.0)
appbundler (0.10.0)
mixlib-cli (~> 1.4)
- artifactory (2.7.0)
+ artifactory (2.8.1)
ast (2.3.0)
- aws-sdk (2.8.5)
- aws-sdk-resources (= 2.8.5)
- aws-sdk-core (2.8.5)
+ aws-sdk (2.8.12)
+ aws-sdk-resources (= 2.8.12)
+ aws-sdk-core (2.8.12)
aws-sigv4 (~> 1.0)
jmespath (~> 1.0)
- aws-sdk-resources (2.8.5)
- aws-sdk-core (= 2.8.5)
+ aws-sdk-resources (2.8.12)
+ aws-sdk-core (= 2.8.12)
aws-sigv4 (1.0.0)
- backports (3.6.8)
+ backports (3.7.0)
binding_of_caller (0.7.2)
debug_inspector (>= 0.0.1)
builder (3.2.3)
@@ -289,14 +289,14 @@ GEM
rspec-core (~> 3.0)
ruby-progressbar (~> 1.4)
fuzzyurl (0.9.0)
- gh (0.15.0)
+ gh (0.15.1)
addressable (~> 2.4.0)
backports
faraday (~> 0.8)
multi_json (~> 1.0)
net-http-persistent (~> 2.9)
net-http-pipeline
- gherkin (4.0.0)
+ gherkin (4.1.1)
git (1.3.0)
gssapi (1.2.0)
ffi (>= 1.0.1)
@@ -466,13 +466,13 @@ GEM
rspec-its
specinfra (~> 2.53)
sfl (2.3)
- simplecov (0.13.0)
+ simplecov (0.14.1)
docile (~> 1.1.0)
json (>= 1.8, < 3)
simplecov-html (~> 0.10.0)
simplecov-html (0.10.0)
slop (3.6.0)
- specinfra (2.67.2)
+ specinfra (2.67.6)
net-scp
net-ssh (>= 2.7, < 5.0)
net-telnet
@@ -506,7 +506,7 @@ GEM
polyglot (~> 0.3)
typhoeus (0.8.0)
ethon (>= 0.8.0)
- tzinfo (1.2.2)
+ tzinfo (1.2.3)
thread_safe (~> 0.1)
unf (0.1.4)
unf_ext
diff --git a/acceptance/Gemfile.lock b/acceptance/Gemfile.lock
index 40fcb3db61..90fba8a853 100644
--- a/acceptance/Gemfile.lock
+++ b/acceptance/Gemfile.lock
@@ -11,16 +11,16 @@ GEM
specs:
addressable (2.5.0)
public_suffix (~> 2.0, >= 2.0.2)
- artifactory (2.7.0)
- aws-sdk (2.8.5)
- aws-sdk-resources (= 2.8.5)
- aws-sdk-core (2.8.5)
+ artifactory (2.8.1)
+ aws-sdk (2.8.12)
+ aws-sdk-resources (= 2.8.12)
+ aws-sdk-core (2.8.12)
aws-sigv4 (~> 1.0)
jmespath (~> 1.0)
- aws-sdk-resources (2.8.5)
- aws-sdk-core (= 2.8.5)
+ aws-sdk-resources (2.8.12)
+ aws-sdk-core (= 2.8.12)
aws-sigv4 (1.0.0)
- berkshelf (5.6.3)
+ berkshelf (5.6.4)
addressable (~> 2.3, >= 2.3.4)
berkshelf-api-client (>= 2.0.2, < 4.0)
buff-config (~> 2.0)
@@ -79,18 +79,18 @@ GEM
hashie (3.5.5)
hitimes (1.2.4)
httpclient (2.8.3)
- inspec (1.16.1)
+ inspec (1.17.0)
faraday (>= 0.9.0)
hashie (~> 3.4)
json (>= 1.8, < 3.0)
method_source (~> 0.8)
mixlib-log
+ nokogiri (~> 1.6)
parallel (~> 1.9)
pry (~> 0)
rainbow (~> 2)
rspec (~> 3)
rspec-its (~> 1.2)
- rspec_junit_formatter (~> 0.2.3)
rubyzip (~> 1.1)
sslshake (~> 1)
thor (~> 0.19)
@@ -115,6 +115,7 @@ GEM
little-plugger (~> 1.1)
multi_json (~> 1.10)
method_source (0.8.2)
+ mini_portile2 (2.1.0)
minitar (0.6.1)
mixlib-archive (0.4.1)
mixlib-log
@@ -137,10 +138,12 @@ GEM
net-ssh-gateway (1.3.0)
net-ssh (>= 2.6.5)
nio4r (2.0.0)
+ nokogiri (1.7.1)
+ mini_portile2 (~> 2.1.0)
nori (2.6.0)
octokit (4.6.2)
sawyer (~> 0.8.0, >= 0.5.3)
- parallel (1.11.0)
+ parallel (1.11.1)
parslet (1.5.0)
blankslate (~> 2.0)
pry (0.10.4)
@@ -185,9 +188,6 @@ GEM
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.5.0)
rspec-support (3.5.0)
- rspec_junit_formatter (0.2.3)
- builder (< 4)
- rspec-core (>= 2, < 4, != 2.12.0)
rubyntlm (0.6.1)
rubyzip (1.2.1)
safe_yaml (1.0.4)
diff --git a/kitchen-tests/Berksfile.lock b/kitchen-tests/Berksfile.lock
index 51217e0602..620c23e5ba 100644
--- a/kitchen-tests/Berksfile.lock
+++ b/kitchen-tests/Berksfile.lock
@@ -16,7 +16,7 @@ DEPENDENCIES
php (~> 1.5.0)
resolver
git: https://github.com/chef-cookbooks/resolver.git
- revision: f82d7595a3536a757e7a9ed799ec06643c69ce25
+ revision: 4ab8cb0dfee3696fb8a1e4398e95bff9f33fd6ab
GRAPH
apt (4.0.2)
@@ -72,14 +72,14 @@ GRAPH
chef-sugar (>= 0.0.0)
httpd (0.4.5)
compat_resource (>= 12.16.3)
- iis (5.0.8)
- windows (>= 1.34.6)
+ iis (5.1.0)
+ windows (>= 2.0)
inifile_chef_gem (0.1.0)
build-essential (>= 0.0.0)
iptables (4.0.0)
logrotate (2.1.0)
compat_resource (>= 0.0.0)
- mariadb (1.2.0)
+ mariadb (1.3.0)
apt (>= 0.0.0)
yum (>= 0.0.0)
yum-epel (>= 0.0.0)
@@ -88,17 +88,17 @@ GRAPH
seven_zip (>= 0.0.0)
multipackage (4.0.0)
compat_resource (>= 0.0.0)
- mysql (8.2.0)
+ mysql (8.3.0)
mysql2_chef_gem (1.1.0)
build-essential (>= 0.0.0)
mariadb (>= 0.0.0)
mysql (>= 6.0)
nscd (5.0.0)
ntp (3.3.1)
- ohai (5.0.0)
+ ohai (5.0.2)
openssh (2.1.1)
iptables (>= 1.0)
- openssl (7.0.0)
+ openssl (7.0.1)
php (1.5.0)
build-essential (>= 0.0.0)
iis (>= 0.0.0)
@@ -118,7 +118,7 @@ GRAPH
ubuntu (2.0.1)
apt (>= 0.0.0)
users (4.0.3)
- windows (3.0.0)
+ windows (3.0.3)
ohai (>= 4.0.0)
xml (3.1.1)
build-essential (>= 0.0.0)
diff --git a/kitchen-tests/Gemfile.lock b/kitchen-tests/Gemfile.lock
index ad1674fd6a..86bb4d1198 100644
--- a/kitchen-tests/Gemfile.lock
+++ b/kitchen-tests/Gemfile.lock
@@ -3,16 +3,16 @@ GEM
specs:
addressable (2.5.0)
public_suffix (~> 2.0, >= 2.0.2)
- artifactory (2.7.0)
- aws-sdk (2.8.5)
- aws-sdk-resources (= 2.8.5)
- aws-sdk-core (2.8.5)
+ artifactory (2.8.1)
+ aws-sdk (2.8.12)
+ aws-sdk-resources (= 2.8.12)
+ aws-sdk-core (2.8.12)
aws-sigv4 (~> 1.0)
jmespath (~> 1.0)
- aws-sdk-resources (2.8.5)
- aws-sdk-core (= 2.8.5)
+ aws-sdk-resources (2.8.12)
+ aws-sdk-core (= 2.8.12)
aws-sigv4 (1.0.0)
- berkshelf (5.6.3)
+ berkshelf (5.6.4)
addressable (~> 2.3, >= 2.3.4)
berkshelf-api-client (>= 2.0.2, < 4.0)
buff-config (~> 2.0)
@@ -73,18 +73,18 @@ GEM
hitimes (1.2.4)
hitimes (1.2.4-x86-mingw32)
httpclient (2.8.3)
- inspec (1.16.1)
+ inspec (1.17.0)
faraday (>= 0.9.0)
hashie (~> 3.4)
json (>= 1.8, < 3.0)
method_source (~> 0.8)
mixlib-log
+ nokogiri (~> 1.6)
parallel (~> 1.9)
pry (~> 0)
rainbow (~> 2)
rspec (~> 3)
rspec-its (~> 1.2)
- rspec_junit_formatter (~> 0.2.3)
rubyzip (~> 1.1)
sslshake (~> 1)
thor (~> 0.19)
@@ -113,6 +113,7 @@ GEM
little-plugger (~> 1.1)
multi_json (~> 1.10)
method_source (0.8.2)
+ mini_portile2 (2.1.0)
minitar (0.6.1)
mixlib-archive (0.4.1)
mixlib-log
@@ -139,10 +140,14 @@ GEM
net-ssh-gateway (1.3.0)
net-ssh (>= 2.6.5)
nio4r (2.0.0)
+ nokogiri (1.7.1)
+ mini_portile2 (~> 2.1.0)
+ nokogiri (1.7.1-x86-mingw32)
+ mini_portile2 (~> 2.1.0)
nori (2.6.0)
octokit (4.6.2)
sawyer (~> 0.8.0, >= 0.5.3)
- parallel (1.11.0)
+ parallel (1.11.1)
parslet (1.5.0)
blankslate (~> 2.0)
pry (0.10.4)
@@ -187,9 +192,6 @@ GEM
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.5.0)
rspec-support (3.5.0)
- rspec_junit_formatter (0.2.3)
- builder (< 4)
- rspec-core (>= 2, < 4, != 2.12.0)
rubyntlm (0.6.1)
rubyzip (1.2.1)
safe_yaml (1.0.4)
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
index 7f456c8eec..fcc56b4164 100644
--- a/omnibus/Gemfile.lock
+++ b/omnibus/Gemfile.lock
@@ -36,15 +36,15 @@ GEM
specs:
addressable (2.5.0)
public_suffix (~> 2.0, >= 2.0.2)
- artifactory (2.7.0)
+ artifactory (2.8.1)
awesome_print (1.7.0)
- aws-sdk (2.8.10)
- aws-sdk-resources (= 2.8.10)
- aws-sdk-core (2.8.10)
+ aws-sdk (2.8.12)
+ aws-sdk-resources (= 2.8.12)
+ aws-sdk-core (2.8.12)
aws-sigv4 (~> 1.0)
jmespath (~> 1.0)
- aws-sdk-resources (2.8.10)
- aws-sdk-core (= 2.8.10)
+ aws-sdk-resources (2.8.12)
+ aws-sdk-core (= 2.8.12)
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 e05cb0c5f6..32f460499c 100644
--- a/omnibus_overrides.rb
+++ b/omnibus_overrides.rb
@@ -1,5 +1,5 @@
# DO NOT EDIT. Generated by "rake dependencies". Edit version_policy.rb instead.
-override :rubygems, version: "2.6.10"
+override :rubygems, version: "2.6.11"
override :bundler, version: "1.12.5"
override "libffi", version: "3.2.1"
override "libiconv", version: "1.14"
diff --git a/tasks/bundle.rb b/tasks/bundle.rb
index 0176fe209e..f530515786 100644
--- a/tasks/bundle.rb
+++ b/tasks/bundle.rb
@@ -1,5 +1,5 @@
#
-# Copyright:: Copyright (c) 2016 Chef Software Inc.
+# Copyright:: Copyright (c) 2016-2017, Chef Software Inc.
# License:: Apache License, Version 2.0
#
# Licensed under the Apache License, Version 2.0 (the "License");
@@ -53,27 +53,31 @@ namespace :bundle do
end
end
+ def parse_bundle_outdated(bundle_outdated_output)
+ result = []
+ bundle_outdated_output.each_line do |line|
+ if line =~ /^\s*\* (.+) \(newest ([^,]+), installed ([^,)])*/
+ gem_name, newest_version, installed_version = $1, $2, $3
+ result << [ line, gem_name ]
+ end
+ end
+ result
+ end
+
# Find out if we're using the latest gems we can (so we don't regress versions)
desc "Check for gems that are not at the latest released version, and report if anything not in ACCEPTABLE_OUTDATED_GEMS (version_policy.rb) is out of date."
task :outdated do
- extend BundleUtil
- puts ""
- puts "-------------------------------------------------------------------"
- puts "Checking for outdated gems ..."
- puts "-------------------------------------------------------------------"
- # TODO check for outdated windows gems too
- with_bundle_unfrozen do
- bundle_outdated = bundle("outdated", extract_output: true)
+ bundle_outdated = ""
+ Bundler.with_clean_env do
+ sh "bundle config --local frozen '0'"
+ bundle_outdated = `bundle outdated`
puts bundle_outdated
- outdated_gems = parse_bundle_outdated(bundle_outdated).map { |line, gem_name| gem_name }
- # Weed out the acceptable ones
- outdated_gems = outdated_gems.reject { |gem_name| ACCEPTABLE_OUTDATED_GEMS.include?(gem_name) }
- if outdated_gems.empty?
- puts ""
- puts "SUCCESS!"
- else
- raise "ERROR: outdated gems: #{outdated_gems.join(", ")}. Either fix them or add them to ACCEPTABLE_OUTDATED_GEMS in #{__FILE__}."
- end
+ sh "bundle config --local frozen '1'"
+ end
+ outdated_gems = parse_bundle_outdated(bundle_outdated).map { |line, gem_name| gem_name }
+ outdated_gems = outdated_gems.reject { |gem_name| ACCEPTABLE_OUTDATED_GEMS.include?(gem_name) }
+ unless outdated_gems.empty?
+ raise "ERROR: outdated gems: #{outdated_gems.join(", ")}. Either fix them or add them to ACCEPTABLE_OUTDATED_GEMS in #{__FILE__}."
end
end
end
diff --git a/version_policy.rb b/version_policy.rb
index b703e22111..39bc81f2fa 100644
--- a/version_policy.rb
+++ b/version_policy.rb
@@ -33,7 +33,7 @@ OMNIBUS_OVERRIDES = {
"makedepend" => "1.0.5",
"ncurses" => "5.9",
"pkg-config-lite" => "0.28-1",
- "ruby" => "2.3.3",
+ "ruby" => "2.4.1",
# Leave dev-kit pinned to 4.5 on 32-bit, because 4.7 is 20MB larger and we don't want
# to unnecessarily make the client any fatter. (Since it's different between
# 32 and 64, we have to do it in the project file still.)
@@ -86,6 +86,8 @@ ACCEPTABLE_OUTDATED_GEMS = [
"github_changelog_generator", # we manage this independent of the rubygem
"cheffish", # 5.0.0 breaks chef-provisioning
"net-ssh-gateway", # chef-provisiong and test-kitchen have ~> 1.2 constraint
+ "mixlib-install", # dunno why
+ "thor", # berks
]
#
View Lorry Controller Status