chef-dk 0.9.0 → 0.10.0

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

@@ -1,12 +1,12 @@
-
-context = ChefDK::Generator.context
-cookbook_dir = File.join(context.cookbook_root, context.cookbook_name)
-attribute_dir = File.join(cookbook_dir, "attributes")
-attribute_path = File.join(cookbook_dir, "attributes", "#{context.new_file_basename}.rb")
-
-directory attribute_dir
-
-template attribute_path do
-  source "attribute.rb.erb"
-  helpers(ChefDK::Generator::TemplateHelper)
-end
+
+context = ChefDK::Generator.context
+cookbook_dir = File.join(context.cookbook_root, context.cookbook_name)
+attribute_dir = File.join(cookbook_dir, "attributes")
+attribute_path = File.join(cookbook_dir, "attributes", "#{context.new_file_basename}.rb")
+
+directory attribute_dir
+
+template attribute_path do
+  source "attribute.rb.erb"
+  helpers(ChefDK::Generator::TemplateHelper)
+end

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

@@ -1,104 +1,117 @@
-
-context = ChefDK::Generator.context
-cookbook_dir = File.join(context.cookbook_root, context.cookbook_name)
-
-# cookbook root dir
-directory cookbook_dir
-
-# metadata.rb
-template "#{cookbook_dir}/metadata.rb" do
-  helpers(ChefDK::Generator::TemplateHelper)
-  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"
-
-# Policyfile
-template "#{cookbook_dir}/Policyfile.rb" do
-  source "Policyfile.rb.erb"
-  helpers(ChefDK::Generator::TemplateHelper)
-end
-
-###
-# Berks is no longer the default, uncomment this to enable it.
-#
-# # Berks
-# cookbook_file "#{cookbook_dir}/Berksfile" do
-#   action :create_if_missing
-# end
-
-# TK & Serverspec
-template "#{cookbook_dir}/.kitchen.yml" do
-  ## Uncomment this and delete the following `source` line to generate
-  ## non-Policyfile kitchen.yml files (do this if you're using berks):
-  # source 'kitchen.yml.erb'
-  source 'kitchen_policyfile.yml.erb'
-  helpers(ChefDK::Generator::TemplateHelper)
-  action :create_if_missing
-end
-
-directory "#{cookbook_dir}/test/integration/default/serverspec" do
-  recursive true
-end
-
-directory "#{cookbook_dir}/test/integration/helpers/serverspec" 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'
-  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
-  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
-  if !context.skip_git_init
-
-    execute("initialize-git") do
-      command("git init .")
-      cwd cookbook_dir
-    end
-  end
-
-  cookbook_file "#{cookbook_dir}/.gitignore" do
-    source "gitignore"
-  end
-end
+
+context = ChefDK::Generator.context
+cookbook_dir = File.join(context.cookbook_root, context.cookbook_name)
+
+# cookbook root dir
+directory cookbook_dir
+
+# metadata.rb
+template "#{cookbook_dir}/metadata.rb" do
+  helpers(ChefDK::Generator::TemplateHelper)
+  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
+
+
+# TK & Serverspec
+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
+
+directory "#{cookbook_dir}/test/integration/default/serverspec" do
+  recursive true
+end
+
+directory "#{cookbook_dir}/test/integration/helpers/serverspec" 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'
+  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
+  if !context.skip_git_init
+
+    execute("initialize-git") do
+      command("git init .")
+      cwd cookbook_dir
+    end
+  end
+
+  cookbook_file "#{cookbook_dir}/.gitignore" do
+    source "gitignore"
+  end
+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,27 @@
-
-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")
+
+# 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

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

@@ -1,48 +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)
-end
-
-cookbook_file "#{repo_dir}/README.md" do
-  source "repo/README.md"
-end
-
-cookbook_file "#{repo_dir}/chefignore" do
-  source "chefignore"
-end
-
-%w{cookbooks data_bags environments roles}.each do |tlo|
-  remote_directory "#{repo_dir}/#{tlo}" do
-    source "repo/#{tlo}"
-  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
-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)
-  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