chef-dk 1.2.22 → 1.3.40

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

@@ -4,14 +4,30 @@ cookbook_dir = File.join(context.cookbook_root, context.cookbook_name)
 
 silence_chef_formatter unless context.verbose
 
-generator_desc("Ensuring correct cookbook file content")
+generator_desc('Ensuring correct cookbook file content')
 
 # cookbook root dir
 directory cookbook_dir
 
 # metadata.rb
+spdx_license =  case context.license
+                when 'apachev2'
+                  'Apache-2.0'
+                when 'mit'
+                  'MIT'
+                when 'gplv2'
+                  'GPL-2.0'
+                when 'gplv3'
+                  'GPL-3.0'
+                else
+                  'All Rights Reserved'
+                end
+
 template "#{cookbook_dir}/metadata.rb" do
   helpers(ChefDK::Generator::TemplateHelper)
+  variables(
+    spdx_license: spdx_license
+  )
   action :create_if_missing
 end
 
@@ -34,16 +50,14 @@ else
 
   # Policyfile
   template "#{cookbook_dir}/Policyfile.rb" do
-    source "Policyfile.rb.erb"
+    source 'Policyfile.rb.erb'
     helpers(ChefDK::Generator::TemplateHelper)
   end
 
 end
 
-
 # Test Kitchen
 template "#{cookbook_dir}/.kitchen.yml" do
-
   if context.use_berkshelf
     source 'kitchen.yml.erb'
   else
@@ -71,18 +85,17 @@ directory "#{cookbook_dir}/spec/unit/recipes" do
 end
 
 cookbook_file "#{cookbook_dir}/spec/spec_helper.rb" do
-
   if context.use_berkshelf
-    source "spec_helper.rb"
+    source 'spec_helper.rb'
   else
-    source "spec_helper_policyfile.rb"
+    source 'spec_helper_policyfile.rb'
   end
 
   action :create_if_missing
 end
 
 template "#{cookbook_dir}/spec/unit/recipes/default_spec.rb" do
-  source "recipe_spec.rb.erb"
+  source 'recipe_spec.rb.erb'
   helpers(ChefDK::Generator::TemplateHelper)
   action :create_if_missing
 end
@@ -92,7 +105,7 @@ end
 directory "#{cookbook_dir}/recipes"
 
 template "#{cookbook_dir}/recipes/default.rb" do
-  source "recipe.rb.erb"
+  source 'recipe.rb.erb'
   helpers(ChefDK::Generator::TemplateHelper)
   action :create_if_missing
 end
@@ -101,35 +114,31 @@ end
 if context.have_git
   unless context.skip_git_init
 
-    generator_desc("Committing cookbook files to git")
+    generator_desc('Committing cookbook files to git')
 
-    execute("initialize-git") do
-      command("git init .")
+    execute('initialize-git') do
+      command('git init .')
       cwd cookbook_dir
     end
 
   end
 
   cookbook_file "#{cookbook_dir}/.gitignore" do
-    source "gitignore"
+    source 'gitignore'
   end
 
   unless context.skip_git_init
 
-    execute("git-add-new-files") do
-      command("git add .")
+    execute('git-add-new-files') do
+      command('git add .')
       cwd cookbook_dir
     end
 
-    execute("git-commit-new-files") do
-      command("git commit -m \"Add generated cookbook content\"")
+    execute('git-commit-new-files') do
+      command('git commit -m "Add generated cookbook content"')
       cwd cookbook_dir
     end
   end
 end
 
-if context.enable_delivery
-
-  include_recipe "::build_cookbook"
-
-end
+include_recipe '::build_cookbook' if context.enable_delivery

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

@@ -1,23 +1,23 @@
 
 context = ChefDK::Generator.context
 cookbook_dir = File.join(context.cookbook_root, context.cookbook_name)
-files_dir = File.join(cookbook_dir, "files", "default")
-cookbook_file_path = File.join(cookbook_dir, "files", "default", context.new_file_basename)
+files_dir = File.join(cookbook_dir, 'files', 'default')
+cookbook_file_path = File.join(cookbook_dir, 'files', 'default', context.new_file_basename)
 
 directory files_dir do
   recursive true
 end
 
-if source_file = context.content_source
+if context.content_source
 
   file cookbook_file_path do
-    content(IO.read(source_file))
+    content(IO.read(context.context_source))
   end
 
 else
 
   template cookbook_file_path do
-    source "cookbook_file.erb"
+    source 'cookbook_file.erb'
     helpers(ChefDK::Generator::TemplateHelper)
   end
 

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

@@ -2,22 +2,22 @@
 context = ChefDK::Generator.context
 cookbook_dir = File.join(context.cookbook_root, context.cookbook_name)
 
-resource_dir = File.join(cookbook_dir, "resources")
+resource_dir = File.join(cookbook_dir, 'resources')
 resource_path = File.join(resource_dir, "#{context.new_file_basename}.rb")
 
-provider_dir = File.join(cookbook_dir, "providers")
+provider_dir = File.join(cookbook_dir, 'providers')
 provider_path = File.join(provider_dir, "#{context.new_file_basename}.rb")
 
 directory resource_dir
 
 template resource_path do
-  source "resource.rb.erb"
+  source 'resource.rb.erb'
   helpers(ChefDK::Generator::TemplateHelper)
 end
 
 directory provider_dir
 
 template provider_path do
-  source "provider.rb.erb"
+  source 'provider.rb.erb'
   helpers(ChefDK::Generator::TemplateHelper)
 end

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

@@ -3,6 +3,6 @@ context = ChefDK::Generator.context
 policyfile_path = File.join(context.policyfile_dir, "#{context.new_file_basename}.rb")
 
 template policyfile_path do
-  source "Policyfile.rb.erb"
+  source 'Policyfile.rb.erb'
   helpers(ChefDK::Generator::TemplateHelper)
 end

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

@@ -1,14 +1,14 @@
 
 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_dir = File.join(cookbook_dir, "spec", "unit", "recipes")
+recipe_path = File.join(cookbook_dir, 'recipes', "#{context.new_file_basename}.rb")
+spec_helper_path = File.join(cookbook_dir, 'spec', 'spec_helper.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")
+inspec_dir = File.join(cookbook_dir, 'test', 'smoke', 'default')
+inspec_path = File.join(inspec_dir, "#{context.new_file_basename}_test.rb")
 
-if File.directory?(File.join(cookbook_dir, "test", "recipes"))
+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".
@@ -28,7 +28,7 @@ cookbook_file spec_helper_path do
 end
 
 template spec_path do
-  source "recipe_spec.rb.erb"
+  source 'recipe_spec.rb.erb'
   helpers(ChefDK::Generator::TemplateHelper)
   action :create_if_missing
 end
@@ -46,6 +46,6 @@ end
 
 # Recipe
 template recipe_path do
-  source "recipe.rb.erb"
+  source 'recipe.rb.erb'
   helpers(ChefDK::Generator::TemplateHelper)
 end

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

@@ -12,27 +12,27 @@ template "#{repo_dir}/LICENSE" do
 end
 
 cookbook_file "#{repo_dir}/.chef-repo.txt" do
-  source "repo/dot-chef-repo.txt"
+  source 'repo/dot-chef-repo.txt'
   action :create_if_missing
 end
 
 cookbook_file "#{repo_dir}/README.md" do
-  source "repo/README.md"
+  source 'repo/README.md'
   action :create_if_missing
 end
 
 cookbook_file "#{repo_dir}/chefignore" do
-  source "chefignore"
+  source 'chefignore'
   action :create_if_missing
 end
 
-directories_to_create = %w{ cookbooks data_bags }
+directories_to_create = %w( cookbooks data_bags )
 
-if context.use_roles
-  directories_to_create += %w{ roles environments }
-else
-  directories_to_create += %w{ policies }
-end
+directories_to_create += if context.use_roles
+                           %w( roles environments )
+                         else
+                           %w( policies )
+                         end
 
 directories_to_create.each do |tlo|
   remote_directory "#{repo_dir}/#{tlo}" do
@@ -43,24 +43,24 @@ end
 
 cookbook_file "#{repo_dir}/cookbooks/README.md" do
   if context.policy_only
-    source "cookbook_readmes/README-policy.md"
+    source 'cookbook_readmes/README-policy.md'
   else
-    source "cookbook_readmes/README.md"
+    source 'cookbook_readmes/README.md'
   end
   action :create_if_missing
 end
 
 # git
 if context.have_git
-  if !context.skip_git_init
-    execute("initialize-git") do
-      command("git init .")
+  unless context.skip_git_init
+    execute('initialize-git') do
+      command('git init .')
       cwd repo_dir
       not_if { File.exist?("#{repo_dir}/.gitignore") }
     end
   end
   template "#{repo_dir}/.gitignore" do
-    source "repo/gitignore.erb"
+    source 'repo/gitignore.erb'
     helpers(ChefDK::Generator::TemplateHelper)
     action :create_if_missing
   end

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

@@ -1,31 +1,31 @@
 
 context = ChefDK::Generator.context
 cookbook_dir = File.join(context.cookbook_root, context.cookbook_name)
-template_dir = File.join(cookbook_dir, "templates", "default")
+template_dir = File.join(cookbook_dir, 'templates', 'default')
 template_filename = context.new_file_basename
 
-unless File.extname(template_filename) == ".erb"
+unless File.extname(template_filename) == '.erb'
   # new_file_basename is a frozen string, so we have to create an entirely
   # new string here instead of using concat.
   template_filename = "#{template_filename}.erb"
 end
 
-template_path = File.join(cookbook_dir, "templates", template_filename)
+template_path = File.join(cookbook_dir, 'templates', template_filename)
 
 directory template_dir do
   recursive true
 end
 
-if source_file = context.content_source
+if context.content_source
 
   file template_path do
-    content(IO.read(source_file))
+    content(IO.read(context.context_source))
   end
 
 else
 
   template template_path do
-    source "template.erb"
+    source 'template.erb'
     helpers(ChefDK::Generator::TemplateHelper)
   end
 

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

@@ -3,7 +3,5 @@ source 'https://supermarket.chef.io'
 metadata
 
 group :delivery do
-  cookbook 'delivery_build', git: 'https://github.com/chef-cookbooks/delivery_build'
-  cookbook 'delivery-base', git: 'https://github.com/chef-cookbooks/delivery-base'
   cookbook 'test', path: './test/fixtures/cookbooks/test'
 end

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

@@ -3,6 +3,7 @@ maintainer '<%= copyright_holder %>'
 maintainer_email '<%= email %>'
 license '<%= license %>'
 version '0.1.0'
+chef_version '>= 12.1' if respond_to?(:chef_version)
 <% if build_cookbook_parent_is_cookbook -%>
 
 depends 'delivery-truck'

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

@@ -6,13 +6,13 @@
 # found at http://inspec.io/docs/reference/resources/
 
 unless os.windows?
-  describe user('root') do
+  # This is an example test, replace with your own test.
+  describe user('root'), :skip do
     it { should exist }
-    skip 'This is an example test, replace with your own test.'
   end
 end
 
-describe port(80) do
+# This is an example test, replace it with your own test.
+describe port(80), :skip do
   it { should_not be_listening }
-  skip 'This is an example test, replace with your own test.'
 end

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.2
+  - name: centos-7.3
 
 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.2
+  - name: centos-7.3
 
 suites:
   - name: default

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

@@ -1,19 +1,20 @@
 name '<%= cookbook_name %>'
 maintainer '<%= copyright_holder %>'
 maintainer_email '<%= email %>'
-license '<%= license %>'
+license '<%= @spdx_license %>'
 description 'Installs/Configures <%= cookbook_name %>'
 long_description 'Installs/Configures <%= cookbook_name %>'
 version '0.1.0'
+chef_version '>= 12.1' if respond_to?(:chef_version)
 
 # 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)
+# issues_url 'https://github.com/<insert_org_here>/<%= cookbook_name %>/issues'
 
 # 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)
+# source_url 'https://github.com/<insert_org_here>/<%= cookbook_name %>'

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

@@ -7,9 +7,11 @@
 require 'spec_helper'
 
 describe '<%= cookbook_name %>::<%= recipe_name %>' do
-  context 'When all attributes are default, on an unspecified platform' do
+  context 'When all attributes are default, on an Ubuntu 16.04' do
     let(:chef_run) do
-      runner = ChefSpec::ServerRunner.new
+      # for a complete list of available platforms and versions see:
+      # https://github.com/customink/fauxhai/blob/master/PLATFORMS.md
+      runner = ChefSpec::ServerRunner.new(platform: 'ubuntu', version: '16.04')
       runner.converge(described_recipe)
     end
 

data/lib/chef-dk/ui.rb

@@ -55,4 +55,3 @@ module ChefDK
     end
   end
 end
-

data/lib/chef-dk/version.rb

@@ -16,5 +16,5 @@
 #
 
 module ChefDK
-  VERSION = "1.2.22"
+  VERSION = "1.3.40"
 end

data/lib/kitchen/provisioner/policyfile_zero.rb

@@ -21,7 +21,7 @@ require "kitchen/provisioner/chef_base"
 # TODO: chef-dk and kitchen can only co-exist if kitchen and chef-dk agree on
 # the version of mixlib-shellout to use. Kitchen currently locked at 1.4,
 # chef-dk is on 2.x
-require 'chef-dk/policyfile_services/export_repo'
+require "chef-dk/policyfile_services/export_repo"
 
 module Kitchen
 
@@ -69,13 +69,13 @@ module Kitchen
 
       default_config :chef_client_path do |provisioner|
         provisioner.
-          remote_path_join(%W[#{provisioner[:chef_omnibus_root]} bin chef-client]).
+          remote_path_join(%W{#{provisioner[:chef_omnibus_root]} bin chef-client}).
           tap { |path| path.concat(".bat") if provisioner.windows_os? }
       end
 
       default_config :ruby_bindir do |provisioner|
         provisioner.
-          remote_path_join(%W[#{provisioner[:chef_omnibus_root]} embedded bin])
+          remote_path_join(%W{#{provisioner[:chef_omnibus_root]} embedded bin})
       end
 
       # (see Base#finalize_config!)
@@ -96,7 +96,7 @@ module Kitchen
       # (see Base#run_command)
       def run_command
         level = config[:log_level] == :info ? :auto : config[:log_level]
-        
+
         cmd = "#{sudo(config[:chef_client_path])} --local-mode".
           tap { |str| str.insert(0, "& ") if powershell_shell? }
 
@@ -104,10 +104,10 @@ module Kitchen
           "--config #{config[:root_path]}/client.rb",
           "--log_level #{level}",
           "--force-formatter",
-          "--no-color"
+          "--no-color",
         ]
         if config[:chef_zero_port]
-          args <<  "--chef-zero-port #{config[:chef_zero_port]}"
+          args << "--chef-zero-port #{config[:chef_zero_port]}"
         end
         if config[:log_file]
           args << "--logfile #{config[:log_file]}"
@@ -166,7 +166,7 @@ module Kitchen
         info("Preparing validation.pem")
         debug("Using a dummy validation.pem")
 
-        source = File.join(Kitchen.source_root, %w[support dummy-validation.pem])
+        source = File.join(Kitchen.source_root, %w{support dummy-validation.pem})
         FileUtils.cp(source, File.join(sandbox_path, "validation.pem"))
       end