Pin our InSpec version and use Chefstyle from rubygems for now

We have an inspec / rubocop conflict that's getting worked out right now, but for now we need to make sure a bundle update doesn't downgrade inspec.

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

3 files changed, 29 insertions, 33 deletions

diff --git a/Gemfile b/Gemfile
index 3801c16ced..0298aab7df 100644
--- a/Gemfile
+++ b/Gemfile
@@ -27,8 +27,8 @@ gem "chef-telemetry", ">=1.0.8" # 1.0.8 removes the http dep
 group(:omnibus_package) do
   gem "appbundler"
   gem "rb-readline"
-  gem "inspec-core", "~> 4.18"
-  gem "inspec-core-bin", "~> 4.18" # need to provide the binaries for inspec
+  gem "inspec-core", "~> 4.23"
+  gem "inspec-core-bin", "~> 4.23" # need to provide the binaries for inspec
   gem "chef-vault"
 end
 
@@ -58,7 +58,9 @@ end
 
 group(:chefstyle) do
   # for testing new chefstyle rules
-  gem "chefstyle", git: "https://github.com/chef/chefstyle.git", branch: "master"
+  # 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"
 end
 
 instance_eval(ENV["GEMFILE_MOD"]) if ENV["GEMFILE_MOD"]
diff --git a/Gemfile.lock b/Gemfile.lock
index 6615488a98..4778ebf058 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,17 +1,9 @@
 GIT
-  remote: https://github.com/chef/chefstyle.git
-  revision: 2176e18262ccdaee221be8323dd2b06e04463d2b
-  branch: master
-  specs:
-    chefstyle (1.5.5)
-      rubocop (= 1.4.2)
-
-GIT
   remote: https://github.com/chef/ohai.git
-  revision: 8d1ae429422439c4123e7973fe087a7d53514f15
+  revision: 876839a6324a635f15db4118366c938bdd3d675b
   branch: master
   specs:
-    ohai (16.7.37)
+    ohai (16.8.0)
       chef-config (>= 12.8, < 17)
       chef-utils (>= 16.0, < 17)
       ffi (~> 1.9)
@@ -164,6 +156,8 @@ 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)
@@ -176,7 +170,7 @@ GEM
     erubis (2.7.0)
     faraday (1.0.1)
       multipart-post (>= 1.2, < 3)
-    fauxhai-ng (8.5.0)
+    fauxhai-ng (8.6.0)
       net-ssh
     ffi (1.13.1)
     ffi (1.13.1-x64-mingw32)
@@ -311,7 +305,7 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
     rspec-support (3.10.0)
-    rubocop (1.4.2)
+    rubocop (1.3.1)
       parallel (~> 1.10)
       parser (>= 2.7.1.5)
       rainbow (>= 2.2.2, < 4.0)
@@ -320,7 +314,7 @@ GEM
       rubocop-ast (>= 1.1.1)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 2.0)
-    rubocop-ast (1.2.0)
+    rubocop-ast (1.3.0)
       parser (>= 2.7.1.5)
     ruby-prof (1.2.0)
     ruby-progressbar (1.10.1)
@@ -432,10 +426,10 @@ DEPENDENCIES
   chef-utils!
   chef-vault
   cheffish (>= 14)
-  chefstyle!
+  chefstyle (= 1.5.2)
   fauxhai-ng
-  inspec-core (~> 4.18)
-  inspec-core-bin (~> 4.18)
+  inspec-core (~> 4.23)
+  inspec-core-bin (~> 4.23)
   ohai!
   pry
   pry-byebug
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
index a0ea86313d..82adf554b5 100644
--- a/omnibus/Gemfile.lock
+++ b/omnibus/Gemfile.lock
@@ -18,7 +18,7 @@ GIT
 
 GIT
   remote: https://github.com/chef/omnibus-software
-  revision: dada23e7f4237e9353aff0362f2dde964ee5abe0
+  revision: 01f76620796c00bea448f0355bb177647b3a64a2
   branch: master
   specs:
     omnibus-software (4.0.0)
@@ -32,7 +32,7 @@ GEM
     artifactory (3.0.15)
     awesome_print (1.8.0)
     aws-eventstream (1.1.0)
-    aws-partitions (1.399.0)
+    aws-partitions (1.401.0)
     aws-sdk-core (3.109.3)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.239.0)
@@ -41,7 +41,7 @@ GEM
     aws-sdk-kms (1.39.0)
       aws-sdk-core (~> 3, >= 3.109.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.85.0)
+    aws-sdk-s3 (1.86.0)
       aws-sdk-core (~> 3, >= 3.109.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.1)
@@ -64,12 +64,12 @@ GEM
       solve (~> 4.0)
       thor (>= 0.20)
     builder (3.2.4)
-    chef (16.6.14)
+    chef (16.7.61)
       addressable
       bcrypt_pbkdf (= 1.1.0.rc1)
       bundler (>= 1.10)
-      chef-config (= 16.6.14)
-      chef-utils (= 16.6.14)
+      chef-config (= 16.7.61)
+      chef-utils (= 16.7.61)
       chef-vault
       chef-zero (>= 14.0.11)
       diff-lcs (>= 1.2.4, < 1.4.0)
@@ -100,12 +100,12 @@ GEM
       tty-screen (~> 0.6)
       tty-table (~> 0.11)
       uuidtools (~> 2.1.5)
-    chef (16.6.14-universal-mingw32)
+    chef (16.7.61-universal-mingw32)
       addressable
       bcrypt_pbkdf (= 1.1.0.rc1)
       bundler (>= 1.10)
-      chef-config (= 16.6.14)
-      chef-utils (= 16.6.14)
+      chef-config (= 16.7.61)
+      chef-utils (= 16.7.61)
       chef-vault
       chef-zero (>= 14.0.11)
       diff-lcs (>= 1.2.4, < 1.4.0)
@@ -143,19 +143,19 @@ GEM
       win32-eventlog (= 0.6.3)
       win32-mmap (~> 0.4.1)
       win32-mutex (~> 0.4.2)
-      win32-process (~> 0.8.2)
+      win32-process (~> 0.9)
       win32-service (>= 2.1.5, < 3.0)
       win32-taskscheduler (~> 2.0)
       wmi-lite (~> 1.0)
     chef-cleanroom (1.0.2)
-    chef-config (16.6.14)
+    chef-config (16.7.61)
       addressable
-      chef-utils (= 16.6.14)
+      chef-utils (= 16.7.61)
       fuzzyurl
       mixlib-config (>= 2.2.12, < 4.0)
       mixlib-shellout (>= 2.0, < 4.0)
       tomlrb (~> 1.2)
-    chef-utils (16.6.14)
+    chef-utils (16.7.61)
     chef-vault (4.1.0)
     chef-zero (15.0.3)
       ffi-yajl (~> 2.2)
@@ -359,7 +359,7 @@ GEM
       ffi
     win32-mutex (0.4.3)
       win32-ipc (>= 0.6.0)
-    win32-process (0.8.3)
+    win32-process (0.9.0)
       ffi (>= 1.0.0)
     win32-service (2.2.0)
       ffi