1 files changed, 26 insertions, 12 deletions
diff --git a/Gemfile b/Gemfile
index e39a50a586..cfa05118d1 100644
--- a/Gemfile
+++ b/Gemfile
@@ -2,12 +2,25 @@ source "https://rubygems.org"
 gemspec name: "chef"
 
 gem "activesupport", "< 4.0.0", group: :compat_testing, platform: "ruby"
-
-gem "chef-config", path: "chef-config" if File.exist?(File.expand_path("../chef-config", __FILE__))
-
+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(:omnibus_package) do
+  gem "appbundler"
+  gem "rb-readline"
+  gem "nokogiri"
+end
+group(:omnibus_package, :development) do
+  gem "cheffish"
+end
+group(:omnibus_package, :pry) do
+  gem "pry"
+  gem "pry-byebug"
+  gem "pry-remote"
+  gem "pry-stack_explorer"
+end
+
 group(:docgen) do
   gem "yard"
 end
@@ -20,26 +33,27 @@ group(:maintenance) do
   gem "netrc"
 end
 
-group(:pry) do
-  gem "pry"
-  gem "pry-byebug"
-  gem "pry-stack_explorer"
-end
-
-group(:ruby_prof) do
+# Everything except AIX
+group(:linux, :bsd, :mac_os_x, :solaris, :windows, :ruby_prof) 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"
+end
 
 group(:development, :test) do
   gem "simplecov"
-  gem "rack", "~> 1.5.1"
+  gem "rack"
 
   # for testing new chefstyle rules
   # gem 'chefstyle', github: 'chef/chefstyle'
   gem "chefstyle", git: "https://github.com/chef/chefstyle.git", branch: "master"
+end
 
-  gem "ruby-shadow", platforms: :ruby unless RUBY_PLATFORM.downcase =~ /(aix|cygwin)/
+group(:changelog) do
+  gem "github_changelog_generator", "1.11.3"
 end
 
 group(:travis) do