summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLamont Granquist <lamont@scriptkiddie.org>2019-01-15 15:40:15 -0800
committerLamont Granquist <lamont@scriptkiddie.org>2019-01-15 15:40:15 -0800
commit7400ace1926d3700ea12287b74723a7934c196a2 (patch)
treefe6ae0d8804dfcbc7d6167433ce5e5e717173d40
parent990974ca5cd44df0c77bb6a12fc57a3c32b92e23 (diff)
downloadchef-7400ace1926d3700ea12287b74723a7934c196a2.tar.gz
pull new chefstyle into the bundle
Signed-off-by: Lamont Granquist <lamont@scriptkiddie.org>
-rw-r--r--Gemfile.lock18
1 files changed, 10 insertions, 8 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index e86b99f511..0ac372b149 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,10 +1,10 @@
GIT
remote: https://github.com/chef/chefstyle.git
- revision: 5190569ae0901e1139f296a92cb448a60d98da56
+ revision: 97710fcf8164ce11c64bf0d524e75eadca8c0c75
branch: master
specs:
- chefstyle (0.11.1)
- rubocop (= 0.55.0)
+ chefstyle (0.12.0)
+ rubocop (= 0.62.0)
GIT
remote: https://github.com/chef/ohai.git
@@ -142,7 +142,7 @@ GEM
docile (1.3.1)
equatable (0.5.0)
erubis (2.7.0)
- ethon (0.11.0)
+ ethon (0.12.0)
ffi (>= 1.3.0)
faraday (0.15.4)
multipart-post (>= 1.2, < 3)
@@ -192,6 +192,7 @@ GEM
tty-table (~> 0.10)
ipaddress (0.8.3)
iso8601 (0.12.1)
+ jaro_winkler (1.5.2)
json (2.1.0)
launchy (2.4.3)
addressable (~> 2.3)
@@ -277,13 +278,14 @@ GEM
rspec_junit_formatter (0.2.3)
builder (< 4)
rspec-core (>= 2, < 4, != 2.12.0)
- rubocop (0.55.0)
+ rubocop (0.62.0)
+ jaro_winkler (~> 1.5.1)
parallel (~> 1.10)
- parser (>= 2.5)
+ parser (>= 2.5, != 2.5.1.1)
powerpack (~> 0.1)
rainbow (>= 2.2.2, < 4.0)
ruby-progressbar (~> 1.7)
- unicode-display_width (~> 1.0, >= 1.0.1)
+ unicode-display_width (~> 1.4.0)
ruby-prof (0.17.0)
ruby-progressbar (1.10.0)
ruby-shadow (2.5.0)
@@ -424,4 +426,4 @@ DEPENDENCIES
yard
BUNDLED WITH
- 1.17.2
+ 1.17.3