chef-dk 0.15.16 → 0.16.28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fb142ee9ea0cda2c706a1db0c397605745ae2fa1
-  data.tar.gz: 9146a5b8e321da01bdd48c28c489e592be4338a8
+  metadata.gz: 93c94115bcdbe4eb0e2c5938689c66292c346a77
+  data.tar.gz: 08739c3ab1e1944401a208f16d69ed921cd40b16
 SHA512:
-  metadata.gz: b91caf2b14bd0f6e433833c715f83a3e0906d2f7295d18c5c611354db1055ee31535cbd068f8b561e8718c2534e4bb76fe7c22ffd8007da7266823a433f71293
-  data.tar.gz: 10a81f1ff20674a506bf7923327d105bb0261b8e58b958ae31abce5d61d0968651c4576c1a6cc1d6a808494b438ac02f792c375934139b33bb6b2fd6b3551e6e
+  metadata.gz: c9ae2a76b69b2cfdf3b232cde35a43ed26ceacc4e0436c90d2944758511cf2e5788334eb54dbbd8bb15472f977ebb6a91c3c1571da824ff549682e69dd39d3af
+  data.tar.gz: 30d8b6e29f7cf5041daaf77e2651cb671b648037a664beca4fb8d8e1c3b1966ace1c0d99479c5c7602ccd84fc5b8fd3969b3ba6aa073827b904d535b523479b2

data/CONTRIBUTING.md

@@ -27,9 +27,6 @@ Chef is built to last. We strive to ensure high quality throughout the Chef expe
   continuously on all the pull requests. We require the Travis runs to succeed on every pull
   request before being merged.
 
-In addition to this it would be nice to include the description of the problem you are solving
-  with your change. You can use [Chef Issue Template](#issuetemplate) in the description section
-  of the pull request.
 
 ### <a name="cr"></a> Chef Code Review Process
 
@@ -49,6 +46,7 @@ Once you a pull request, the **Chef Engineering Team** or **Chef Core Committers
 If you would like to learn about when your code will be available in a release of Chef, read more about
   [Chef Release Process](#release).
 
+
 ### Contributor License Agreement (CLA)
 Licensing is very important to open source projects. It helps ensure the
   software continues to be available under the terms that the author desired.
@@ -121,29 +119,6 @@ If you are familiar with Chef and know the component that is causing you a probl
 Otherwise you can file your issue in the [Chef project](https://github.com/chef/chef/issues)
   and we will make sure it gets filed against the appropriate project.
 
-In order to decrease the back and forth in issues, and to help us get to the bottom of them quickly
-  we use the below issue template. You can copy/paste this template into the issue you are opening and
-  edit it accordingly.
-
-<a name="issuetemplate"></a>
-```
-### Version:
-[Version of the project installed]
-
-### Environment: [Details about the environment such as the Operating System, cookbook details, etc...]
-
-### Scenario:
-[What you are trying to achieve and you can't?]
-
-### Steps to Reproduce:
-[If you are filing an issue what are the things we need to do in order to repro your problem?]
-
-### Expected Result:
-[What are you expecting to happen as the consequence of above reproduction steps?]
-
-### Actual Result:
-[What actually happens after the reproduction steps?]
-```
 
 ## <a name="release"></a> Chef Release Cycles
 

data/Gemfile

@@ -1,5 +1,5 @@
 #
-# Copyright:: Copyright (c) 2014 Chef Software Inc.
+# Copyright:: Copyright (c) 2014-2016 Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -27,6 +27,9 @@ 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"
@@ -52,13 +55,14 @@ 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.11.18"
+  gem "chef", github: "chef/chef", branch: "v12.12.15"
   gem "cheffish", ">= 2.0.3"
   gem "chefspec"
   gem "fauxhai"
   gem "foodcritic", ">= 6.1.1"
   gem "inspec", ">= 0.17.1"
   gem "kitchen-ec2"
+  gem "kitchen-dokken"
   gem "kitchen-inspec"
   gem "kitchen-vagrant"
   gem "knife-windows"
@@ -68,9 +72,11 @@ group(:omnibus_package) do
   gem "listen", "< 3.1.0"
   gem "mixlib-install"
 
+  # until dk runs on ruby 2.2.2+
+  gem "activesupport", "< 5.0"
+
   # For Delivery build node
   gem "chef-sugar"
-  gem "knife-supermarket"
   gem "mixlib-versioning"
   gem "artifactory"
   # The opscode-pushy-client version is pinned by "rake dependencies", which grabs the current version from omnibus.
@@ -81,7 +87,7 @@ group(:omnibus_package) do
   # All of the following used to be software definitions we included:
   gem "knife-spork"
   gem "dep-selector-libgecode"
-  gem "nokogiri", "1.6.7.2"
+  gem "nokogiri"
   gem "pry-byebug"
   gem "pry-remote"
   gem "pry-stack_explorer"

data/Gemfile.lock

@@ -7,12 +7,12 @@ GIT
 
 GIT
   remote: git://github.com/chef/chef.git
-  revision: 09dcd84395bcec512e4c704db5d2156663891d55
-  branch: v12.11.18
+  revision: aca2bd61c35d9cc26b351f87db62f9739151c7f6
+  branch: v12.12.15
   specs:
-    chef (12.11.18)
+    chef (12.12.15)
       bundler (>= 1.10)
-      chef-config (= 12.11.18)
+      chef-config (= 12.12.15)
       chef-zero (~> 4.5)
       diff-lcs (~> 1.2, >= 1.2.4)
       erubis (~> 2.7)
@@ -37,9 +37,9 @@ GIT
       specinfra (~> 2.10)
       syslog-logger (~> 1.6)
       uuidtools (~> 2.1.5)
-    chef (12.11.18-universal-mingw32)
+    chef (12.12.15-universal-mingw32)
       bundler (>= 1.10)
-      chef-config (= 12.11.18)
+      chef-config (= 12.12.15)
       chef-zero (~> 4.5)
       diff-lcs (~> 1.2, >= 1.2.4)
       erubis (~> 2.7)
@@ -75,10 +75,6 @@ GIT
       win32-service (~> 0.8.7)
       windows-api (~> 0.4.4)
       wmi-lite (~> 1.0)
-    chef-config (12.11.18)
-      fuzzyurl (~> 0.8.0)
-      mixlib-config (~> 2.0)
-      mixlib-shellout (~> 2.0)
 
 GIT
   remote: git://github.com/chef/opscode-pushy-client.git
@@ -94,14 +90,14 @@ GIT
 PATH
   remote: .
   specs:
-    chef-dk (0.15.16)
+    chef-dk (0.16.28)
       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)
+      mixlib-cli (~> 1.5, < 1.7)
       mixlib-shellout (~> 2.0)
       paint (~> 1.0)
       solve (~> 2.0, >= 2.0.1)
@@ -110,7 +106,7 @@ GEM
   remote: https://rubygems.org/
   specs:
     CFPropertyList (2.3.2)
-    activesupport (4.2.6)
+    activesupport (4.2.7)
       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
@@ -118,18 +114,18 @@ GEM
       tzinfo (~> 1.1)
     addressable (2.4.0)
     app_conf (0.4.2)
-    artifactory (2.3.2)
+    artifactory (2.3.3)
     ast (2.3.0)
     autoparse (0.3.3)
       addressable (>= 2.3.1)
       extlib (>= 0.9.15)
       multi_json (>= 1.0.0)
-    aws-sdk (2.3.14)
-      aws-sdk-resources (= 2.3.14)
-    aws-sdk-core (2.3.14)
+    aws-sdk (2.3.22)
+      aws-sdk-resources (= 2.3.22)
+    aws-sdk-core (2.3.22)
       jmespath (~> 1.0)
-    aws-sdk-resources (2.3.14)
-      aws-sdk-core (= 2.3.14)
+    aws-sdk-resources (2.3.22)
+      aws-sdk-core (= 2.3.22)
     aws-sdk-v1 (1.66.0)
       json (~> 1.4)
       nokogiri (>= 1.4.4)
@@ -172,6 +168,10 @@ 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)
       inifile (>= 2.0.2)
@@ -199,11 +199,11 @@ GEM
       chef-provisioning
     chef-sugar (3.3.0)
     chef-vault (2.9.0)
-    chef-zero (4.6.2)
+    chef-zero (4.7.1)
       ffi-yajl (~> 2.2)
       hashie (>= 2.0, < 4.0)
       mixlib-log (~> 1.3)
-      rack
+      rack (< 2)
       uuidtools (~> 2.1)
     cheffish (2.0.4)
       chef-zero (~> 4.3)
@@ -215,6 +215,7 @@ GEM
     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)
     cookstyle (0.0.1)
@@ -228,22 +229,24 @@ GEM
       ffi (~> 1.9)
     diff-lcs (1.2.5)
     diffy (3.1.0)
-    docker-api (1.28.0)
+    docker-api (1.29.0)
       excon (>= 0.38.0)
       json
     erubis (2.7.0)
-    excon (0.49.0)
+    excon (0.51.0)
     extlib (0.9.16)
     faraday (0.9.2)
       multipart-post (>= 1.2, < 3)
-    fauxhai (3.5.0)
+    fauxhai (3.6.0)
       net-ssh
-    ffi (1.9.10)
-    ffi (1.9.10-x86-mingw32)
+    ffi (1.9.14)
+    ffi (1.9.14-x86-mingw32)
     ffi-rzmq (2.0.4)
       ffi-rzmq-core (>= 1.0.1)
     ffi-rzmq-core (1.0.5)
       ffi
+    ffi-win32-extensions (1.0.2)
+      ffi
     ffi-yajl (2.2.3)
       libyajl2 (~> 1.2)
     fission (0.5.0)
@@ -285,12 +288,12 @@ GEM
     fog-atmos (0.1.0)
       fog-core
       fog-xml
-    fog-aws (0.9.2)
-      fog-core (~> 1.27)
+    fog-aws (0.10.0)
+      fog-core (~> 1.38)
       fog-json (~> 1.0)
       fog-xml (~> 0.1)
       ipaddress (~> 0.8)
-    fog-brightbox (0.10.1)
+    fog-brightbox (0.11.0)
       fog-core (~> 1.22)
       fog-json
       inflecto (~> 0.0.2)
@@ -299,7 +302,7 @@ GEM
       fog-json (~> 1.0)
       fog-xml (~> 0.1)
       ipaddress (~> 0.8)
-    fog-core (1.40.0)
+    fog-core (1.42.0)
       builder
       excon (~> 0.49)
       formatador (~> 0.2)
@@ -319,8 +322,8 @@ GEM
       multi_json (~> 1.10)
     fog-local (0.3.0)
       fog-core (~> 1.27)
-    fog-openstack (0.1.6)
-      fog-core (>= 1.39)
+    fog-openstack (0.1.8)
+      fog-core (>= 1.40)
       fog-json (>= 1.0)
       ipaddress (>= 0.8)
     fog-powerdns (0.1.1)
@@ -350,7 +353,7 @@ GEM
     fog-serverlove (0.1.2)
       fog-core
       fog-json
-    fog-softlayer (1.1.2)
+    fog-softlayer (1.1.3)
       fog-core
       fog-json
     fog-storm_on_demand (0.1.1)
@@ -374,7 +377,7 @@ GEM
     fog-xml (0.1.2)
       fog-core
       nokogiri (~> 1.5, >= 1.5.11)
-    foodcritic (6.3.0)
+    foodcritic (7.0.1)
       cucumber-core (>= 1.3)
       erubis
       nokogiri (>= 1.5, < 2.0)
@@ -427,7 +430,7 @@ GEM
     inflecto (0.0.2)
     inifile (3.0.0)
     iniparse (1.4.2)
-    inspec (0.26.0)
+    inspec (0.27.1)
       hashie (~> 3.4)
       json (~> 1.8)
       method_source (~> 0.8)
@@ -437,20 +440,21 @@ GEM
       rspec-its (~> 1.2)
       rubyzip (~> 1.1)
       thor (~> 0.19)
-      train (~> 0.13)
+      train (>= 0.15.1, < 1.0)
     ipaddress (0.8.3)
-    jmespath (1.2.4)
-      json_pure (>= 1.8.1)
+    jmespath (1.3.0)
     json (1.8.3)
-    json_pure (1.8.3)
     jwt (1.5.4)
+    kitchen-dokken (0.0.31)
+      docker-api (~> 1.29)
+      test-kitchen (~> 1.5)
     kitchen-ec2 (1.0.0)
       aws-sdk (~> 2)
       excon
       multi_json
       retryable (~> 2.0)
       test-kitchen (~> 1.4, >= 1.4.1)
-    kitchen-inspec (0.14.0)
+    kitchen-inspec (0.15.0)
       inspec (>= 0.22.0, < 1.0.0)
       test-kitchen (~> 1.6)
     kitchen-vagrant (0.20.0)
@@ -462,8 +466,6 @@ GEM
       chef (>= 11.0.0)
       diffy (>= 3.0.1)
       git (>= 1.2.5)
-    knife-supermarket (0.2.4)
-      chef (>= 0.10.10)
     knife-windows (1.4.1)
       winrm (~> 1.7)
     launchy (2.4.3)
@@ -482,15 +484,16 @@ GEM
     memoist (0.14.0)
     method_source (0.8.2)
     mime-types (2.99.2)
-    mini_portile2 (2.0.0)
+    mini_portile2 (2.1.0)
     minitar (0.5.4)
     minitest (5.9.0)
-    mixlib-archive (0.1.0)
+    mixlib-archive (0.2.0)
+      mixlib-log
     mixlib-authentication (1.4.1)
       mixlib-log
     mixlib-cli (1.6.0)
     mixlib-config (2.2.1)
-    mixlib-install (1.0.13)
+    mixlib-install (1.1.0)
       artifactory
       mixlib-shellout
       mixlib-versioning
@@ -508,7 +511,7 @@ GEM
       net-ssh (>= 2.6.5)
     net-sftp (2.1.2)
       net-ssh (>= 2.6.5)
-    net-ssh (3.1.1)
+    net-ssh (3.2.0)
     net-ssh-gateway (1.2.0)
       net-ssh (>= 2.6.5)
     net-ssh-multi (1.2.1)
@@ -516,17 +519,19 @@ GEM
       net-ssh-gateway (>= 1.2.0)
     net-telnet (0.1.1)
     nio4r (1.2.1)
-    nokogiri (1.6.7.2)
-      mini_portile2 (~> 2.0.0.rc2)
-    nokogiri (1.6.7.2-x86-mingw32)
-      mini_portile2 (~> 2.0.0.rc2)
+    nokogiri (1.6.8)
+      mini_portile2 (~> 2.1.0)
+      pkg-config (~> 1.1.7)
+    nokogiri (1.6.8-x86-mingw32)
+      mini_portile2 (~> 2.1.0)
+      pkg-config (~> 1.1.7)
     nori (2.6.0)
     notiffany (0.1.0)
       nenv (~> 0.1)
       shellany (~> 0.0)
     octokit (4.3.0)
       sawyer (~> 0.7.0, >= 0.5.3)
-    ohai (8.16.0)
+    ohai (8.17.1)
       chef-config (>= 12.5.0.alpha.1, < 13)
       ffi (~> 1.9)
       ffi-yajl (~> 2.2)
@@ -542,11 +547,12 @@ GEM
     paint (1.0.1)
     parser (2.3.1.2)
       ast (~> 2.2)
+    pkg-config (1.1.7)
     plist (3.2.0)
     polyglot (0.3.5)
     powerpack (0.1.1)
     proxifier (1.0.3)
-    pry (0.10.3)
+    pry (0.10.4)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
@@ -574,7 +580,7 @@ GEM
       json (~> 1.4)
     rdp-ruby-wmi (0.3.1)
     retriable (1.4.1)
-    retryable (2.0.3)
+    retryable (2.0.4)
     ridley (4.5.1)
       addressable
       buff-config (~> 1.0)
@@ -637,7 +643,7 @@ GEM
       specinfra (~> 2.53)
     sfl (2.2)
     shellany (0.0.1)
-    signet (0.7.2)
+    signet (0.7.3)
       addressable (~> 2.3)
       faraday (~> 0.9)
       jwt (~> 1.5)
@@ -646,7 +652,7 @@ GEM
     solve (2.0.3)
       molinillo (~> 0.4.2)
       semverse (~> 1.1)
-    specinfra (2.59.0)
+    specinfra (2.59.6)
       net-scp
       net-ssh (>= 2.7, < 4.0)
       net-telnet
@@ -659,7 +665,7 @@ GEM
       uuid (~> 2.0)
     syslog-logger (1.6.8)
     systemu (2.6.5)
-    test-kitchen (1.10.0)
+    test-kitchen (1.10.2)
       mixlib-install (~> 1.0, >= 1.0.4)
       mixlib-shellout (>= 1.2, < 3.0)
       net-scp (~> 1.1)
@@ -670,7 +676,7 @@ GEM
     thread_safe (0.3.5)
     timers (4.0.4)
       hitimes
-    train (0.13.1)
+    train (0.15.1)
       docker-api (~> 1.26)
       json (~> 1.8)
       mixlib-shellout (~> 2.0)
@@ -698,7 +704,7 @@ GEM
       win32-ipc (>= 0.6.0)
     win32-eventlog (0.6.3)
       ffi
-    win32-ipc (0.6.6)
+    win32-ipc (0.7.0)
       ffi
     win32-mmap (0.4.2)
       ffi
@@ -706,11 +712,12 @@ GEM
       win32-ipc (>= 0.6.0)
     win32-process (0.8.3)
       ffi (>= 1.0.0)
-    win32-service (0.8.7)
+    win32-service (0.8.9)
       ffi
+      ffi-win32-extensions
     windows-api (0.4.4)
       win32-api (>= 1.4.5)
-    windows-pr (1.2.4)
+    windows-pr (1.2.5)
       win32-api (>= 1.4.5)
       windows-api (>= 0.4.0)
     winrm (1.8.1)
@@ -724,7 +731,7 @@ GEM
     winrm-elevated (0.4.0)
       winrm (~> 1.5)
       winrm-fs (~> 0.4.2)
-    winrm-fs (0.4.2)
+    winrm-fs (0.4.3)
       erubis (~> 2.7)
       logging (>= 1.6.1, < 3.0)
       rubyzip (~> 1.1)
@@ -732,13 +739,14 @@ GEM
     wmi-lite (1.0.0)
     xml-simple (1.1.5)
     yajl-ruby (1.2.1)
-    yard (0.8.7.6)
+    yard (0.9.0)
 
 PLATFORMS
   ruby
   x86-mingw32
 
 DEPENDENCIES
+  activesupport (< 5.0)
   appbundler!
   artifactory
   berkshelf
@@ -762,17 +770,17 @@ DEPENDENCIES
   foodcritic (>= 6.1.1)
   guard
   inspec (>= 0.17.1)
+  kitchen-dokken
   kitchen-ec2
   kitchen-inspec
   kitchen-vagrant
   knife-push
   knife-spork
-  knife-supermarket
   knife-windows
   listen (< 3.1.0)
   mixlib-install
   mixlib-versioning
-  nokogiri (= 1.6.7.2)
+  nokogiri
   ohai (>= 8.13.0)
   opscode-pushy-client!
   pry
@@ -783,6 +791,7 @@ DEPENDENCIES
   rb-readline
   rdoc
   rdp-ruby-wmi
+  rspec-core (= 3.4.4)
   rubocop
   ruby-prof
   ruby-shadow