chef-dk 2.1.11 → 2.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 829f122f43726668a549776bfcf08866bd964d1f
-  data.tar.gz: 706b08e7b6fd30398637987668619ce630a3cf99
+  metadata.gz: d0ac21757728bf2929d02b02907e26e5a21c4f2e
+  data.tar.gz: 67cc4fe0f04200bad1514480a8761e95be76b5ef
 SHA512:
-  metadata.gz: 6386fc330b45fd81d06588320e496d6aa166c5b5c071f8f60a4c96467c467a273cf1fbe9a9f419c87387cada9d5200b464329f1b1e8cc13a4b020d8b1875035d
-  data.tar.gz: d3319d7259f4190a6368af6d2be959ad50d68e25a81e458ea63f386984895958838ac48c460def6badc30c944f89f042b9d8283c942ce9e62da296a5b2a59dde
+  metadata.gz: 3022ea4a851f7bc1f401f73d5107eaf9ce63569a16a5b6ae8ac1e394343ce3c3c80cf8793f41cd0faa413c9a0d2ce47bf2a5b2dcff892019ccdfa8b8eded82df
+  data.tar.gz: 1865eca49e6bda07c62497f52fda3dedbfbc973febf611e60de753e45c591846a2db0c675955b4a3d7ee2b85afd4a4b62382b9b7c173a580bce3c2f9e203caec

data/Gemfile

@@ -19,9 +19,6 @@ source "https://rubygems.org"
 
 gemspec
 
-# temporary pin until molinillo is fixed
-gem "molinillo", "< 0.6.0"
-
 gem "bundler"
 
 group(:omnibus_package, :development, :test) do
@@ -47,7 +44,7 @@ group(:omnibus_package) do
   gem "chef-provisioning-azure", ">= 0.6.0"
   gem "chef-provisioning-fog", ">= 0.20.0"
   gem "chef-vault"
-  gem "chef", "= 13.2.20"
+  gem "chef", "= 13.4.19"
   gem "cheffish", ">= 13.0"
   gem "chefspec"
   gem "fauxhai"
@@ -85,6 +82,7 @@ group(:omnibus_package) do
   gem "winrm-fs"
   gem "winrm-elevated"
   gem "cucumber"
+  gem "stove"
 end
 
 # Everything except AIX
@@ -97,6 +95,8 @@ group(:ruby_shadow) do
   gem "ruby-shadow", platform: :ruby
 end
 
+gem "chefstyle", group: :test
+
 # TODO delete this when we figure out how to include the pushy windows dependencies
 # correctly
 platforms :mswin, :mingw do

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    chef-dk (2.1.11)
+    chef-dk (2.3.1)
       addressable (>= 2.3.5, < 2.6)
       chef (~> 13.0)
       chef-provisioning (~> 2.0)
@@ -12,7 +12,7 @@ PATH
       mixlib-cli (~> 1.7)
       mixlib-shellout (~> 2.0)
       paint (~> 1.0)
-      solve (> 2.0, < 4.0)
+      solve (> 2.0, < 5.0)
 
 GEM
   remote: https://rubygems.org/
@@ -23,29 +23,30 @@ GEM
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    addressable (2.5.1)
-      public_suffix (~> 2.0, >= 2.0.2)
+    addressable (2.5.2)
+      public_suffix (>= 2.0.2, < 4.0)
     app_conf (0.4.2)
     appbundler (0.10.0)
       mixlib-cli (~> 1.4)
+      mixlib-shellout (~> 2.0)
     artifactory (2.8.2)
     ast (2.3.0)
     autoparse (0.3.3)
       addressable (>= 2.3.1)
       extlib (>= 0.9.15)
       multi_json (>= 1.0.0)
-    aws-sdk (2.10.24)
-      aws-sdk-resources (= 2.10.24)
-    aws-sdk-core (2.10.24)
+    aws-sdk (2.10.45)
+      aws-sdk-resources (= 2.10.45)
+    aws-sdk-core (2.10.45)
       aws-sigv4 (~> 1.0)
       jmespath (~> 1.0)
-    aws-sdk-resources (2.10.24)
-      aws-sdk-core (= 2.10.24)
+    aws-sdk-resources (2.10.45)
+      aws-sdk-core (= 2.10.45)
     aws-sdk-v1 (1.67.0)
       json (~> 1.4)
       nokogiri (~> 1)
-    aws-sigv4 (1.0.1)
-    berkshelf (6.3.0)
+    aws-sigv4 (1.0.2)
+    berkshelf (6.3.1)
       buff-config (~> 2.0)
       buff-extensions (~> 2.0)
       chef (>= 12.7.2)
@@ -59,7 +60,7 @@ GEM
       octokit (~> 4.0)
       retryable (~> 2.0)
       ridley (~> 5.0)
-      solve (> 2.0, < 4.0)
+      solve (~> 4.0)
       thor (~> 0.19, < 0.19.2)
     binding_of_caller (0.7.2)
       debug_inspector (>= 0.0.1)
@@ -73,16 +74,16 @@ GEM
     buff-shell_out (1.1.0)
       buff-ruby_engine (~> 1.0)
     builder (3.2.3)
-    byebug (9.0.6)
+    byebug (9.1.0)
     celluloid (0.16.0)
       timers (~> 4.0.0)
     celluloid-io (0.16.2)
       celluloid (>= 0.16.0)
       nio4r (>= 1.1.0)
-    chef (13.2.20)
+    chef (13.4.19)
       addressable
       bundler (>= 1.10)
-      chef-config (= 13.2.20)
+      chef-config (= 13.4.19)
       chef-zero (>= 13.0)
       diff-lcs (~> 1.2, >= 1.2.4)
       erubis (~> 2.7)
@@ -109,10 +110,10 @@ GEM
       specinfra (~> 2.10)
       syslog-logger (~> 1.6)
       uuidtools (~> 2.1.5)
-    chef (13.2.20-universal-mingw32)
+    chef (13.4.19-universal-mingw32)
       addressable
       bundler (>= 1.10)
-      chef-config (= 13.2.20)
+      chef-config (= 13.4.19)
       chef-zero (>= 13.0)
       diff-lcs (~> 1.2, >= 1.2.4)
       erubis (~> 2.7)
@@ -150,7 +151,10 @@ GEM
       win32-service (~> 0.8.7)
       windows-api (~> 0.4.4)
       wmi-lite (~> 1.0)
-    chef-config (13.2.20)
+    chef-api (0.7.1)
+      logify (~> 0.1)
+      mime-types
+    chef-config (13.4.19)
       addressable
       fuzzyurl
       mixlib-config (~> 2.0)
@@ -184,7 +188,7 @@ GEM
       retryable
       winrm-elevated
     chef-sugar (3.5.0)
-    chef-vault (3.2.0)
+    chef-vault (3.3.0)
     chef-zero (13.1.0)
       ffi-yajl (~> 2.2)
       hashie (>= 2.0, < 4.0)
@@ -198,12 +202,14 @@ GEM
       chef (>= 12.14.89)
       fauxhai (>= 4, < 6)
       rspec (~> 3.0)
+    chefstyle (0.6.0)
+      rubocop (= 0.49.1)
     cleanroom (1.0.0)
-    coderay (1.1.1)
+    coderay (1.1.2)
     concurrent-ruby (1.0.5)
     cookbook-omnifetch (0.6.0)
       mixlib-archive (~> 0.4)
-    cookstyle (2.0.0)
+    cookstyle (2.1.0)
       rubocop (= 0.49.1)
     cucumber (2.4.0)
       builder (>= 2.1.2)
@@ -221,7 +227,7 @@ GEM
       thor (~> 0.19)
     debug_inspector (0.0.3)
     dep-selector-libgecode (1.3.1)
-    dep_selector (1.0.5)
+    dep_selector (1.0.6)
       dep-selector-libgecode (~> 1.0)
       ffi (~> 1.9)
     diff-lcs (1.3)
@@ -230,9 +236,9 @@ GEM
       excon (>= 0.38.0)
       json
     erubis (2.7.0)
-    excon (0.58.0)
+    excon (0.59.0)
     extlib (0.9.16)
-    faraday (0.12.2)
+    faraday (0.13.1)
       multipart-post (>= 1.2, < 3)
     fauxhai (5.3.0)
       net-ssh
@@ -291,7 +297,7 @@ GEM
     fog-atmos (0.1.0)
       fog-core
       fog-xml
-    fog-aws (1.4.0)
+    fog-aws (1.4.1)
       fog-core (~> 1.38)
       fog-json (~> 1.0)
       fog-xml (~> 0.1)
@@ -338,7 +344,7 @@ GEM
     fog-json (1.0.2)
       fog-core (~> 1.0)
       multi_json (~> 1.10)
-    fog-local (0.3.1)
+    fog-local (0.4.0)
       fog-core (~> 1.27)
     fog-openstack (0.1.21)
       fog-core (>= 1.40)
@@ -388,7 +394,7 @@ GEM
     fog-voxel (0.1.0)
       fog-core
       fog-xml
-    fog-vsphere (1.11.3)
+    fog-vsphere (1.12.0)
       fog-core
       rbvmomi (~> 1.9)
     fog-xenserver (0.3.0)
@@ -397,7 +403,7 @@ GEM
     fog-xml (0.1.3)
       fog-core
       nokogiri (>= 1.5.11, < 2.0.0)
-    foodcritic (11.3.0)
+    foodcritic (11.4.0)
       cucumber-core (>= 1.3)
       erubis
       ffi-yajl (~> 2.0)
@@ -451,7 +457,7 @@ GEM
     inflecto (0.0.2)
     inifile (3.0.0)
     iniparse (1.4.4)
-    inspec (1.33.1)
+    inspec (1.36.1)
       addressable (~> 2.4)
       faraday (>= 0.9.0)
       hashie (~> 3.4)
@@ -476,7 +482,7 @@ GEM
     jmespath (1.3.1)
     json (1.8.6)
     jwt (1.5.6)
-    kitchen-dokken (2.6.1)
+    kitchen-dokken (2.6.5)
       docker-api (~> 1.33)
       lockfile (~> 2.1)
       test-kitchen (~> 1.15)
@@ -486,13 +492,13 @@ GEM
       multi_json
       retryable (~> 2.0)
       test-kitchen (~> 1.4, >= 1.4.1)
-    kitchen-hyperv (0.5.0)
+    kitchen-hyperv (0.5.1)
       test-kitchen (~> 1.4)
     kitchen-inspec (0.19.0)
       hashie (~> 3.4)
       inspec (>= 0.34.0, < 2.0.0)
       test-kitchen (~> 1.6)
-    kitchen-vagrant (1.2.0)
+    kitchen-vagrant (1.2.1)
       test-kitchen (~> 1.4)
     knife-opc (0.3.2)
     knife-push (1.0.3)
@@ -517,6 +523,7 @@ GEM
     logging (2.2.2)
       little-plugger (~> 1.1)
       multi_json (~> 1.10)
+    logify (0.2.0)
     lumberjack (1.0.12)
     macaddr (1.7.1)
       systemu (~> 2.6.2)
@@ -530,8 +537,7 @@ GEM
     minitest (5.10.3)
     mixlib-archive (0.4.1)
       mixlib-log
-    mixlib-authentication (1.4.1)
-      mixlib-log
+    mixlib-authentication (1.4.2)
     mixlib-cli (1.7.0)
     mixlib-config (2.2.4)
     mixlib-install (2.1.12)
@@ -545,8 +551,8 @@ GEM
       win32-process (~> 0.8.2)
       wmi-lite (~> 1.0)
     mixlib-versioning (1.2.2)
-    molinillo (0.5.7)
-    multi_json (1.12.1)
+    molinillo (0.6.3)
+    multi_json (1.12.2)
     multi_test (0.1.2)
     multipart-post (2.0.0)
     nenv (0.3.0)
@@ -554,7 +560,7 @@ GEM
       net-ssh (>= 2.6.5)
     net-sftp (2.1.2)
       net-ssh (>= 2.6.5)
-    net-ssh (4.1.0)
+    net-ssh (4.2.0)
     net-ssh-gateway (1.3.0)
       net-ssh (>= 2.6.5)
     net-ssh-multi (1.2.1)
@@ -574,7 +580,7 @@ GEM
       shellany (~> 0.0)
     octokit (4.7.0)
       sawyer (~> 0.8.0, >= 0.5.3)
-    ohai (13.3.0)
+    ohai (13.4.0)
       chef-config (>= 12.5.0.alpha.1, < 14)
       ffi (~> 1.9)
       ffi-yajl (~> 2.2)
@@ -606,8 +612,8 @@ GEM
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
-    pry-byebug (3.4.2)
-      byebug (~> 9.0)
+    pry-byebug (3.5.0)
+      byebug (~> 9.1)
       pry (~> 0.10)
     pry-remote (0.1.8)
       pry (~> 0.9)
@@ -615,11 +621,11 @@ GEM
     pry-stack_explorer (0.4.9.2)
       binding_of_caller (>= 0.7)
       pry (>= 0.9.11)
-    public_suffix (2.0.5)
+    public_suffix (3.0.0)
     rack (2.0.3)
     rainbow (2.2.2)
       rake
-    rake (12.0.0)
+    rake (12.1.0)
     rb-fsevent (0.10.2)
     rb-inotify (0.9.10)
       ffi (>= 0.5.0, < 2)
@@ -678,7 +684,7 @@ GEM
       ruby-progressbar (~> 1.7)
       unicode-display_width (~> 1.0, >= 1.0.1)
     ruby-prof (0.16.2)
-    ruby-progressbar (1.8.1)
+    ruby-progressbar (1.8.3)
     ruby-shadow (2.5.0)
     ruby_dep (1.5.0)
     rubyntlm (0.6.2)
@@ -702,15 +708,18 @@ GEM
       jwt (~> 1.5)
       multi_json (~> 1.10)
     slop (3.6.0)
-    solve (3.1.1)
-      molinillo (>= 0.5)
+    solve (4.0.0)
+      molinillo (~> 0.6)
       semverse (>= 1.1, < 3.0)
-    specinfra (2.70.1)
+    specinfra (2.71.2)
       net-scp
       net-ssh (>= 2.7, < 5.0)
       net-telnet
       sfl
     sslshake (1.2.0)
+    stove (6.0.0)
+      chef-api (~> 0.5)
+      logify (~> 0.2)
     stuartpreston-azure-sdk-for-ruby (0.7.2)
       json (~> 1.8)
       mime-types (> 1, < 4)
@@ -733,7 +742,7 @@ GEM
       hitimes
     toml (0.1.2)
       parslet (~> 1.5.0)
-    train (0.26.0)
+    train (0.26.2)
       docker-api (~> 1.26)
       json (>= 1.8, < 3.0)
       mixlib-shellout (~> 2.0)
@@ -808,7 +817,7 @@ DEPENDENCIES
   artifactory
   berkshelf (>= 6.3)
   bundler
-  chef (= 13.2.20)
+  chef (= 13.4.19)
   chef-dk!
   chef-provisioning (>= 2.4.0)
   chef-provisioning-aws (>= 2.0)
@@ -818,6 +827,7 @@ DEPENDENCIES
   chef-vault
   cheffish (>= 13.0)
   chefspec
+  chefstyle
   cookstyle (>= 2.0.0)
   cucumber
   dco
@@ -841,7 +851,6 @@ DEPENDENCIES
   listen
   mixlib-install
   mixlib-versioning
-  molinillo (< 0.6.0)
   nokogiri
   ohai (>= 13.1.0)
   opscode-pushy-client (>= 2.3.0)
@@ -859,6 +868,7 @@ DEPENDENCIES
   rubocop
   ruby-prof
   ruby-shadow
+  stove
   test-kitchen
   win32-api
   win32-dir
@@ -873,4 +883,4 @@ DEPENDENCIES
   yard
 
 BUNDLED WITH
-   1.15.3
+   1.15.4

data/README.md

@@ -321,13 +321,13 @@ packaging, and building works.
 - - -
 
 [Berkshelf]: https://docs.chef.io/berkshelf.html "Berkshelf"
-[Chef]: https://www.chef.io "Chef"
+[Chef]: https://www.chef.io/chef/ "Chef"
 [ChefDK]: https://downloads.chef.io/chefdk "Chef Development Kit"
 [Chef Documentation]: https://docs.chef.io "Chef Documentation"
-[ChefSpec]: http://sethvargo.github.io/chefspec/ "ChefSpec"
+[ChefSpec]: http://chefspec.github.io/chefspec/ "ChefSpec"
 [Cookstyle]: https://docs.chef.io/cookstyle.html "Cookstyle"
 [Foodcritic]: http://foodcritic.io "Foodcritic"
 [Learn Chef]: https://learn.chef.io "Learn Chef"
 [Test Kitchen]: http://kitchen.ci "Test Kitchen"
-[Delivery CLI]: https://docs.chef.io/ctl_delivery.html "Delivery CLI"
+[Delivery CLI]: https://docs.chef.io/delivery_cli.html "Delivery CLI"
 [Push Jobs Client]: https://docs.chef.io/push_jobs.html#push-jobs-client "Push Jobs Client"

data/acceptance/Gemfile.lock

@@ -9,22 +9,21 @@ GIT
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.5.1)
-      public_suffix (~> 2.0, >= 2.0.2)
+    addressable (2.5.2)
+      public_suffix (>= 2.0.2, < 4.0)
     artifactory (2.8.2)
-    aws-sdk (2.10.10)
-      aws-sdk-resources (= 2.10.10)
-    aws-sdk-core (2.10.10)
+    aws-sdk (2.10.44)
+      aws-sdk-resources (= 2.10.44)
+    aws-sdk-core (2.10.44)
       aws-sigv4 (~> 1.0)
       jmespath (~> 1.0)
-    aws-sdk-resources (2.10.10)
-      aws-sdk-core (= 2.10.10)
-    aws-sigv4 (1.0.1)
-    berkshelf (6.2.0)
-      addressable (~> 2.3, >= 2.3.4)
-      berkshelf-api-client (>= 4.0.0)
+    aws-sdk-resources (2.10.44)
+      aws-sdk-core (= 2.10.44)
+    aws-sigv4 (1.0.2)
+    berkshelf (6.3.1)
       buff-config (~> 2.0)
       buff-extensions (~> 2.0)
+      chef (>= 12.7.2)
       cleanroom (~> 1.0)
       concurrent-ruby (~> 1.0)
       faraday (~> 0.9)
@@ -35,10 +34,8 @@ GEM
       octokit (~> 4.0)
       retryable (~> 2.0)
       ridley (~> 5.0)
-      solve (> 2.0, < 4.0)
+      solve (~> 4.0)
       thor (~> 0.19, < 0.19.2)
-    berkshelf-api-client (4.0.1)
-      chef (>= 12.0)
     blankslate (2.1.2.4)
     buff-config (2.0.0)
       buff-extensions (~> 2.0)
@@ -92,15 +89,15 @@ GEM
       rack (< 2)
       uuidtools (~> 2.1)
     cleanroom (1.0.0)
-    coderay (1.1.1)
+    coderay (1.1.2)
     concurrent-ruby (1.0.5)
     diff-lcs (1.3)
     docker-api (1.33.6)
       excon (>= 0.38.0)
       json
     erubis (2.7.0)
-    excon (0.57.1)
-    faraday (0.12.1)
+    excon (0.59.0)
+    faraday (0.13.1)
       multipart-post (>= 1.2, < 3)
     ffi (1.9.18)
     ffi-yajl (2.3.1)
@@ -112,11 +109,11 @@ GEM
       builder (>= 2.1.2)
     hashie (3.5.6)
     highline (1.7.8)
-    hitimes (1.2.5)
+    hitimes (1.2.6)
     htmlentities (4.3.4)
     httpclient (2.8.3)
     iniparse (1.4.4)
-    inspec (1.31.1)
+    inspec (1.36.1)
       addressable (~> 2.4)
       faraday (>= 0.9.0)
       hashie (~> 3.4)
@@ -135,7 +132,7 @@ GEM
       sslshake (~> 1.2)
       thor (~> 0.19)
       toml (~> 0.1)
-      train (>= 0.24.0, < 1.0)
+      train (~> 0.26)
     ipaddress (0.8.3)
     jmespath (1.3.1)
     json (2.1.0)
@@ -149,7 +146,7 @@ GEM
       hashie (~> 3.4)
       inspec (>= 0.34.0, < 2.0.0)
       test-kitchen (~> 1.6)
-    kitchen-vagrant (1.1.0)
+    kitchen-vagrant (1.2.1)
       test-kitchen (~> 1.4)
     libyajl2 (1.2.0)
     little-plugger (1.1.4)
@@ -160,8 +157,7 @@ GEM
     minitar (0.6.1)
     mixlib-archive (0.4.1)
       mixlib-log
-    mixlib-authentication (1.4.1)
-      mixlib-log
+    mixlib-authentication (1.4.2)
     mixlib-cli (1.7.0)
     mixlib-config (2.2.4)
     mixlib-install (1.2.3)
@@ -169,10 +165,10 @@ GEM
       mixlib-shellout
       mixlib-versioning
     mixlib-log (1.7.1)
-    mixlib-shellout (2.2.7)
-    mixlib-versioning (1.1.0)
-    molinillo (0.5.7)
-    multi_json (1.12.1)
+    mixlib-shellout (2.3.2)
+    mixlib-versioning (1.2.2)
+    molinillo (0.6.3)
+    multi_json (1.12.2)
     multipart-post (2.0.0)
     net-scp (1.2.1)
       net-ssh (>= 2.6.5)
@@ -201,7 +197,7 @@ GEM
       plist (~> 3.1)
       systemu (~> 2.6.4)
       wmi-lite (~> 1.0)
-    parallel (1.11.2)
+    parallel (1.12.0)
     parslet (1.5.0)
       blankslate (~> 2.0)
     plist (3.3.0)
@@ -210,7 +206,7 @@ GEM
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
-    public_suffix (2.0.5)
+    public_suffix (3.0.0)
     rack (1.6.8)
     rainbow (2.1.0)
     retryable (2.0.4)
@@ -258,17 +254,17 @@ GEM
       addressable (>= 2.3.5, < 2.6)
       faraday (~> 0.8, < 1.0)
     semverse (2.0.0)
-    serverspec (2.39.1)
+    serverspec (2.40.0)
       multi_json
       rspec (~> 3.0)
       rspec-its
       specinfra (~> 2.68)
     sfl (2.3)
     slop (3.6.0)
-    solve (3.1.0)
-      molinillo (>= 0.5)
+    solve (4.0.0)
+      molinillo (~> 0.6)
       semverse (>= 1.1, < 3.0)
-    specinfra (2.68.2)
+    specinfra (2.71.2)
       net-scp
       net-ssh (>= 2.7, < 5.0)
       net-telnet
@@ -276,7 +272,7 @@ GEM
     sslshake (1.2.0)
     syslog-logger (1.6.8)
     systemu (2.6.5)
-    test-kitchen (1.16.0)
+    test-kitchen (1.17.0)
       mixlib-install (>= 1.2, < 3.0)
       mixlib-shellout (>= 1.2, < 3.0)
       net-scp (~> 1.1)
@@ -289,7 +285,7 @@ GEM
       hitimes
     toml (0.1.2)
       parslet (~> 1.5.0)
-    train (0.25.0)
+    train (0.26.2)
       docker-api (~> 1.26)
       json (>= 1.8, < 3.0)
       mixlib-shellout (~> 2.0)
@@ -340,4 +336,4 @@ DEPENDENCIES
   winrm-fs
 
 BUNDLED WITH
-   1.15.1
+   1.15.4

data/chef-dk.gemspec

@@ -44,7 +44,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency "ffi-yajl", ">= 1.0", "< 3.0"
   gem.add_dependency "minitar", "~> 0.5.4"
   gem.add_dependency "chef", "~> 13.0"
-  gem.add_dependency "solve", "< 4.0", "> 2.0"
+  gem.add_dependency "solve", "< 5.0", "> 2.0"
   gem.add_dependency "addressable", ">= 2.3.5", "< 2.6"
   gem.add_dependency "cookbook-omnifetch", "~> 0.5"
   gem.add_dependency "diff-lcs", "~> 1.0"

data/lib/chef-dk/command/generate.rb

@@ -23,7 +23,7 @@ require "chef-dk/command/generator_commands/cookbook"
 require "chef-dk/command/generator_commands/app"
 require "chef-dk/command/generator_commands/attribute"
 require "chef-dk/command/generator_commands/cookbook_file"
-require 'chef-dk/command/generator_commands/helpers'
+require "chef-dk/command/generator_commands/helpers"
 require "chef-dk/command/generator_commands/resource"
 require "chef-dk/command/generator_commands/recipe"
 require "chef-dk/command/generator_commands/template"

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

@@ -15,7 +15,7 @@
 # limitations under the License.
 #
 
-require 'chef-dk/command/generator_commands/cookbook_code_file'
+require "chef-dk/command/generator_commands/cookbook_code_file"
 
 module ChefDK
   module Command
@@ -28,7 +28,7 @@ module ChefDK
         options.merge!(SharedGeneratorOptions.options)
 
         def recipe
-          'helpers'
+          "helpers"
         end
       end
     end

data/lib/chef-dk/command/provision.rb

@@ -384,7 +384,7 @@ E
           ui.err("The --no-policy flag cannot be combined with policyfile arguments")
           ui.err("")
           ui.err(opt_parser)
-          return false
+          false
         end
       end
 

data/lib/chef-dk/cookbook_profiler/identifiers.rb

@@ -52,7 +52,7 @@ module ChefDK
       end
 
       def fingerprint_text
-        files_with_checksums.sort { |a, b| a[0] <=> b[0] }.inject("") do |fingerprint, file_spec|
+        files_with_checksums.sort_by { |a| a[0] }.inject("") do |fingerprint, file_spec|
           fingerprint << "#{file_spec[0]}:#{file_spec[1]}\n"
         end
       end

data/lib/chef-dk/exceptions.rb

@@ -51,7 +51,7 @@ module ChefDK
   end
 
   class OmnibusInstallNotFound < RuntimeError
-    def initialize()
+    def initialize
       super("Can not find omnibus installation directory for Chef.")
     end
   end

data/lib/chef-dk/helpers.rb

@@ -163,8 +163,8 @@ module ChefDK
     # This method resets all the instance variables used. It
     # should only be used for testing
     def reset!
-      self.instance_variables.each do |ivar|
-        self.instance_variable_set(ivar, nil)
+      instance_variables.each do |ivar|
+        instance_variable_set(ivar, nil)
       end
     end
 

data/lib/chef-dk/policyfile/artifactory_cookbook_source.rb

@@ -85,7 +85,7 @@ module ChefDK
       private
 
       def http_connection_for(base_url)
-        headers = { 'X-Jfrog-Art-API' => chef_config.artifactory_api_key || ENV["ARTIFACTORY_API_KEY"] }
+        headers = { "X-Jfrog-Art-API" => chef_config.artifactory_api_key || ENV["ARTIFACTORY_API_KEY"] }
         @http_connections[base_url] ||= Chef::HTTP::Simple.new(base_url, headers: headers)
       end
 

data/lib/chef-dk/policyfile/solution_dependencies.rb

@@ -122,7 +122,7 @@ module ChefDK
       end
 
       def transitive_deps(names)
-        require 'set'
+        require "set"
         deps = Set.new
         to_explore = names.dup
         until to_explore.empty?

data/lib/chef-dk/policyfile/source_uri.rb

@@ -46,8 +46,8 @@ module ChefDK
       def validate
         super
 
-        unless VALID_SCHEMES.include?(self.scheme)
-          raise InvalidPolicyfileSourceURI.new(self, "invalid URI scheme '#{self.scheme}'. Valid schemes: #{VALID_SCHEMES}")
+        unless VALID_SCHEMES.include?(scheme)
+          raise InvalidPolicyfileSourceURI.new(self, "invalid URI scheme '#{scheme}'. Valid schemes: #{VALID_SCHEMES}")
         end
       rescue Addressable::URI::InvalidURIError => ex
         raise InvalidPolicyfileSourceURI.new(self, ex)

data/lib/chef-dk/policyfile_compiler.rb

@@ -347,9 +347,9 @@ module ChefDK
     def best_source_for(cookbook_name)
       preferred = default_source.find { |s| s.preferred_source_for?(cookbook_name) }
       if preferred.nil?
-        default_source.find { |s|
+        default_source.find do |s|
           s.universe_graph.has_key?(cookbook_name)
-        }
+        end
       else
         preferred
       end

data/lib/chef-dk/skeletons/code_generator/files/default/build_cookbook/.kitchen.yml

@@ -12,7 +12,7 @@ provisioner:
 
 platforms:
   - name: ubuntu-16.04
-  - name: centos-7.3
+  - name: centos-7
 
 suites:
   - name: default

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

@@ -5,7 +5,9 @@
     "path": ".delivery/build_cookbook"
   },
   "delivery-truck": {
-    "enable_cookstyle": true
+    "lint": {
+      "enable_cookstyle": true
+    }
   },
   "skip_phases": [],
   "job_dispatch": {

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

@@ -8,6 +8,7 @@
 
 # Bundler
 Gemfile.lock
+gems.locked
 bin/*
 .bundle/*
 

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

@@ -57,6 +57,13 @@ else
 
 end
 
+# LICENSE
+template "#{cookbook_dir}/LICENSE" do
+  helpers(ChefDK::Generator::TemplateHelper)
+  source "LICENSE.#{context.license}.erb"
+  action :create_if_missing
+end
+
 # Test Kitchen
 template "#{cookbook_dir}/.kitchen.yml" do
   if context.use_berkshelf

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

@@ -14,7 +14,7 @@ verifier:
 
 platforms:
   - name: ubuntu-16.04
-  - name: centos-7.3
+  - name: centos-7
 
 suites:
   - name: default

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

@@ -23,7 +23,7 @@ verifier:
 
 platforms:
   - name: ubuntu-16.04
-  - name: centos-7.3
+  - name: centos-7
 
 suites:
   - name: default

data/lib/chef-dk/version.rb

@@ -16,5 +16,5 @@
 #
 
 module ChefDK
-  VERSION = "2.1.11"
+  VERSION = "2.3.1"
 end

data/omnibus_overrides.rb

@@ -1,7 +1,7 @@
 # THIS IS NOW HAND MANAGED, JUST EDIT THE THING
 # .travis.yml and appveyor.yml consume this,
 # try to keep it machine-parsable.
-override :rubygems, version: "2.6.11"
+override :rubygems, version: "2.6.13"
 override :bundler, version: "1.15.1"
 override "libffi", version: "3.2.1"
 override "libiconv", version: "1.15"
@@ -13,7 +13,7 @@ override "libyaml", version: "0.1.6"
 override "makedepend", version: "1.0.5"
 override "ncurses", version: "5.9"
 override "pkg-config-lite", version: "0.28-1"
-override "ruby", version: "2.4.1"
+override "ruby", version: "2.4.2"
 override "ruby-windows-devkit-bash", version: "3.1.23-4-msys-1.0.18"
 override "util-macros", version: "1.19.0"
 override "xproto", version: "7.0.28"

data/spec/unit/cli_spec.rb

@@ -125,7 +125,7 @@ E
     let(:argv) { %w{-v} }
     let(:delivery_version) { "master (454c3f37819ed508a49c971f38e42267ce8a47de)" }
 
-    let(:tools) {
+    let(:tools) do
       {
         "chef-client" => {
           "version_output" => "Chef: 12.0.3",
@@ -145,10 +145,10 @@ E
         },
         "inspec" => {
           "version_output" => "1.19.1\n\nYour version of InSpec is out of date! The latest version is 1.21.0.",
-          "expected_version" => "1.19.1"
-        }
+          "expected_version" => "1.19.1",
+        },
       }
-    }
+    end
 
     it "does not print versions of tools with missing or errored tools" do
       full_version_message = version_message

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

@@ -134,7 +134,7 @@ describe ChefDK::Command::GeneratorCommands::Base do
     end
   end
 
-  describe '#have_git?' do
+  describe "#have_git?" do
     let(:cmd) { described_class.new([]) }
     let(:path) { "bin_path" }
 

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

@@ -310,7 +310,7 @@ METADATA
 
         git!("init .")
         git!("add .")
-        git!("commit -m \"initial commit\"")
+        git!("commit --no-gpg-sign -m \"initial commit\"")
 
         Dir.chdir(tempdir) do
           allow(cookbook_generator.chef_runner).to receive(:stdout).and_return(stdout_io)
@@ -344,7 +344,7 @@ METADATA
 
         git!("init .")
         git!("add .")
-        git!("commit -m \"initial commit\"")
+        git!("commit --no-gpg-sign -m \"initial commit\"")
 
         Dir.chdir(tempdir) do
           allow(cookbook_generator.chef_runner).to receive(:stdout).and_return(stdout_io)

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

@@ -38,6 +38,7 @@ describe ChefDK::Command::GeneratorCommands::Cookbook do
       test/smoke/default/default_test.rb
       Berksfile
       chefignore
+      LICENSE
       metadata.rb
       README.md
       recipes
@@ -236,7 +237,9 @@ PROJECT_DOT_TOML
     "path": ".delivery/build_cookbook"
   },
   "delivery-truck": {
-    "enable_cookstyle": true
+    "lint": {
+      "enable_cookstyle": true
+    }
   },
   "skip_phases": [],
   "job_dispatch": {
@@ -575,7 +578,7 @@ verifier:
 
 platforms:
   - name: ubuntu-16.04
-  - name: centos-7.3
+  - name: centos-7
 
 suites:
   - name: default
@@ -652,7 +655,7 @@ verifier:
 
 platforms:
   - name: ubuntu-16.04
-  - name: centos-7.3
+  - name: centos-7
 
 suites:
   - name: default

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

@@ -15,9 +15,9 @@
 # limitations under the License.
 #
 
-require 'spec_helper'
-require 'shared/a_file_generator'
-require 'chef-dk/command/generator_commands/helpers'
+require "spec_helper"
+require "shared/a_file_generator"
+require "chef-dk/command/generator_commands/helpers"
 
 describe ChefDK::Command::GeneratorCommands::Helpers do
 

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

@@ -24,11 +24,12 @@ describe ChefDK::Command::GeneratorCommands::Recipe do
   include_examples "a file generator" do
 
     let(:generator_name) { "recipe" }
-    let(:generated_files) { [ "recipes/new_recipe.rb",
+    let(:generated_files) do
+      [ "recipes/new_recipe.rb",
                               "spec/spec_helper.rb",
                               "spec/unit/recipes/new_recipe_spec.rb",
                               "test/smoke/default/new_recipe_test.rb",
-                            ] }
+                            ] end
     let(:new_file_name) { "new_recipe" }
 
   end

data/spec/unit/cookbook_profiler/git_spec.rb

@@ -107,6 +107,7 @@ describe ChefDK::CookbookProfiler::Git do
           edit_repo
           system_command('git config --local user.name "Alice"', cwd: cookbook_path).error!
           system_command('git config --local user.email "alice@example.com"', cwd: cookbook_path).error!
+          system_command('git config --local commit.gpgsign "false"', cwd: cookbook_path).error!
           system_command('git commit -a -m "update readme" --author "Alice <alice@example.com>"', cwd: cookbook_path).error!
         end
 

data/spec/unit/generator_spec.rb

@@ -67,7 +67,7 @@ describe ChefDK::Generator::TemplateHelper do
       end
 
       it "should comment if requested" do
-        expect(helper.license_description('#')).to match(/^# Copyright/)
+        expect(helper.license_description("#")).to match(/^# Copyright/)
       end
     end
 
@@ -78,7 +78,7 @@ describe ChefDK::Generator::TemplateHelper do
       end
 
       it "should comment if requested" do
-        expect(helper.license_description('#')).to match(/# Licensed under the Apache/)
+        expect(helper.license_description("#")).to match(/# Licensed under the Apache/)
       end
     end
 
@@ -89,7 +89,7 @@ describe ChefDK::Generator::TemplateHelper do
       end
 
       it "should comment if requested" do
-        expect(helper.license_description('#')).to match(/# Permission is hereby granted/)
+        expect(helper.license_description("#")).to match(/# Permission is hereby granted/)
       end
     end
 
@@ -100,7 +100,7 @@ describe ChefDK::Generator::TemplateHelper do
       end
 
       it "should comment if requested" do
-        expect(helper.license_description('#')).to match(/# This program is free software;/)
+        expect(helper.license_description("#")).to match(/# This program is free software;/)
       end
     end
 
@@ -111,7 +111,7 @@ describe ChefDK::Generator::TemplateHelper do
       end
 
       it "should comment if requested" do
-        expect(helper.license_description('#')).to match(/# This program is free software:/)
+        expect(helper.license_description("#")).to match(/# This program is free software:/)
       end
     end
   end

data/spec/unit/policyfile/chef_repo_cookbook_source_spec.rb

@@ -20,13 +20,13 @@ require "chef-dk/policyfile/chef_repo_cookbook_source"
 
 describe ChefDK::Policyfile::ChefRepoCookbookSource do
 
-  let(:repo_path) {
+  let(:repo_path) do
     File.expand_path("spec/unit/fixtures/local_path_cookbooks", project_root)
-  }
+  end
 
   let(:cookbook_source) { ChefDK::Policyfile::ChefRepoCookbookSource.new(repo_path) }
 
-  let(:local_repo_universe) {
+  let(:local_repo_universe) do
     {
       "another-local-cookbook" => {
         "0.1.0" => [],
@@ -41,7 +41,7 @@ describe ChefDK::Policyfile::ChefRepoCookbookSource do
         "0.1.0" => [],
       },
     }
-  }
+  end
 
   it "gives the set of arguments to `default_source` used to create it" do
     expect(cookbook_source.default_source_args).to eq([:chef_repo, repo_path])

data/spec/unit/policyfile/solution_dependencies_spec.rb

@@ -69,7 +69,7 @@ describe ChefDK::Policyfile::SolutionDependencies do
 
   end
 
-  context 'when populated with dependency data from a complex lockfile' do
+  context "when populated with dependency data from a complex lockfile" do
     let(:dependency_data) do
       {
         "Policyfile" => [
@@ -88,9 +88,9 @@ describe ChefDK::Policyfile::SolutionDependencies do
     it "can compute list of transitive dependencies" do
 
       expect(solution_dependencies.transitive_deps(["e"])).to eq(["e"])
-      expect(solution_dependencies.transitive_deps(["c"])).to eq(["c", "e"])
-      expect(solution_dependencies.transitive_deps(["c", "d"])).to eq(["c", "d", "e"])
-      expect(solution_dependencies.transitive_deps(["a"])).to eq(["a", "c", "d", "e"])
+      expect(solution_dependencies.transitive_deps(["c"])).to eq(%w{c e})
+      expect(solution_dependencies.transitive_deps(%w{c d})).to eq(%w{c d e})
+      expect(solution_dependencies.transitive_deps(["a"])).to eq(%w{a c d e})
     end
   end
 

data/spec/unit/policyfile/source_uri_spec.rb

@@ -22,7 +22,7 @@ require "chef-dk/policyfile/source_uri"
 describe ChefDK::Policyfile::SourceURI do
   subject { described_class.parse(source_uri) }
 
-  describe '#validate' do
+  describe "#validate" do
     context "when the scheme is not https" do
       let(:source_uri) { "ftp://chef.example.com" }
 

data/spec/unit/policyfile/uploader_spec.rb

@@ -45,8 +45,9 @@ describe ChefDK::Policyfile::Uploader do
     }
   end
 
-  let(:policyfile_lock) { instance_double("ChefDK::PolicyfileLock", name: "example",
-                                                                    to_lock: policyfile_lock_data) }
+  let(:policyfile_lock) do
+    instance_double("ChefDK::PolicyfileLock", name: "example",
+                                              to_lock: policyfile_lock_data) end
 
   let(:policy_group) { "unit-test" }
 

data/spec/unit/policyfile_demands_spec.rb

@@ -867,7 +867,6 @@ MESSAGE
           "remote-cb (0.1.0)" => [],
         },
 
-
       }
       expect(policyfile.solution_dependencies.to_lock).to eq(expected_solution_deps)
     end

data/spec/unit/policyfile_lock_build_spec.rb

@@ -674,7 +674,6 @@ REVISION_STRING
             "source_options" => nil,
           },
 
-
         },
 
         "default_attributes" => {},

data/spec/unit/policyfile_services/update_spec.rb

@@ -15,11 +15,10 @@
 # limitations under the License.
 #
 
-require 'spec_helper'
+require "spec_helper"
 require "chef-dk/policyfile_services/install"
 require "chef-dk/policyfile/cookbook_sources"
 
-
 describe ChefDK::PolicyfileServices::Install do
 
   include ChefDK::Helpers
@@ -70,8 +69,8 @@ EOH
       "origin" => "https://supermarket.chef.io:443/api/v1/cookbooks/#{name}/versions/#{version}/download",
       "source_options" => {
         "artifactserver" => "https://supermarket.chef.io:443/api/v1/cookbooks/#{name}/versions/#{version}/download",
-        "version" => version
-      }
+        "version" => version,
+      },
     }
   end
 
@@ -84,7 +83,7 @@ EOH
         "top-level" => cookbook_lock("top-level", "1.2.0"),
         "a" => cookbook_lock("a", "2.1.0"),
         "b" => cookbook_lock("b", "1.2.3"),
-        "top-level-bis" => cookbook_lock("top-level-bis", "1.0.0")
+        "top-level-bis" => cookbook_lock("top-level-bis", "1.0.0"),
       },
       "default_attributes" => {},
       "override_attributes" => {},
@@ -99,13 +98,12 @@ EOH
           "top-level (1.2.0)" => [ [ "a", "~> 2.1" ], [ "b", "~> 1.0" ] ],
           "a (2.1.0)" => [],
           "b (1.2.3)" => [],
-          "top-level-bis (1.0.0)" => []
-        }
-      }
+          "top-level-bis (1.0.0)" => [],
+        },
+      },
     }.to_json
   end
 
-
   context "when given one cookbook to update" do
     before(:each) do
       # stub access to Policyfile.rb and Policyfile.lock.json
@@ -115,7 +113,6 @@ EOH
       expect(IO).to receive(:read).with(policyfile_rb_path).and_return(policyfile_content)
       expect(IO).to receive(:read).with(policyfile_lock_path).and_return(policyfile_lock_content)
 
-
       # lock generation is a no-op. Its behavior is already tested
       # elsewhere. We only check constraints changes
       expect(install_service).to receive(:generate_lock_and_install)

data/tasks/announce.rb

@@ -1,5 +1,5 @@
 #
-# Copyright:: Copyright (c) 2016 Chef Software Inc.
+# Copyright:: Copyright (c) 2016-2017, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -24,7 +24,6 @@ class ReleaseAnnouncement
 
   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
@@ -41,7 +40,7 @@ class ReleaseAnnouncement
   end
 
   def release_notes_from_file
-    File.read("RELEASE_NOTES.md").match(/^# ChefDK #{@maj_minor} Release Notes\n\n(.*)/m)[1]
+    File.read("RELEASE_NOTES.md").match(/^# ChefDK #{@version} Release Notes\n\n(.*)/m)[1]
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chef-dk
 version: !ruby/object:Gem::Version
-  version: 2.1.11
+  version: 2.3.1
 platform: ruby
 authors:
 - Daniel DeLeo
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-11 00:00:00.000000000 Z
+date: 2017-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-cli
@@ -94,7 +94,7 @@ dependencies:
     requirements:
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.0'
     - - ">"
       - !ruby/object:Gem::Version
         version: '2.0'
@@ -104,7 +104,7 @@ dependencies:
     requirements:
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.0'
     - - ">"
       - !ruby/object:Gem::Version
         version: '2.0'
@@ -636,7 +636,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: A streamlined development and deployment workflow for Chef platform.