chef-dk 1.0.3 → 1.1.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dd414e5ce801d69ed1f78241d2e99fc3ac0c5cac
-  data.tar.gz: fd8dc5a6813bab3ba2d66fd9dd3dd8189adb4489
+  metadata.gz: afccc47a23300a0cb2b6e842e38d27f15360586c
+  data.tar.gz: 8b1be04f2a755078caa2d95bd70e34ba798065a0
 SHA512:
-  metadata.gz: c1c9d70a61e82174c1f138676ef3ea6df575ee1f6e63e286fbe82639da5de7f9e5b682963022ae14875ca64a6853c3f411509771693a4d429acd97502561c41c
-  data.tar.gz: 0bb24e25cbe06011569745db1e6db2fa00ab748ed9c21da1b3cef9b274a0fd1a097172c1776c7101805178049ea1d69713759bd8274ad1b1ea1fb08035a8547c
+  metadata.gz: cf44e64920b4a009cf8ffc41ebd7f5ca2be7e8eae2de5617c71285773cfdc4557b3a96d027d13b7a46c57ab6d2448e0f9d0c474c60f69d662974168ffb6b55f7
+  data.tar.gz: c00feeb0ee230fab0cf1de8ac0f63667560c702ea4bb81572f9ea116829ee8751971ad60ddecacb3857bbb49f531429f6b4ce328400f79aab6db78214df549d6

data/Gemfile

@@ -52,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.16.42"
+  gem "chef", github: "chef/chef", branch: "v12.17.44"
   gem "cheffish", ">= 4.0"
   gem "chefspec"
   gem "fauxhai"
@@ -67,7 +67,7 @@ group(:omnibus_package) do
   gem "ohai", ">= 8.13.0"
   gem "test-kitchen"
   gem "listen"
-  gem "mixlib-install"
+  gem "dco"
 
   # For Delivery build node
   gem "chef-sugar"
@@ -98,6 +98,13 @@ group(:linux, :bsd, :mac_os_x, :solaris) do
   gem "ruby-shadow", platform: :ruby
 end
 
+group(:changelog) do
+  gem "github_changelog_generator", git: "https://github.com/tduffield/github-changelog-generator", branch: "adjust-tag-section-mapping"
+end
+
+# mixlib-install is used by two groups
+gem 'mixlib-install', :group => [:changelog, :omnibus_package]
+
 # TODO delete this when we figure out how to include the pushy windows dependencies
 # correctly
 platforms :mswin, :mingw do

data/Gemfile.lock

@@ -1,19 +1,19 @@
 GIT
   remote: git://github.com/chef/appbundler.git
-  revision: 76cb17280186ba314d31cd5751e674025ec93c79
+  revision: 6582b68884453b5ca5c962458a0c08046c719558
   specs:
-    appbundler (0.9.0)
+    appbundler (0.10.0)
       mixlib-cli (~> 1.4)
 
 GIT
   remote: git://github.com/chef/chef.git
-  revision: fecaf2fc865e215c95154f353d5d9b3c81b2ff7c
-  branch: v12.16.42
+  revision: 066935169905ad96b553520160b3678497c0284b
+  branch: v12.17.44
   specs:
-    chef (12.16.42)
+    chef (12.17.44)
       addressable
       bundler (>= 1.10)
-      chef-config (= 12.16.42)
+      chef-config (= 12.17.44)
       chef-zero (>= 4.8)
       diff-lcs (~> 1.2, >= 1.2.4)
       erubis (~> 2.7)
@@ -39,10 +39,10 @@ GIT
       specinfra (~> 2.10)
       syslog-logger (~> 1.6)
       uuidtools (~> 2.1.5)
-    chef (12.16.42-universal-mingw32)
+    chef (12.17.44-universal-mingw32)
       addressable
       bundler (>= 1.10)
-      chef-config (= 12.16.42)
+      chef-config (= 12.17.44)
       chef-zero (>= 4.8)
       diff-lcs (~> 1.2, >= 1.2.4)
       erubis (~> 2.7)
@@ -79,7 +79,7 @@ GIT
       win32-service (~> 0.8.7)
       windows-api (~> 0.4.4)
       wmi-lite (~> 1.0)
-    chef-config (12.16.42)
+    chef-config (12.17.44)
       addressable
       fuzzyurl
       mixlib-config (~> 2.0)
@@ -96,10 +96,24 @@ GIT
       ohai
       uuidtools
 
+GIT
+  remote: https://github.com/tduffield/github-changelog-generator
+  revision: 8effcdd6988617b453669965fedc1280aa84bd7a
+  branch: adjust-tag-section-mapping
+  specs:
+    github_changelog_generator (1.14.2)
+      activesupport
+      faraday-http-cache
+      multi_json
+      octokit (~> 4.6)
+      rainbow (>= 2.1)
+      rake (>= 10.0)
+      retriable (>= 1.4)
+
 PATH
   remote: .
   specs:
-    chef-dk (1.0.3)
+    chef-dk (1.1.16)
       chef (~> 12.5)
       chef-provisioning (~> 2.0)
       cookbook-omnifetch (~> 0.2, >= 0.2.2)
@@ -114,7 +128,7 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    CFPropertyList (2.3.3)
+    CFPropertyList (2.3.4)
     activesupport (4.2.7.1)
       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
@@ -130,15 +144,17 @@ GEM
       addressable (>= 2.3.1)
       extlib (>= 0.9.15)
       multi_json (>= 1.0.0)
-    aws-sdk (2.6.19)
-      aws-sdk-resources (= 2.6.19)
-    aws-sdk-core (2.6.19)
+    aws-sdk (2.6.35)
+      aws-sdk-resources (= 2.6.35)
+    aws-sdk-core (2.6.35)
+      aws-sigv4 (~> 1.0)
       jmespath (~> 1.0)
-    aws-sdk-resources (2.6.19)
-      aws-sdk-core (= 2.6.19)
+    aws-sdk-resources (2.6.35)
+      aws-sdk-core (= 2.6.35)
     aws-sdk-v1 (1.66.0)
       json (~> 1.4)
       nokogiri (>= 1.4.4)
+    aws-sigv4 (1.0.0)
     backports (3.6.8)
     berkshelf (5.2.0)
       addressable (~> 2.3, >= 2.3.4)
@@ -185,10 +201,10 @@ GEM
       net-ssh (>= 2.9, < 4.0)
       net-ssh-gateway (~> 1.2.0)
       winrm-fs (~> 1.0)
-    chef-provisioning-aws (2.0.0)
+    chef-provisioning-aws (2.1.0)
       aws-sdk (>= 2.1.26, < 3.0)
       aws-sdk-v1 (>= 1.59.0)
-      chef-provisioning (~> 2.0)
+      chef-provisioning (>= 1.0, < 3.0)
       retryable (~> 2.0, >= 2.0.1)
       ubuntu_ami (~> 0.4, >= 0.4.1)
     chef-provisioning-azure (0.6.0)
@@ -222,8 +238,8 @@ GEM
     coderay (1.1.1)
     cookbook-omnifetch (0.2.3)
       minitar (~> 0.5.4)
-    cookstyle (0.0.1)
-      rubocop (= 0.39.0)
+    cookstyle (1.1.0)
+      rubocop (= 0.46.0)
     cucumber (2.4.0)
       builder (>= 2.1.2)
       cucumber-core (~> 1.5.0)
@@ -235,6 +251,9 @@ GEM
     cucumber-core (1.5.0)
       gherkin (~> 4.0)
     cucumber-wire (0.0.1)
+    dco (1.0.1)
+      git (~> 1.3)
+      thor (~> 0.19)
     debug_inspector (0.0.2)
     dep-selector-libgecode (1.3.1)
     dep_selector (1.0.4)
@@ -242,7 +261,7 @@ GEM
       ffi (~> 1.9)
     diff-lcs (1.2.5)
     diffy (3.1.0)
-    docker-api (1.32.1)
+    docker-api (1.33.0)
       excon (>= 0.38.0)
       json
     erubis (2.7.0)
@@ -250,6 +269,8 @@ GEM
     extlib (0.9.16)
     faraday (0.9.2)
       multipart-post (>= 1.2, < 3)
+    faraday-http-cache (2.0.0)
+      faraday (~> 0.8)
     fauxhai (3.10.0)
       net-ssh
     ffi (1.9.14)
@@ -301,7 +322,7 @@ GEM
     fog-atmos (0.1.0)
       fog-core
       fog-xml
-    fog-aws (0.12.0)
+    fog-aws (1.0.0)
       fog-core (~> 1.38)
       fog-json (~> 1.0)
       fog-xml (~> 0.1)
@@ -340,7 +361,7 @@ GEM
       multi_json (~> 1.10)
     fog-local (0.3.1)
       fog-core (~> 1.27)
-    fog-openstack (0.1.17)
+    fog-openstack (0.1.18)
       fog-core (>= 1.40)
       fog-json (>= 1.0)
       ipaddress (>= 0.8)
@@ -385,7 +406,7 @@ GEM
     fog-voxel (0.1.0)
       fog-core
       fog-xml
-    fog-vsphere (1.5.1)
+    fog-vsphere (1.5.2)
       fog-core
       rbvmomi (~> 1.9)
     fog-xenserver (0.2.3)
@@ -442,12 +463,12 @@ GEM
     highline (1.7.8)
     hitimes (1.2.4)
     hitimes (1.2.4-x86-mingw32)
-    httpclient (2.8.2.4)
+    httpclient (2.8.3)
     i18n (0.7.0)
     inflecto (0.0.2)
     inifile (3.0.0)
     iniparse (1.4.2)
-    inspec (1.4.1)
+    inspec (1.7.2)
       hashie (~> 3.4)
       json (>= 1.8, < 3.0)
       method_source (~> 0.8)
@@ -457,38 +478,39 @@ GEM
       rainbow (~> 2)
       rspec (~> 3)
       rspec-its (~> 1.2)
+      rspec_junit_formatter (~> 0.2.3)
       rubyzip (~> 1.1)
       sslshake (~> 1)
       thor (~> 0.19)
-      train (>= 0.20.1, < 1.0)
+      train (>= 0.22.0, < 1.0)
     ipaddress (0.8.3)
     jmespath (1.3.1)
     json (1.8.3)
     jwt (1.5.6)
-    kitchen-dokken (1.0.4)
-      docker-api (~> 1.29)
-      test-kitchen (~> 1.5)
+    kitchen-dokken (1.0.9)
+      docker-api (~> 1.32)
+      test-kitchen (~> 1.13)
     kitchen-ec2 (1.2.0)
       aws-sdk (~> 2)
       excon
       multi_json
       retryable (~> 2.0)
       test-kitchen (~> 1.4, >= 1.4.1)
-    kitchen-inspec (0.16.1)
+    kitchen-inspec (0.17.0)
       hashie (~> 3.4)
       inspec (>= 0.34.0, < 2.0.0)
       test-kitchen (~> 1.6)
-    kitchen-vagrant (0.20.0)
+    kitchen-vagrant (0.21.1)
       test-kitchen (~> 1.4)
     knife-opc (0.3.2)
     knife-push (1.0.2)
       chef (>= 12.7.2)
-    knife-spork (1.6.2)
+    knife-spork (1.6.3)
       app_conf (>= 0.4.0)
       chef (>= 11.0.0)
       diffy (>= 3.0.1)
       git (>= 1.2.5)
-    knife-windows (1.7.0)
+    knife-windows (1.7.1)
       winrm (~> 2.1)
       winrm-elevated (~> 1.0)
     launchy (2.4.3)
@@ -512,14 +534,14 @@ GEM
     mime-types-data (3.2016.0521)
     mini_portile2 (2.1.0)
     minitar (0.5.4)
-    minitest (5.9.1)
+    minitest (5.10.1)
     mixlib-archive (0.2.0)
       mixlib-log
     mixlib-authentication (1.4.1)
       mixlib-log
     mixlib-cli (1.7.0)
     mixlib-config (2.2.4)
-    mixlib-install (2.1.6)
+    mixlib-install (2.1.9)
       artifactory
       mixlib-shellout
       mixlib-versioning
@@ -555,9 +577,9 @@ GEM
     notiffany (0.1.1)
       nenv (~> 0.1)
       shellany (~> 0.0)
-    octokit (4.6.0)
+    octokit (4.6.2)
       sawyer (~> 0.8.0, >= 0.5.3)
-    ohai (8.21.0)
+    ohai (8.22.1)
       chef-config (>= 12.5.0.alpha.1, < 13)
       ffi (~> 1.9)
       ffi-yajl (~> 2.2)
@@ -571,8 +593,8 @@ GEM
       wmi-lite (~> 1.0)
     os (0.9.6)
     paint (1.0.1)
-    parallel (1.9.0)
-    parser (2.3.1.4)
+    parallel (1.10.0)
+    parser (2.3.3.1)
       ast (~> 2.2)
     plist (3.2.0)
     polyglot (0.3.5)
@@ -582,7 +604,7 @@ GEM
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
-    pry-byebug (3.4.0)
+    pry-byebug (3.4.2)
       byebug (~> 9.0)
       pry (~> 0.10)
     pry-remote (0.1.8)
@@ -594,7 +616,7 @@ GEM
     public_suffix (2.0.4)
     rack (2.0.1)
     rainbow (2.1.0)
-    rake (11.3.0)
+    rake (12.0.0)
     rb-fsevent (0.9.8)
     rb-inotify (0.9.7)
       ffi (>= 0.5.0)
@@ -645,8 +667,8 @@ GEM
     rspec_junit_formatter (0.2.3)
       builder (< 4)
       rspec-core (>= 2, < 4, != 2.12.0)
-    rubocop (0.39.0)
-      parser (>= 2.3.0.7, < 3.0)
+    rubocop (0.46.0)
+      parser (>= 2.3.1.1, < 3.0)
       powerpack (~> 0.1)
       rainbow (>= 1.99.1, < 3.0)
       ruby-progressbar (~> 1.7)
@@ -659,9 +681,9 @@ GEM
     rubyzip (1.2.0)
     rufus-lru (1.1.0)
     safe_yaml (1.0.4)
-    sawyer (0.8.0)
+    sawyer (0.8.1)
       addressable (>= 2.3.5, < 2.6)
-      faraday (~> 0.8, < 0.10)
+      faraday (~> 0.8, < 1.0)
     semverse (2.0.0)
     serverspec (2.37.2)
       multi_json
@@ -676,10 +698,10 @@ GEM
       jwt (~> 1.5)
       multi_json (~> 1.10)
     slop (3.6.0)
-    solve (3.0.1)
-      molinillo (~> 0.4)
+    solve (3.1.0)
+      molinillo (>= 0.5)
       semverse (>= 1.1, < 3.0)
-    specinfra (2.66.0)
+    specinfra (2.66.2)
       net-scp
       net-ssh (>= 2.7, < 4.0)
       net-telnet
@@ -693,7 +715,7 @@ GEM
       uuid (~> 2.0)
     syslog-logger (1.6.8)
     systemu (2.6.5)
-    test-kitchen (1.13.2)
+    test-kitchen (1.14.2)
       mixlib-install (>= 1.2, < 3.0)
       mixlib-shellout (>= 1.2, < 3.0)
       net-scp (~> 1.1)
@@ -701,11 +723,11 @@ GEM
       net-ssh-gateway (~> 1.2.0)
       safe_yaml (~> 1.0)
       thor (~> 0.18)
-    thor (0.19.1)
+    thor (0.19.4)
     thread_safe (0.3.5)
     timers (4.0.4)
       hitimes
-    train (0.21.1)
+    train (0.22.0)
       docker-api (~> 1.26)
       json (>= 1.8, < 3.0)
       mixlib-shellout (~> 2.0)
@@ -719,7 +741,7 @@ GEM
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
     ubuntu_ami (0.4.1)
-    unicode-display_width (1.1.1)
+    unicode-display_width (1.1.2)
     uuid (2.3.8)
       macaddr (~> 1.0)
     uuidtools (2.1.5)
@@ -741,7 +763,7 @@ GEM
       win32-ipc (>= 0.6.0)
     win32-process (0.8.3)
       ffi (>= 1.0.0)
-    win32-service (0.8.9)
+    win32-service (0.8.10)
       ffi
       ffi-win32-extensions
     windows-api (0.4.4)
@@ -758,10 +780,10 @@ GEM
       logging (>= 1.6.1, < 3.0)
       nori (~> 2.0)
       rubyntlm (~> 0.6.0, >= 0.6.1)
-    winrm-elevated (1.0.1)
+    winrm-elevated (1.1.0)
       winrm (~> 2.0)
       winrm-fs (~> 1.0)
-    winrm-fs (1.0.0)
+    winrm-fs (1.0.1)
       erubis (~> 2.7)
       logging (>= 1.6.1, < 3.0)
       rubyzip (~> 1.1)
@@ -792,12 +814,14 @@ DEPENDENCIES
   chefspec
   cookstyle
   cucumber
+  dco
   dep-selector-libgecode
   dep_selector
   fauxhai
   ffi
   ffi-rzmq-core
   foodcritic (>= 8.0)
+  github_changelog_generator!
   guard
   inspec (>= 0.17.1)
   kitchen-dokken
@@ -839,4 +863,4 @@ DEPENDENCIES
   yard
 
 BUNDLED WITH
-   1.13.3
+   1.12.5

data/Rakefile

@@ -20,3 +20,4 @@ require_relative "tasks/version"
 require_relative "tasks/bundle"
 require_relative "tasks/dependencies"
 require_relative "tasks/github_changelog_generator"
+require_relative "tasks/announce"

data/acceptance/Gemfile.lock

@@ -12,12 +12,14 @@ GEM
     addressable (2.5.0)
       public_suffix (~> 2.0, >= 2.0.2)
     artifactory (2.5.1)
-    aws-sdk (2.6.19)
-      aws-sdk-resources (= 2.6.19)
-    aws-sdk-core (2.6.19)
+    aws-sdk (2.6.35)
+      aws-sdk-resources (= 2.6.35)
+    aws-sdk-core (2.6.35)
+      aws-sigv4 (~> 1.0)
       jmespath (~> 1.0)
-    aws-sdk-resources (2.6.19)
-      aws-sdk-core (= 2.6.19)
+    aws-sdk-resources (2.6.35)
+      aws-sdk-core (= 2.6.35)
+    aws-sigv4 (1.0.0)
     berkshelf (5.2.0)
       addressable (~> 2.3, >= 2.3.4)
       berkshelf-api-client (>= 2.0.2, < 4.0)
@@ -52,7 +54,7 @@ GEM
     celluloid-io (0.16.2)
       celluloid (>= 0.16.0)
       nio4r (>= 1.1.0)
-    chef-config (12.16.42)
+    chef-config (12.17.44)
       addressable
       fuzzyurl
       mixlib-config (~> 2.0)
@@ -60,7 +62,7 @@ GEM
     cleanroom (1.0.0)
     coderay (1.1.1)
     diff-lcs (1.2.5)
-    docker-api (1.32.1)
+    docker-api (1.33.0)
       excon (>= 0.38.0)
       json
     erubis (2.7.0)
@@ -75,8 +77,8 @@ GEM
       builder (>= 2.1.2)
     hashie (3.4.6)
     hitimes (1.2.4)
-    httpclient (2.8.2.4)
-    inspec (1.4.1)
+    httpclient (2.8.3)
+    inspec (1.7.2)
       hashie (~> 3.4)
       json (>= 1.8, < 3.0)
       method_source (~> 0.8)
@@ -86,10 +88,11 @@ GEM
       rainbow (~> 2)
       rspec (~> 3)
       rspec-its (~> 1.2)
+      rspec_junit_formatter (~> 0.2.3)
       rubyzip (~> 1.1)
       sslshake (~> 1)
       thor (~> 0.19)
-      train (>= 0.20.1, < 1.0)
+      train (>= 0.22.0, < 1.0)
     jmespath (1.3.1)
     json (2.0.2)
     kitchen-ec2 (1.2.0)
@@ -98,11 +101,11 @@ GEM
       multi_json
       retryable (~> 2.0)
       test-kitchen (~> 1.4, >= 1.4.1)
-    kitchen-inspec (0.16.1)
+    kitchen-inspec (0.17.0)
       hashie (~> 3.4)
       inspec (>= 0.34.0, < 2.0.0)
       test-kitchen (~> 1.6)
-    kitchen-vagrant (0.20.0)
+    kitchen-vagrant (0.21.1)
       test-kitchen (~> 1.4)
     little-plugger (1.1.4)
     logging (2.1.0)
@@ -132,9 +135,9 @@ GEM
       net-ssh (>= 2.6.5)
     nio4r (1.2.1)
     nori (2.6.0)
-    octokit (4.6.0)
+    octokit (4.6.2)
       sawyer (~> 0.8.0, >= 0.5.3)
-    parallel (1.9.0)
+    parallel (1.10.0)
     pry (0.10.4)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
@@ -176,19 +179,22 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.4.0)
     rspec-support (3.4.1)
+    rspec_junit_formatter (0.2.3)
+      builder (< 4)
+      rspec-core (>= 2, < 4, != 2.12.0)
     rubyntlm (0.6.1)
     rubyzip (1.2.0)
     safe_yaml (1.0.4)
-    sawyer (0.8.0)
+    sawyer (0.8.1)
       addressable (>= 2.3.5, < 2.6)
-      faraday (~> 0.8, < 0.10)
+      faraday (~> 0.8, < 1.0)
     semverse (2.0.0)
     slop (3.6.0)
-    solve (3.0.1)
-      molinillo (~> 0.4)
+    solve (3.1.0)
+      molinillo (>= 0.5)
       semverse (>= 1.1, < 3.0)
     sslshake (1.0.13)
-    test-kitchen (1.13.2)
+    test-kitchen (1.14.2)
       mixlib-install (>= 1.2, < 3.0)
       mixlib-shellout (>= 1.2, < 3.0)
       net-scp (~> 1.1)
@@ -196,10 +202,10 @@ GEM
       net-ssh-gateway (~> 1.2.0)
       safe_yaml (~> 1.0)
       thor (~> 0.18)
-    thor (0.19.1)
+    thor (0.19.4)
     timers (4.0.4)
       hitimes
-    train (0.21.1)
+    train (0.22.0)
       docker-api (~> 1.26)
       json (>= 1.8, < 3.0)
       mixlib-shellout (~> 2.0)
@@ -221,10 +227,10 @@ GEM
       logging (>= 1.6.1, < 3.0)
       nori (~> 2.0)
       rubyntlm (~> 0.6.0, >= 0.6.1)
-    winrm-elevated (1.0.1)
+    winrm-elevated (1.1.0)
       winrm (~> 2.0)
       winrm-fs (~> 1.0)
-    winrm-fs (1.0.0)
+    winrm-fs (1.0.1)
       erubis (~> 2.7)
       logging (>= 1.6.1, < 3.0)
       rubyzip (~> 1.1)

data/chef-dk.gemspec

@@ -50,7 +50,6 @@ Gem::Specification.new do |gem|
   gem.add_dependency "paint", "~> 1.0"
   gem.add_dependency "chef-provisioning", "~> 2.0"
 
-  gem.add_development_dependency "github_changelog_generator"
   gem.add_development_dependency "rake"
 
   %w(rspec-core rspec-expectations rspec-mocks).each do |dev_gem|

data/lib/chef-dk/command/generator_commands/cookbook.rb

@@ -105,7 +105,7 @@ module ChefDK
             msg("\nThere are several commands you can run to get started locally developing and testing your cookbook.")
             msg("Type `delivery local --help` to see a full list.")
             msg("\nWhy not start by writing a test? Tests for the default recipe are stored at:\n")
-            msg("test/recipes/default_test.rb")
+            msg("test/smoke/default/default_test.rb")
             msg("\nIf you'd prefer to dive right in, the default recipe can be found at:")
             msg("\nrecipes/default.rb\n")
           end

data/lib/chef-dk/generator.rb

@@ -73,10 +73,10 @@ module ChefDK
       def license_description(comment=nil)
         case license
         when 'all_rights'
-          result = "Copyright (c) #{year} #{copyright_holder}, All Rights Reserved."
+          result = "Copyright:: #{year}, #{copyright_holder}, All Rights Reserved."
         when 'apachev2'
           result = <<-EOH
-Copyright #{year} #{copyright_holder}
+Copyright:: #{year}, #{copyright_holder}
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -94,7 +94,7 @@ EOH
           result = <<-EOH
 The MIT License (MIT)
 
-Copyright (c) #{year} #{copyright_holder}
+Copyright:: #{year}, #{copyright_holder}
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -116,7 +116,7 @@ THE SOFTWARE.
 EOH
         when 'gplv2'
           result = <<-EOH
-Copyright (C) #{year}  #{copyright_holder}
+Copyright:: #{year},  #{copyright_holder}
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -134,7 +134,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 EOH
         when 'gplv3'
           result = <<-EOH
-Copyright (C) #{year}  #{copyright_holder}
+Copyright:: #{year},  #{copyright_holder}
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by

data/lib/chef-dk/skeletons/code_generator/files/default/delivery-config.json

@@ -5,6 +5,8 @@
     "path": ".delivery/build_cookbook"
   },
   "skip_phases": [],
-  "build_nodes": {},
+  "job_dispatch": {
+    "version": "v2"
+  },
   "dependencies": []
 }

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

@@ -17,11 +17,11 @@ template "#{app_dir}/.kitchen.yml" do
 end
 
 # Inspec
-directory "#{app_dir}/test/recipes" do
+directory "#{app_dir}/test/smoke/default" do
   recursive true
 end
 
-template "#{app_dir}/test/recipes/default_test.rb" do
+template "#{app_dir}/test/smoke/default/default_test.rb" do
   source 'inspec_default_test.rb.erb'
   helpers(ChefDK::Generator::TemplateHelper)
   action :create_if_missing

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

@@ -55,11 +55,11 @@ template "#{cookbook_dir}/.kitchen.yml" do
 end
 
 # Inspec
-directory "#{cookbook_dir}/test/recipes" do
+directory "#{cookbook_dir}/test/smoke/default" do
   recursive true
 end
 
-template "#{cookbook_dir}/test/recipes/default_test.rb" do
+template "#{cookbook_dir}/test/smoke/default/default_test.rb" do
   source 'inspec_default_test.rb.erb'
   helpers(ChefDK::Generator::TemplateHelper)
   action :create_if_missing

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

@@ -3,11 +3,23 @@ context = ChefDK::Generator.context
 cookbook_dir = File.join(context.cookbook_root, context.cookbook_name)
 recipe_path = File.join(cookbook_dir, "recipes", "#{context.new_file_basename}.rb")
 spec_helper_path = File.join(cookbook_dir, "spec", "spec_helper.rb")
-spec_path = File.join(cookbook_dir, "spec", "unit", "recipes", "#{context.new_file_basename}_spec.rb")
-inspec_path = File.join(cookbook_dir, "test", "recipes", "#{context.new_file_basename}.rb")
+spec_dir = File.join(cookbook_dir, "spec", "unit", "recipes")
+spec_path = File.join(spec_dir, "#{context.new_file_basename}_spec.rb")
+inspec_dir = File.join(cookbook_dir, "test", "smoke", "default")
+inspec_path = File.join(inspec_dir, "#{context.new_file_basename}.rb")
+
+if File.directory?(File.join(cookbook_dir, "test", "recipes"))
+  Chef::Log.deprecation <<-EOH
+It appears that you have Inspec tests located at "test/recipes". This location can
+cause issues with Foodcritic and has been deprecated in favor of "test/smoke/default".
+Please move your existing Inspec tests to the newly created "test/smoke/default"
+directory, and update the 'inspec_tests' value in your .kitchen.yml file(s) to
+point to "test/smoke/default".
+  EOH
+end
 
 # Chefspec
-directory "#{cookbook_dir}/spec/unit/recipes" do
+directory spec_dir do
   recursive true
 end
 
@@ -22,7 +34,7 @@ template spec_path do
 end
 
 # Inspec
-directory "#{cookbook_dir}/test/recipes" do
+directory inspec_dir do
   recursive true
 end
 
@@ -37,4 +49,3 @@ template recipe_path do
   source "recipe.rb.erb"
   helpers(ChefDK::Generator::TemplateHelper)
 end
-

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

@@ -1,5 +1,5 @@
 #
-# Cookbook Name:: build_cookbook
+# Cookbook:: build_cookbook
 # Recipe:: <%= @phase %>
 #
 <%= license_description('#') %>

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

@@ -3,7 +3,7 @@
 # Inspec test for recipe <%= cookbook_name %>::<%= recipe_name %>
 
 # The Inspec reference, with examples and extensive documentation, can be
-# found at https://docs.chef.io/inspec_reference.html
+# found at http://inspec.io/docs/reference/resources/
 
 unless os.windows?
   describe user('root') do

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

@@ -22,5 +22,5 @@ suites:
       - recipe[<%= cookbook_name %>::default]
     verifier:
       inspec_tests:
-        - test/recipes
+        - test/smoke/default
     attributes:

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

@@ -29,5 +29,5 @@ suites:
   - name: default
     verifier:
       inspec_tests:
-        - test/recipes
+        - test/smoke/default
     attributes:

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

@@ -6,10 +6,14 @@ 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
+# The `issues_url` points to the location where issues for this cookbook are
+# tracked.  A `View Issues` link will be displayed on this cookbook's page when
+# uploaded to a Supermarket.
+#
 # 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
+# The `source_url` points to the development reposiory for this cookbook.  A
+# `View Source` link will be displayed on this cookbook's page when uploaded to
+# a Supermarket.
+#
 # source_url 'https://github.com/<insert_org_here>/<%= cookbook_name %>' if respond_to?(:source_url)

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

@@ -1,5 +1,5 @@
 #
-# Cookbook Name:: <%= cookbook_name %>
+# Cookbook:: <%= cookbook_name %>
 # Recipe:: <%= recipe_name %>
 #
 <%= license_description('#') %>

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

@@ -1,5 +1,5 @@
 #
-# Cookbook Name:: <%= cookbook_name %>
+# Cookbook:: <%= cookbook_name %>
 # Spec:: default
 #
 <%= license_description('#') %>

data/lib/chef-dk/version.rb

@@ -16,5 +16,5 @@
 #
 
 module ChefDK
-  VERSION = "1.0.3"
+  VERSION = "1.1.16"
 end

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

@@ -31,8 +31,9 @@ describe ChefDK::Command::GeneratorCommands::App do
       .gitignore
       .kitchen.yml
       test
-      test/recipes
-      test/recipes/default_test.rb
+      test/smoke
+      test/smoke/default
+      test/smoke/default/default_test.rb
       README.md
       cookbooks/new_app/Berksfile
       cookbooks/new_app/chefignore
@@ -128,8 +129,8 @@ describe ChefDK::Command::GeneratorCommands::App do
         end
       end
 
-      describe "test/recipes/default_test.rb" do
-        let(:file) { File.join(tempdir, "new_app", "test", "recipes", "default_test.rb") }
+      describe "test/smoke/default/default_test.rb" do
+        let(:file) { File.join(tempdir, "new_app", "test", "smoke", "default", "default_test.rb") }
 
         include_examples "a generated file", :cookbook_name do
           let(:line) { "describe port" }
@@ -148,7 +149,7 @@ describe ChefDK::Command::GeneratorCommands::App do
         let(:file) { File.join(tempdir, "new_app", "cookbooks", "new_app", "recipes", "default.rb") }
 
         include_examples "a generated file", :cookbook_name do
-          let(:line) { "# Cookbook Name:: new_app" }
+          let(:line) { "# Cookbook:: new_app" }
         end
       end
 
@@ -163,4 +164,3 @@ describe ChefDK::Command::GeneratorCommands::App do
     end
   end
 end
-

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

@@ -34,8 +34,8 @@ describe ChefDK::Command::GeneratorCommands::Cookbook do
       .gitignore
       .kitchen.yml
       test
-      test/recipes
-      test/recipes/default_test.rb
+      test/smoke
+      test/smoke/default/default_test.rb
       Berksfile
       chefignore
       metadata.rb
@@ -65,7 +65,7 @@ Type `delivery local --help` to see a full list.
 
 Why not start by writing a test? Tests for the default recipe are stored at:
 
-test/recipes/default_test.rb
+test/smoke/default/default_test.rb
 
 If you'd prefer to dive right in, the default recipe can be found at:
 
@@ -226,7 +226,9 @@ cleanup = "chef exec kitchen destroy"
     "path": ".delivery/build_cookbook"
   },
   "skip_phases": [],
-  "build_nodes": {},
+  "job_dispatch": {
+    "version": "v2"
+  },
   "dependencies": []
 }
   CONFIG_DOT_JSON
@@ -247,10 +249,10 @@ cleanup = "chef exec kitchen destroy"
         let(:expected_content) do
           <<-CONFIG_DOT_JSON
 #
-# Cookbook Name:: build_cookbook
+# Cookbook:: build_cookbook
 # Recipe:: publish
 #
-# Copyright (c) 2016 The Authors, All Rights Reserved.
+# Copyright:: 2016, The Authors, All Rights Reserved.
 include_recipe 'delivery-truck::publish'
   CONFIG_DOT_JSON
         end
@@ -458,8 +460,8 @@ OUTPUT
 
         end
 
-        describe "test/recipes/default_test.rb" do
-          let(:file) { File.join(tempdir, "new_cookbook", "test", "recipes", "default_test.rb") }
+        describe "test/smoke/default/default_test.rb" do
+          let(:file) { File.join(tempdir, "new_cookbook", "test", "smoke", "default", "default_test.rb") }
 
           include_examples "a generated file", :cookbook_name do
             let(:line) { "describe port" }
@@ -568,7 +570,7 @@ suites:
   - name: default
     verifier:
       inspec_tests:
-        - test/recipes
+        - test/smoke/default
     attributes:
 KITCHEN_YML
         end
@@ -645,7 +647,7 @@ suites:
       - recipe[new_cookbook::default]
     verifier:
       inspec_tests:
-        - test/recipes
+        - test/smoke/default
     attributes:
 KITCHEN_YML
         end
@@ -677,7 +679,7 @@ SPEC_HELPER
       let(:file) { File.join(tempdir, "new_cookbook", "recipes", "default.rb") }
 
       include_examples "a generated file", :cookbook_name do
-        let(:line) { "# Cookbook Name:: new_cookbook" }
+        let(:line) { "# Cookbook:: new_cookbook" }
       end
     end
 

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

@@ -27,7 +27,7 @@ describe ChefDK::Command::GeneratorCommands::Recipe do
     let(:generated_files) { [ "recipes/new_recipe.rb",
                               "spec/spec_helper.rb",
                               "spec/unit/recipes/new_recipe_spec.rb",
-                              "test/recipes/new_recipe.rb"
+                              "test/smoke/default/new_recipe.rb"
                             ] }
     let(:new_file_name) { "new_recipe" }
 

data/spec/unit/generator_spec.rb

@@ -63,7 +63,7 @@ describe ChefDK::Generator::TemplateHelper do
     let(:license) { "all_rights" }
     context "all_rights" do
       it "should match the license" do
-        expect(helper.license_description).to match(/^Copyright \(c\)/)
+        expect(helper.license_description).to match(/^Copyright:: /)
       end
 
       it "should comment if requested" do

data/tasks/announce.rb

@@ -0,0 +1,58 @@
+#
+# Copyright:: Copyright (c) 2016 Chef Software Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require "date"
+require "erb"
+
+class ReleaseAnnouncement
+  include ERB::Util
+  attr_accessor :type, :version, :maj_minor, :date, :release_notes
+
+  def initialize(version, date, type)
+    @version = version
+    @maj_minor = version.split(".")[0..1].join(".")
+    @date = Date.parse(date) unless date.nil?
+    @release_notes = release_notes_from_file
+    @type = type
+  end
+
+  def render
+    puts "-" * 30
+    puts ERB.new(template_for(@type)).result(binding)
+    puts "-" * 30
+  end
+
+  def template_for(type)
+    File.read("tasks/templates/#{type}.md.erb")
+  end
+
+  def release_notes_from_file
+    File.read("RELEASE_NOTES.md").match(/^# ChefDK #{@maj_minor} Release notes\n\n(.*)/m)[1]
+  end
+end
+
+namespace :announce do
+  desc "Generate the Prerelease Announcement (version: X.Y.Z, release_date: YYYY-MM-DD)"
+  task :prerelease, :version, :release_date do |t, args|
+    ReleaseAnnouncement.new(args[:version], args[:release_date], "prerelease").render
+  end
+
+  desc "Generate the Release Announcement (version: X.Y.Z)"
+  task :release, :version do |t, args|
+    ReleaseAnnouncement.new(args[:version], nil, "release").render
+  end
+end

data/tasks/github_changelog_generator.rb

@@ -17,17 +17,35 @@
 
 begin
   require "github_changelog_generator/task"
+  require "mixlib/install"
 
-  GitHubChangelogGenerator::RakeTask.new :changelog do |config|
-    config.user = "chef"
-    config.project = "chef-dk"
-    config.future_release = ChefDK::VERSION
-    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(",")
+  namespace :changelog do
+    # Fetch the latest version from mixlib-install
+    latest_stable_version = Mixlib::Install.available_versions("chefdk", "stable").last
+
+    # Take the changelog from the latest stable release and put it into history.
+    desc "Archive current CHANGELOG to HISTORY"
+    task :archive do
+      changelog = Net::HTTP.get(URI("https://raw.githubusercontent.com/chef/chef-dk/v#{latest_stable_version}/CHANGELOG.md")).chomp.split("\n")
+      File.open("HISTORY.md", "w+") { |f| f.write(changelog[2..-4].join("\n")) }
+    end
+
+    # Run this to just update the changelog for the current release. This will
+    # take what is in HISTORY and generate a changelog of PRs between the most
+    # recent stable version and HEAD.
+    GitHubChangelogGenerator::RakeTask.new :update do |config|
+      config.future_release = "v#{ChefDK::VERSION}"
+      config.between_tags = ["v#{latest_stable_version}", "v#{ChefDK::VERSION}"]
+      config.max_issues = 0
+      config.add_issues_wo_labels = false
+      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(",")
+      config.header = "This changelog reflects the current state of chef-dk's master branch on github and may not reflect the current released version of chef-dk, which is [![Gem Version](https://badge.fury.io/rb/chef-dk.svg)](https://badge.fury.io/rb/chef-dk)."
+    end
   end
+
+  task :changelog => "changelog:update"
 rescue LoadError
   puts "github_changelog_generator is not available. gem install github_changelog_generator to generate changelogs"
 end

data/tasks/templates/prerelease.md.erb

@@ -0,0 +1,35 @@
+Ohai Chefs!
+
+We have selected <%= @version %> as our ChefDK v<%= @maj_minor %> release candidate which is scheduled for release on <%= @date.strftime('%A %B %-d, %Y') %>.
+
+# Release Highlights
+
+<%= @release_notes %>
+
+Please see the [CHANGELOG](https://github.com/chef/chef-dk/blob/master/CHANGELOG.md) for the complete list of changes.
+
+# Get the Build
+As always, you can download binaries directly from [downloads.chef.io](https://downloads.chef.io/chefdk/current/<%= @version %>) or by using the new `mixlib-install` command line utility available in ChefDK 0.19.6 or greater.
+
+```shell
+$ mixlib-install download chefdk -v <%= @version %> -c current
+```
+
+Alternatively, you can install ChefDK using one of the following command options:
+
+```shell
+# In Shell
+$ curl https://omnitruck.chef.io/install.sh | sudo bash -s -- -P chefdk -v <%= @version %> -c current
+
+# In Windows Powershell
+. { iwr -useb https://omnitruck.chef.io/install.ps1 } | iex; install -project chefdk -version <%= @version %> -channel current
+```
+
+If you want to give this version a spin in Test Kitchen, create or add the following to a `.kitchen.local.yml` file:
+
+```yaml
+provisioner:
+  product_name: chefdk
+  channel: current
+  product_version: <%= @version %>
+```

data/tasks/templates/release.md.erb

@@ -0,0 +1,34 @@
+Ohai Chefs!
+
+We're happy to announce the release of ChefDK v<%= @maj_minor %>!
+
+# Release Highlights
+
+<%= @release_notes %>
+
+Please see the [CHANGELOG](https://github.com/chef/chef-dk/blob/master/CHANGELOG.md) for the complete list of changes.
+
+# Get the Build
+As always, you can download binaries directly from [downloads.chef.io](https://downloads.chef.io/chefdk/<%= @version %>) or by using the new `mixlib-install` command line utility available in ChefDK 0.19.6 or greater.
+
+```shell
+$ mixlib-install download chefdk -v <%= @version %>
+```
+
+Alternatively, you can install ChefDK using one of the following command options:
+
+```shell
+# In Shell
+$ curl https://omnitruck.chef.io/install.sh | sudo bash -s -- -P chefdk -v <%= @version %>
+
+# In Windows Powershell
+. { iwr -useb https://omnitruck.chef.io/install.ps1 } | iex; install -project chefdk -version <%= @version %>
+```
+
+If you want to give this version a spin in Test Kitchen, create or add the following to a `.kitchen.local.yml` file:
+
+```yaml
+provisioner:
+  product_name: chefdk
+  product_version: <%= @version %>
+```

data/tasks/version.rb

@@ -40,6 +40,10 @@ namespace :version do
     File.expand_path("../../Gemfile.lock", __FILE__)
   end
 
+  def release_notes_path
+    File.expand_path("../../RELEASE_NOTES.md", __FILE__)
+  end
+
   # Add 1 to the current patch version in the VERSION file, and write it back out.
   desc "Bump the patch version in lib/chef-dk/version.rb."
   task :bump_patch do
@@ -63,6 +67,7 @@ namespace :version do
     end
     puts "Updating version in #{version_rb_path} from #{version} to #{new_version.chomp}"
     IO.write(version_rb_path, new_version_file)
+    IO.write(release_notes_path, "# ChefDK #{$2}.#{$3.to_i + 1} Release Notes")
     Rake::Task["version:update_gemfile_lock"].invoke
     Rake::Task["bundle:install"].invoke
   end
@@ -77,6 +82,7 @@ namespace :version do
     end
     puts "Updating version in #{version_rb_path} from #{version} to #{new_version.chomp}"
     IO.write(version_rb_path, new_version_file)
+    IO.write(release_notes_path, "# ChefDK #{$2.to_i + 1}.0 Release Notes")
     Rake::Task["version:update_gemfile_lock"].invoke
     Rake::Task["bundle:install"].invoke
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chef-dk
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.1.16
 platform: ruby
 authors:
 - Daniel DeLeo
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-14 00:00:00.000000000 Z
+date: 2016-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-cli
@@ -164,20 +164,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
-- !ruby/object:Gem::Dependency
-  name: github_changelog_generator
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -603,6 +589,7 @@ files:
 - spec/unit/service_exception_inspectors/http_spec.rb
 - spec/unit/shell_out_spec.rb
 - spec/unit/tasks/helpers_spec.rb
+- tasks/announce.rb
 - tasks/bin/bundle-platform
 - tasks/bin/bundle-platform.bat
 - tasks/bin/create-override-gemfile
@@ -612,6 +599,8 @@ files:
 - tasks/gemfile_util.rb
 - tasks/github_changelog_generator.rb
 - tasks/helpers.rb
+- tasks/templates/prerelease.md.erb
+- tasks/templates/release.md.erb
 - tasks/version.rb
 - version_policy.rb
 - warning.txt