Add back a few gems that are required (and document why)

Signed-off-by: Tom Duffield <tom@chef.io>

5 files changed, 14 insertions, 5 deletions

diff --git a/Gemfile b/Gemfile
index 455d546248..b3fa6b01a3 100644
--- a/Gemfile
+++ b/Gemfile
@@ -12,9 +12,9 @@ source "https://rubygems.org"
 gem "chef", path: "."
 
 gem "chef-config", path: File.expand_path("../chef-config", __FILE__) if File.exist?(File.expand_path("../chef-config", __FILE__))
-# Ensure that we can always install rake, regardless of gem groups
 gem "rake"
 gem "bundler"
+gem "cheffish" # required for rspec tests
 
 group(:omnibus_package) do
   gem "appbundler"
diff --git a/Gemfile.lock b/Gemfile.lock
index 984fdfe388..02819d758b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -561,6 +561,7 @@ DEPENDENCIES
   chef-config!
   chef-provisioning
   chef-sugar
+  cheffish
   chefspec
   chefstyle!
   cucumber (>= 2.4.0)
diff --git a/acceptance/Gemfile b/acceptance/Gemfile
index ba8839d8d3..41a18c9914 100644
--- a/acceptance/Gemfile
+++ b/acceptance/Gemfile
@@ -10,4 +10,7 @@ gem "kitchen-inspec"
 gem "test-kitchen"
 gem "winrm-elevated"
 gem "berkshelf"
-gem "mixlib-install"
+
+# Pin to 1.2.3 because current mixlib-install has a problem where unstable
+# packages are not always immediately available via the omnitruck API.
+gem "mixlib-install", "1.2.3"
diff --git a/acceptance/Gemfile.lock b/acceptance/Gemfile.lock
index 993a45d41b..a56a98b91b 100644
--- a/acceptance/Gemfile.lock
+++ b/acceptance/Gemfile.lock
@@ -119,11 +119,10 @@ GEM
     mixlib-authentication (1.4.1)
       mixlib-log
     mixlib-config (2.2.4)
-    mixlib-install (2.1.12)
+    mixlib-install (1.2.3)
       artifactory
       mixlib-shellout
       mixlib-versioning
-      thor
     mixlib-log (1.7.1)
     mixlib-shellout (2.2.7)
     mixlib-versioning (1.1.0)
@@ -249,7 +248,7 @@ DEPENDENCIES
   kitchen-ec2
   kitchen-inspec
   kitchen-vagrant
-  mixlib-install
+  mixlib-install (= 1.2.3)
   rake
   test-kitchen
   windows_chef_zero
diff --git a/tasks/dependencies.rb b/tasks/dependencies.rb
index 189a147fe1..b37c351d12 100644
--- a/tasks/dependencies.rb
+++ b/tasks/dependencies.rb
@@ -29,6 +29,12 @@ namespace :dependencies do
     system("#{File.join(Dir.pwd, "ci", "dependency_update.sh")}")
   end
 
+  desc "Force update (when adding new gems to Gemfiles)"
+  task :force_update do |t, rake_args|
+    FileUtils.rm_f(File.join(Dir.pwd, ".bundle", "config"))
+    system("#{File.join(Dir.pwd, "ci", "dependency_update.sh")}")
+  end
+
   # Update all dependencies to the latest constraint-matching version
   desc "Update all dependencies. dependencies:update to update as little as possible (CI-only)."
   task :update_ci => %w{