summaryrefslogtreecommitdiff
path: root/Gemfile
diff options
context:
space:
mode:
authorJohn Keiser <john@johnkeiser.com>2016-04-15 12:10:40 -0700
committerJohn Keiser <john@johnkeiser.com>2016-04-18 14:21:02 -0700
commitea2593fe58037739c5c2ada517e3d988dec290ff (patch)
tree55142ceaef43080201a8d9e54f79868368241f60 /Gemfile
parentbbc1d6ebccbd7f22fea72a9c2b76ef19f3b5beb3 (diff)
downloadchef-ea2593fe58037739c5c2ada517e3d988dec290ff.tar.gz
Make gemfile_util capable of copying groups over
Diffstat (limited to 'Gemfile')
-rw-r--r--Gemfile12
1 files changed, 7 insertions, 5 deletions
diff --git a/Gemfile b/Gemfile
index ca6354d107..9099f6c4cb 100644
--- a/Gemfile
+++ b/Gemfile
@@ -3,7 +3,7 @@ require_relative "tasks/gemfile_util"
extend GemfileUtil
source "https://rubygems.org"
-gemspec name: "chef"
+gemspec name: ($chef_platform ? "chef-#{$chef_platform}" : "chef")
gem "activesupport", "< 4.0.0", group: :compat_testing, platform: "ruby"
gem "chef-config", path: File.expand_path("../chef-config", __FILE__) if File.exist?(File.expand_path("../chef-config", __FILE__))
@@ -31,7 +31,7 @@ group(:integration) do
gem "chef-sugar"
gem "chefspec"
gem "halite"
- gem "poise", git: "https://github.com/poise/poise" # until released poise's tests succeed against chef master
+ gem "poise"
gem "knife-windows"
gem "foodcritic"
end
@@ -53,9 +53,11 @@ 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"
+unless $chef_platform == "windows"
+ # Everything except AIX and Windows
+ group(:linux, :bsd, :mac_os_x, :solaris) do
+ gem "ruby-shadow"
+ end
end
group(:development, :test) do