chef-dk 2.4.17 → 2.5.3

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

@@ -1,152 +1,152 @@
-# frozen_string_literal: true
-
-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
-
-# 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
-
-# README
-template "#{cookbook_dir}/README.md" do
-  helpers(ChefDK::Generator::TemplateHelper)
-  action :create_if_missing
-end
-
-# chefignore
-cookbook_file "#{cookbook_dir}/chefignore"
-
-if context.use_berkshelf
-
-  # Berks
-  cookbook_file "#{cookbook_dir}/Berksfile" do
-    action :create_if_missing
-  end
-else
-
-  # Policyfile
-  template "#{cookbook_dir}/Policyfile.rb" do
-    source 'Policyfile.rb.erb'
-    helpers(ChefDK::Generator::TemplateHelper)
-  end
-
-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
-    source 'kitchen.yml.erb'
-  else
-    source 'kitchen_policyfile.yml.erb'
-  end
-
-  helpers(ChefDK::Generator::TemplateHelper)
-  action :create_if_missing
-end
-
-# Inspec
-directory "#{cookbook_dir}/test/smoke/default" do
-  recursive true
-end
-
-template "#{cookbook_dir}/test/smoke/default/default_test.rb" do
-  source 'inspec_default_test.rb.erb'
-  helpers(ChefDK::Generator::TemplateHelper)
-  action :create_if_missing
-end
-
-# Chefspec
-directory "#{cookbook_dir}/spec/unit/recipes" do
-  recursive true
-end
-
-cookbook_file "#{cookbook_dir}/spec/spec_helper.rb" do
-  if context.use_berkshelf
-    source 'spec_helper.rb'
-  else
-    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'
-  helpers(ChefDK::Generator::TemplateHelper)
-  action :create_if_missing
-end
-
-# Recipes
-
-directory "#{cookbook_dir}/recipes"
-
-template "#{cookbook_dir}/recipes/default.rb" do
-  source 'recipe.rb.erb'
-  helpers(ChefDK::Generator::TemplateHelper)
-  action :create_if_missing
-end
-
-# git
-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
-    end
-
-  end
-
-  cookbook_file "#{cookbook_dir}/.gitignore" do
-    source 'gitignore'
-  end
-
-  unless context.skip_git_init
-
-    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"')
-      cwd cookbook_dir
-    end
-  end
-end
-
-include_recipe '::build_cookbook' if context.enable_delivery
+# frozen_string_literal: true
+
+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
+
+# 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
+
+# README
+template "#{cookbook_dir}/README.md" do
+  helpers(ChefDK::Generator::TemplateHelper)
+  action :create_if_missing
+end
+
+# chefignore
+cookbook_file "#{cookbook_dir}/chefignore"
+
+if context.use_berkshelf
+
+  # Berks
+  cookbook_file "#{cookbook_dir}/Berksfile" do
+    action :create_if_missing
+  end
+else
+
+  # Policyfile
+  template "#{cookbook_dir}/Policyfile.rb" do
+    source 'Policyfile.rb.erb'
+    helpers(ChefDK::Generator::TemplateHelper)
+  end
+
+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
+    source 'kitchen.yml.erb'
+  else
+    source 'kitchen_policyfile.yml.erb'
+  end
+
+  helpers(ChefDK::Generator::TemplateHelper)
+  action :create_if_missing
+end
+
+# Inspec
+directory "#{cookbook_dir}/test/integration/default" do
+  recursive true
+end
+
+template "#{cookbook_dir}/test/integration/default/default_test.rb" do
+  source 'inspec_default_test.rb.erb'
+  helpers(ChefDK::Generator::TemplateHelper)
+  action :create_if_missing
+end
+
+# Chefspec
+directory "#{cookbook_dir}/spec/unit/recipes" do
+  recursive true
+end
+
+cookbook_file "#{cookbook_dir}/spec/spec_helper.rb" do
+  if context.use_berkshelf
+    source 'spec_helper.rb'
+  else
+    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'
+  helpers(ChefDK::Generator::TemplateHelper)
+  action :create_if_missing
+end
+
+# Recipes
+
+directory "#{cookbook_dir}/recipes"
+
+template "#{cookbook_dir}/recipes/default.rb" do
+  source 'recipe.rb.erb'
+  helpers(ChefDK::Generator::TemplateHelper)
+  action :create_if_missing
+end
+
+# git
+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
+    end
+
+  end
+
+  cookbook_file "#{cookbook_dir}/.gitignore" do
+    source 'gitignore'
+  end
+
+  unless context.skip_git_init
+
+    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"')
+      cwd cookbook_dir
+    end
+  end
+end
+
+include_recipe '::build_cookbook' if context.enable_delivery

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

@@ -1,25 +1,25 @@
-# frozen_string_literal: true
-
-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 context.content_source
-
-  file cookbook_file_path do
-    content(IO.read(context.context_source))
-  end
-
-else
-
-  template cookbook_file_path do
-    source 'cookbook_file.erb'
-    helpers(ChefDK::Generator::TemplateHelper)
-  end
-
-end
+# frozen_string_literal: true
+
+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 context.content_source
+
+  file cookbook_file_path do
+    content(IO.read(context.context_source))
+  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/helpers.rb

@@ -1,21 +1,21 @@
-# frozen_string_literal: true
-
-context = ChefDK::Generator.context
-cookbook_dir = File.join(context.cookbook_root, context.cookbook_name)
-libraries_dir = File.join(cookbook_dir, 'libraries')
-helpers_path = File.join(cookbook_dir, 'libraries', "#{context.new_file_basename}.rb")
-
-directory libraries_dir
-
-def camelize(name)
-  name.to_s.split(/[^a-zA-Z]/).map(&:capitalize).join
-end
-
-cookbook_class_name = camelize(context.cookbook_name)
-helper_class_name = "#{camelize(context.new_file_basename)}Helpers"
-
-template helpers_path do
-  source 'helpers.rb.erb'
-  helpers(ChefDK::Generator::TemplateHelper)
-  variables(cookbook_class_name: cookbook_class_name, helper_class_name: helper_class_name)
-end
+# frozen_string_literal: true
+
+context = ChefDK::Generator.context
+cookbook_dir = File.join(context.cookbook_root, context.cookbook_name)
+libraries_dir = File.join(cookbook_dir, 'libraries')
+helpers_path = File.join(cookbook_dir, 'libraries', "#{context.new_file_basename}.rb")
+
+directory libraries_dir
+
+def camelize(name)
+  name.to_s.split(/[^a-zA-Z]/).map(&:capitalize).join
+end
+
+cookbook_class_name = camelize(context.cookbook_name)
+helper_class_name = "#{camelize(context.new_file_basename)}Helpers"
+
+template helpers_path do
+  source 'helpers.rb.erb'
+  helpers(ChefDK::Generator::TemplateHelper)
+  variables(cookbook_class_name: cookbook_class_name, helper_class_name: helper_class_name)
+end

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

@@ -1,9 +1,9 @@
-# frozen_string_literal: true
-
-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
+# frozen_string_literal: true
+
+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,52 +1,52 @@
-# frozen_string_literal: true
-
-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')
-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}_test.rb")
-
-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".
-Please move your existing Inspec tests to the newly created "test/smoke/default"
-directory, and update the 'inspec_tests' value in your .kitchen.yml file(s) to
-point to "test/smoke/default".
-  EOH
-end
-
-# Chefspec
-directory spec_dir 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 inspec_dir 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
+# frozen_string_literal: true
+
+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')
+spec_path = File.join(spec_dir, "#{context.new_file_basename}_spec.rb")
+inspec_dir = File.join(cookbook_dir, 'test', 'integration', 'default')
+inspec_path = File.join(inspec_dir, "#{context.new_file_basename}_test.rb")
+
+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/integration/default".
+Please move your existing Inspec tests to the newly created "test/integration/default"
+directory, and update the 'inspec_tests' value in your .kitchen.yml file(s) to
+point to "test/integration/default".
+  EOH
+end
+
+# Chefspec
+directory spec_dir 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 inspec_dir 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