diff options
author | Tim Smith <tsmith@chef.io> | 2018-10-24 10:20:38 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-10-24 10:20:38 -0700 |
commit | 35bc0957fe7181b8513d3a608d54bcd6110eccfc (patch) | |
tree | debcbbdd824a0c9478189b27a11679abe3d7428c | |
parent | 15f41cc22e6d911fb4ae2e6e696b5e6d412b649c (diff) | |
parent | 7f811f4ec1fa058690626e73f92fd32c6786d134 (diff) | |
download | chef-35bc0957fe7181b8513d3a608d54bcd6110eccfc.tar.gz |
Merge pull request #7770 from chef/chefstyle_gem
Use the Chefstyle gem instead of a git checkout
-rw-r--r-- | Gemfile | 3 | ||||
-rw-r--r-- | Gemfile.lock | 12 | ||||
-rw-r--r-- | omnibus/Gemfile.lock | 8 |
3 files changed, 8 insertions, 15 deletions
@@ -52,8 +52,7 @@ group(:development, :test) do 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" end group(:travis) do diff --git a/Gemfile.lock b/Gemfile.lock index 6b37613b81..291c4f5151 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,11 +1,3 @@ -GIT - remote: https://github.com/chef/chefstyle.git - revision: 4a885da4a201b55f2a5568bc0ea054860ccbf3c3 - branch: master - specs: - chefstyle (0.10.0) - rubocop (= 0.55.0) - PATH remote: . specs: @@ -116,6 +108,8 @@ GEM cheffish (14.0.1) chef-zero (~> 14.0) net-ssh + chefstyle (0.11.0) + rubocop (= 0.55.0) coderay (1.1.2) crack (0.4.3) safe_yaml (~> 1.0.0) @@ -361,7 +355,7 @@ DEPENDENCIES chef-config! chef-vault cheffish (~> 14) - chefstyle! + chefstyle inspec-core (~> 2) netrc octokit diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock index 706554ebd8..c812ec5944 100644 --- a/omnibus/Gemfile.lock +++ b/omnibus/Gemfile.lock @@ -33,15 +33,15 @@ GEM awesome_print (1.8.0) aws-eventstream (1.0.1) aws-partitions (1.106.0) - aws-sdk-core (3.33.0) + aws-sdk-core (3.34.0) aws-eventstream (~> 1.0) aws-partitions (~> 1.0) aws-sigv4 (~> 1.0) jmespath (~> 1.0) - aws-sdk-kms (1.9.0) + aws-sdk-kms (1.10.0) aws-sdk-core (~> 3, >= 3.26.0) aws-sigv4 (~> 1.0) - aws-sdk-s3 (1.21.0) + aws-sdk-s3 (1.22.0) aws-sdk-core (~> 3, >= 3.26.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.0) @@ -178,7 +178,7 @@ GEM ipaddress (0.8.3) iso8601 (0.11.0) jmespath (1.4.0) - kitchen-vagrant (1.3.4) + kitchen-vagrant (1.3.5) test-kitchen (~> 1.4) libyajl2 (1.2.0) license_scout (1.0.16) |