chef-dk 0.15.16 → 0.16.28

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

@@ -3,27 +3,36 @@ context = ChefDK::Generator.context
 delivery_project_dir = context.delivery_project_dir
 dot_delivery_dir = File.join(delivery_project_dir, ".delivery")
 
+generator_desc("Ensuring delivery configuration")
+
 directory dot_delivery_dir
 
 cookbook_file File.join(dot_delivery_dir, "config.json") do
   source "delivery-config.json"
 end
 
-build_cookbook_dir = File.join(dot_delivery_dir, "build-cookbook")
+# Adding a new prototype file for delivery-cli local commands
+cookbook_file File.join(dot_delivery_dir, "project.toml") do
+  source "delivery-project.toml"
+end
+
+generator_desc("Ensuring correct delivery build cookbook content")
+
+build_cookbook_dir = File.join(dot_delivery_dir, "build_cookbook")
 
 # cookbook root dir
 directory build_cookbook_dir
 
 # metadata.rb
 template "#{build_cookbook_dir}/metadata.rb" do
-  source "build-cookbook/metadata.rb.erb"
+  source "build_cookbook/metadata.rb.erb"
   helpers(ChefDK::Generator::TemplateHelper)
   action :create_if_missing
 end
 
 # README
 cookbook_file "#{build_cookbook_dir}/README.md" do
-  source "build-cookbook/README.md"
+  source "build_cookbook/README.md"
   action :create_if_missing
 end
 
@@ -39,7 +48,7 @@ cookbook_file "#{build_cookbook_dir}/chefignore"
 
 # Berksfile
 template "#{build_cookbook_dir}/Berksfile" do
-  source "build-cookbook/Berksfile.erb"
+  source "build_cookbook/Berksfile.erb"
   helpers(ChefDK::Generator::TemplateHelper)
   action :create_if_missing
 end
@@ -49,7 +58,7 @@ directory "#{build_cookbook_dir}/recipes"
 
 %w(default deploy functional lint provision publish quality security smoke syntax unit).each do |phase|
   template "#{build_cookbook_dir}/recipes/#{phase}.rb" do
-    source 'build-cookbook/recipe.rb.erb'
+    source 'build_cookbook/recipe.rb.erb'
     helpers(ChefDK::Generator::TemplateHelper)
     variables phase: phase
     action :create_if_missing
@@ -58,7 +67,7 @@ end
 
 # Test Kitchen build node
 cookbook_file "#{build_cookbook_dir}/.kitchen.yml" do
-  source "build-cookbook/.kitchen.yml"
+  source "build_cookbook/.kitchen.yml"
 end
 
 directory "#{build_cookbook_dir}/data_bags/keys" do
@@ -83,7 +92,7 @@ version '0.1.0')
 end
 
 cookbook_file "#{build_cookbook_dir}/test/fixtures/cookbooks/test/recipes/default.rb" do
-  source "build-cookbook/test-fixture-recipe.rb"
+  source "build_cookbook/test-fixture-recipe.rb"
 end
 
 # Construct git history as if we did all the work in a feature branch which we
@@ -101,6 +110,8 @@ end
 #
 if context.have_git && context.delivery_project_git_initialized && !context.skip_git_init
 
+  generator_desc("Adding delivery configuration to feature branch")
+
   execute("git-create-feature-branch") do
     command("git checkout -t -b add-delivery-configuration")
     cwd delivery_project_dir
@@ -113,6 +124,15 @@ if context.have_git && context.delivery_project_git_initialized && !context.skip
     only_if "git status --porcelain |grep \".\""
   end
 
+  # Adding the new prototype file to the feature branch
+  # so it gets checked in with the delivery config commit
+  execute("git-add-delivery-project-toml") do
+    command("git add .delivery/project.toml")
+    cwd delivery_project_dir
+
+    only_if "git status --porcelain |grep \".\""
+  end
+
   execute("git-commit-delivery-config") do
     command("git commit -m \"Add generated delivery configuration\"")
     cwd delivery_project_dir
@@ -120,6 +140,7 @@ if context.have_git && context.delivery_project_git_initialized && !context.skip
     only_if "git status --porcelain |grep \".\""
   end
 
+  generator_desc("Adding build cookbook to feature branch")
 
   execute("git-add-delivery-build-cookbook-files") do
     command("git add .delivery")
@@ -140,6 +161,8 @@ if context.have_git && context.delivery_project_git_initialized && !context.skip
     cwd delivery_project_dir
   end
 
+  generator_desc("Merging delivery content feature branch to master")
+
   execute("git-merge-delivery-config-branch") do
     command("git merge --no-ff add-delivery-configuration")
     cwd delivery_project_dir

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

@@ -2,6 +2,10 @@
 context = ChefDK::Generator.context
 cookbook_dir = File.join(context.cookbook_root, context.cookbook_name)
 
+silence_chef_formatter unless context.verbose
+
+generator_desc("Ensuring correct cookbook file content")
+
 # cookbook root dir
 directory cookbook_dir
 
@@ -37,7 +41,7 @@ else
 end
 
 
-# TK & Serverspec
+# Test Kitchen
 template "#{cookbook_dir}/.kitchen.yml" do
 
   if context.use_berkshelf
@@ -50,21 +54,13 @@ template "#{cookbook_dir}/.kitchen.yml" do
   action :create_if_missing
 end
 
-directory "#{cookbook_dir}/test/integration/default/serverspec" do
-  recursive true
-end
-
-directory "#{cookbook_dir}/test/integration/helpers/serverspec" do
+# Inspec
+directory "#{cookbook_dir}/test/recipes" do
   recursive true
 end
 
-cookbook_file "#{cookbook_dir}/test/integration/helpers/serverspec/spec_helper.rb" do
-  source 'serverspec_spec_helper.rb'
-  action :create_if_missing
-end
-
-template "#{cookbook_dir}/test/integration/default/serverspec/default_spec.rb" do
-  source 'serverspec_default_spec.rb.erb'
+template "#{cookbook_dir}/test/recipes/default_test.rb" do
+  source 'inspec_default_test.rb.erb'
   helpers(ChefDK::Generator::TemplateHelper)
   action :create_if_missing
 end
@@ -105,6 +101,8 @@ end
 if context.have_git
   unless context.skip_git_init
 
+    generator_desc("Committing cookbook files to git")
+
     execute("initialize-git") do
       command("git init .")
       cwd cookbook_dir
@@ -132,6 +130,6 @@ end
 
 if context.enable_delivery
 
-  include_recipe "code_generator::build_cookbook"
+  include_recipe "::build_cookbook"
 
 end

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

@@ -1,24 +1,24 @@
-
-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}")
-
-directory files_dir do
-  recursive true
-end
-
-if source_file = context.content_source
-
-  file cookbook_file_path do
-    content(IO.read(source_file))
-  end
-
-else
-
-  template cookbook_file_path do
-    source "cookbook_file.erb"
-    helpers(ChefDK::Generator::TemplateHelper)
-  end
-
-end
+
+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}")
+
+directory files_dir do
+  recursive true
+end
+
+if source_file = context.content_source
+
+  file cookbook_file_path do
+    content(IO.read(source_file))
+  end
+
+else
+
+  template cookbook_file_path do
+    source "cookbook_file.erb"
+    helpers(ChefDK::Generator::TemplateHelper)
+  end
+
+end

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

@@ -1,23 +1,23 @@
-
-context = ChefDK::Generator.context
-cookbook_dir = File.join(context.cookbook_root, context.cookbook_name)
-
-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_path = File.join(provider_dir, "#{context.new_file_basename}.rb")
-
-directory resource_dir
-
-template resource_path do
-  source "resource.rb.erb"
-  helpers(ChefDK::Generator::TemplateHelper)
-end
-
-directory provider_dir
-
-template provider_path do
-  source "provider.rb.erb"
-  helpers(ChefDK::Generator::TemplateHelper)
-end
+
+context = ChefDK::Generator.context
+cookbook_dir = File.join(context.cookbook_root, context.cookbook_name)
+
+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_path = File.join(provider_dir, "#{context.new_file_basename}.rb")
+
+directory resource_dir
+
+template resource_path do
+  source "resource.rb.erb"
+  helpers(ChefDK::Generator::TemplateHelper)
+end
+
+directory provider_dir
+
+template provider_path do
+  source "provider.rb.erb"
+  helpers(ChefDK::Generator::TemplateHelper)
+end

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

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

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

@@ -1,27 +1,40 @@
-
-context = ChefDK::Generator.context
-cookbook_dir = File.join(context.cookbook_root, context.cookbook_name)
-recipe_path = File.join(cookbook_dir, "recipes", "#{context.new_file_basename}.rb")
-spec_helper_path = File.join(cookbook_dir, "spec", "spec_helper.rb")
-spec_path = File.join(cookbook_dir, "spec", "unit", "recipes", "#{context.new_file_basename}_spec.rb")
-
-# Chefspec
-directory "#{cookbook_dir}/spec/unit/recipes" do
-  recursive true
-end
-
-cookbook_file spec_helper_path do
-  action :create_if_missing
-end
-
-template spec_path do
-  source "recipe_spec.rb.erb"
-  helpers(ChefDK::Generator::TemplateHelper)
-  action :create_if_missing
-end
-
-# Recipe
-template recipe_path do
-  source "recipe.rb.erb"
-  helpers(ChefDK::Generator::TemplateHelper)
-end
+
+context = ChefDK::Generator.context
+cookbook_dir = File.join(context.cookbook_root, context.cookbook_name)
+recipe_path = File.join(cookbook_dir, "recipes", "#{context.new_file_basename}.rb")
+spec_helper_path = File.join(cookbook_dir, "spec", "spec_helper.rb")
+spec_path = File.join(cookbook_dir, "spec", "unit", "recipes", "#{context.new_file_basename}_spec.rb")
+inspec_path = File.join(cookbook_dir, "test", "recipes", "#{context.new_file_basename}.rb")
+
+# Chefspec
+directory "#{cookbook_dir}/spec/unit/recipes" do
+  recursive true
+end
+
+cookbook_file spec_helper_path do
+  action :create_if_missing
+end
+
+template spec_path do
+  source "recipe_spec.rb.erb"
+  helpers(ChefDK::Generator::TemplateHelper)
+  action :create_if_missing
+end
+
+# Inspec
+directory "#{cookbook_dir}/test/recipes" do
+  recursive true
+end
+
+template inspec_path do
+  source 'inspec_default_test.rb.erb'
+  helpers(ChefDK::Generator::TemplateHelper)
+  action :create_if_missing
+end
+
+# Recipe
+template recipe_path do
+  source "recipe.rb.erb"
+  helpers(ChefDK::Generator::TemplateHelper)
+end
+

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

@@ -1,67 +1,67 @@
-context = ChefDK::Generator.context
-repo_dir = File.join(context.repo_root, context.repo_name)
-
-# repo root dir
-directory repo_dir
-
-# Top level files
-template "#{repo_dir}/LICENSE" do
-  source "LICENSE.#{context.license}.erb"
-  helpers(ChefDK::Generator::TemplateHelper)
-  action :create_if_missing
-end
-
-cookbook_file "#{repo_dir}/.chef-repo.txt" do
-  source "repo/dot-chef-repo.txt"
-  action :create_if_missing
-end
-
-cookbook_file "#{repo_dir}/README.md" do
-  source "repo/README.md"
-  action :create_if_missing
-end
-
-cookbook_file "#{repo_dir}/chefignore" do
-  source "chefignore"
-  action :create_if_missing
-end
-
-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.each do |tlo|
-  remote_directory "#{repo_dir}/#{tlo}" do
-    source "repo/#{tlo}"
-    action :create_if_missing
-  end
-end
-
-cookbook_file "#{repo_dir}/cookbooks/README.md" do
-  if context.policy_only
-    source "cookbook_readmes/README-policy.md"
-  else
-    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 .")
-      cwd repo_dir
-      not_if { File.exist?("#{repo_dir}/.gitignore") }
-    end
-  end
-  template "#{repo_dir}/.gitignore" do
-    source "repo/gitignore.erb"
-    helpers(ChefDK::Generator::TemplateHelper)
-    action :create_if_missing
-  end
-end
+context = ChefDK::Generator.context
+repo_dir = File.join(context.repo_root, context.repo_name)
+
+# repo root dir
+directory repo_dir
+
+# Top level files
+template "#{repo_dir}/LICENSE" do
+  source "LICENSE.#{context.license}.erb"
+  helpers(ChefDK::Generator::TemplateHelper)
+  action :create_if_missing
+end
+
+cookbook_file "#{repo_dir}/.chef-repo.txt" do
+  source "repo/dot-chef-repo.txt"
+  action :create_if_missing
+end
+
+cookbook_file "#{repo_dir}/README.md" do
+  source "repo/README.md"
+  action :create_if_missing
+end
+
+cookbook_file "#{repo_dir}/chefignore" do
+  source "chefignore"
+  action :create_if_missing
+end
+
+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.each do |tlo|
+  remote_directory "#{repo_dir}/#{tlo}" do
+    source "repo/#{tlo}"
+    action :create_if_missing
+  end
+end
+
+cookbook_file "#{repo_dir}/cookbooks/README.md" do
+  if context.policy_only
+    source "cookbook_readmes/README-policy.md"
+  else
+    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 .")
+      cwd repo_dir
+      not_if { File.exist?("#{repo_dir}/.gitignore") }
+    end
+  end
+  template "#{repo_dir}/.gitignore" do
+    source "repo/gitignore.erb"
+    helpers(ChefDK::Generator::TemplateHelper)
+    action :create_if_missing
+  end
+end