chefstyle/omnibus-software/omnibus back to master

Signed-off-by: Lamont Granquist <lamont@scriptkiddie.org>

4 files changed, 24 insertions, 19 deletions

diff --git a/Gemfile b/Gemfile
index 993e1736cc..ceea7fe9c3 100644
--- a/Gemfile
+++ b/Gemfile
@@ -56,7 +56,7 @@ group(:development, :test) do
 
   # for testing new chefstyle rules
   # gem 'chefstyle', github: 'chef/chefstyle'
-  gem "chefstyle"
+  gem "chefstyle", git: "https://github.com/chef/chefstyle.git", branch: "master"
 end
 
 group(:travis) do
diff --git a/Gemfile.lock b/Gemfile.lock
index b5d9bdb79d..2fc85e5a52 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,9 +1,17 @@
 GIT
+  remote: https://github.com/chef/chefstyle.git
+  revision: 6177d8b414add867bc89c8bab374f2e39cc717fe
+  branch: master
+  specs:
+    chefstyle (0.7.0)
+      rubocop (= 0.52.1)
+
+GIT
   remote: https://github.com/chef/ohai.git
-  revision: 8f699a2404e135165a93f8bc171ea74c51fe9524
+  revision: 8cdfbfe462ef0850333095f31a6ef1a23dda6b73
   branch: master
   specs:
-    ohai (14.0.17)
+    ohai (14.0.18)
       chef-config (>= 12.8, < 15)
       ffi (~> 1.9)
       ffi-yajl (~> 2.2)
@@ -132,8 +140,6 @@ GEM
     cheffish (13.1.0)
       chef-zero (~> 13.0)
       net-ssh
-    chefstyle (0.6.0)
-      rubocop (= 0.49.1)
     coderay (1.1.2)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
@@ -258,8 +264,7 @@ GEM
       json
       websocket (~> 1.0)
     rack (2.0.4)
-    rainbow (2.2.2)
-      rake
+    rainbow (3.0.0)
     rake (12.3.0)
     rb-readline (0.5.5)
     rspec (3.7.0)
@@ -281,11 +286,11 @@ GEM
     rspec_junit_formatter (0.2.3)
       builder (< 4)
       rspec-core (>= 2, < 4, != 2.12.0)
-    rubocop (0.49.1)
+    rubocop (0.52.1)
       parallel (~> 1.10)
-      parser (>= 2.3.3.1, < 3.0)
+      parser (>= 2.4.0.2, < 3.0)
       powerpack (~> 0.1)
-      rainbow (>= 1.99.1, < 3.0)
+      rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (~> 1.0, >= 1.0.1)
     ruby-prof (0.17.0)
@@ -395,7 +400,7 @@ DEPENDENCIES
   chef-config!
   chef-vault
   cheffish (~> 13)
-  chefstyle
+  chefstyle!
   inspec (~> 1)
   netrc
   octokit
diff --git a/omnibus/Gemfile b/omnibus/Gemfile
index 9470a86266..67c6bb4571 100644
--- a/omnibus/Gemfile
+++ b/omnibus/Gemfile
@@ -1,7 +1,7 @@
 source "https://rubygems.org"
 
-gem "omnibus", git: "https://github.com/chef/omnibus", branch: "lcg/improve-appbundling"
-gem "omnibus-software", git: "https://github.com/chef/omnibus-software", branch: "lcg/appbundle-0.11-without"
+gem "omnibus", git: "https://github.com/chef/omnibus", branch: "master"
+gem "omnibus-software", git: "https://github.com/chef/omnibus-software", branch: "master"
 
 gem "pedump"
 
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
index bc5e9cbbbf..8a81e35bb7 100644
--- a/omnibus/Gemfile.lock
+++ b/omnibus/Gemfile.lock
@@ -1,7 +1,7 @@
 GIT
   remote: https://github.com/chef/omnibus
-  revision: bc76c699bc8b85959bb546933efa6b5cf0ff1823
-  branch: lcg/improve-appbundling
+  revision: 9a3a97bb0c6b437524fdea15b4cd15a65ff6ac29
+  branch: master
   specs:
     omnibus (5.6.10)
       aws-sdk (~> 2)
@@ -18,8 +18,8 @@ GIT
 
 GIT
   remote: https://github.com/chef/omnibus-software
-  revision: 3f6f9836cb041ad6187b7b52a25cf759fc830bc6
-  branch: lcg/appbundle-0.11-without
+  revision: f0c34cd3a21c4da6207721914213ac775b44570f
+  branch: master
   specs:
     omnibus-software (4.0.0)
       chef-sugar (>= 3.4.0)
@@ -150,8 +150,8 @@ GEM
     nori (2.6.0)
     octokit (4.8.0)
       sawyer (~> 0.8.0, >= 0.5.3)
-    ohai (13.7.1)
-      chef-config (>= 12.5.0.alpha.1, < 14)
+    ohai (14.0.0)
+      chef-config (>= 12.5.0.alpha.1, < 15)
       ffi (~> 1.9)
       ffi-yajl (~> 2.2)
       ipaddress