Cleanup Gemfiles, Berksfiles, and update Gemfile groups

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

1 files changed, 3 insertions, 2 deletions

diff --git a/Gemfile b/Gemfile
index 5e8bc0d4ea..455d546248 100644
--- a/Gemfile
+++ b/Gemfile
@@ -13,9 +13,8 @@ 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", group: [ :default, :omnibus_package, :development ]
+gem "rake"
 gem "bundler"
-gem "cheffish"
 
 group(:omnibus_package) do
   gem "appbundler"
@@ -29,6 +28,7 @@ group(:omnibus_package, :pry) do
   gem "pry-remote"
   gem "pry-stack_explorer"
 end
+
 # These are used for external tests
 group(:integration) do
   gem "chef-provisioning"
@@ -63,6 +63,7 @@ group(:linux, :bsd, :mac_os_x, :solaris, :windows) do
   # may need to disable this in insolation on fussy builds like AIX, RHEL4, etc
   gem "ruby-prof"
 end
+
 # Everything except AIX and Windows
 group(:linux, :bsd, :mac_os_x, :solaris) do
   gem "ruby-shadow", platforms: :ruby