chef-dk 0.16.28 → 0.17.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 93c94115bcdbe4eb0e2c5938689c66292c346a77
-  data.tar.gz: 08739c3ab1e1944401a208f16d69ed921cd40b16
+  metadata.gz: e87c2780a2527adbfbf2398f04c21071e17d444c
+  data.tar.gz: 9e909f8c26214c9fbe273ef9a3e0aa89fd5ebae2
 SHA512:
-  metadata.gz: c9ae2a76b69b2cfdf3b232cde35a43ed26ceacc4e0436c90d2944758511cf2e5788334eb54dbbd8bb15472f977ebb6a91c3c1571da824ff549682e69dd39d3af
-  data.tar.gz: 30d8b6e29f7cf5041daaf77e2651cb671b648037a664beca4fb8d8e1c3b1966ace1c0d99479c5c7602ccd84fc5b8fd3969b3ba6aa073827b904d535b523479b2
+  metadata.gz: 455bf41016fa0f77bf4a6e6cc9ff119a9773bc2722e0cfaf2944438ec47a81844b0c016c0e70cb549f30f4c8978f1c7d8738ea5d6db592cf11ecaa453db97645
+  data.tar.gz: 8401c1c5f28495efc09578a696ea290c9015029ae828464d84a541b181f9e945abbbff9fab5b2efe74b50615fe934391a7dfe9a978cff3f3f3f8ec55732a2538

data/Gemfile

@@ -27,9 +27,6 @@ gem "chef-dk", path: "."
 # EXPERIMENTAL: ALL gems specified here will be installed in chef-dk omnibus.
 # This represents all gems that will be part of chef-dk.
 
-# TODO remove this when we update Chef to use the new api exposed in 3.5.1
-gem "rspec-core", "= 3.4.4"
-
 group(:omnibus_package, :development, :test) do
   gem "pry"
   gem "rake"
@@ -55,7 +52,7 @@ group(:omnibus_package) do
   gem "chef-provisioning-vagrant", ">= 0.11.0"
   gem "chef-vault"
   # The chef version is pinned by "rake dependencies", which grabs the current version from omnibus.
-  gem "chef", github: "chef/chef", branch: "v12.12.15"
+  gem "chef", github: "chef/chef", branch: "v12.13.37"
   gem "cheffish", ">= 2.0.3"
   gem "chefspec"
   gem "fauxhai"
@@ -80,7 +77,7 @@ group(:omnibus_package) do
   gem "mixlib-versioning"
   gem "artifactory"
   # The opscode-pushy-client version is pinned by "rake dependencies", which grabs the current version from omnibus.
-  gem "opscode-pushy-client", github: "chef/opscode-pushy-client", branch: "2.1.0"
+  gem "opscode-pushy-client", github: "chef/opscode-pushy-client", branch: "2.1.1"
   gem "ffi-rzmq-core"
   gem "knife-push"
 

data/Gemfile.lock

@@ -7,20 +7,21 @@ GIT
 
 GIT
   remote: git://github.com/chef/chef.git
-  revision: aca2bd61c35d9cc26b351f87db62f9739151c7f6
-  branch: v12.12.15
+  revision: 3c3b48fe740846c429370d62489bfb8ecdfdff28
+  branch: v12.13.37
   specs:
-    chef (12.12.15)
+    chef (12.13.37)
       bundler (>= 1.10)
-      chef-config (= 12.12.15)
-      chef-zero (~> 4.5)
+      chef-config (= 12.13.37)
+      chef-zero (~> 4.8)
       diff-lcs (~> 1.2, >= 1.2.4)
       erubis (~> 2.7)
       ffi-yajl (~> 2.2)
       highline (~> 1.6, >= 1.6.9)
       iniparse (~> 1.4)
+      mixlib-archive (>= 0.2.0)
       mixlib-authentication (~> 1.4)
-      mixlib-cli (~> 1.4)
+      mixlib-cli (~> 1.7)
       mixlib-log (~> 1.3)
       mixlib-shellout (~> 2.0)
       net-sftp (~> 2.1, >= 2.1.2)
@@ -29,26 +30,27 @@ GIT
       ohai (>= 8.6.0.alpha.1, < 9)
       plist (~> 3.2)
       proxifier (~> 1.0)
-      rspec-core (~> 3.4)
-      rspec-expectations (~> 3.4)
-      rspec-mocks (~> 3.4)
+      rspec-core (~> 3.5)
+      rspec-expectations (~> 3.5)
+      rspec-mocks (~> 3.5)
       rspec_junit_formatter (~> 0.2.0)
       serverspec (~> 2.7)
       specinfra (~> 2.10)
       syslog-logger (~> 1.6)
       uuidtools (~> 2.1.5)
-    chef (12.12.15-universal-mingw32)
+    chef (12.13.37-universal-mingw32)
       bundler (>= 1.10)
-      chef-config (= 12.12.15)
-      chef-zero (~> 4.5)
+      chef-config (= 12.13.37)
+      chef-zero (~> 4.8)
       diff-lcs (~> 1.2, >= 1.2.4)
       erubis (~> 2.7)
       ffi (~> 1.9)
       ffi-yajl (~> 2.2)
       highline (~> 1.6, >= 1.6.9)
       iniparse (~> 1.4)
+      mixlib-archive (>= 0.2.0)
       mixlib-authentication (~> 1.4)
-      mixlib-cli (~> 1.4)
+      mixlib-cli (~> 1.7)
       mixlib-log (~> 1.3)
       mixlib-shellout (~> 2.0)
       net-sftp (~> 2.1, >= 2.1.2)
@@ -57,9 +59,9 @@ GIT
       ohai (>= 8.6.0.alpha.1, < 9)
       plist (~> 3.2)
       proxifier (~> 1.0)
-      rspec-core (~> 3.4)
-      rspec-expectations (~> 3.4)
-      rspec-mocks (~> 3.4)
+      rspec-core (~> 3.5)
+      rspec-expectations (~> 3.5)
+      rspec-mocks (~> 3.5)
       rspec_junit_formatter (~> 0.2.0)
       serverspec (~> 2.7)
       specinfra (~> 2.10)
@@ -75,13 +77,17 @@ GIT
       win32-service (~> 0.8.7)
       windows-api (~> 0.4.4)
       wmi-lite (~> 1.0)
+    chef-config (12.13.37)
+      fuzzyurl
+      mixlib-config (~> 2.0)
+      mixlib-shellout (~> 2.0)
 
 GIT
   remote: git://github.com/chef/opscode-pushy-client.git
-  revision: 90822656ffd5e1ae5c700f75a06ad9fcf82f2076
-  branch: 2.1.0
+  revision: ae7bd646eb0390b3c1c6f7ae06de5dae7fc92336
+  branch: 2.1.1
   specs:
-    opscode-pushy-client (2.0.2)
+    opscode-pushy-client (2.1.1)
       chef (>= 12.5)
       ffi-rzmq
       ohai
@@ -90,14 +96,14 @@ GIT
 PATH
   remote: .
   specs:
-    chef-dk (0.16.28)
+    chef-dk (0.17.17)
       chef (~> 12.5)
       chef-provisioning (~> 1.2)
       cookbook-omnifetch (~> 0.2, >= 0.2.2)
       diff-lcs (~> 1.0)
       ffi-yajl (>= 1.0, < 3.0)
       minitar (~> 0.5.4)
-      mixlib-cli (~> 1.5, < 1.7)
+      mixlib-cli (~> 1.7)
       mixlib-shellout (~> 2.0)
       paint (~> 1.0)
       solve (~> 2.0, >= 2.0.1)
@@ -106,7 +112,7 @@ GEM
   remote: https://rubygems.org/
   specs:
     CFPropertyList (2.3.2)
-    activesupport (4.2.7)
+    activesupport (4.2.7.1)
       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
@@ -120,12 +126,12 @@ GEM
       addressable (>= 2.3.1)
       extlib (>= 0.9.15)
       multi_json (>= 1.0.0)
-    aws-sdk (2.3.22)
-      aws-sdk-resources (= 2.3.22)
-    aws-sdk-core (2.3.22)
+    aws-sdk (2.5.3)
+      aws-sdk-resources (= 2.5.3)
+    aws-sdk-core (2.5.3)
       jmespath (~> 1.0)
-    aws-sdk-resources (2.3.22)
-      aws-sdk-core (= 2.3.22)
+    aws-sdk-resources (2.5.3)
+      aws-sdk-core (= 2.5.3)
     aws-sdk-v1 (1.66.0)
       json (~> 1.4)
       nokogiri (>= 1.4.4)
@@ -168,19 +174,15 @@ GEM
     celluloid-io (0.16.2)
       celluloid (>= 0.16.0)
       nio4r (>= 1.1.0)
-    chef-config (12.12.15)
-      fuzzyurl (~> 0.8.0)
-      mixlib-config (~> 2.0)
-      mixlib-shellout (~> 2.0)
-    chef-provisioning (1.8.0)
-      cheffish (>= 1.3.1, < 3.0)
+    chef-provisioning (1.9.1)
+      cheffish (>= 1.3.1, < 4.0)
       inifile (>= 2.0.2)
       mixlib-install (~> 1.0)
       net-scp (~> 1.0)
       net-ssh (>= 2.9, < 4.0)
       net-ssh-gateway (~> 1.2.0)
       winrm (~> 1.3)
-    chef-provisioning-aws (1.10.0)
+    chef-provisioning-aws (1.11.0)
       aws-sdk (>= 2.1.26, < 3.0)
       aws-sdk-v1 (>= 1.59.0)
       chef-provisioning (~> 1.4)
@@ -189,32 +191,31 @@ GEM
     chef-provisioning-azure (0.5.0)
       chef-provisioning (~> 1.0)
       stuartpreston-azure-sdk-for-ruby (~> 0.7)
-    chef-provisioning-fog (0.19.0)
+    chef-provisioning-fog (0.19.1)
       chef-provisioning (~> 1.0)
-      fog (>= 1.38.0)
+      fog (>= 1.37.0)
       fog-softlayer (~> 1.1.0)
       google-api-client (~> 0.8.0)
       retryable
     chef-provisioning-vagrant (0.11.0)
       chef-provisioning
-    chef-sugar (3.3.0)
+    chef-sugar (3.4.0)
     chef-vault (2.9.0)
-    chef-zero (4.7.1)
+    chef-zero (4.9.0)
       ffi-yajl (~> 2.2)
       hashie (>= 2.0, < 4.0)
       mixlib-log (~> 1.3)
       rack (< 2)
       uuidtools (~> 2.1)
-    cheffish (2.0.4)
+    cheffish (3.0.0)
       chef-zero (~> 4.3)
-      compat_resource
+      net-ssh
     chefspec (4.7.0)
       chef (>= 11.14)
       fauxhai (~> 3.2)
       rspec (~> 3.0)
     cleanroom (1.0.0)
     coderay (1.1.1)
-    compat_resource (12.10.6)
     concurrent-ruby (1.0.2)
     cookbook-omnifetch (0.2.3)
       minitar (~> 0.5.4)
@@ -223,13 +224,13 @@ GEM
     cucumber-core (1.5.0)
       gherkin (~> 4.0)
     debug_inspector (0.0.2)
-    dep-selector-libgecode (1.2.0)
-    dep_selector (1.0.3)
+    dep-selector-libgecode (1.3.1)
+    dep_selector (1.0.4)
       dep-selector-libgecode (~> 1.0)
       ffi (~> 1.9)
     diff-lcs (1.2.5)
     diffy (3.1.0)
-    docker-api (1.29.0)
+    docker-api (1.31.0)
       excon (>= 0.38.0)
       json
     erubis (2.7.0)
@@ -237,7 +238,7 @@ GEM
     extlib (0.9.16)
     faraday (0.9.2)
       multipart-post (>= 1.2, < 3)
-    fauxhai (3.6.0)
+    fauxhai (3.8.0)
       net-ssh
     ffi (1.9.14)
     ffi (1.9.14-x86-mingw32)
@@ -247,7 +248,7 @@ GEM
       ffi
     ffi-win32-extensions (1.0.2)
       ffi
-    ffi-yajl (2.2.3)
+    ffi-yajl (2.3.0)
       libyajl2 (~> 1.2)
     fission (0.5.0)
       CFPropertyList (~> 2.2)
@@ -288,7 +289,7 @@ GEM
     fog-atmos (0.1.0)
       fog-core
       fog-xml
-    fog-aws (0.10.0)
+    fog-aws (0.11.0)
       fog-core (~> 1.38)
       fog-json (~> 1.0)
       fog-xml (~> 0.1)
@@ -322,7 +323,7 @@ GEM
       multi_json (~> 1.10)
     fog-local (0.3.0)
       fog-core (~> 1.27)
-    fog-openstack (0.1.8)
+    fog-openstack (0.1.11)
       fog-core (>= 1.40)
       fog-json (>= 1.0)
       ipaddress (>= 0.8)
@@ -368,7 +369,7 @@ GEM
     fog-voxel (0.1.0)
       fog-core
       fog-xml
-    fog-vsphere (0.8.0)
+    fog-vsphere (1.0.0)
       fog-core
       rbvmomi (~> 1.8)
     fog-xenserver (0.2.3)
@@ -386,7 +387,7 @@ GEM
       treetop (~> 1.4)
       yajl-ruby (~> 1.1)
     formatador (0.2.5)
-    fuzzyurl (0.8.0)
+    fuzzyurl (0.9.0)
     gherkin (4.0.0)
     git (1.3.0)
     google-api-client (0.8.6)
@@ -430,7 +431,7 @@ GEM
     inflecto (0.0.2)
     inifile (3.0.0)
     iniparse (1.4.2)
-    inspec (0.27.1)
+    inspec (0.29.0)
       hashie (~> 3.4)
       json (~> 1.8)
       method_source (~> 0.8)
@@ -440,15 +441,15 @@ GEM
       rspec-its (~> 1.2)
       rubyzip (~> 1.1)
       thor (~> 0.19)
-      train (>= 0.15.1, < 1.0)
+      train (>= 0.16.0, < 1.0)
     ipaddress (0.8.3)
-    jmespath (1.3.0)
+    jmespath (1.3.1)
     json (1.8.3)
     jwt (1.5.4)
-    kitchen-dokken (0.0.31)
+    kitchen-dokken (0.0.32)
       docker-api (~> 1.29)
       test-kitchen (~> 1.5)
-    kitchen-ec2 (1.0.0)
+    kitchen-ec2 (1.1.0)
       aws-sdk (~> 2)
       excon
       multi_json
@@ -466,7 +467,7 @@ GEM
       chef (>= 11.0.0)
       diffy (>= 3.0.1)
       git (>= 1.2.5)
-    knife-windows (1.4.1)
+    knife-windows (1.5.0)
       winrm (~> 1.7)
     launchy (2.4.3)
       addressable (~> 2.3)
@@ -483,7 +484,9 @@ GEM
       systemu (~> 2.6.2)
     memoist (0.14.0)
     method_source (0.8.2)
-    mime-types (2.99.2)
+    mime-types (3.1)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2016.0521)
     mini_portile2 (2.1.0)
     minitar (0.5.4)
     minitest (5.9.0)
@@ -491,13 +494,13 @@ GEM
       mixlib-log
     mixlib-authentication (1.4.1)
       mixlib-log
-    mixlib-cli (1.6.0)
+    mixlib-cli (1.7.0)
     mixlib-config (2.2.1)
     mixlib-install (1.1.0)
       artifactory
       mixlib-shellout
       mixlib-versioning
-    mixlib-log (1.6.0)
+    mixlib-log (1.7.1)
     mixlib-shellout (2.2.6)
     mixlib-shellout (2.2.6-universal-mingw32)
       win32-process (~> 0.8.2)
@@ -526,12 +529,12 @@ GEM
       mini_portile2 (~> 2.1.0)
       pkg-config (~> 1.1.7)
     nori (2.6.0)
-    notiffany (0.1.0)
+    notiffany (0.1.1)
       nenv (~> 0.1)
       shellany (~> 0.0)
     octokit (4.3.0)
       sawyer (~> 0.7.0, >= 0.5.3)
-    ohai (8.17.1)
+    ohai (8.19.1)
       chef-config (>= 12.5.0.alpha.1, < 13)
       ffi (~> 1.9)
       ffi-yajl (~> 2.2)
@@ -581,11 +584,11 @@ GEM
     rdp-ruby-wmi (0.3.1)
     retriable (1.4.1)
     retryable (2.0.4)
-    ridley (4.5.1)
+    ridley (4.6.1)
       addressable
       buff-config (~> 1.0)
       buff-extensions (~> 1.0)
-      buff-ignore (~> 1.1)
+      buff-ignore (~> 1.1.1)
       buff-shell_out (~> 0.1)
       celluloid (~> 0.16.0)
       celluloid-io (~> 0.16.1)
@@ -599,22 +602,22 @@ GEM
       retryable (~> 2.0)
       semverse (~> 1.1)
       varia_model (~> 0.4.0)
-    rspec (3.4.0)
-      rspec-core (~> 3.4.0)
-      rspec-expectations (~> 3.4.0)
-      rspec-mocks (~> 3.4.0)
-    rspec-core (3.4.4)
-      rspec-support (~> 3.4.0)
-    rspec-expectations (3.4.0)
+    rspec (3.5.0)
+      rspec-core (~> 3.5.0)
+      rspec-expectations (~> 3.5.0)
+      rspec-mocks (~> 3.5.0)
+    rspec-core (3.5.2)
+      rspec-support (~> 3.5.0)
+    rspec-expectations (3.5.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.4.0)
+      rspec-support (~> 3.5.0)
     rspec-its (1.2.0)
       rspec-core (>= 3.0.0)
       rspec-expectations (>= 3.0.0)
-    rspec-mocks (3.4.1)
+    rspec-mocks (3.5.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.4.0)
-    rspec-support (3.4.1)
+      rspec-support (~> 3.5.0)
+    rspec-support (3.5.0)
     rspec_junit_formatter (0.2.3)
       builder (< 4)
       rspec-core (>= 2, < 4, != 2.12.0)
@@ -627,7 +630,7 @@ GEM
     ruby-prof (0.15.9)
     ruby-progressbar (1.8.1)
     ruby-shadow (2.5.0)
-    ruby_dep (1.3.1)
+    ruby_dep (1.4.0)
     rubyntlm (0.6.0)
     rubyzip (1.2.0)
     rufus-lru (1.1.0)
@@ -652,31 +655,32 @@ GEM
     solve (2.0.3)
       molinillo (~> 0.4.2)
       semverse (~> 1.1)
-    specinfra (2.59.6)
+    specinfra (2.61.1)
       net-scp
       net-ssh (>= 2.7, < 4.0)
       net-telnet
       sfl
-    stuartpreston-azure-sdk-for-ruby (0.7.1)
+    stuartpreston-azure-sdk-for-ruby (0.7.2)
       json (~> 1.8)
-      mime-types (~> 2.0)
+      mime-types (> 1, < 4)
       nokogiri (~> 1.5)
       systemu (~> 2.6)
       uuid (~> 2.0)
     syslog-logger (1.6.8)
     systemu (2.6.5)
-    test-kitchen (1.10.2)
+    test-kitchen (1.11.1)
       mixlib-install (~> 1.0, >= 1.0.4)
       mixlib-shellout (>= 1.2, < 3.0)
       net-scp (~> 1.1)
       net-ssh (>= 2.9, < 4.0)
+      net-ssh-gateway (~> 1.2.0)
       safe_yaml (~> 1.0)
       thor (~> 0.18)
     thor (0.19.1)
     thread_safe (0.3.5)
     timers (4.0.4)
       hitimes
-    train (0.15.1)
+    train (0.16.0)
       docker-api (~> 1.26)
       json (~> 1.8)
       mixlib-shellout (~> 2.0)
@@ -684,7 +688,7 @@ GEM
       net-ssh (>= 2.9, < 4.0)
       winrm (~> 1.6)
       winrm-fs (~> 0.3)
-    treetop (1.6.5)
+    treetop (1.6.8)
       polyglot (~> 0.3)
     trollop (2.1.2)
     tzinfo (1.2.2)
@@ -739,7 +743,7 @@ GEM
     wmi-lite (1.0.0)
     xml-simple (1.1.5)
     yajl-ruby (1.2.1)
-    yard (0.9.0)
+    yard (0.9.5)
 
 PLATFORMS
   ruby
@@ -791,7 +795,6 @@ DEPENDENCIES
   rb-readline
   rdoc
   rdp-ruby-wmi
-  rspec-core (= 3.4.4)
   rubocop
   ruby-prof
   ruby-shadow

data/acceptance/Gemfile.lock

@@ -11,12 +11,12 @@ GEM
   specs:
     addressable (2.4.0)
     artifactory (2.3.3)
-    aws-sdk (2.3.22)
-      aws-sdk-resources (= 2.3.22)
-    aws-sdk-core (2.3.22)
+    aws-sdk (2.5.3)
+      aws-sdk-resources (= 2.5.3)
+    aws-sdk-core (2.5.3)
       jmespath (~> 1.0)
-    aws-sdk-resources (2.3.22)
-      aws-sdk-core (= 2.3.22)
+    aws-sdk-resources (2.5.3)
+      aws-sdk-core (= 2.5.3)
     berkshelf (4.3.5)
       addressable (~> 2.3, >= 2.3.4)
       berkshelf-api-client (~> 2.0, >= 2.0.2)
@@ -53,14 +53,14 @@ GEM
     celluloid-io (0.16.2)
       celluloid (>= 0.16.0)
       nio4r (>= 1.1.0)
-    chef-config (12.12.15)
-      fuzzyurl (~> 0.8.0)
+    chef-config (12.13.30)
+      fuzzyurl
       mixlib-config (~> 2.0)
       mixlib-shellout (~> 2.0)
     cleanroom (1.0.0)
     coderay (1.1.1)
     diff-lcs (1.2.5)
-    docker-api (1.29.0)
+    docker-api (1.31.0)
       excon (>= 0.38.0)
       json
     erubis (2.7.0)
@@ -68,7 +68,7 @@ GEM
     faraday (0.9.2)
       multipart-post (>= 1.2, < 3)
     ffi (1.9.14)
-    fuzzyurl (0.8.0)
+    fuzzyurl (0.9.0)
     gssapi (1.2.0)
       ffi (>= 1.0.1)
     gyoku (1.3.1)
@@ -76,7 +76,7 @@ GEM
     hashie (3.4.4)
     hitimes (1.2.4)
     httpclient (2.7.2)
-    inspec (0.27.1)
+    inspec (0.29.0)
       hashie (~> 3.4)
       json (~> 1.8)
       method_source (~> 0.8)
@@ -86,10 +86,10 @@ GEM
       rspec-its (~> 1.2)
       rubyzip (~> 1.1)
       thor (~> 0.19)
-      train (>= 0.15.1, < 1.0)
-    jmespath (1.3.0)
+      train (>= 0.16.0, < 1.0)
+    jmespath (1.3.1)
     json (1.8.3)
-    kitchen-ec2 (1.0.0)
+    kitchen-ec2 (1.1.0)
       aws-sdk (~> 2)
       excon
       multi_json
@@ -115,7 +115,7 @@ GEM
       artifactory
       mixlib-shellout
       mixlib-versioning
-    mixlib-log (1.6.0)
+    mixlib-log (1.7.1)
     mixlib-shellout (2.2.6)
     mixlib-versioning (1.1.0)
     molinillo (0.4.5)
@@ -124,6 +124,8 @@ GEM
     net-scp (1.2.1)
       net-ssh (>= 2.6.5)
     net-ssh (3.2.0)
+    net-ssh-gateway (1.2.0)
+      net-ssh (>= 2.6.5)
     nio4r (1.2.1)
     nori (2.6.0)
     octokit (4.3.0)
@@ -134,11 +136,11 @@ GEM
       slop (~> 3.4)
     rainbow (2.1.0)
     retryable (2.0.4)
-    ridley (4.5.1)
+    ridley (4.6.1)
       addressable
       buff-config (~> 1.0)
       buff-extensions (~> 1.0)
-      buff-ignore (~> 1.1)
+      buff-ignore (~> 1.1.1)
       buff-shell_out (~> 0.1)
       celluloid (~> 0.16.0)
       celluloid-io (~> 0.16.1)
@@ -179,17 +181,18 @@ GEM
     solve (2.0.3)
       molinillo (~> 0.4.2)
       semverse (~> 1.1)
-    test-kitchen (1.10.2)
+    test-kitchen (1.11.1)
       mixlib-install (~> 1.0, >= 1.0.4)
       mixlib-shellout (>= 1.2, < 3.0)
       net-scp (~> 1.1)
       net-ssh (>= 2.9, < 4.0)
+      net-ssh-gateway (~> 1.2.0)
       safe_yaml (~> 1.0)
       thor (~> 0.18)
     thor (0.19.1)
     timers (4.0.4)
       hitimes
-    train (0.15.1)
+    train (0.16.0)
       docker-api (~> 1.26)
       json (~> 1.8)
       mixlib-shellout (~> 2.0)

data/chef-dk.gemspec

@@ -39,7 +39,7 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.add_dependency "mixlib-cli", "~> 1.5", "< 1.7"
+  gem.add_dependency "mixlib-cli", "~> 1.7"
   gem.add_dependency "mixlib-shellout", "~> 2.0"
   gem.add_dependency "ffi-yajl", ">= 1.0", "< 3.0"
 

data/lib/chef-dk/skeletons/code_generator/files/default/chefignore

@@ -82,6 +82,11 @@ Berksfile.lock
 cookbooks/*
 tmp
 
+# Policyfile #
+##############
+Policyfile.rb
+Policyfile.lock.json
+
 # Cookbooks #
 #############
 CONTRIBUTING*

data/lib/chef-dk/skeletons/code_generator/files/default/delivery-project.toml

@@ -9,12 +9,15 @@
 # By default these phases are configured for Cookbook Workflow only
 #
 # As this is still a prototype we are not modifying the current
-# config.json file and it will continue working as usual. 
+# config.json file and it will continue working as usual.
 
 [local_phases]
 unit = "rspec spec/"
 lint = "cookstyle"
-syntax = "foodcritic . --exclude spec -f any"
+# Foodcritic expects an `issues_url` and `source_url` in the metadata.rb
+# We turn this off by default because only cookbooks uploaded to the
+# Supermarket will have these added.
+syntax = "foodcritic . --exclude spec -f any -t \"~FC064\" -t \"~FC065\""
 provision = "chef exec kitchen create"
 deploy = "chef exec kitchen converge"
 smoke = "chef exec kitchen verify"

data/lib/chef-dk/skeletons/code_generator/recipes/cookbook_file.rb

@@ -2,7 +2,7 @@
 context = ChefDK::Generator.context
 cookbook_dir = File.join(context.cookbook_root, context.cookbook_name)
 files_dir = File.join(cookbook_dir, "files", "default")
-cookbook_file_path = File.join(cookbook_dir, "files", "default", "#{context.new_file_basename}")
+cookbook_file_path = File.join(cookbook_dir, "files", "default", context.new_file_basename)
 
 directory files_dir do
   recursive true

data/lib/chef-dk/skeletons/code_generator/templates/default/build_cookbook/Berksfile.erb

@@ -1,17 +1,6 @@
 source 'https://supermarket.chef.io'
 
 metadata
-<% if build_cookbook_parent_is_cookbook -%>
-
-cookbook 'delivery-truck',
-  git: 'https://github.com/chef-cookbooks/delivery-truck.git',
-  branch: 'master'
-
-# This is so we know where to get delivery-truck's dependency
-cookbook 'delivery-sugar',
-  git: 'https://github.com/chef-cookbooks/delivery-sugar.git',
-  branch: 'master'
-<% end -%>
 
 group :delivery do
   cookbook 'delivery_build', git: 'https://github.com/chef-cookbooks/delivery_build'

data/lib/chef-dk/skeletons/code_generator/templates/default/kitchen.yml.erb

@@ -16,4 +16,7 @@ suites:
   - name: default
     run_list:
       - recipe[<%= cookbook_name %>::default]
+    verifier:
+      inspec_tests:
+        - test/recipes
     attributes:

data/lib/chef-dk/skeletons/code_generator/templates/default/kitchen_policyfile.yml.erb

@@ -27,4 +27,7 @@ platforms:
 
 suites:
   - name: default
+    verifier:
+      inspec_tests:
+        - test/recipes
     attributes:

data/lib/chef-dk/skeletons/code_generator/templates/default/metadata.rb.erb

@@ -5,3 +5,11 @@ license '<%= license %>'
 description 'Installs/Configures <%= cookbook_name %>'
 long_description 'Installs/Configures <%= cookbook_name %>'
 version '0.1.0'
+
+# If you upload to Supermarket you should set this so your cookbook
+# gets a `View Issues` link
+# issues_url 'https://github.com/<insert_org_here>/<%= cookbook_name %>/issues' if respond_to?(:issues_url)
+
+# If you upload to Supermarket you should set this so your cookbook
+# gets a `View Source` link
+# source_url 'https://github.com/<insert_org_here>/<%= cookbook_name %>' if respond_to?(:source_url)

data/lib/chef-dk/version.rb

@@ -16,5 +16,5 @@
 #
 
 module ChefDK
-  VERSION = "0.16.28"
+  VERSION = "0.17.17"
 end

data/spec/unit/command/generator_commands/cookbook_spec.rb

@@ -190,12 +190,15 @@ EOF
 # By default these phases are configured for Cookbook Workflow only
 #
 # As this is still a prototype we are not modifying the current
-# config.json file and it will continue working as usual. 
+# config.json file and it will continue working as usual.
 
 [local_phases]
 unit = "rspec spec/"
 lint = "cookstyle"
-syntax = "foodcritic . --exclude spec -f any"
+# Foodcritic expects an `issues_url` and `source_url` in the metadata.rb
+# We turn this off by default because only cookbooks uploaded to the
+# Supermarket will have these added.
+syntax = "foodcritic . --exclude spec -f any -t \\\"~FC064\\\" -t \\\"~FC065\\\""
 provision = "chef exec kitchen create"
 deploy = "chef exec kitchen converge"
 smoke = "chef exec kitchen verify"
@@ -269,15 +272,6 @@ source 'https://supermarket.chef.io'
 
 metadata
 
-cookbook 'delivery-truck',
-  git: 'https://github.com/chef-cookbooks/delivery-truck.git',
-  branch: 'master'
-
-# This is so we know where to get delivery-truck's dependency
-cookbook 'delivery-sugar',
-  git: 'https://github.com/chef-cookbooks/delivery-sugar.git',
-  branch: 'master'
-
 group :delivery do
   cookbook 'delivery_build', git: 'https://github.com/chef-cookbooks/delivery_build'
   cookbook 'delivery-base', git: 'https://github.com/chef-cookbooks/delivery-base'
@@ -571,6 +565,9 @@ platforms:
 
 suites:
   - name: default
+    verifier:
+      inspec_tests:
+        - test/recipes
     attributes:
 KITCHEN_YML
         end
@@ -641,6 +638,9 @@ suites:
   - name: default
     run_list:
       - recipe[new_cookbook::default]
+    verifier:
+      inspec_tests:
+        - test/recipes
     attributes:
 KITCHEN_YML
         end
@@ -664,7 +664,7 @@ SPEC_HELPER
       let(:file) { File.join(tempdir, "new_cookbook", "metadata.rb") }
 
       include_examples "a generated file", :cookbook_name do
-        let(:line) { /name\s+'new_cookbook'/ }
+        let(:line) { /name\s+'new_cookbook'.+# issues_url.+# source_url/m }
       end
     end
 

data/spec/unit/command/shell_init_spec.rb

@@ -20,7 +20,7 @@ require 'chef-dk/command/shell_init'
 
 describe ChefDK::Command::ShellInit do
 
-  let(:expected_path) { [omnibus_bin_dir, user_bin_dir, omnibus_embedded_bin_dir, ENV['PATH']].join(File::PATH_SEPARATOR) }
+  let(:expected_path) { [omnibus_bin_dir, user_bin_dir, omnibus_embedded_bin_dir, ENV['PATH'], git_bin_dir].join(File::PATH_SEPARATOR) }
   let(:stdout_io) { StringIO.new }
   let(:stderr_io) { StringIO.new }
 
@@ -37,15 +37,22 @@ describe ChefDK::Command::ShellInit do
     let(:expected_gem_home) { Gem.user_dir }
     let(:expected_gem_path) { Gem.path.join(File::PATH_SEPARATOR) }
 
+    before do
+      allow(::Dir).to receive(:exists?).and_call_original
+    end
+
     context "with no explicit omnibus directory" do
 
       let(:omnibus_bin_dir) { "/foo/bin" }
       let(:omnibus_embedded_bin_dir) { "/foo/embedded/bin" }
+      let(:git_bin_dir) { "/foo/gitbin" }
       let(:argv) { [shell] }
 
       before do
         allow(command_instance).to receive(:omnibus_embedded_bin_dir).and_return(omnibus_embedded_bin_dir)
         allow(command_instance).to receive(:omnibus_bin_dir).and_return(omnibus_bin_dir)
+        allow(command_instance).to receive(:git_bin_dir).and_return(git_bin_dir)
+        allow(::Dir).to receive(:exists?).with(git_bin_dir).and_return(true)
       end
 
       it "emits a script to add ChefDK's ruby to the shell environment" do
@@ -66,9 +73,14 @@ describe ChefDK::Command::ShellInit do
       let(:omnibus_root) { File.join(fixtures_path, "eg_omnibus_dir/valid/") }
       let(:omnibus_bin_dir) { File.join(omnibus_root, "bin") }
       let(:omnibus_embedded_bin_dir) { File.join(omnibus_root, "embedded/bin") }
+      let(:git_bin_dir) { File.join(omnibus_root, "gitbin") }
 
       let(:argv) { [shell, "--omnibus-dir", omnibus_root] }
 
+      before do
+        allow(::Dir).to receive(:exists?).with(git_bin_dir).and_return(true)
+      end
+
       it "emits a script to add ChefDK's ruby to the shell environment" do
         command_instance.run(argv)
         expect(stdout_io.string).to include(expected_environment_commands)
@@ -234,7 +246,7 @@ compdef _chef chef
     before do
       stub_const('File::PATH_SEPARATOR', ':')
     end
-    let(:expected_path) { [omnibus_bin_dir, user_bin_dir, omnibus_embedded_bin_dir, ENV['PATH']].join(':').split(':').join('" "') }
+    let(:expected_path) { [omnibus_bin_dir, user_bin_dir, omnibus_embedded_bin_dir, ENV['PATH'], git_bin_dir].join(':').split(':').join('" "') }
     let(:expected_environment_commands) do
       <<-EOH
 set -gx PATH "#{expected_path}" 2>/dev/null;

data/tasks/github_changelog_generator.rb

@@ -25,6 +25,8 @@ begin
     config.enhancement_labels = "enhancement,Enhancement,New Feature,Feature".split(",")
     config.bug_labels = "bug,Bug,Improvement,Upstream Bug".split(",")
     config.exclude_labels = "duplicate,question,invalid,wontfix,no_changelog,Exclude From Changelog,Question,Discussion".split(",")
+#    Makes life easier by only generating changelogs between said tags.
+#    config.between_tags = "v0.15.15,v0.16.28".split(",")
   end
 rescue LoadError
   puts "github_changelog_generator is not available. gem install github_changelog_generator to generate changelogs"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chef-dk
 version: !ruby/object:Gem::Version
-  version: 0.16.28
+  version: 0.17.17
 platform: ruby
 authors:
 - Daniel DeLeo
@@ -10,16 +10,13 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-20 00:00:00.000000000 Z
+date: 2016-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-cli
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.5'
-    - - "<"
       - !ruby/object:Gem::Version
         version: '1.7'
   type: :runtime
@@ -27,9 +24,6 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.5'
-    - - "<"
       - !ruby/object:Gem::Version
         version: '1.7'
 - !ruby/object:Gem::Dependency
@@ -656,7 +650,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.4
+rubygems_version: 2.6.6
 signing_key: 
 specification_version: 4
 summary: A streamlined development and deployment workflow for Chef platform.
@@ -840,4 +834,3 @@ test_files:
 - spec/unit/service_exception_inspectors/http_spec.rb
 - spec/unit/shell_out_spec.rb
 - spec/unit/tasks/helpers_spec.rb
-has_rdoc: