major testing overhaullcg/simplify-external-tests

See the PR comments for more philosophical background.

This simplifies the external tests.  The major feature here is that
halite, poise, chefspec, etc are removed from the Gemfile.lock and
the transitive Gemfile splicing is gone from the external tests.

We're back to simply tracking master on external projects and bundle
installing without locks and going red if the break.  Those external
projects should all similarly track master of chef/chef to reduce
the possibility that they break us here.

This also bumps bundler to 1.14.x and unblocks us there.

It continues to simplify our use of bundler to be more mainstream and
less impenetrable.

There was some crazy shit that I found where I had to remove env vars
like BUNDLE_ENABLE_TRAMPOLINE and the BUNDLE_IGNORE_CONFIG and
BUNDLE_FROZEN env vars in appveyor along with the .bundle/config frozen
setting were necessary to unbreak appveyor.  We seem to have gotten
very far afield of standard bundler usage and it was breaking in strange
to debug ways.

Oddly enough this exposed weird errors in the
chef-config/spec/units/fips_spec.rb tests where we need to require the
"win32/registry" file there now even though I can't figure out why that
broke or how it was working previously.

Also, adding x64-mingw32 to x86-mingw32 was necessary to test in
appveyor on 64-bit windows (I tried universal-mingw32 and that failed)
which seems obvious and is another case that I don't understand how it
was working in bundler 1.12.x

Signed-off-by: Lamont Granquist <lamont@scriptkiddie.org>

1 files changed, 4 insertions, 22 deletions

diff --git a/Gemfile b/Gemfile
index c18357639b..1097635fd6 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,7 +1,3 @@
-# This buys us the ability to be included in other Gemfiles
-require_relative "tasks/gemfile_util"
-extend GemfileUtil
-
 source "https://rubygems.org"
 
 # Note we do not use the gemspec DSL which restricts to the
@@ -14,8 +10,6 @@ gem "chef", path: "."
 gem "ohai", "~> 13"
 
 gem "chef-config", path: File.expand_path("../chef-config", __FILE__) if File.exist?(File.expand_path("../chef-config", __FILE__))
-gem "rake"
-gem "bundler"
 gem "cheffish", "~> 13" # required for rspec tests
 
 group(:omnibus_package) do
@@ -33,22 +27,6 @@ group(:omnibus_package, :pry) do
   gem "pry-stack_explorer"
 end
 
-# These are used for external tests
-group(:integration) do
-  gem "chef-sugar"
-  gem "chefspec"
-  gem "halite", git: "https://github.com/poise/halite.git"
-  gem "poise", git: "https://github.com/poise/poise.git"
-  gem "poise-boiler", git: "https://github.com/poise/poise-boiler.git"
-  gem "knife-windows"
-  gem "foodcritic"
-
-  # We pin this so nobody brings in a cucumber-core incompatible with cucumber latest
-  gem "cucumber", ">= 2.4.0"
-  # We pin oc-chef-pedant to prevent it from updating out of lockstep with chef-zero
-  gem "oc-chef-pedant", git: "https://github.com/chef/chef-server"
-end
-
 group(:docgen) do
   gem "yard"
 end
@@ -72,7 +50,11 @@ group(:linux, :bsd, :mac_os_x, :solaris) do
   gem "ruby-shadow", platforms: :ruby
 end
 
+# appveyor seems to need this here?
+gem "bundler"
+
 group(:development, :test) do
+  gem "rake"
   gem "simplecov"
 
   # for testing new chefstyle rules