From 17accdcb73bd3eb21207f00bc819c0fd0b6951bc Mon Sep 17 00:00:00 2001
From: Tim Smith <tsmith@chef.io>
Date: Fri, 14 Dec 2018 11:22:26 -0800
Subject: [PATCH] Update cookstyle and update habtitat plan to match omnibus

Cookstyle was failing to appbundler. This should have blown up in the hab package build, but we weren't appbundler it there. This adds the packages we appbundler in the omnibus build to the habitat plan.

Signed-off-by: Tim Smith <tsmith@chef.io>
---
 Gemfile.lock         | 12 ++++++------
 habitat/plan.sh      |  5 +++++
 omnibus/Gemfile.lock |  4 ++--
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 0a42b7070..d4af85ad6 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -30,13 +30,13 @@ GEM
       mixlib-shellout (~> 2.0)
     artifactory (3.0.0)
     ast (2.4.0)
-    aws-sdk (2.11.190)
-      aws-sdk-resources (= 2.11.190)
-    aws-sdk-core (2.11.190)
+    aws-sdk (2.11.191)
+      aws-sdk-resources (= 2.11.191)
+    aws-sdk-core (2.11.191)
       aws-sigv4 (~> 1.0)
       jmespath (~> 1.0)
-    aws-sdk-resources (2.11.190)
-      aws-sdk-core (= 2.11.190)
+    aws-sdk-resources (2.11.191)
+      aws-sdk-core (= 2.11.191)
     aws-sigv4 (1.0.3)
     axiom-types (0.1.1)
       descendants_tracker (~> 0.0.4)
@@ -220,7 +220,7 @@ GEM
     concurrent-ruby (1.1.3)
     cookbook-omnifetch (0.8.0)
       mixlib-archive (~> 0.4)
-    cookstyle (3.0.1)
+    cookstyle (3.0.2)
       rubocop (= 0.55.0)
     cucumber (3.1.2)
       builder (>= 2.1.2)
diff --git a/habitat/plan.sh b/habitat/plan.sh
index 0dbcfc724..41e4fff2d 100644
--- a/habitat/plan.sh
+++ b/habitat/plan.sh
@@ -99,6 +99,10 @@ do_install() {
   bundle exec appbundler $HAB_CACHE_SRC_PATH/$pkg_dirname $pkg_prefix/ruby-bin test-kitchen
   bundle exec appbundler $HAB_CACHE_SRC_PATH/$pkg_dirname $pkg_prefix/ruby-bin berkshelf
   bundle exec appbundler $HAB_CACHE_SRC_PATH/$pkg_dirname $pkg_prefix/ruby-bin inspec
+  bundle exec appbundler $HAB_CACHE_SRC_PATH/$pkg_dirname $pkg_prefix/ruby-bin cookstyle
+  bundle exec appbundler $HAB_CACHE_SRC_PATH/$pkg_dirname $pkg_prefix/ruby-bin chef-apply
+  bundle exec appbundler $HAB_CACHE_SRC_PATH/$pkg_dirname $pkg_prefix/ruby-bin chef-vault
+  bundle exec appbundler $HAB_CACHE_SRC_PATH/$pkg_dirname $pkg_prefix/ruby-bin dco
 
   if [[ `readlink /usr/bin/env` = "$(pkg_path_for coreutils)/bin/env" ]]; then
     build_line "Removing the symlink we created for '/usr/bin/env'"
@@ -119,6 +123,7 @@ do_install() {
   wrap_ruby_bin "foodcritic"
   wrap_ruby_bin "inspec"
   wrap_ruby_bin "chef-resource-inspector"
+  wrap_ruby_bin "dco"
 }
 
 # Stubs
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
index 778694300..d08ef6837 100644
--- a/omnibus/Gemfile.lock
+++ b/omnibus/Gemfile.lock
@@ -1,6 +1,6 @@
 GIT
   remote: https://github.com/chef/omnibus-software.git
-  revision: 23e12509574a66f079b00fc4f99cc8665a4ed50e
+  revision: e551136c73499d7cacf550163b5f1832adb5a675
   branch: master
   specs:
     omnibus-software (4.0.0)
@@ -32,7 +32,7 @@ GEM
       public_suffix (>= 2.0.2, < 4.0)
     awesome_print (1.8.0)
     aws-eventstream (1.0.1)
-    aws-partitions (1.123.0)
+    aws-partitions (1.124.0)
     aws-sdk-core (3.44.0)
       aws-eventstream (~> 1.0)
       aws-partitions (~> 1.0)