Switch back to chefstyle from github

The issue that requires pinning has been resolved

Signed-off-by: Tim Smith <tsmith@chef.io>

3 files changed, 19 insertions, 15 deletions

diff --git a/Gemfile b/Gemfile
index f92dc7be14..30d573a2b0 100644
--- a/Gemfile
+++ b/Gemfile
@@ -57,9 +57,7 @@ end
 
 group(:chefstyle) do
   # for testing new chefstyle rules
-  # disabled until we resolve the conflict in regexp_parser deps between rubocop and inspec
-  # gem "chefstyle", git: "https://github.com/chef/chefstyle.git", branch: "master"
-  gem "chefstyle", "= 1.5.2"
+  gem "chefstyle", git: "https://github.com/chef/chefstyle.git", branch: "master"
 end
 
 instance_eval(ENV["GEMFILE_MOD"]) if ENV["GEMFILE_MOD"]
diff --git a/Gemfile.lock b/Gemfile.lock
index c8e7bd2d2a..f93e4a06d6 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,4 +1,12 @@
 GIT
+  remote: https://github.com/chef/chefstyle.git
+  revision: 4beb76511e5e3e414bb88942c75f107eb56a9aa1
+  branch: master
+  specs:
+    chefstyle (1.5.7)
+      rubocop (= 1.5.2)
+
+GIT
   remote: https://github.com/chef/ohai.git
   revision: 876839a6324a635f15db4118366c938bdd3d675b
   branch: master
@@ -158,8 +166,6 @@ GEM
     cheffish (16.0.12)
       chef-zero (>= 14.0)
       net-ssh
-    chefstyle (1.5.2)
-      rubocop (= 1.3.1)
     coderay (1.1.3)
     concurrent-ruby (1.1.7)
     crack (0.4.4)
@@ -188,7 +194,7 @@ GEM
       ffi (>= 1.0.1)
     gyoku (1.3.1)
       builder (>= 2.1.2)
-    hana (1.3.6)
+    hana (1.3.7)
     hashdiff (1.0.1)
     hashie (3.6.0)
     highline (2.0.3)
@@ -307,13 +313,13 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
     rspec-support (3.10.0)
-    rubocop (1.3.1)
+    rubocop (1.5.2)
       parallel (~> 1.10)
       parser (>= 2.7.1.5)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.8)
+      regexp_parser (>= 1.8, < 3.0)
       rexml
-      rubocop-ast (>= 1.1.1)
+      rubocop-ast (>= 1.2.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 2.0)
     rubocop-ast (1.3.0)
@@ -428,7 +434,7 @@ DEPENDENCIES
   chef-utils!
   chef-vault
   cheffish (>= 14)
-  chefstyle (= 1.5.2)
+  chefstyle!
   fauxhai-ng
   inspec-core-bin (~> 4.23)
   ohai!
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
index 82adf554b5..646bdb609d 100644
--- a/omnibus/Gemfile.lock
+++ b/omnibus/Gemfile.lock
@@ -18,7 +18,7 @@ GIT
 
 GIT
   remote: https://github.com/chef/omnibus-software
-  revision: 01f76620796c00bea448f0355bb177647b3a64a2
+  revision: 3f948d5a56ef3a5af1e617af30443fabf63c6f0a
   branch: master
   specs:
     omnibus-software (4.0.0)
@@ -32,8 +32,8 @@ GEM
     artifactory (3.0.15)
     awesome_print (1.8.0)
     aws-eventstream (1.1.0)
-    aws-partitions (1.401.0)
-    aws-sdk-core (3.109.3)
+    aws-partitions (1.402.0)
+    aws-sdk-core (3.110.0)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.239.0)
       aws-sigv4 (~> 1.1)
@@ -204,7 +204,7 @@ GEM
       tomlrb (~> 1.2)
       tty-box (~> 0.6)
       tty-prompt (~> 0.20)
-    license_scout (1.2.3)
+    license_scout (1.2.6)
       ffi-yajl (~> 2.2)
       mixlib-shellout (>= 2.2, < 4.0)
       toml-rb (>= 1, < 3)
@@ -296,7 +296,7 @@ GEM
     strings-ansi (0.2.0)
     structured_warnings (0.4.0)
     syslog-logger (1.6.8)
-    test-kitchen (2.7.2)
+    test-kitchen (2.8.0)
       bcrypt_pbkdf (~> 1.0)
       ed25519 (~> 1.2)
       license-acceptance (>= 1.0.11, < 3.0)