summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Gemfile.lock25
-rw-r--r--README.md2
-rw-r--r--VERSION2
-rw-r--r--acceptance/Gemfile.lock16
-rw-r--r--chef-config/lib/chef-config/version.rb2
-rw-r--r--kitchen-tests/Gemfile.lock12
-rw-r--r--lib/chef/provider/package/yum.rb6
-rw-r--r--lib/chef/version.rb2
-rw-r--r--omnibus/Gemfile.lock18
-rw-r--r--omnibus_overrides.rb2
-rw-r--r--tasks/dependencies.rb104
-rw-r--r--version_policy.rb4
12 files changed, 90 insertions, 105 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index ef17beea6f..4e368bc92c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -18,9 +18,9 @@ GIT
PATH
remote: .
specs:
- chef (12.10.38)
+ chef (12.10.41)
bundler (>= 1.10)
- chef-config (= 12.10.38)
+ chef-config (= 12.10.41)
chef-zero (~> 4.5)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -45,9 +45,9 @@ PATH
specinfra (~> 2.10)
syslog-logger (~> 1.6)
uuidtools (~> 2.1.5)
- chef (12.10.38-universal-mingw32)
+ chef (12.10.41-universal-mingw32)
bundler (>= 1.10)
- chef-config (= 12.10.38)
+ chef-config (= 12.10.41)
chef-zero (~> 4.5)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -87,7 +87,7 @@ PATH
PATH
remote: chef-config
specs:
- chef-config (12.10.38)
+ chef-config (12.10.41)
fuzzyurl (~> 0.8.0)
mixlib-config (~> 2.0)
mixlib-shellout (~> 2.0)
@@ -145,8 +145,6 @@ GEM
chef (>= 11.14)
fauxhai (~> 3.2)
rspec (~> 3.0)
- childprocess (0.5.9)
- ffi (~> 1.0, >= 1.0.11)
coderay (1.1.1)
colorize (0.7.7)
compat_resource (12.9.1)
@@ -183,14 +181,10 @@ GEM
hashie (>= 3.4)
multi_json (>= 1.7.5, < 2.0)
oauth2
- github_changelog_generator (1.12.0)
- bundler (>= 1.7)
+ github_changelog_generator (1.12.1)
colorize (~> 0.7)
github_api (~> 0.12)
- overcommit (>= 0.31)
rake (>= 10.0)
- rspec (>= 3.2)
- rubocop (>= 0.31)
gssapi (1.2.0)
ffi (>= 1.0.1)
gyoku (1.3.1)
@@ -281,9 +275,6 @@ GEM
plist (~> 3.1)
systemu (~> 2.6.4)
wmi-lite (~> 1.0)
- overcommit (0.33.0)
- childprocess (~> 0.5.8)
- iniparse (~> 1.4)
parser (2.3.1.0)
ast (~> 2.2)
plist (3.2.0)
@@ -339,7 +330,7 @@ GEM
ruby-progressbar (1.8.0)
ruby-shadow (2.5.0)
rubyntlm (0.6.0)
- rufus-lru (1.0.5)
+ rufus-lru (1.1.0)
sawyer (0.7.0)
addressable (>= 2.3.5, < 2.5)
faraday (~> 0.8, < 0.10)
@@ -392,7 +383,7 @@ GEM
ffi
windows-api (0.4.4)
win32-api (>= 1.4.5)
- winrm (1.8.0)
+ winrm (1.8.1)
builder (>= 2.1.2)
gssapi (~> 1.2)
gyoku (~> 1.0)
diff --git a/README.md b/README.md
index 4697e55190..74f2f3d330 100644
--- a/README.md
+++ b/README.md
@@ -157,7 +157,7 @@ Additionally, periodically Chef will update the desired versions of chef compone
Whenever a change is checked in to `master`, the patch version of `chef` is bumped. To do this, the `lita-versioner` bot listens to github for merged PRs, and when it finds one, takes these actions:
1. Bumps the patch version in `lib/chef/version.rb` (e.g. 0.9.14 -> 0.9.15).
-2. Runs `rake dependencies:update_conservative` to update the `Gemfile.lock` to include the new version.
+2. Runs `rake bundle:install` to update the `Gemfile.lock` to include the new version.
3. Pushes to `master` and submits a new build to Chef's Jenkins cluster.
## Component Versions
diff --git a/VERSION b/VERSION
index 7405fa55a5..45612c5cda 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-12.10.38 \ No newline at end of file
+12.10.41 \ No newline at end of file
diff --git a/acceptance/Gemfile.lock b/acceptance/Gemfile.lock
index 3fe4c3d6f4..108fb83509 100644
--- a/acceptance/Gemfile.lock
+++ b/acceptance/Gemfile.lock
@@ -1,6 +1,6 @@
GIT
remote: git://github.com/chef/chef-acceptance.git
- revision: 49458ec493dbd12588680eea9f2f9beb76463d09
+ revision: 4abda84e2fadd0452b77a8a88d4fd534843ced55
specs:
chef-acceptance (0.2.0)
mixlib-shellout (~> 2.0)
@@ -11,12 +11,12 @@ GEM
specs:
addressable (2.4.0)
artifactory (2.3.2)
- aws-sdk (2.3.1)
- aws-sdk-resources (= 2.3.1)
- aws-sdk-core (2.3.1)
+ aws-sdk (2.3.2)
+ aws-sdk-resources (= 2.3.2)
+ aws-sdk-core (2.3.2)
jmespath (~> 1.0)
- aws-sdk-resources (2.3.1)
- aws-sdk-core (= 2.3.1)
+ aws-sdk-resources (2.3.2)
+ aws-sdk-core (= 2.3.2)
berkshelf (4.3.2)
addressable (~> 2.3, >= 2.3.4)
berkshelf-api-client (~> 2.0, >= 2.0.2)
@@ -188,7 +188,7 @@ GEM
solve (2.0.3)
molinillo (~> 0.4.2)
semverse (~> 1.1)
- test-kitchen (1.7.3)
+ test-kitchen (1.8.0)
mixlib-install (~> 1.0, >= 1.0.4)
mixlib-shellout (>= 1.2, < 3.0)
net-scp (~> 1.1)
@@ -203,7 +203,7 @@ GEM
hashie (>= 2.0.2, < 4.0.0)
windows_chef_zero (2.0.0)
test-kitchen (>= 1.2.1)
- winrm (1.8.0)
+ winrm (1.8.1)
builder (>= 2.1.2)
gssapi (~> 1.2)
gyoku (~> 1.0)
diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb
index bc61383c37..752286425f 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.10.38"
+ VERSION = "12.10.41"
end
#
diff --git a/kitchen-tests/Gemfile.lock b/kitchen-tests/Gemfile.lock
index 04d7012d56..3067871ab3 100644
--- a/kitchen-tests/Gemfile.lock
+++ b/kitchen-tests/Gemfile.lock
@@ -14,12 +14,12 @@ GEM
specs:
addressable (2.4.0)
artifactory (2.3.2)
- aws-sdk (2.3.1)
- aws-sdk-resources (= 2.3.1)
- aws-sdk-core (2.3.1)
+ aws-sdk (2.3.2)
+ aws-sdk-resources (= 2.3.2)
+ aws-sdk-core (2.3.2)
jmespath (~> 1.0)
- aws-sdk-resources (2.3.1)
- aws-sdk-core (= 2.3.1)
+ aws-sdk-resources (2.3.2)
+ aws-sdk-core (= 2.3.2)
berkshelf (4.3.2)
addressable (~> 2.3, >= 2.3.4)
berkshelf-api-client (~> 2.0, >= 2.0.2)
@@ -139,7 +139,7 @@ GEM
solve (2.0.3)
molinillo (~> 0.4.2)
semverse (~> 1.1)
- test-kitchen (1.7.3)
+ test-kitchen (1.8.0)
mixlib-install (~> 1.0, >= 1.0.4)
mixlib-shellout (>= 1.2, < 3.0)
net-scp (~> 1.1)
diff --git a/lib/chef/provider/package/yum.rb b/lib/chef/provider/package/yum.rb
index dfd32fde55..64f1b2043c 100644
--- a/lib/chef/provider/package/yum.rb
+++ b/lib/chef/provider/package/yum.rb
@@ -46,7 +46,7 @@ class Chef
lead = 0
tail = evr.size
- if evr =~ %r{^([\d]+):}
+ if %r{^([\d]+):}.match(evr) # rubocop:disable Performance/RedundantMatch
epoch = $1.to_i
lead = $1.length + 1
elsif evr[0].ord == ":".ord
@@ -54,7 +54,7 @@ class Chef
lead = 1
end
- if evr =~ %r{:?.*-(.*)$}
+ if %r{:?.*-(.*)$}.match(evr) # rubocop:disable Performance/RedundantMatch
release = $1
tail = evr.length - release.length - lead - 1
@@ -443,7 +443,7 @@ class Chef
# "mtr >= 2:0.71-3.0"
# "mta"
def self.parse(string)
- if string =~ %r{^(\S+)\s+(>|>=|=|==|<=|<)\s+(\S+)$}
+ if %r{^(\S+)\s+(>|>=|=|==|<=|<)\s+(\S+)$}.match(string) # rubocop:disable Performance/RedundantMatch
name = $1
if $2 == "="
flag = :==
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index b0c626a7aa..a1317bac07 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.10.38"
+ VERSION = "12.10.41"
end
#
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
index 76f2ef0f46..879e8ecf4f 100644
--- a/omnibus/Gemfile.lock
+++ b/omnibus/Gemfile.lock
@@ -1,13 +1,13 @@
GIT
remote: https://github.com/chef/omnibus-software.git
- revision: b03a220058ff29b9522d7f3ebc335e396647680c
+ revision: 7e566482a86aca8b94e77285242b6a526fe77ffe
specs:
omnibus-software (4.0.0)
omnibus (>= 5.2.0)
GIT
remote: https://github.com/chef/omnibus.git
- revision: acebe9d9a85930422cda6077e93302e9392ef842
+ revision: b62510242eceae2f52f2701f6ee0c4ef48ae8b4a
specs:
omnibus (5.4.0)
aws-sdk (~> 2)
@@ -38,12 +38,12 @@ GEM
addressable (2.3.8)
artifactory (2.3.2)
awesome_print (1.6.1)
- aws-sdk (2.3.1)
- aws-sdk-resources (= 2.3.1)
- aws-sdk-core (2.3.1)
+ aws-sdk (2.3.2)
+ aws-sdk-resources (= 2.3.2)
+ aws-sdk-core (2.3.2)
jmespath (~> 1.0)
- aws-sdk-resources (2.3.1)
- aws-sdk-core (= 2.3.1)
+ aws-sdk-resources (2.3.2)
+ aws-sdk-core (= 2.3.2)
berkshelf (3.3.0)
addressable (~> 2.3.4)
berkshelf-api-client (~> 1.2)
@@ -130,7 +130,7 @@ GEM
rspec-core (~> 3.2)
rspec-expectations (~> 3.2)
rspec-mocks (~> 3.2)
- mixlib-cli (1.5.0)
+ mixlib-cli (1.6.0)
mixlib-config (2.2.1)
mixlib-install (1.0.11)
artifactory
@@ -231,7 +231,7 @@ GEM
hashie (>= 2.0.2, < 4.0.0)
win32-process (0.8.3)
ffi (>= 1.0.0)
- winrm (1.8.0)
+ winrm (1.8.1)
builder (>= 2.1.2)
gssapi (~> 1.2)
gyoku (~> 1.0)
diff --git a/omnibus_overrides.rb b/omnibus_overrides.rb
index 00a99966e7..3414f217fa 100644
--- a/omnibus_overrides.rb
+++ b/omnibus_overrides.rb
@@ -1,6 +1,6 @@
# DO NOT EDIT. Generated by "rake dependencies". Edit version_policy.rb instead.
override :rubygems, version: "2.6.4"
-override :bundler, version: "1.12.2"
+override :bundler, version: "1.12.3"
override "libffi", version: "3.2.1"
override "libiconv", version: "1.14"
override "liblzma", version: "5.2.2"
diff --git a/tasks/dependencies.rb b/tasks/dependencies.rb
index 2faf3b883a..eb4bb1f44f 100644
--- a/tasks/dependencies.rb
+++ b/tasks/dependencies.rb
@@ -22,8 +22,8 @@ require_relative "../version_policy"
desc "Tasks to update and check dependencies"
namespace :dependencies do
# Update all dependencies to the latest constraint-matching version
- desc "Update all dependencies. dependencies:update[conservative] to update as little as possible."
- task :update, [:conservative] => %w{
+ desc "Update all dependencies. dependencies:update to update as little as possible."
+ task :update => %w{
dependencies:update_gemfile_lock
dependencies:update_omnibus_overrides
dependencies:update_omnibus_gemfile_lock
@@ -32,28 +32,22 @@ namespace :dependencies do
dependencies:update_kitchen_tests_berksfile_lock
}
- desc "Update Gemfile.lock and all Gemfile.<platform>.locks. update_gemfile_lock[conservative] to update as little as possible."
- task :update_gemfile_lock, [:conservative] do |t, rake_args|
- conservative = rake_args[:conservative]
- if conservative
- Rake::Task["bundle:install"].invoke
- else
- Rake::Task["bundle:update"].invoke
- end
+ desc "Update Gemfile.lock and all Gemfile.<platform>.locks."
+ task :update_gemfile_lock do |t, rake_args|
+ Rake::Task["bundle:update"].invoke
end
def gemfile_lock_task(task_name, dirs: [], other_platforms: true, leave_frozen: true)
dirs.each do |dir|
- desc "Update #{dir}/Gemfile.lock. #{task_name}[conservative] to update as little as possible."
- task task_name, [:conservative] do |t, rake_args|
+ desc "Update #{dir}/Gemfile.lock."
+ task task_name do |t, rake_args|
extend BundleUtil
- conservative = rake_args[:conservative]
puts ""
puts "-------------------------------------------------------------------"
- puts "Updating #{dir}/Gemfile.lock#{conservative ? " (conservatively)" : ""} ..."
+ puts "Updating #{dir}/Gemfile.lock ..."
puts "-------------------------------------------------------------------"
with_bundle_unfrozen(cwd: dir, leave_frozen: leave_frozen) do
- bundle "install", cwd: dir, delete_gemfile_lock: !conservative
+ bundle "install", cwd: dir, delete_gemfile_lock: true
if other_platforms
# Include all other supported platforms into the lockfile as well
platforms.each do |platform|
@@ -67,15 +61,14 @@ namespace :dependencies do
def berksfile_lock_task(task_name, dirs: [])
dirs.each do |dir|
- desc "Update #{dir}/Berksfile.lock. #{task_name}[conservative] to update as little as possible."
- task task_name, [:conservative] do |t, rake_args|
+ desc "Update #{dir}/Berksfile.lock."
+ task task_name do |t, rake_args|
extend BundleUtil
- conservative = rake_args[:conservative]
puts ""
puts "-------------------------------------------------------------------"
- puts "Updating #{dir}/Berksfile.lock#{conservative ? " (conservatively)" : ""} ..."
+ puts "Updating #{dir}/Berksfile.lock ..."
puts "-------------------------------------------------------------------"
- if !conservative && File.exist?("#{project_root}/#{dir}/Berksfile.lock")
+ if File.exist?("#{project_root}/#{dir}/Berksfile.lock")
File.delete("#{project_root}/#{dir}/Berksfile.lock")
end
Dir.chdir("#{project_root}/#{dir}") do
@@ -100,48 +93,45 @@ namespace :dependencies do
}
# kitchen-tests/cookbooks/webapp isn't solving right now ....
- desc "Update omnibus overrides, including versions in version_policy.rb and latest version of gems: #{OMNIBUS_RUBYGEMS_AT_LATEST_VERSION.keys}. update_omnibus_overrides[conservative] does nothing."
- task :update_omnibus_overrides, [:conservative] do |t, rake_args|
- conservative = rake_args[:conservative]
- unless conservative
- puts ""
- puts "-------------------------------------------------------------------"
- puts "Updating omnibus_overrides.rb ..."
- puts "-------------------------------------------------------------------"
-
- # Generate the new overrides file
- overrides = "# DO NOT EDIT. Generated by \"rake dependencies\". Edit version_policy.rb instead.\n"
+ desc "Update omnibus overrides, including versions in version_policy.rb and latest version of gems: #{OMNIBUS_RUBYGEMS_AT_LATEST_VERSION.keys}."
+ task :update_omnibus_overrides do |t, rake_args|
+ puts ""
+ puts "-------------------------------------------------------------------"
+ puts "Updating omnibus_overrides.rb ..."
+ puts "-------------------------------------------------------------------"
- # Replace the bundler and rubygems versions
- OMNIBUS_RUBYGEMS_AT_LATEST_VERSION.each do |override_name, gem_name|
- # Get the latest bundler version
- puts "Running gem list -r #{gem_name} ..."
- gem_list = `gem list -r #{gem_name}`
- unless gem_list =~ /^#{gem_name}\s*\(([^)]*)\)$/
- raise "gem list -r #{gem_name} failed with output:\n#{gem_list}"
- end
+ # Generate the new overrides file
+ overrides = "# DO NOT EDIT. Generated by \"rake dependencies\". Edit version_policy.rb instead.\n"
- # Emit it
- puts "Latest version of #{gem_name} is #{$1}"
- overrides << "override #{override_name.inspect}, version: #{$1.inspect}\n"
+ # Replace the bundler and rubygems versions
+ OMNIBUS_RUBYGEMS_AT_LATEST_VERSION.each do |override_name, gem_name|
+ # Get the latest bundler version
+ puts "Running gem list -r #{gem_name} ..."
+ gem_list = `gem list -r #{gem_name}`
+ unless gem_list =~ /^#{gem_name}\s*\(([^)]*)\)$/
+ raise "gem list -r #{gem_name} failed with output:\n#{gem_list}"
end
- # Add explicit overrides
- OMNIBUS_OVERRIDES.each do |override_name, version|
- overrides << "override #{override_name.inspect}, version: #{version.inspect}\n"
- end
+ # Emit it
+ puts "Latest version of #{gem_name} is #{$1}"
+ overrides << "override #{override_name.inspect}, version: #{$1.inspect}\n"
+ end
- # Write the file out (if changed)
- overrides_path = File.expand_path("../../omnibus_overrides.rb", __FILE__)
- if overrides != IO.read(overrides_path)
- puts "Overrides changed!"
- puts `git diff #{overrides_path}`
- puts "Writing modified #{overrides_path} ..."
- IO.write(overrides_path, overrides)
- end
+ # Add explicit overrides
+ OMNIBUS_OVERRIDES.each do |override_name, version|
+ overrides << "override #{override_name.inspect}, version: #{version.inspect}\n"
+ end
+
+ # Write the file out (if changed)
+ overrides_path = File.expand_path("../../omnibus_overrides.rb", __FILE__)
+ if overrides != IO.read(overrides_path)
+ puts "Overrides changed!"
+ puts `git diff #{overrides_path}`
+ puts "Writing modified #{overrides_path} ..."
+ IO.write(overrides_path, overrides)
end
end
end
-desc "Update all dependencies and check for outdated gems. Call dependencies[conservative] to update as little as possible."
-task :dependencies, [:conservative] => [ "dependencies:update", "bundle:outdated" ]
-task :update, [:conservative] => [ "dependencies:update", "bundle:outdated"]
+desc "Update all dependencies and check for outdated gems."
+task :dependencies => [ "dependencies:update", "bundle:outdated" ]
+task :update => [ "dependencies:update", "bundle:outdated"]
diff --git a/version_policy.rb b/version_policy.rb
index 59ebd58160..8d450010d3 100644
--- a/version_policy.rb
+++ b/version_policy.rb
@@ -71,12 +71,16 @@ OMNIBUS_RUBYGEMS_AT_LATEST_VERSION = {
# jwt - expected to update with new oauth2 release
# mini_portile2 - should go away *entirely* with new nokogiri release (not a dep anymore)
# slop - expected to disappear with new pry release
+# stove - halite pins to ~> 3.2 in 1.2.1
+# rubocop - chef-style pins to 0.39.0 in 0.3.1
#
ACCEPTABLE_OUTDATED_GEMS = %w{
gherkin
jwt
mini_portile2
slop
+ stove
+ rubocop
}
#
View Lorry Controller Status