diff options
| -rw-r--r-- | Gemfile.lock | 18 | ||||
| -rw-r--r-- | acceptance/Gemfile.lock | 16 | ||||
| -rw-r--r-- | kitchen-tests/Berksfile.lock | 28 | ||||
| -rw-r--r-- | kitchen-tests/Gemfile.lock | 38 | ||||
| -rw-r--r-- | omnibus/Gemfile.lock | 16 | ||||
| -rw-r--r-- | tasks/dependencies.rb | 81 |
6 files changed, 104 insertions, 93 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 6e80bddc44..bda943ca81 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,6 +1,6 @@ GIT remote: https://github.com/chef/chef-server - revision: 847eaefa52e105a8e3c94a530f63b74bcbab6931 + revision: 4ec1d014c9a4945398c6baa550c71f7e3a7e69e0 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: 78cd084d9fe65e044a8d2f1f2f055151b20ac9d1 specs: ohai (13.0.0) chef-config (>= 12.5.0.alpha.1, < 14) @@ -205,13 +205,13 @@ GEM mixlib-cli (~> 1.4) artifactory (2.7.0) 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.3) + aws-sdk-resources (= 2.8.3) + aws-sdk-core (2.8.3) aws-sigv4 (~> 1.0) jmespath (~> 1.0) - aws-sdk-resources (2.8.5) - aws-sdk-core (= 2.8.5) + aws-sdk-resources (2.8.3) + aws-sdk-core (= 2.8.3) aws-sigv4 (1.0.0) backports (3.6.8) binding_of_caller (0.7.2) @@ -332,7 +332,7 @@ GEM addressable (~> 2.3) libyajl2 (1.2.0) little-plugger (1.1.4) - logging (2.2.0) + logging (2.1.0) little-plugger (~> 1.1) multi_json (~> 1.10) logify (0.2.0) @@ -601,4 +601,4 @@ DEPENDENCIES yard BUNDLED WITH - 1.14.6 + 1.13.7 diff --git a/acceptance/Gemfile.lock b/acceptance/Gemfile.lock index 40fcb3db61..6d2bc0572d 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.7.0) - aws-sdk (2.8.5) - aws-sdk-resources (= 2.8.5) - aws-sdk-core (2.8.5) + aws-sdk (2.8.1) + aws-sdk-resources (= 2.8.1) + aws-sdk-core (2.8.1) aws-sigv4 (~> 1.0) jmespath (~> 1.0) - aws-sdk-resources (2.8.5) - aws-sdk-core (= 2.8.5) + aws-sdk-resources (2.8.1) + aws-sdk-core (= 2.8.1) aws-sigv4 (1.0.0) berkshelf (5.6.3) addressable (~> 2.3, >= 2.3.4) @@ -111,7 +111,7 @@ GEM kitchen-vagrant (1.0.2) test-kitchen (~> 1.4) little-plugger (1.1.4) - logging (2.2.0) + logging (2.1.0) little-plugger (~> 1.1) multi_json (~> 1.10) method_source (0.8.2) @@ -140,7 +140,7 @@ GEM nori (2.6.0) octokit (4.6.2) sawyer (~> 0.8.0, >= 0.5.3) - parallel (1.11.0) + parallel (1.10.0) parslet (1.5.0) blankslate (~> 2.0) pry (0.10.4) @@ -262,4 +262,4 @@ DEPENDENCIES winrm-elevated BUNDLED WITH - 1.14.6 + 1.13.4 diff --git a/kitchen-tests/Berksfile.lock b/kitchen-tests/Berksfile.lock index bf0adfee6c..4643665745 100644 --- a/kitchen-tests/Berksfile.lock +++ b/kitchen-tests/Berksfile.lock @@ -14,7 +14,7 @@ DEPENDENCIES php (~> 1.5.0) resolver git: https://github.com/chef-cookbooks/resolver.git - revision: f82d7595a3536a757e7a9ed799ec06643c69ce25 + revision: 8bf9034dabc47d29a07870e4059c32114f2c820a GRAPH apt (4.0.2) @@ -55,30 +55,33 @@ GRAPH build-essential (8.0.0) mingw (>= 1.1) seven_zip (>= 0.0.0) - chef-client (7.2.0) + chef-client (7.1.0) cron (>= 1.7.0) logrotate (>= 1.9.0) windows (>= 1.42.0) chef-sugar (3.4.0) - chef_hostname (0.5.0) + chef_hostname (0.4.2) + compat_resource (>= 0.0.0) compat_resource (12.16.3) - cron (4.0.0) + cron (3.0.0) database (6.1.1) postgresql (>= 1.0.0) firewall (2.5.4) chef-sugar (>= 0.0.0) httpd (0.4.5) compat_resource (>= 12.16.3) - iis (5.0.7) + iis (5.0.5) windows (>= 1.34.6) - iptables (4.0.0) + iptables (3.1.0) + compat_resource (>= 12.14.3) logrotate (2.1.0) compat_resource (>= 0.0.0) mariadb (1.0.1) apt (>= 0.0.0) yum (>= 0.0.0) yum-epel (>= 0.0.0) - mingw (2.0.0) + mingw (1.2.5) + compat_resource (>= 12.16.3) seven_zip (>= 0.0.0) multipackage (4.0.0) compat_resource (>= 0.0.0) @@ -89,12 +92,13 @@ GRAPH build-essential (>= 0.0.0) mariadb (>= 0.0.0) mysql (>= 6.0) - nscd (5.0.0) + nscd (4.1.0) + compat_resource (>= 0.0.0) ntp (3.3.1) ohai (5.0.0) openssh (2.1.1) iptables (>= 1.0) - openssl (7.0.0) + openssl (6.1.1) php (1.5.0) build-essential (>= 0.0.0) iis (>= 0.0.0) @@ -102,19 +106,19 @@ GRAPH windows (>= 0.0.0) xml (>= 0.0.0) yum-epel (>= 0.0.0) - postgresql (6.1.1) + postgresql (6.0.1) build-essential (>= 2.0.0) compat_resource (>= 12.16.3) openssl (>= 4.0) rbac (1.0.3) - resolver (2.0.1) + resolver (1.3.1) selinux (0.9.0) seven_zip (2.0.2) windows (>= 1.2.2) smf (2.2.8) rbac (>= 1.0.1) sudo (3.3.1) - ubuntu (2.0.1) + ubuntu (2.0.0) apt (>= 0.0.0) users (4.0.3) windows (2.1.1) diff --git a/kitchen-tests/Gemfile.lock b/kitchen-tests/Gemfile.lock index 943218833a..81ab901afa 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.7.0) - aws-sdk (2.8.5) - aws-sdk-resources (= 2.8.5) - aws-sdk-core (2.8.5) + aws-sdk (2.7.15) + aws-sdk-resources (= 2.7.15) + aws-sdk-core (2.7.15) aws-sigv4 (~> 1.0) jmespath (~> 1.0) - aws-sdk-resources (2.8.5) - aws-sdk-core (= 2.8.5) + aws-sdk-resources (2.7.15) + aws-sdk-core (= 2.7.15) aws-sigv4 (1.0.0) berkshelf (5.6.3) addressable (~> 2.3, >= 2.3.4) @@ -32,7 +32,6 @@ GEM faraday (~> 0.9) httpclient (~> 2.7) ridley (>= 4.5, < 6.0) - blankslate (2.1.2.4) buff-config (2.0.0) buff-extensions (~> 2.0) varia_model (~> 0.6) @@ -47,7 +46,7 @@ GEM celluloid-io (0.16.2) celluloid (>= 0.16.0) nio4r (>= 1.1.0) - chef-config (13.0.1) + chef-config (12.19.36) addressable fuzzyurl mixlib-config (~> 2.0) @@ -62,8 +61,8 @@ GEM excon (0.55.0) faraday (0.9.2) multipart-post (>= 1.2, < 3) - ffi (1.9.18) - ffi (1.9.18-x86-mingw32) + ffi (1.9.17) + ffi (1.9.17-x86-mingw32) fuzzyurl (0.9.0) gssapi (1.2.0) ffi (>= 1.0.1) @@ -73,7 +72,7 @@ GEM hitimes (1.2.4) hitimes (1.2.4-x86-mingw32) httpclient (2.8.3) - inspec (1.16.1) + inspec (1.14.1) faraday (>= 0.9.0) hashie (~> 3.4) json (>= 1.8, < 3.0) @@ -88,7 +87,6 @@ GEM rubyzip (~> 1.1) sslshake (~> 1) thor (~> 0.19) - toml (~> 0.1) train (>= 0.22.0, < 1.0) jmespath (1.3.1) json (2.0.3) @@ -109,7 +107,7 @@ GEM kitchen-vagrant (1.0.2) test-kitchen (~> 1.4) little-plugger (1.1.4) - logging (2.2.0) + logging (2.1.0) little-plugger (~> 1.1) multi_json (~> 1.10) method_source (0.8.2) @@ -130,7 +128,7 @@ GEM win32-process (~> 0.8.2) wmi-lite (~> 1.0) mixlib-versioning (1.1.0) - molinillo (0.5.7) + molinillo (0.5.6) multi_json (1.12.1) multipart-post (2.0.0) net-scp (1.2.1) @@ -142,9 +140,7 @@ GEM nori (2.6.0) octokit (4.6.2) sawyer (~> 0.8.0, >= 0.5.3) - parallel (1.11.0) - parslet (1.5.0) - blankslate (~> 2.0) + parallel (1.10.0) pry (0.10.4) coderay (~> 1.1.0) method_source (~> 0.8.1) @@ -202,19 +198,17 @@ GEM molinillo (>= 0.5) semverse (>= 1.1, < 3.0) sslshake (1.0.13) - test-kitchen (1.16.0) + test-kitchen (1.15.0) mixlib-install (>= 1.2, < 3.0) mixlib-shellout (>= 1.2, < 3.0) net-scp (~> 1.1) net-ssh (>= 2.9, < 5.0) net-ssh-gateway (~> 1.2) safe_yaml (~> 1.0) - thor (~> 0.19, < 0.19.2) + thor (~> 0.18) thor (0.19.1) timers (4.0.4) hitimes - toml (0.1.2) - parslet (~> 1.5.0) train (0.22.1) docker-api (~> 1.26) json (>= 1.8, < 3.0) @@ -229,7 +223,7 @@ GEM hashie (>= 2.0.2, < 4.0.0) win32-process (0.8.3) ffi (>= 1.0.0) - winrm (2.1.3) + winrm (2.1.2) builder (>= 2.1.2) erubis (~> 2.7) gssapi (~> 1.2) @@ -262,4 +256,4 @@ DEPENDENCIES vagrant-wrapper BUNDLED WITH - 1.14.6 + 1.13.7 diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock index 20eb83adec..d00e91914b 100644 --- a/omnibus/Gemfile.lock +++ b/omnibus/Gemfile.lock @@ -24,7 +24,7 @@ GIT GIT remote: https://github.com/chef/omnibus-software - revision: 703ecb80af7897a6a85a7340f9b280f757f3372f + revision: a6f5d260b34c5a19fb2ef873ab3216c7bab0ef6f specs: omnibus-software (4.0.0) chef-sugar (>= 3.4.0) @@ -37,13 +37,13 @@ GEM public_suffix (~> 2.0, >= 2.0.2) artifactory (2.7.0) awesome_print (1.7.0) - aws-sdk (2.8.5) - aws-sdk-resources (= 2.8.5) - aws-sdk-core (2.8.5) + aws-sdk (2.8.2) + aws-sdk-resources (= 2.8.2) + aws-sdk-core (2.8.2) aws-sigv4 (~> 1.0) jmespath (~> 1.0) - aws-sdk-resources (2.8.5) - aws-sdk-core (= 2.8.5) + aws-sdk-resources (2.8.2) + aws-sdk-core (= 2.8.2) aws-sigv4 (1.0.0) berkshelf (4.3.5) addressable (~> 2.3, >= 2.3.4) @@ -117,7 +117,7 @@ GEM test-kitchen (~> 1.4) libyajl2 (1.2.0) little-plugger (1.1.4) - logging (2.2.0) + logging (2.1.0) little-plugger (~> 1.1) multi_json (~> 1.10) method_source (0.8.2) @@ -265,4 +265,4 @@ DEPENDENCIES winrm-fs (~> 1.0) BUNDLED WITH - 1.14.6 + 1.12.5 diff --git a/tasks/dependencies.rb b/tasks/dependencies.rb index 6b836b747e..b37c351d12 100644 --- a/tasks/dependencies.rb +++ b/tasks/dependencies.rb @@ -1,5 +1,5 @@ # -# Copyright:: Copyright (c) 2016-2017, Chef Software Inc. +# Copyright:: Copyright (c) 2016 Chef Software Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -44,53 +44,66 @@ namespace :dependencies do dependencies:update_acceptance_gemfile_lock dependencies:update_kitchen_tests_gemfile_lock dependencies:update_kitchen_tests_berksfile_lock - dependencies:update_audit_tests_berksfile_lock } - def bundle_update_locked_multiplatform_task(task_name, dir) - desc "Update #{dir}/Gemfile.lock." - task task_name do - Dir.chdir(dir) do - Bundler.with_clean_env do - sh "bundle config --local frozen '0'" - sh "bundle lock --update --add-platform ruby" - sh "bundle lock --update --add-platform x86-mingw32" - sh "bundle config --local frozen '1'" - end - end - 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 bundle_update_task(task_name, dir) - desc "Update #{dir}/Gemfile.lock." - task task_name do - Dir.chdir(dir) do - Bundler.with_clean_env do - sh "bundle update" + def gemfile_lock_task(task_name, dirs: [], other_platforms: true, leave_frozen: true) + dirs.each do |dir| + desc "Update #{dir}/Gemfile.lock." + task task_name do |t, rake_args| + extend BundleUtil + puts "" + puts "-------------------------------------------------------------------" + puts "Updating #{dir}/Gemfile.lock ..." + puts "-------------------------------------------------------------------" + with_bundle_unfrozen(cwd: dir, leave_frozen: leave_frozen) do + 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| + bundle "lock", cwd: dir, platform: platform + end + end end end end end - def berks_update_task(task_name, dir) - desc "Update #{dir}/Berksfile.lock." - task task_name do - FileUtils.rm_f("#{dir}/Berksfile.lock") - Dir.chdir(dir) do - Bundler.with_clean_env do - sh "bundle exec berks install" + def berksfile_lock_task(task_name, dirs: []) + dirs.each do |dir| + desc "Update #{dir}/Berksfile.lock." + task task_name do |t, rake_args| + extend BundleUtil + puts "" + puts "-------------------------------------------------------------------" + puts "Updating #{dir}/Berksfile.lock ..." + puts "-------------------------------------------------------------------" + if File.exist?("#{project_root}/#{dir}/Berksfile.lock") + File.delete("#{project_root}/#{dir}/Berksfile.lock") + end + Dir.chdir("#{project_root}/#{dir}") do + Bundler.with_clean_env do + sh "bundle exec berks install" + end end end end end - bundle_update_locked_multiplatform_task :update_gemfile_lock, "." - bundle_update_locked_multiplatform_task :update_omnibus_gemfile_lock, "omnibus" - bundle_update_task :update_acceptance_gemfile_lock, "acceptance" - bundle_update_locked_multiplatform_task :update_kitchen_tests_gemfile_lock, "kitchen-tests" - - berks_update_task :update_kitchen_tests_berksfile_lock, "kitchen-tests" - berks_update_task :update_audit_tests_berksfile_lock, "kitchen-tests/cookbooks/audit_test" + gemfile_lock_task :update_omnibus_gemfile_lock, dirs: %w{omnibus} + gemfile_lock_task :update_acceptance_gemfile_lock, dirs: %w{acceptance}, + other_platforms: false, leave_frozen: false + gemfile_lock_task :update_kitchen_tests_gemfile_lock, dirs: %w{ + kitchen-tests + } + berksfile_lock_task :update_kitchen_tests_berksfile_lock, dirs: %w{ + kitchen-tests + kitchen-tests/cookbooks/audit_test + } 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| |