1 files changed, 23 insertions, 44 deletions

diff --git a/Gemfile b/Gemfile
index 803e1115d5..527199f80f 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,50 +1,33 @@
-# This buys us the ability to be included in other Gemfiles
-require_relative "tasks/gemfile_util"
-extend GemfileUtil
-
 source "https://rubygems.org"
 
-# Pick the gemspec for our platform
-gemspec_name = "chef"
-Dir.glob("chef-*.gemspec").each do |gemspec_filename|
-  gemspec_filename =~ /^chef-(.+).gemspec/
-  gemspec_platform = $1
-  if Gem::Platform.match(Gem::Platform.new(gemspec_platform))
-    Bundler.ui.info "Using gemspec #{gemspec_filename} for current platform."
-    gemspec_name = "chef-#{gemspec_platform}"
-  end
-end
-gemspec name: gemspec_name
+# Note we do not use the gemspec DSL which restricts to the
+# gemspec for the current platform and filters out other platforms
+# during a bundle lock operation. We actually want dependencies from
+# both of our gemspecs. Also note this this mimics gemspec behavior
+# of bundler versions prior to 1.12.0 (https://github.com/bundler/bundler/commit/193a14fe5e0d56294c7b370a0e59f93b2c216eed)
+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"
+gem "cheffish", "~> 14"
 
 group(:omnibus_package) do
+  # override for unf_ext for inspec 2 until
+  # https://github.com/knu/ruby-unf_ext/pull/39
+  # is merged and released
+  gem "unf_ext", "=0.0.7.6", :git => "https://github.com/jquick/ruby-unf_ext.git"
+
   gem "appbundler"
   gem "rb-readline"
-  gem "nokogiri"
+  gem "inspec", "~> 2"
+  gem "chef-vault"
 end
+
 group(:omnibus_package, :pry) do
   gem "pry"
   gem "pry-byebug"
   gem "pry-remote"
   gem "pry-stack_explorer"
 end
-# These are used for external tests
-group(:integration) do
-  gem "chef-provisioning"
-  gem "chef-provisioning-aws"
-  gem "chef-rewind"
-  gem "chef-sugar"
-  gem "chefspec"
-  gem "halite"
-  gem "poise"
-  gem "knife-windows"
-  gem "foodcritic"
-end
 
 group(:docgen) do
   gem "yard"
@@ -59,35 +42,31 @@ group(:maintenance) do
 end
 
 # Everything except AIX
-group(:linux, :bsd, :mac_os_x, :solaris, :windows) do
-  # may need to disable this in insolation on fussy builds like AIX, RHEL4, etc
+group(:ruby_prof) do
   gem "ruby-prof"
 end
+
 # Everything except AIX and Windows
-group(:linux, :bsd, :mac_os_x, :solaris) do
+group(:ruby_shadow) do
   gem "ruby-shadow", platforms: :ruby
 end
 
 group(:development, :test) do
+  gem "rake"
   gem "simplecov"
-  gem "rack"
+  gem "webmock"
 
   # for testing new chefstyle rules
   # gem 'chefstyle', github: 'chef/chefstyle'
   gem "chefstyle", git: "https://github.com/chef/chefstyle.git", branch: "master"
 end
 
-group(:changelog) do
-  gem "github_changelog_generator"
-end
-
 group(:travis) do
-  # See `bundler-audit` in .travis.yml
-  gem "bundler-audit", git: "https://github.com/rubysec/bundler-audit.git", ref: "4e32fca"
+  gem "travis"
 end
 
 instance_eval(ENV["GEMFILE_MOD"]) if ENV["GEMFILE_MOD"]
 
 # If you want to load debugging tools into the bundle exec sandbox,
-# add these additional dependencies into chef/Gemfile.local
-eval(IO.read(__FILE__ + ".local"), binding) if File.exist?(__FILE__ + ".local")
+# add these additional dependencies into Gemfile.local
+eval_gemfile(__FILE__ + ".local") if File.exist?(__FILE__ + ".local")