summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Gemfile.lock10
-rw-r--r--tasks/dependencies.rb24
-rw-r--r--version_policy.rb4
3 files changed, 22 insertions, 16 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 3d32f3133d..1256976775 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -18,9 +18,9 @@ GIT
PATH
remote: .
specs:
- chef (12.10.5)
+ chef (12.10.6)
bundler (>= 1.10)
- chef-config (= 12.10.5)
+ chef-config (= 12.10.6)
chef-zero (~> 4.5)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -44,9 +44,9 @@ PATH
specinfra (~> 2.10)
syslog-logger (~> 1.6)
uuidtools (~> 2.1.5)
- chef (12.10.5-universal-mingw32)
+ chef (12.10.6-universal-mingw32)
bundler (>= 1.10)
- chef-config (= 12.10.5)
+ chef-config (= 12.10.6)
chef-zero (~> 4.5)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -85,7 +85,7 @@ PATH
PATH
remote: chef-config
specs:
- chef-config (12.10.5)
+ chef-config (12.10.6)
fuzzyurl (~> 0.8.0)
mixlib-config (~> 2.0)
mixlib-shellout (~> 2.0)
diff --git a/tasks/dependencies.rb b/tasks/dependencies.rb
index e353dbae87..eb5b20d1bb 100644
--- a/tasks/dependencies.rb
+++ b/tasks/dependencies.rb
@@ -89,7 +89,7 @@ namespace :dependencies do
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
+ other_platforms: false, leave_frozen: false
gemfile_lock_task :update_kitchen_tests_gemfile_lock, dirs: %w{
kitchen-tests
kitchen-tests/test/integration/webapp/serverspec
@@ -151,16 +151,18 @@ namespace :dependencies do
puts "Checking for outdated gems ..."
puts "-------------------------------------------------------------------"
# TODO check for outdated windows gems too
- bundle_outdated = bundle("outdated", extract_output: true)
- 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__}."
+ with_bundle_unfrozen do
+ bundle_outdated = bundle("outdated", extract_output: true)
+ 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
end
end
end
diff --git a/version_policy.rb b/version_policy.rb
index 94b8371f43..44b4af592e 100644
--- a/version_policy.rb
+++ b/version_policy.rb
@@ -71,7 +71,11 @@ OMNIBUS_RUBYGEMS_AT_LATEST_VERSION = {
#
ACCEPTABLE_OUTDATED_GEMS = %w{
activesupport
+ gherkin
github_changelog_generator
+ jwt
+ mini_portile2
+ slop
}
#