summaryrefslogtreecommitdiff
path: root/Gemfile
diff options
context:
space:
mode:
authorLamont Granquist <lamont@scriptkiddie.org>2017-02-24 14:25:24 -0800
committerLamont Granquist <lamont@scriptkiddie.org>2017-02-28 11:19:48 -0800
commit5db6276728e2d912650bfcc57643652db4dc2738 (patch)
treeeb92cf269b2eea8da00679097b3c9cbc1e412645 /Gemfile
parentef11843d6ce1f1553ec4b76deab6faad05cc08ff (diff)
downloadchef-5db6276728e2d912650bfcc57643652db4dc2738.tar.gz
Bump chef version to 13.0.0
This requires pulling in master of several gems, bumps all the other gems, plus pulls in new kitchen-appbundle-updater which supports pulling master of ohai. Note that kitchen-windows is disabled because it turns out it was broken and red on 12.19 all along. Signed-off-by: Lamont Granquist <lamont@scriptkiddie.org>
Diffstat (limited to 'Gemfile')
-rw-r--r--Gemfile9
1 files changed, 6 insertions, 3 deletions
diff --git a/Gemfile b/Gemfile
index b3fa6b01a3..092fe8c018 100644
--- a/Gemfile
+++ b/Gemfile
@@ -11,6 +11,9 @@ source "https://rubygems.org"
# of bundler versions prior to 1.12.0 (https://github.com/bundler/bundler/commit/193a14fe5e0d56294c7b370a0e59f93b2c216eed)
gem "chef", path: "."
+# tracking master of ohai for chef-13.0 development, this should be able to be deleted after release
+gem "ohai", git: "https://github.com/chef/ohai.git"
+
gem "chef-config", path: File.expand_path("../chef-config", __FILE__) if File.exist?(File.expand_path("../chef-config", __FILE__))
gem "rake"
gem "bundler"
@@ -34,9 +37,9 @@ group(:integration) do
gem "chef-provisioning"
gem "chef-sugar"
gem "chefspec"
- gem "halite"
- gem "poise"
- gem "poise-boiler"
+ 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"