chef-dk 3.9.0 → 3.10.1

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', '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
+# 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

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

@@ -1,68 +1,68 @@
-# frozen_string_literal: true
-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 )
-
-directories_to_create += if context.use_roles
-                           %w( roles environments )
-                         else
-                           %w( policyfiles )
-                         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
-  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'
-    helpers(ChefDK::Generator::TemplateHelper)
-    action :create_if_missing
-  end
-end
+# frozen_string_literal: true
+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 )
+
+directories_to_create += if context.use_roles
+                           %w( roles environments )
+                         else
+                           %w( policyfiles )
+                         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
+  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'
+    helpers(ChefDK::Generator::TemplateHelper)
+    action :create_if_missing
+  end
+end

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

@@ -1,13 +1,13 @@
-# frozen_string_literal: true
-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")
-
-directory resource_dir
-
-template resource_path do
-  source 'resource.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)
+
+resource_dir = File.join(cookbook_dir, 'resources')
+resource_path = File.join(resource_dir, "#{context.new_file_basename}.rb")
+
+directory resource_dir
+
+template resource_path do
+  source 'resource.rb.erb'
+  helpers(ChefDK::Generator::TemplateHelper)
+end

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

@@ -1,32 +1,32 @@
-# frozen_string_literal: true
-context = ChefDK::Generator.context
-cookbook_dir = File.join(context.cookbook_root, context.cookbook_name)
-template_dir = File.join(cookbook_dir, 'templates')
-template_filename = context.new_file_basename
-
-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)
-
-directory template_dir do
-  recursive true
-end
-
-if context.content_source
-
-  file template_path do
-    content(IO.read(context.content_source))
-  end
-
-else
-
-  template template_path do
-    source 'template.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)
+template_dir = File.join(cookbook_dir, 'templates')
+template_filename = context.new_file_basename
+
+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)
+
+directory template_dir do
+  recursive true
+end
+
+if context.content_source
+
+  file template_path do
+    content(IO.read(context.content_source))
+  end
+
+else
+
+  template template_path do
+    source 'template.erb'
+    helpers(ChefDK::Generator::TemplateHelper)
+  end
+
+end