chef-dk 3.5.13 → 3.6.57

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ecca76bc9a30982fdd0d66356688d489ba1f1c6d7d329d4e5c94872131b2597d
-  data.tar.gz: ac04e0272e7bde633fdaeadb8928f3087f3d6372fc1b432df4e7bb794fd2a5b0
+  metadata.gz: 5efe53aaa527d1bacb2c39fa87a4bc8fbcfcf695371957521cf23b64e132fdec
+  data.tar.gz: fae96dc2073d15083a8469714e91925c85b7e3dd70b8ba0480b47c27ac62cef1
 SHA512:
-  metadata.gz: a4aad5584e54344fc3df82de2f4bc65560cc5a6e150442b6c7c5d2f8d4ee8466c96d18d64ff15a8e5ad6172f40aaab5255011c0e973d13bfe442c7355d6eef1e
-  data.tar.gz: abc2f5e0b9a6bac97d84cea1e80e2cbae43352666fafb2d3f145b8aaa391c747fec4372a6da7d304188561fc746d0a59ff56bbee1d9ca3d387842d31bf53139b
+  metadata.gz: 5abd2fba57f8cd7da933c7b4817dadefba40170ef9028d03fe738d3b60abf3dfc868e605f435964fd008990299d304974db54908722e53ac752f9d6e02e8930f
+  data.tar.gz: 24d4e637fcafcdfca407736d8950dc2a18902021eb6b8ad89648c83e871d97e83aee0d689bffd23f8e4d659e3db15189a5f290c60466eebd498a28c587384517

data/Gemfile

@@ -22,9 +22,14 @@ gemspec
 gem "bundler"
 
 group(:omnibus_package, :development, :test) do
-  gem "rake"
+  # we pin these gems as they are installed in the ruby source and if we let them
+  # float we'll end up with 2 copies shipped in DK. When we bump Ruby we need to
+  # look at these pins and adjust them
+  gem "rake", "<= 12.3.0"
+  gem "rdoc", "<= 6.0.1"
+  gem "minitest", "<= 5.10.3"
+
   gem "pry"
-  gem "rdoc"
   gem "yard"
   gem "guard"
   gem "cookstyle", ">= 2.0.0"
@@ -52,7 +57,7 @@ group(:omnibus_package) do
   # gems to Rubygems now, so letting this float on latest should always give us the latest
   # stable release. May have to re-pin around major version bumping time, or during patch
   # fixes.
-  gem "chef", "= 14.7.17"
+  gem "chef", "= 14.8.12"
   gem "cheffish", ">= 14.0.1"
   gem "chefspec", ">= 7.3.0"
   gem "fauxhai", ">= 6.7"

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    chef-dk (3.5.13)
+    chef-dk (3.6.57)
       addressable (>= 2.3.5, < 2.6)
       chef (~> 14.0)
       chef-provisioning (~> 2.0)
@@ -17,7 +17,7 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (5.2.1)
+    activesupport (5.2.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
@@ -28,15 +28,15 @@ GEM
     appbundler (0.11.6)
       mixlib-cli (~> 1.4)
       mixlib-shellout (~> 2.0)
-    artifactory (2.8.2)
+    artifactory (3.0.0)
     ast (2.4.0)
-    aws-sdk (2.11.171)
-      aws-sdk-resources (= 2.11.171)
-    aws-sdk-core (2.11.171)
+    aws-sdk (2.11.197)
+      aws-sdk-resources (= 2.11.197)
+    aws-sdk-core (2.11.197)
       aws-sigv4 (~> 1.0)
       jmespath (~> 1.0)
-    aws-sdk-resources (2.11.171)
-      aws-sdk-core (= 2.11.171)
+    aws-sdk-resources (2.11.197)
+      aws-sdk-core (= 2.11.197)
     aws-sigv4 (1.0.3)
     axiom-types (0.1.1)
       descendants_tracker (~> 0.0.4)
@@ -46,12 +46,12 @@ GEM
       ms_rest_azure (~> 0.11.0)
     azure_mgmt_key_vault (0.17.2)
       ms_rest_azure (~> 0.11.0)
-    azure_mgmt_network (0.18.0)
+    azure_mgmt_network (0.18.2)
       ms_rest_azure (~> 0.11.0)
     azure_mgmt_resources (0.17.2)
       ms_rest_azure (~> 0.11.0)
     backports (3.11.4)
-    berkshelf (7.0.6)
+    berkshelf (7.0.7)
       chef (>= 13.6.52)
       chef-config
       cleanroom (~> 1.0)
@@ -68,10 +68,10 @@ GEM
       debug_inspector (>= 0.0.1)
     builder (3.2.3)
     byebug (10.0.2)
-    chef (14.7.17)
+    chef (14.8.12)
       addressable
       bundler (>= 1.10)
-      chef-config (= 14.7.17)
+      chef-config (= 14.8.12)
       chef-zero (>= 13.0)
       diff-lcs (~> 1.2, >= 1.2.4)
       erubis (~> 2.7)
@@ -98,10 +98,10 @@ GEM
       specinfra (~> 2.10)
       syslog-logger (~> 1.6)
       uuidtools (~> 2.1.5)
-    chef (14.7.17-universal-mingw32)
+    chef (14.8.12-universal-mingw32)
       addressable
       bundler (>= 1.10)
-      chef-config (= 14.7.17)
+      chef-config (= 14.8.12)
       chef-zero (>= 13.0)
       diff-lcs (~> 1.2, >= 1.2.4)
       erubis (~> 2.7)
@@ -141,10 +141,10 @@ GEM
       win32-taskscheduler (~> 2.0)
       windows-api (~> 0.4.4)
       wmi-lite (~> 1.0)
-    chef-api (0.8.0)
+    chef-api (0.9.0)
       logify (~> 0.1)
       mime-types
-    chef-apply (0.2.2)
+    chef-apply (0.2.4)
       chef (>= 14.0)
       chef-dk (>= 3.0)
       chef-telemetry
@@ -157,13 +157,13 @@ GEM
       toml-rb
       train
       tty-spinner
-    chef-config (14.7.17)
+    chef-config (14.8.12)
       addressable
       fuzzyurl
       mixlib-config (>= 2.2.12, < 3.0)
       mixlib-shellout (~> 2.0)
       tomlrb (~> 1.2)
-    chef-provisioning (2.7.2)
+    chef-provisioning (2.7.4)
       cheffish (>= 4.0, < 15.0)
       inifile (>= 2.0.2)
       mixlib-install (>= 1.0)
@@ -173,12 +173,12 @@ GEM
       winrm (~> 2.0)
       winrm-elevated (~> 1.0)
       winrm-fs (~> 1.0)
-    chef-provisioning-aws (3.0.6)
+    chef-provisioning-aws (3.0.7)
       aws-sdk (>= 2.2.18, < 3.0)
       chef-provisioning (>= 1.0, < 3.0)
       retryable (~> 2.0, >= 2.0.1)
       ubuntu_ami (~> 0.4, >= 0.4.1)
-    chef-provisioning-fog (0.26.1)
+    chef-provisioning-fog (0.26.3)
       chef-provisioning (>= 1.0, < 3.0)
       cheffish (>= 13.1.0, < 15.0)
       fog-digitalocean
@@ -190,7 +190,7 @@ GEM
       fog-xenserver
       retryable
       winrm-elevated
-    chef-sugar (4.1.0)
+    chef-sugar (5.0.0)
     chef-telemetry (0.1.0)
       chef-config
       concurrent-ruby (~> 1.0)
@@ -206,7 +206,7 @@ GEM
     cheffish (14.0.4)
       chef-zero (~> 14.0)
       net-ssh
-    chefspec (7.3.2)
+    chefspec (7.3.4)
       chef (>= 12.16.42)
       fauxhai (>= 4)
       rspec (~> 3.0)
@@ -217,10 +217,10 @@ GEM
     coderay (1.1.2)
     coercible (1.0.0)
       descendants_tracker (~> 0.0.1)
-    concurrent-ruby (1.1.3)
+    concurrent-ruby (1.1.4)
     cookbook-omnifetch (0.8.0)
       mixlib-archive (~> 0.4)
-    cookstyle (3.0.0)
+    cookstyle (3.0.2)
       rubocop (= 0.55.0)
     cucumber (3.1.2)
       builder (>= 2.1.2)
@@ -257,9 +257,9 @@ GEM
       multi_json
     domain_name (0.5.20180417)
       unf (>= 0.0.5, < 1.0.0)
-    droplet_kit (2.6.0)
+    droplet_kit (2.8.0)
       activesupport (> 3.0, < 6)
-      faraday (~> 0.9)
+      faraday (~> 0.15)
       kartograph (~> 0.2.3)
       resource_kit (~> 0.1.5)
       virtus (~> 1.0.3)
@@ -267,19 +267,19 @@ GEM
     equatable (0.5.0)
     erubis (2.7.0)
     excon (0.62.0)
-    faraday (0.15.3)
+    faraday (0.15.4)
       multipart-post (>= 1.2, < 3)
     faraday-cookie_jar (0.0.6)
       faraday (>= 0.7.4)
       http-cookie (~> 1.0.0)
     faraday_middleware (0.12.2)
       faraday (>= 0.7.4, < 1.0)
-    fauxhai (6.9.1)
+    fauxhai (6.10.0)
       net-ssh
     ffi (1.9.25)
     ffi (1.9.25-x64-mingw32)
     ffi (1.9.25-x86-mingw32)
-    ffi-libarchive (0.4.4)
+    ffi-libarchive (0.4.6)
       ffi (~> 1.0)
     ffi-rzmq (2.0.6)
       ffi-rzmq-core (>= 1.0.6)
@@ -332,7 +332,7 @@ GEM
     fog-xml (0.1.3)
       fog-core
       nokogiri (>= 1.5.11, < 2.0.0)
-    foodcritic (14.3.0)
+    foodcritic (15.1.0)
       cucumber-core (>= 1.3, < 4.0)
       erubis
       ffi-yajl (~> 2.0)
@@ -387,12 +387,12 @@ GEM
     http-form_data (1.0.3)
     http_parser.rb (0.6.0)
     httpclient (2.8.3)
-    i18n (1.1.1)
+    i18n (1.3.0)
       concurrent-ruby (~> 1.0)
     ice_nine (0.11.2)
     inifile (3.0.0)
     iniparse (1.4.4)
-    inspec (3.0.52)
+    inspec (3.2.6)
       addressable (~> 2.4)
       faraday (>= 0.9.0)
       faraday_middleware (~> 0.12.2)
@@ -413,16 +413,18 @@ GEM
       term-ansicolor
       thor (~> 0.20)
       tomlrb (~> 1.2)
-      train (~> 1.5, >= 1.5.6)
+      train (~> 1.5, >= 1.6.3)
+      tty-prompt (~> 0.17)
+      tty-table (~> 0.10)
     ipaddress (0.8.3)
     iso8601 (0.12.1)
     jmespath (1.4.0)
     json (2.1.0)
     jwt (2.1.0)
     kartograph (0.2.7)
-    kitchen-azurerm (0.14.5)
-      azure_mgmt_network (~> 0.15, >= 0.15.0)
-      azure_mgmt_resources (~> 0.15, >= 0.15.0)
+    kitchen-azurerm (0.14.7)
+      azure_mgmt_network (~> 0.18, >= 0.18.2)
+      azure_mgmt_resources (~> 0.17, >= 0.17.2)
       inifile (~> 3.0, >= 3.0.0)
       sshkey (~> 1, >= 1.0.0)
     kitchen-digitalocean (0.10.1)
@@ -432,13 +434,13 @@ GEM
       docker-api (~> 1.33)
       lockfile (~> 2.1)
       test-kitchen (~> 1.15)
-    kitchen-ec2 (2.3.1)
+    kitchen-ec2 (2.4.0)
       aws-sdk (~> 2)
       excon
       multi_json
       retryable (~> 2.0)
       test-kitchen (~> 1.4, >= 1.4.1)
-    kitchen-google (2.0.0)
+    kitchen-google (2.0.1)
       gcewinpass (~> 1.1)
       google-api-client (~> 0.19)
       test-kitchen
@@ -451,20 +453,20 @@ GEM
     kitchen-vagrant (1.3.6)
       test-kitchen (~> 1.4)
     knife-acl (1.0.3)
-    knife-cloud (1.2.1)
-      chef (>= 0.10.10)
-      knife-windows (>= 0.5.14)
+    knife-cloud (1.2.3)
+      excon (>= 0.50)
+      knife-windows (>= 1.0)
       mixlib-shellout
-    knife-ec2 (0.19.10)
+    knife-ec2 (0.19.16)
       fog-aws (>= 1, < 4)
       knife-windows (~> 1.0)
-    knife-google (3.3.3)
+    knife-google (3.3.7)
       gcewinpass (~> 1.1)
       google-api-client (>= 0.19.8, < 0.25)
       knife-cloud (~> 1.2.0)
-    knife-opc (0.4.0)
-    knife-push (1.0.3)
-      chef (>= 12.7.2)
+    knife-opc (0.4.1)
+    knife-push (1.1.2)
+      chef (>= 13.0)
     knife-spork (1.7.2)
       app_conf (>= 0.4.0)
       chef (>= 11.0.0)
@@ -497,27 +499,27 @@ GEM
     mime-types (3.2.2)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2018.0812)
-    mini_portile2 (2.3.0)
+    mini_portile2 (2.4.0)
     minitar (0.7)
-    minitest (5.11.3)
-    mixlib-archive (0.4.18)
+    minitest (5.10.3)
+    mixlib-archive (0.4.19)
       mixlib-log
-    mixlib-archive (0.4.18-universal-mingw32)
+    mixlib-archive (0.4.19-universal-mingw32)
       mixlib-log
     mixlib-authentication (2.1.1)
     mixlib-cli (1.7.0)
-    mixlib-config (2.2.13)
+    mixlib-config (2.2.18)
       tomlrb
     mixlib-install (3.11.5)
       mixlib-shellout
       mixlib-versioning
       thor
-    mixlib-log (2.0.4)
-    mixlib-shellout (2.4.0)
-    mixlib-shellout (2.4.0-universal-mingw32)
+    mixlib-log (2.0.9)
+    mixlib-shellout (2.4.4)
+    mixlib-shellout (2.4.4-universal-mingw32)
       win32-process (~> 0.8.2)
       wmi-lite (~> 1.0)
-    mixlib-versioning (1.2.2)
+    mixlib-versioning (1.2.7)
     molinillo (0.6.6)
     ms_rest (0.7.3)
       concurrent-ruby (~> 1.0)
@@ -531,6 +533,7 @@ GEM
     multi_json (1.13.1)
     multi_test (0.1.2)
     multipart-post (2.0.0)
+    necromancer (0.4.0)
     nenv (0.3.0)
     net-scp (1.2.1)
       net-ssh (>= 2.6.5)
@@ -544,19 +547,19 @@ GEM
       net-ssh-gateway (>= 1.2.0)
     net-telnet (0.1.1)
     netaddr (1.5.1)
-    nokogiri (1.8.5)
-      mini_portile2 (~> 2.3.0)
-    nokogiri (1.8.5-x64-mingw32)
-      mini_portile2 (~> 2.3.0)
-    nokogiri (1.8.5-x86-mingw32)
-      mini_portile2 (~> 2.3.0)
+    nokogiri (1.9.1)
+      mini_portile2 (~> 2.4.0)
+    nokogiri (1.9.1-x64-mingw32)
+      mini_portile2 (~> 2.4.0)
+    nokogiri (1.9.1-x86-mingw32)
+      mini_portile2 (~> 2.4.0)
     nori (2.6.0)
     notiffany (0.1.1)
       nenv (~> 0.1)
       shellany (~> 0.0)
     octokit (4.13.0)
       sawyer (~> 0.8.0, >= 0.5.3)
-    ohai (14.6.2)
+    ohai (14.8.10)
       chef-config (>= 12.8, < 15)
       ffi (~> 1.9)
       ffi-yajl (~> 2.2)
@@ -582,7 +585,7 @@ GEM
     pastel (0.7.2)
       equatable (~> 0.5.0)
       tty-color (~> 0.4.0)
-    plist (3.4.0)
+    plist (3.5.0)
     polyglot (0.3.5)
     powerpack (0.1.2)
     proxifier (1.0.3)
@@ -604,17 +607,17 @@ GEM
       r18n-core (= 3.2.0)
     rack (2.0.6)
     rainbow (3.0.0)
-    rake (12.3.1)
+    rake (12.3.0)
     rb-fsevent (0.10.3)
-    rb-inotify (0.9.10)
-      ffi (>= 0.5.0, < 2)
+    rb-inotify (0.10.0)
+      ffi (~> 1.0)
     rb-readline (0.5.5)
     rbvmomi (1.13.0)
       builder (~> 3.0)
       json (>= 1.8)
       nokogiri (~> 1.5)
       trollop (~> 2.1)
-    rdoc (6.0.4)
+    rdoc (6.0.1)
     rdp-ruby-wmi (0.3.1)
     representable (3.0.4)
       declarative (< 0.1.0)
@@ -660,7 +663,7 @@ GEM
     sawyer (0.8.1)
       addressable (>= 2.3.5, < 2.6)
       faraday (~> 0.8, < 1.0)
-    semverse (2.0.0)
+    semverse (3.0.0)
     serverspec (2.41.3)
       multi_json
       rspec (~> 3.0)
@@ -674,25 +677,30 @@ GEM
       jwt (>= 1.5, < 3.0)
       multi_json (~> 1.10)
     slop (3.6.0)
-    solve (4.0.0)
+    solve (4.0.2)
       molinillo (~> 0.6)
-      semverse (>= 1.1, < 3.0)
-    specinfra (2.76.3)
+      semverse (>= 1.1, < 4.0)
+    specinfra (2.76.5)
       net-scp
       net-ssh (>= 2.7)
       net-telnet (= 0.1.1)
       sfl
     sshkey (1.9.0)
     sslshake (1.2.0)
-    stove (6.0.0)
+    stove (7.0.1)
       chef-api (~> 0.5)
       logify (~> 0.2)
+    strings (0.1.4)
+      strings-ansi (~> 0.1.0)
+      unicode-display_width (~> 1.4.0)
+      unicode_utils (~> 1.4.0)
+    strings-ansi (0.1.0)
     structured_warnings (0.3.0)
     syslog-logger (1.6.8)
     systemu (2.6.5)
     term-ansicolor (1.7.0)
       tins (~> 1.0)
-    test-kitchen (1.23.2)
+    test-kitchen (1.24.0)
       mixlib-install (~> 3.6)
       mixlib-shellout (>= 1.2, < 3.0)
       net-scp (~> 1.1)
@@ -705,11 +713,12 @@ GEM
     thor (0.20.3)
     thread_safe (0.3.6)
     timeliness (0.3.8)
+    timers (4.2.0)
     tins (1.20.2)
     toml-rb (1.1.2)
       citrus (~> 3.0, > 3.0)
-    tomlrb (1.2.7)
-    train (1.5.6)
+    tomlrb (1.2.8)
+    train (1.6.3)
       aws-sdk (~> 2)
       azure_graph_rbac (~> 0.16)
       azure_mgmt_key_vault (~> 0.17)
@@ -729,18 +738,36 @@ GEM
     trollop (2.9.9)
     tty-color (0.4.3)
     tty-cursor (0.6.0)
-    tty-spinner (0.8.0)
-      tty-cursor (>= 0.5.0)
+    tty-prompt (0.18.0)
+      necromancer (~> 0.4.0)
+      pastel (~> 0.7.0)
+      timers (~> 4.0)
+      tty-cursor (~> 0.6.0)
+      tty-reader (~> 0.5.0)
+    tty-reader (0.5.0)
+      tty-cursor (~> 0.6.0)
+      tty-screen (~> 0.6.4)
+      wisper (~> 2.0.0)
+    tty-screen (0.6.5)
+    tty-spinner (0.9.0)
+      tty-cursor (~> 0.6.0)
+    tty-table (0.10.0)
+      equatable (~> 0.5.0)
+      necromancer (~> 0.4.0)
+      pastel (~> 0.7.2)
+      strings (~> 0.1.0)
+      tty-screen (~> 0.6.4)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
     uber (0.1.0)
-    ubuntu_ami (0.4.1)
+    ubuntu_ami (0.4.2)
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.7.5)
     unf_ext (0.0.7.5-x64-mingw32)
     unf_ext (0.0.7.5-x86-mingw32)
-    unicode-display_width (1.4.0)
+    unicode-display_width (1.4.1)
+    unicode_utils (1.4.0)
     uuidtools (2.1.5)
     virtus (1.0.5)
       axiom-types (~> 0.1)
@@ -776,7 +803,7 @@ GEM
     windows-pr (1.2.6)
       win32-api (>= 1.4.5)
       windows-api (>= 0.4.0)
-    winrm (2.3.0)
+    winrm (2.3.1)
       builder (>= 2.1.2)
       erubis (~> 2.7)
       gssapi (~> 1.2)
@@ -785,15 +812,16 @@ GEM
       logging (>= 1.6.1, < 3.0)
       nori (~> 2.0)
       rubyntlm (~> 0.6.0, >= 0.6.1)
-    winrm-elevated (1.1.0)
+    winrm-elevated (1.1.1)
       winrm (~> 2.0)
       winrm-fs (~> 1.0)
-    winrm-fs (1.3.1)
+    winrm-fs (1.3.2)
       erubis (~> 2.7)
       logging (>= 1.6.1, < 3.0)
       rubyzip (~> 1.1)
       winrm (~> 2.0)
-    wmi-lite (1.0.0)
+    wisper (2.0.0)
+    wmi-lite (1.0.1)
     xmlrpc (0.3.0)
     yard (0.9.16)
 
@@ -807,7 +835,7 @@ DEPENDENCIES
   artifactory
   berkshelf (>= 7.0.5)
   bundler
-  chef (= 14.7.17)
+  chef (= 14.8.12)
   chef-apply
   chef-dk!
   chef-provisioning (>= 2.7.1)
@@ -847,6 +875,7 @@ DEPENDENCIES
   knife-vsphere (>= 2.1.1)
   knife-windows (>= 1.9.1)
   listen
+  minitest (<= 5.10.3)
   mixlib-archive (>= 0.4.16)
   mixlib-install
   mixlib-versioning
@@ -858,9 +887,9 @@ DEPENDENCIES
   pry-byebug
   pry-remote
   pry-stack_explorer
-  rake
+  rake (<= 12.3.0)
   rb-readline
-  rdoc
+  rdoc (<= 6.0.1)
   rdp-ruby-wmi
   rspec-core (~> 3.0)
   rspec-expectations (~> 3.0)
@@ -883,4 +912,4 @@ DEPENDENCIES
   yard
 
 BUNDLED WITH
-   1.17.1
+   1.17.2

data/Rakefile

@@ -1,5 +1,5 @@
 #
-# Copyright:: Copyright (c) 2016 Chef Software Inc.
+# Copyright:: Copyright (c) 2016-2018 Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,7 +15,6 @@
 # limitations under the License.
 #
 
-require "bundler/gem_tasks"
 require_relative "tasks/dependencies"
 require_relative "tasks/announce"
 

data/chef-dk.gemspec

@@ -31,8 +31,7 @@ Gem::Specification.new do |gem|
 
   gem.required_ruby_version = ">= 2.4"
 
-  gem.files = %w{Rakefile LICENSE README.md warning.txt} +
-    %w{omnibus_overrides.rb} +
+  gem.files = %w{Rakefile LICENSE warning.txt} +
     Dir.glob("Gemfile*") + # Includes Gemfile and locks
     Dir.glob("*.gemspec") +
     Dir.glob("{lib,spec,acceptance,tasks}/**/*", File::FNM_DOTMATCH).reject { |f| File.directory?(f) }

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

@@ -42,6 +42,11 @@ module ChefDK
           boolean:     true,
           default:     nil
 
+        option :kitchen,
+          long:        "--kitchen CONFIGURATION",
+          description: "Generate cookbooks with a specific kitchen configuration (dokken|vagrant) - defaults to vagrant",
+          default:     "vagrant"
+
         option :policy,
           short:        "-P",
           long:         "--policy",
@@ -131,6 +136,11 @@ module ChefDK
 
           Generator.add_attr_to_context(:use_berkshelf, berks_mode?)
           Generator.add_attr_to_context(:pipeline, pipeline)
+          Generator.add_attr_to_context(:kitchen, kitchen)
+        end
+
+        def kitchen
+          config[:kitchen]
         end
 
         def pipeline

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

@@ -72,7 +72,10 @@ end
 
 # Test Kitchen
 template "#{cookbook_dir}/.kitchen.yml" do
-  if context.use_berkshelf
+  if context.kitchen == 'dokken'
+    # kitchen-dokken configuration works with berkshelf and policyfiles
+    source 'kitchen_dokken.yml.erb'
+  elsif context.use_berkshelf
     source 'kitchen.yml.erb'
   else
     source 'kitchen_policyfile.yml.erb'

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

@@ -0,0 +1,31 @@
+---
+driver:
+  name: dokken
+
+provisioner:
+  name: dokken
+
+transport:
+  name: dokken
+
+verifier:
+  name: inspec
+
+platforms:
+  # @see https://github.com/someara/dokken-images
+  # @see https://hub.docker.com/r/dokken/
+  - name: ubuntu-16.04
+    driver:
+      image: dokken/ubuntu-16.04
+  - name: centos-7
+    driver:
+      image: dokken/centos-7
+
+suites:
+  - name: default
+    run_list:
+      - recipe[<%= cookbook_name %>::default]
+    verifier:
+      inspec_tests:
+        - test/integration/default
+    attributes:

data/lib/chef-dk/version.rb

@@ -16,5 +16,5 @@
 #
 
 module ChefDK
-  VERSION = "3.5.13".freeze
+  VERSION = "3.6.57".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chef-dk
 version: !ruby/object:Gem::Version
-  version: 3.5.13
+  version: 3.6.57
 platform: ruby
 authors:
 - Daniel DeLeo
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-16 00:00:00.000000000 Z
+date: 2018-12-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-cli
@@ -239,7 +239,6 @@ files:
 - Gemfile
 - Gemfile.lock
 - LICENSE
-- README.md
 - Rakefile
 - acceptance/.shared/kitchen_acceptance/.kitchen.digitalocean.yml
 - acceptance/.shared/kitchen_acceptance/.kitchen.ec2.yml
@@ -419,6 +418,7 @@ files:
 - lib/chef-dk/skeletons/code_generator/templates/default/helpers.rb.erb
 - lib/chef-dk/skeletons/code_generator/templates/default/inspec_default_test.rb.erb
 - lib/chef-dk/skeletons/code_generator/templates/default/kitchen.yml.erb
+- lib/chef-dk/skeletons/code_generator/templates/default/kitchen_dokken.yml.erb
 - lib/chef-dk/skeletons/code_generator/templates/default/kitchen_policyfile.yml.erb
 - lib/chef-dk/skeletons/code_generator/templates/default/metadata.rb.erb
 - lib/chef-dk/skeletons/code_generator/templates/default/recipe.rb.erb
@@ -429,7 +429,6 @@ files:
 - lib/chef-dk/ui.rb
 - lib/chef-dk/version.rb
 - lib/kitchen/provisioner/policyfile_zero.rb
-- omnibus_overrides.rb
 - spec/shared/a_file_generator.rb
 - spec/shared/a_generated_file.rb
 - spec/shared/command_with_ui_object.rb

data/README.md

@@ -1,335 +0,0 @@
-# Chef Development Kit
-
-[![Build Status Master](https://travis-ci.org/chef/chef-dk.svg?branch=master)](https://travis-ci.org/chef/chef-dk)
-[![Build Status Master](https://ci.appveyor.com/api/projects/status/github/chef/chef-dk?branch=master&svg=true&passingText=master%20-%20Ok&pendingText=master%20-%20Pending&failingText=master%20-%20Failing)](https://ci.appveyor.com/project/Chef/chef-dk/branch/master)
-[![](https://img.shields.io/badge/Release%20Policy-Cadence%20Release-brightgreen.svg)](https://github.com/chef/chef-rfc/blob/master/rfc086-chef-oss-project-policies.md#cadence-release)
-[![Docker Stars](https://img.shields.io/docker/stars/chef/chefdk.svg?maxAge=2592000)](https://hub.docker.com/r/chef/chefdk)
-[![Docker Pulls](https://img.shields.io/docker/pulls/chef/chefdk.svg?maxAge=2592000)](https://hub.docker.com/r/chef/chefdk)
-
-Chef Development Kit (ChefDK) brings Chef and the development tools developed by the Chef Community together and acts as the consistent interface to this awesomeness. This awesomeness is composed of:
-
-* [Chef][]
-* [Berkshelf][]
-* [Test Kitchen][]
-* [ChefSpec][]
-* [Foodcritic][]
-* [Cookstyle][]
-* [Delivery CLI][]
-* [Push Jobs Client][]
-
-This repository contains the code for the `chef` command. The full
-package is built with omnibus. Project and component build definitions
-are in the omnibus directory in this repository.
-
-## Installation
-
-You can get the [latest release of ChefDK from the downloads page][ChefDK].
-
-On Mac OS X, you can also use [homebrew-cask](https://caskroom.github.io/)
-to `brew cask install chef/chef/chefdk`.
-
-Once you install the package, the `chef-client` suite, `berks`,
-`kitchen`, and this application (`chef`) will be symlinked into your
-system bin directory, ready to use.
-
-### Pre-release Candidates
-
-The following commands will download the latest ChefDK package from the `current` channel.  The `current` channel holds builds that have passed testing and are candidates for release.
-More information about flags supported by install.sh available here: https://docs.chef.io/api_omnitruck.html
-
-#### Linux and OS/X:
-
-In a terminal, run:
-
-`curl https://omnitruck.chef.io/install.sh | sudo bash -s -- -c current -P chefdk`
-
-To download a specific version, append the `-v` flag.  EG, `-v 0.9.0`.
-
-#### Windows
-
-Open up a Powershell command prompt as Administrator and run:
-
-`. { iwr -useb https://omnitruck.chef.io/install.ps1 } | iex; install -channel current -project chefdk`
-
-To download a specific version, append the `-version` flag.  EG, `-version 0.9.0`.
-
-## Usage
-
-For help with [Berkshelf][], [Test Kitchen][], [ChefSpec][], [Foodcritic][], [Delivery CLI][] or [Push Jobs Client][],
-visit those projects' homepages for documentation and guides. For help with
-`chef-client` and `knife`, visit the [Chef documentation][]
-and [Learn Chef][].
-
-### The `chef` Command
-
-Our goal is for `chef` to become a workflow tool that builds on the
-ideas of Berkshelf to provide an awesome experience that encourages
-quick iteration and testing (and makes those things easy) and provides a
-way to easily, reliably, and repeatably roll out new automation code to
-your infrastructure.
-
-While we've got a long way to go before we reach that goal we do have
-some helpful bits of functionality already included in the `chef`
-command:
-
-#### `chef generate`
-The generate subcommand generates skeleton Chef code
-layouts so you can skip repetitive boilerplate and get down to
-automating your infrastructure quickly. Unlike other generators, it only
-generates the minimum required files when creating a cookbook so you can
-focus on the task at hand without getting overwhelmed by stuff you don't
-need.
-
-The following generators are built-in:
-
-* `chef generate app` Creates an "application" layout that supports
-multiple cookbooks. This is a somewhat experimental compromise between
-the one-repo-per-cookbook and monolithic-chef-repo styles of cookbook
-management.
-
-* `chef generate cookbook` Creates a single cookbook.
-* `chef generate recipe` Creates a new recipe file in an existing
-cookbook.
-* `chef generate attribute` Creates a new attributes file in an existing
-cookbook.
-* `chef generate template` Creates a new template file in an existing
-cookbook. Use the `-s SOURCE` option to copy a source file's content to
-populate the template.
-* `chef generate file` Creates a new cookbook file in an existing
-cookbook. Supports the `-s SOURCE` option similar to template.
-* `chef generate lwrp` Creates a new LWRP resource and provider in an
-existing cookbook.
-
-The `chef generate` command also accepts additional `--generator-arg key=value`
-pairs that can be used to supply ad-hoc data to a generator cookbook.
-For example, you might specify `--generator-arg database=mysql` and then only
-write a template for `recipes/mysql.rb` if `context.database == 'mysql'`.
-
-#### `chef gem`
-`chef gem` is a wrapper command that manages installation and updating
-of rubygems for the Ruby installation embedded in the ChefDK package.
-This allows you to install knife plugins, Test Kitchen drivers, and
-other Ruby applications that are not packaged with ChefDK.
-
-Gems are installed to a `.chefdk` directory in your home directory; any
-executables included with a gem you install will be created in
-`~/.chefdk/gem/ruby/2.1.0/bin`. You can run these executables with
-`chef exec`, or use `chef shell-init` to add ChefDK's paths to your
-environment. Those commands are documented below.
-
-### `chef exec`
-`chef exec <command>` runs any arbitrary shell command with the PATH
-environment variable and the ruby environment variables (`GEM_HOME`,
-`GEM_PATH`, etc.) setup to point at the embedded ChefDK omnibus environment.
-
-### `chef shell-init`
-`chef shell-init SHELL_NAME` emits shell commands that modify your
-environment to make ChefDK your primary ruby. It supports bash, zsh,
-fish and PowerShell (posh). For more information to help you decide if
-this is desirable and instructions, see "Using ChefDK as Your Primary
-Development Environment" below.
-
-### `chef install`
-`chef install` reads a `Policyfile.rb` document, which contains a
-`run_list` and optional cookbook version constraints, finds a set of
-cookbooks that provide the desired recipes and meet dependency
-constraints, and emits a `Policyfile.lock.json` describing the expanded
-run list and locked cookbook set. The `Policyfile.lock.json` can be used
-to install the cookbooks on another machine. The policy lock can be
-uploaded to a Chef Server (via the `chef push` command) to apply the
-expanded run list and locked cookbook set to nodes in your
-infrastructure. See the POLICYFILE_README.md for further details.
-
-### `chef push`
-`chef push POLICY_GROUP` uploads a Policyfile.lock.json along with the cookbooks it
-references to a Chef Server. The policy lock is applied to a
-`POLICY_GROUP`, which is a set of nodes that share the same run list and
-cookbook set. This command operates in compatibility mode and has the
-same caveats as `chef install`. See the POLICYFILE_README.md for further
-details.
-
-### `chef update`
-`chef update` updates a Policyfile.lock.json with the latest cookbooks
-from upstream sources. It supports an `--attributes` flag which will
-cause only attributes from the Policyfile.rb to be updated.
-
-### `chef diff`
-`chef diff` shows an itemized diff between Policyfile locks. It can
-compare Policyfile locks from local disk, git, and/or the Chef Server,
-based on the options given.
-
-#### `chef verify`
-`chef verify` tests the embedded applications. By default it runs a
-quick "smoke test" to verify that the embedded applications are
-installed correctly and can run basic commands. As an end user this is
-probably all you'll ever need, but `verify` can also optionally run unit
-and integration tests by supplying the `--unit` and `--integration`
-flags, respectively.
-
-You can also focus on a specific suite of tests by passing it as an argument.
-For example `chef verify git` will only run the smoke tests for the `git` suite.
-
-*WARNING:* The integration tests will do dangerous things like start
-HTTP servers with access to your filesystem and even create users and
-groups if run with sufficient privileges. The tests may also be
-sensitive to your machine's configuration. If you choose to run these,
-we recommend to only run them on dedicated, isolated hosts (we do this
-in our build cluster to verify each build).
-
-### Using ChefDK as Your Primary Development Environment
-
-By default, ChefDK only adds a few select applications to your `PATH`
-and packages them in such a way that they are isolated from any other
-Ruby development tools you have on your system. If you're happily using
-your system ruby, rvm, rbenv, chruby or any other development
-environment, you can continue to do so. Just ensure that the ChefDK
-provided applications appear first in your `PATH` before any
-gem-installed versions and you're good to go.
-
-If you'd like to use ChefDK as your primary Ruby/Chef development
-environment, however, you can do so by initializing your shell with
-ChefDK's environment.
-
-To try it temporarily, in a new terminal session, run:
-
-```sh
-eval "$(chef shell-init SHELL_NAME)"
-```
-
-where `SHELL_NAME` is the name of your shell (usually bash, but zsh is
-also common). This modifies your `PATH` and `GEM_*` environment
-variables to include ChefDK's paths (run without the `eval` to see the
-generated code). Now your default `ruby` and associated tools will be
-the ones from ChefDK:
-
-```sh
-which ruby
-# => /opt/chefdk/embedded/bin/ruby
-```
-
-To add ChefDK to your shell's environment permanently, add the
-initialization step to your shell's profile:
-
-```sh
-echo 'eval "$(chef shell-init SHELL_NAME)"' >> ~/.YOUR_SHELL_PROFILE
-```
-
-Where `YOUR_SHELL_PROFILE` is `~/.bash_profile` for most bash users,
-`~/.zshrc` for zsh, and `~/.bashrc` on Ubuntu.
-
-#### Powershell
-
-You can use `chef shell-init` with PowerShell on Windows.
-
-To try it in your current session:
-
-```posh
-chef shell-init powershell | Invoke-Expression
-```
-
-To enable it permanently:
-
-```posh
-"chef shell-init powershell | Invoke-Expression" >> $PROFILE
-```
-
-#### Fish
-
-`chef shell-init` also supports fish.
-
-To try it:
-
-```fish
-eval (chef shell-init fish)
-```
-
-To permanently enable:
-
-```fish
-echo 'eval (chef shell-init SHELL_NAME)' >> ~/.config/fish/config.fish
-```
-
-## Uninstallation Instructions
-
-### Mac OS X
-
-You can uninstall Chef Development Kit on Mac using the below commands.
-
-First, remove the main package files:
-
-```sh
-# Remove the installed files
-sudo rm -rf /opt/chefdk
-
-# Remove the system installation entry
-sudo pkgutil --forget com.getchef.pkg.chefdk
-```
-
-Next, remove the symlinks which the Chef Development Kit installs. The
-location for these differs based on your OS X version.
-
-Pre-El Capitan:
-
-```sh
-# Symlinks are in /usr/bin
-ls -la /usr/bin | egrep '/opt/chefdk' | awk '{ print $9 }' | sudo xargs -I % rm -f /usr/bin/%
-```
-
-Post-El Capitan:
-
-```sh
-# Symlinks are in /usr/local/bin
-ls -la /usr/local/bin | egrep '/opt/chefdk' | awk '{ print $9 }' | sudo xargs -I % rm -f /usr/local/bin/%
-```
-
-### Windows
-
-You can use `Add / Remove Programs` on Windows to remove the Chef Development
-Kit from your system.
-
-### RHEL
-
-You can use `rpm` to uninstall Chef Development Kit on RHEL based systems:
-
-```sh
-rpm -qa *chefdk*
-yum remove <package>
-rm -rf /opt/chefdk
-rm -rf ~/.chefdk
-```
-
-### Ubuntu
-
-You can use `dpkg` to uninstall Chef Development Kit on Ubuntu based systems:
-
-```sh
-dpkg --list | grep chefdk # or dpkg --status chefdk
-
-# Purge chefdk from the system.
-# see man dkpg for details
-dpkg -P chefdk
-```
-
-## Contributing
-
-For information on contributing to this project see <https://github.com/chef/chef/blob/master/CONTRIBUTING.md>
-
-# For ChefDK Developers
-
-See the [Development Guide](CONTRIBUTING.md) for how to get started with
-development on the ChefDK itself, as well as details on how dependencies,
-packaging, and building works.
-
-- - -
-
-[Berkshelf]: https://docs.chef.io/berkshelf.html "Berkshelf"
-[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://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/delivery_cli.html "Delivery CLI"
-[Push Jobs Client]: https://docs.chef.io/push_jobs.html#push-jobs-client "Push Jobs Client"

data/omnibus_overrides.rb

@@ -1,25 +0,0 @@
-# THIS IS NOW HAND MANAGED, JUST EDIT THE THING
-# .travis.yml and appveyor.yml consume this,
-# try to keep it machine-parsable.
-#
-# NOTE: You MUST update omnibus-software when adding new versions of
-# software here: bundle exec rake dependencies:update_omnibus_gemfile_lock
-override :rubygems, version: "2.7.6"
-override :bundler, version: "1.16.1"
-override "libffi", version: "3.2.1"
-override "libiconv", version: "1.15"
-override "liblzma", version: "5.2.3"
-override "libtool", version: "2.4.2"
-override "libxml2", version: "2.9.8"
-override "libxslt", version: "1.1.30"
-override "libyaml", version: "0.1.7"
-override "makedepend", version: "1.0.5"
-override "ncurses", version: "5.9"
-override "pkg-config-lite", version: "0.28-1"
-override "ruby", version: "2.5.3"
-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"
-override "zlib", version: "1.2.11"
-override "libzmq", version: "4.0.7"
-override "openssl", version: "1.0.2p"