From 50c1806021ee359196d171b3b8f0c7e8801fe065 Mon Sep 17 00:00:00 2001
From: tyler-ball <tyleraball@gmail.com>
Date: Mon, 4 Jan 2016 13:03:37 -0800
Subject: ChefDK is getting cached in a subdirectory (chef-dk/chefdk) so we
 need to pull in omnibus changes to respect that, and modify our appbundle
 call to use the correct new API

---
 Gemfile                   |  2 +-
 Gemfile.lock              | 18 ++++++++----------
 config/software/chefdk.rb |  3 +--
 3 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/Gemfile b/Gemfile
index ad415d576a..09945709ca 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
-gem 'omnibus', github: 'chef/omnibus'
+gem 'omnibus', github: 'chef/omnibus', branch: 'tball/chefdk'
 gem 'omnibus-software', github: 'chef/omnibus-software'
 
 # This development group is installed by default when you run `bundle install`,
diff --git a/Gemfile.lock b/Gemfile.lock
index 56011237d1..d3e31c21b7 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -6,7 +6,8 @@ GIT
 
 GIT
   remote: git://github.com/chef/omnibus.git
-  revision: 58f4b2622adc524aa7bd8a369938a0ea44aaf3aa
+  revision: 75e7077d5c5cc0c42e019afd3d107708e0b0164a
+  branch: tball/chefdk
   specs:
     omnibus (5.0.0)
       aws-sdk (~> 2)
@@ -22,12 +23,12 @@ GEM
   remote: https://rubygems.org/
   specs:
     addressable (2.3.8)
-    aws-sdk (2.2.6)
-      aws-sdk-resources (= 2.2.6)
-    aws-sdk-core (2.2.6)
+    aws-sdk (2.2.8)
+      aws-sdk-resources (= 2.2.8)
+    aws-sdk-core (2.2.8)
       jmespath (~> 1.0)
-    aws-sdk-resources (2.2.6)
-      aws-sdk-core (= 2.2.6)
+    aws-sdk-resources (2.2.8)
+      aws-sdk-core (= 2.2.8)
     berkshelf (3.2.4)
       addressable (~> 2.3.4)
       berkshelf-api-client (~> 1.2)
@@ -60,7 +61,7 @@ GEM
     celluloid-io (0.16.2)
       celluloid (>= 0.16.0)
       nio4r (>= 1.1.0)
-    chef-config (12.5.1)
+    chef-config (12.6.0)
       mixlib-config (~> 2.0)
       mixlib-shellout (~> 2.0)
     chef-sugar (3.2.0)
@@ -198,6 +199,3 @@ DEPENDENCIES
   omnibus-software!
   test-kitchen (~> 1.4.0)
   winrm-transport (~> 1.0)
-
-BUNDLED WITH
-   1.10.6
diff --git a/config/software/chefdk.rb b/config/software/chefdk.rb
index 67658d5e19..4f4938953a 100644
--- a/config/software/chefdk.rb
+++ b/config/software/chefdk.rb
@@ -21,7 +21,6 @@ source git: "git://github.com/chef/chef-dk.git"
 
 relative_path "chef-dk"
 
-
 if windows?
   dependency "ruby-windows"
   dependency "ruby-windows-devkit"
@@ -69,7 +68,7 @@ build do
       " --verbose", env: env
 
   appbundle 'berkshelf'
-  appbundle 'chef-dk'
+  appbundle 'chefdk'
   appbundle 'chef-vault'
   appbundle 'foodcritic'
   appbundle 'rubocop'
-- 
cgit v1.2.1