summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Smith <tsmith@chef.io>2018-03-02 09:35:39 -0800
committerTim Smith <tsmith@chef.io>2018-03-02 09:35:39 -0800
commit6d94a0d2099db49f9b6aad53bd2008ad2970366b (patch)
tree0614e0a81001879cb5992fae0ff33626557aa76d
parentbe86290b4812ce584f928b8f3a6575a59eca9d17 (diff)
downloadchef-6d94a0d2099db49f9b6aad53bd2008ad2970366b.tar.gz
Pin InSpec to 1.X and Chefstyle to 0.6.0
InSpec 2.0 brings in a huge number of deps that are conflicting in some cases and we're not going to bring 2.0 into our stable branch. Chefstyle 0.7 requires a bunch of fixes that we've done on master, but aren't going to backport to our stable branch. Signed-off-by: Tim Smith <tsmith@chef.io>
-rw-r--r--Gemfile7
1 files changed, 2 insertions, 5 deletions
diff --git a/Gemfile b/Gemfile
index 14b67daf94..5a6204b414 100644
--- a/Gemfile
+++ b/Gemfile
@@ -15,7 +15,7 @@ gem "cheffish", "~> 13" # required for rspec tests
group(:omnibus_package) do
gem "appbundler"
gem "rb-readline"
- gem "inspec"
+ gem "inspec", "~> 1"
gem "chef-vault"
end
@@ -52,10 +52,7 @@ group(:development, :test) do
gem "rake"
gem "simplecov"
gem "webmock"
-
- # for testing new chefstyle rules
- # gem 'chefstyle', github: 'chef/chefstyle'
- gem "chefstyle", git: "https://github.com/chef/chefstyle.git", branch: "master"
+ gem "chefstyle", "0.6.0"
end
group(:travis) do