chef-dk 0.17.17 → 0.18.26

data/acceptance/.shared/kitchen_acceptance/.kitchen.ec2.yml

@@ -14,7 +14,6 @@ driver:
   aws_ssh_key_id: <%= ENV['AWS_SSH_KEY_ID'] || ENV['USER'] || ENV['USERNAME'] %>
   # test-specific stuff
   region: us-west-2
-  availability_zone: a
   subnet_id: subnet-19ac017c
   security_group_ids: ["sg-e401eb83", "sg-96274af3"]
   instance_type: m3.large

data/acceptance/Gemfile.lock

@@ -10,21 +10,19 @@ GEM
   remote: https://rubygems.org/
   specs:
     addressable (2.4.0)
-    artifactory (2.3.3)
-    aws-sdk (2.5.3)
-      aws-sdk-resources (= 2.5.3)
-    aws-sdk-core (2.5.3)
+    artifactory (2.5.0)
+    aws-sdk (2.6.2)
+      aws-sdk-resources (= 2.6.2)
+    aws-sdk-core (2.6.2)
       jmespath (~> 1.0)
-    aws-sdk-resources (2.5.3)
-      aws-sdk-core (= 2.5.3)
-    berkshelf (4.3.5)
+    aws-sdk-resources (2.6.2)
+      aws-sdk-core (= 2.6.2)
+    berkshelf (5.1.0)
       addressable (~> 2.3, >= 2.3.4)
-      berkshelf-api-client (~> 2.0, >= 2.0.2)
-      buff-config (~> 1.0)
-      buff-extensions (~> 1.0)
-      buff-shell_out (~> 0.1)
-      celluloid (= 0.16.0)
-      celluloid-io (~> 0.16.1)
+      berkshelf-api-client (>= 2.0.2, < 4.0)
+      buff-config (~> 2.0)
+      buff-extensions (~> 2.0)
+      buff-shell_out (~> 1.0)
       cleanroom (~> 1.0)
       faraday (~> 0.9)
       httpclient (~> 2.7)
@@ -32,28 +30,29 @@ GEM
       mixlib-archive (~> 0.1)
       octokit (~> 4.0)
       retryable (~> 2.0)
-      ridley (~> 4.5)
-      solve (~> 2.0)
+      ridley (~> 5.0)
+      solve (> 2.0, < 4.0)
       thor (~> 0.19)
-    berkshelf-api-client (2.0.2)
-      faraday (~> 0.9.1)
-      httpclient (~> 2.7.0)
-      ridley (~> 4.5)
-    buff-config (1.0.1)
-      buff-extensions (~> 1.0)
-      varia_model (~> 0.4)
-    buff-extensions (1.0.0)
-    buff-ignore (1.1.1)
-    buff-ruby_engine (0.1.0)
-    buff-shell_out (0.2.0)
-      buff-ruby_engine (~> 0.1.0)
+    berkshelf-api-client (3.0.0)
+      faraday (~> 0.9)
+      httpclient (~> 2.7)
+      ridley (>= 4.5, < 6.0)
+    buff-config (2.0.0)
+      buff-extensions (~> 2.0)
+      varia_model (~> 0.6)
+    buff-extensions (2.0.0)
+    buff-ignore (1.2.0)
+    buff-ruby_engine (1.0.0)
+    buff-shell_out (1.1.0)
+      buff-ruby_engine (~> 1.0)
     builder (3.2.2)
     celluloid (0.16.0)
       timers (~> 4.0.0)
     celluloid-io (0.16.2)
       celluloid (>= 0.16.0)
       nio4r (>= 1.1.0)
-    chef-config (12.13.30)
+    chef-config (12.14.77)
+      addressable
       fuzzyurl
       mixlib-config (~> 2.0)
       mixlib-shellout (~> 2.0)
@@ -64,7 +63,7 @@ GEM
       excon (>= 0.38.0)
       json
     erubis (2.7.0)
-    excon (0.51.0)
+    excon (0.52.0)
     faraday (0.9.2)
       multipart-post (>= 1.2, < 3)
     ffi (1.9.14)
@@ -73,29 +72,32 @@ GEM
       ffi (>= 1.0.1)
     gyoku (1.3.1)
       builder (>= 2.1.2)
-    hashie (3.4.4)
+    hashie (3.4.6)
     hitimes (1.2.4)
-    httpclient (2.7.2)
-    inspec (0.29.0)
+    httpclient (2.8.2.4)
+    inspec (0.35.0)
       hashie (~> 3.4)
-      json (~> 1.8)
+      json (>= 1.8, < 3.0)
       method_source (~> 0.8)
+      mixlib-log
+      parallel (~> 1.9)
       pry (~> 0)
       rainbow (~> 2)
       rspec (~> 3)
       rspec-its (~> 1.2)
       rubyzip (~> 1.1)
+      sslshake (~> 1)
       thor (~> 0.19)
-      train (>= 0.16.0, < 1.0)
+      train (>= 0.19.0, < 1.0)
     jmespath (1.3.1)
-    json (1.8.3)
-    kitchen-ec2 (1.1.0)
+    json (2.0.2)
+    kitchen-ec2 (1.2.0)
       aws-sdk (~> 2)
       excon
       multi_json
       retryable (~> 2.0)
       test-kitchen (~> 1.4, >= 1.4.1)
-    kitchen-inspec (0.15.0)
+    kitchen-inspec (0.15.1)
       inspec (>= 0.22.0, < 1.0.0)
       test-kitchen (~> 1.6)
     kitchen-vagrant (0.20.0)
@@ -110,15 +112,15 @@ GEM
       mixlib-log
     mixlib-authentication (1.4.1)
       mixlib-log
-    mixlib-config (2.2.1)
-    mixlib-install (1.1.0)
+    mixlib-config (2.2.4)
+    mixlib-install (1.2.2)
       artifactory
       mixlib-shellout
       mixlib-versioning
     mixlib-log (1.7.1)
-    mixlib-shellout (2.2.6)
+    mixlib-shellout (2.2.7)
     mixlib-versioning (1.1.0)
-    molinillo (0.4.5)
+    molinillo (0.5.1)
     multi_json (1.12.1)
     multipart-post (2.0.0)
     net-scp (1.2.1)
@@ -130,18 +132,19 @@ GEM
     nori (2.6.0)
     octokit (4.3.0)
       sawyer (~> 0.7.0, >= 0.5.3)
+    parallel (1.9.0)
     pry (0.10.4)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
     rainbow (2.1.0)
     retryable (2.0.4)
-    ridley (4.6.1)
+    ridley (5.1.0)
       addressable
-      buff-config (~> 1.0)
-      buff-extensions (~> 1.0)
-      buff-ignore (~> 1.1.1)
-      buff-shell_out (~> 0.1)
+      buff-config (~> 2.0)
+      buff-extensions (~> 2.0)
+      buff-ignore (~> 1.2)
+      buff-shell_out (~> 1.0)
       celluloid (~> 0.16.0)
       celluloid-io (~> 0.16.1)
       chef-config (>= 12.5.0)
@@ -152,8 +155,8 @@ GEM
       json (>= 1.7.7)
       mixlib-authentication (>= 1.3.0)
       retryable (~> 2.0)
-      semverse (~> 1.1)
-      varia_model (~> 0.4.0)
+      semverse (~> 2.0)
+      varia_model (~> 0.6)
     rspec (3.4.0)
       rspec-core (~> 3.4.0)
       rspec-expectations (~> 3.4.0)
@@ -170,19 +173,20 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.4.0)
     rspec-support (3.4.1)
-    rubyntlm (0.6.0)
+    rubyntlm (0.6.1)
     rubyzip (1.2.0)
     safe_yaml (1.0.4)
     sawyer (0.7.0)
       addressable (>= 2.3.5, < 2.5)
       faraday (~> 0.8, < 0.10)
-    semverse (1.2.1)
+    semverse (2.0.0)
     slop (3.6.0)
-    solve (2.0.3)
-      molinillo (~> 0.4.2)
-      semverse (~> 1.1)
-    test-kitchen (1.11.1)
-      mixlib-install (~> 1.0, >= 1.0.4)
+    solve (3.0.1)
+      molinillo (~> 0.4)
+      semverse (>= 1.1, < 3.0)
+    sslshake (1.0.12)
+    test-kitchen (1.13.0)
+      mixlib-install (~> 1.2)
       mixlib-shellout (>= 1.2, < 3.0)
       net-scp (~> 1.1)
       net-ssh (>= 2.9, < 4.0)
@@ -192,35 +196,36 @@ GEM
     thor (0.19.1)
     timers (4.0.4)
       hitimes
-    train (0.16.0)
+    train (0.20.0)
       docker-api (~> 1.26)
-      json (~> 1.8)
+      json (>= 1.8, < 3.0)
       mixlib-shellout (~> 2.0)
       net-scp (~> 1.2)
       net-ssh (>= 2.9, < 4.0)
-      winrm (~> 1.6)
-      winrm-fs (~> 0.3)
-    varia_model (0.4.1)
-      buff-extensions (~> 1.0)
+      winrm (~> 2.0)
+      winrm-fs (~> 1.0)
+    varia_model (0.6.0)
+      buff-extensions (~> 2.0)
       hashie (>= 2.0.2, < 4.0.0)
     windows_chef_zero (2.0.0)
       test-kitchen (>= 1.2.1)
-    winrm (1.8.1)
+    winrm (2.0.2)
       builder (>= 2.1.2)
+      erubis (~> 2.7)
       gssapi (~> 1.2)
       gyoku (~> 1.0)
       httpclient (~> 2.2, >= 2.2.0.2)
       logging (>= 1.6.1, < 3.0)
       nori (~> 2.0)
-      rubyntlm (~> 0.6.0)
-    winrm-elevated (0.4.0)
-      winrm (~> 1.5)
-      winrm-fs (~> 0.4.2)
-    winrm-fs (0.4.3)
+      rubyntlm (~> 0.6.0, >= 0.6.1)
+    winrm-elevated (1.0.1)
+      winrm (~> 2.0)
+      winrm-fs (~> 1.0)
+    winrm-fs (1.0.0)
       erubis (~> 2.7)
       logging (>= 1.6.1, < 3.0)
       rubyzip (~> 1.1)
-      winrm (~> 1.5)
+      winrm (~> 2.0)
 
 PLATFORMS
   ruby

data/chef-dk.gemspec

@@ -28,7 +28,7 @@ Gem::Specification.new do |gem|
   gem.summary       = gem.description
   gem.homepage      = "https://www.chef.io/"
 
-  gem.required_ruby_version = '>= 2.0'
+  gem.required_ruby_version = '>= 2.2'
 
   gem.files = %w{Rakefile LICENSE README.md CONTRIBUTING.md warning.txt} +
       %w{version_policy.rb omnibus_overrides.rb} +
@@ -42,19 +42,13 @@ Gem::Specification.new do |gem|
   gem.add_dependency "mixlib-cli", "~> 1.7"
   gem.add_dependency "mixlib-shellout", "~> 2.0"
   gem.add_dependency "ffi-yajl", ">= 1.0", "< 3.0"
-
   gem.add_dependency "minitar", "~> 0.5.4"
-
   gem.add_dependency "chef", "~> 12.5"
-
-  gem.add_dependency "solve", "~> 2.0", ">= 2.0.1"
-
+  gem.add_dependency "solve", ">= 2.0.1"
   gem.add_dependency "cookbook-omnifetch", "~> 0.2", ">= 0.2.2"
-
   gem.add_dependency "diff-lcs", "~> 1.0"
   gem.add_dependency "paint", "~> 1.0"
-
-  gem.add_dependency "chef-provisioning", "~> 1.2"
+  gem.add_dependency "chef-provisioning", "~> 2.0"
 
   gem.add_development_dependency "github_changelog_generator"
   gem.add_development_dependency "rake"

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

@@ -37,7 +37,7 @@ to remove orphaned policies before running this command.
 
 See our detailed README for more information:
 
-https://github.com/chef/chef-dk/blob/master/POLICYFILE_README.md
+https://docs.chef.io/policyfile.html
 
 Options:
 
@@ -113,4 +113,3 @@ BANNER
     end
   end
 end
-

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

@@ -36,7 +36,7 @@ before deleting them, use `chef show-policy --orphans`.
 
 See our detailed README for more information:
 
-https://github.com/chef/chef-dk/blob/master/POLICYFILE_README.md
+https://docs.chef.io/policyfile.html
 
 Options:
 

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

@@ -36,7 +36,7 @@ command.
 
 See our detailed README for more information:
 
-https://github.com/chef/chef-dk/blob/master/POLICYFILE_README.md
+https://docs.chef.io/policyfile.html
 
 Options:
 

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

@@ -36,7 +36,7 @@ you to undo this operation via the `chef undelete` command.
 
 See our detailed README for more information:
 
-https://github.com/chef/chef-dk/blob/master/POLICYFILE_README.md
+https://docs.chef.io/policyfile.html
 
 Options:
 

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

@@ -40,7 +40,7 @@ machine with:
 
 See our detailed README for more information:
 
-https://github.com/chef/chef-dk/blob/master/POLICYFILE_README.md
+https://docs.chef.io/policyfile.html
 
 Options:
 

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

@@ -29,6 +29,11 @@ module ChefDK
 
         attr_reader :cookbook_name_or_path
 
+        option :pipeline,
+          :long  => "--pipeline PIPELINE",
+          :description => "Use PIPELINE to set target branch to something other than master for the build_cookbook",
+          :default => "master"
+
         options.merge!(SharedGeneratorOptions.options)
 
         def initialize(params)
@@ -58,6 +63,12 @@ module ChefDK
 
           Generator.add_attr_to_context(:delivery_project_git_initialized, delivery_project_git_initialized?)
           Generator.add_attr_to_context(:build_cookbook_parent_is_cookbook, build_cookbook_parent_is_cookbook?)
+
+          Generator.add_attr_to_context(:pipeline, pipeline)
+        end
+
+        def pipeline
+          config[:pipeline]
         end
 
         def recipe
@@ -112,4 +123,3 @@ module ChefDK
     end
   end
 end
-

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

@@ -63,6 +63,11 @@ module ChefDK
           boolean:      true,
           default:      false
 
+        option :pipeline,
+          :long  => "--pipeline PIPELINE",
+          :description => "Use PIPELINE to set target branch to something other than master for the build_cookbook",
+          :default => "master"
+
         options.merge!(SharedGeneratorOptions.options)
 
         def initialize(params)
@@ -125,6 +130,11 @@ module ChefDK
           Generator.add_attr_to_context(:verbose, verbose?)
 
           Generator.add_attr_to_context(:use_berkshelf, berks_mode?)
+          Generator.add_attr_to_context(:pipeline, pipeline)
+        end
+
+        def pipeline
+          config[:pipeline]
         end
 
         def policy_name
@@ -196,8 +206,7 @@ module ChefDK
           if !@cookbook_name_or_path
             @params_valid = false
           elsif /-/ =~ File.basename(@cookbook_name_or_path)
-            err("Hyphens are not allowed in cookbook names. Please specify a cookbook name without hyphens.")
-            @params_valid = false
+            msg("Hyphens are discouraged in cookbook names as they may cause problems with custom resources. See https://docs.chef.io/ctl_chef.html#chef-generate-cookbook for more information.")
           end
 
           if config[:berks] && config[:policy]

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

@@ -39,7 +39,7 @@ cookbooks to nodes in your infrastructure.
 
 See our detailed README for more information:
 
-https://github.com/chef/chef-dk/blob/master/POLICYFILE_README.md
+https://docs.chef.io/policyfile.html
 
 Options:
 

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

@@ -37,7 +37,7 @@ run_list and cookbooks.
 
 See our detailed README for more information:
 
-https://github.com/chef/chef-dk/blob/master/POLICYFILE_README.md
+https://docs.chef.io/policyfile.html
 
 Options:
 

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

@@ -37,7 +37,7 @@ run_list and cookbooks.
 
 For more information about Policyfiles, see our detailed README:
 
-https://github.com/chef/chef-dk/blob/master/POLICYFILE_README.md
+https://docs.chef.io/policyfile.html
 
 Options:
 E

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

@@ -40,7 +40,7 @@ command.
 
 See our detailed README for more information:
 
-https://github.com/chef/chef-dk/blob/master/POLICYFILE_README.md
+https://docs.chef.io/policyfile.html
 
 Options: