chef-dk 0.15.16 → 0.16.28

data/lib/chef-dk/skeletons/code_generator/files/default/delivery-config.json

@@ -1,8 +1,8 @@
 {
   "version": "2",
   "build_cookbook": {
-    "name": "build-cookbook",
-    "path": ".delivery/build-cookbook"
+    "name": "build_cookbook",
+    "path": ".delivery/build_cookbook"
   },
   "skip_phases": [],
   "build_nodes": {},

data/lib/chef-dk/skeletons/code_generator/files/default/delivery-project.toml

@@ -0,0 +1,21 @@
+# Delivery Prototype for Local Phases Execution
+#
+# The purpose of this file is to prototype a new way to execute
+# phases locally on your workstation. The delivery-cli will read
+# this file and execute the command(s) that are configured for
+# each phase. You can customize them by just modifying the phase
+# key on this file.
+#
+# By default these phases are configured for Cookbook Workflow only
+#
+# As this is still a prototype we are not modifying the current
+# config.json file and it will continue working as usual. 
+
+[local_phases]
+unit = "rspec spec/"
+lint = "cookstyle"
+syntax = "foodcritic . --exclude spec -f any"
+provision = "chef exec kitchen create"
+deploy = "chef exec kitchen converge"
+smoke = "chef exec kitchen verify"
+cleanup = "chef exec kitchen destroy"

data/lib/chef-dk/skeletons/code_generator/files/default/gitignore

@@ -1,16 +1,16 @@
-.vagrant
-Berksfile.lock
-*~
-*#
-.#*
-\#*#
-.*.sw[a-z]
-*.un~
-
-# Bundler
-Gemfile.lock
-bin/*
-.bundle/*
-
-.kitchen/
-.kitchen.local.yml
+.vagrant
+Berksfile.lock
+*~
+*#
+.#*
+\#*#
+.*.sw[a-z]
+*.un~
+
+# Bundler
+Gemfile.lock
+bin/*
+.bundle/*
+
+.kitchen/
+.kitchen.local.yml

data/lib/chef-dk/skeletons/code_generator/files/default/repo/README.md

@@ -1,28 +1,24 @@
-Overview
-========
+# Overview
 
 Every Chef installation needs a Chef Repository. This is the place where cookbooks, roles, config files and other artifacts for managing systems with Chef will live. We strongly recommend storing this repository in a version control system such as Git and treat it like source code.
 
 While we prefer Git, and make this repository available via GitHub, you are welcome to download a tar or zip archive and use your favorite version control system to manage the code.
 
-Repository Directories
-======================
+# Repository Directories
 
 This repository contains several directories, and each directory contains a README file that describes what it is for in greater detail, and how to use it for managing your systems with Chef.
 
-* `cookbooks/` - Cookbooks you download or create.
-* `data_bags/` - Store data bags and items in .json in the repository.
-* `roles/` - Store roles in .rb or .json in the repository.
-* `environments/` - Store environments in .rb or .json in the repository.
+- `cookbooks/` - Cookbooks you download or create.
+- `data_bags/` - Store data bags and items in .json in the repository.
+- `roles/` - Store roles in .rb or .json in the repository.
+- `environments/` - Store environments in .rb or .json in the repository.
 
-Configuration
-=============
+# Configuration
 
 The config file, `.chef/knife.rb` is a repository specific configuration file for knife. If you're using the Chef Platform, you can download one for your organization from the management console. If you're using the Open Source Chef Server, you can generate a new one with `knife configure`. For more information about configuring Knife, see the Knife documentation.
 
-https://docs.chef.io/knife.html
+<https://docs.chef.io/knife.html>
 
-Next Steps
-==========
+# Next Steps
 
 Read the README file in each of the subdirectories for more information about what goes in those directories.

data/lib/chef-dk/skeletons/code_generator/files/default/repo/cookbooks/example/README.md

@@ -6,22 +6,22 @@ An example cookbook
 
 ### Platform:
 
-*No platforms defined*
+_No platforms defined_
 
 ### Cookbooks:
 
-*No dependencies defined*
+_No dependencies defined_
 
 ## Attributes
 
-* `node['example']['name']` -  Defaults to `Sam Doe`.
+- `node['example']['name']` - Defaults to `Sam Doe`.
 
 ## Recipes
 
-* example::default
+- example::default
 
 ## License and Maintainer
 
-Maintainer::  (<>)
+Maintainer:: (<>)
 
 License:: All rights reserved

data/lib/chef-dk/skeletons/code_generator/files/default/repo/cookbooks/example/attributes/default.rb

@@ -1,7 +1,7 @@
-# This is a Chef attributes file. It can be used to specify default and override
-# attributes to be applied to nodes that run this cookbook.
-
-# Set a default name
-default["example"]["name"] = "Sam Doe"
-
-# For further information, see the Chef documentation (https://docs.chef.io/essentials_cookbook_attribute_files.html).
+# This is a Chef attributes file. It can be used to specify default and override
+# attributes to be applied to nodes that run this cookbook.
+
+# Set a default name
+default["example"]["name"] = "Sam Doe"
+
+# For further information, see the Chef documentation (https://docs.chef.io/essentials_cookbook_attribute_files.html).

data/lib/chef-dk/skeletons/code_generator/files/default/repo/cookbooks/example/metadata.rb

@@ -1,3 +1,3 @@
-name 'example'
-description 'An example cookbook'
-version '1.0.0'
+name 'example'
+description 'An example cookbook'
+version '1.0.0'

data/lib/chef-dk/skeletons/code_generator/files/default/repo/cookbooks/example/recipes/default.rb

@@ -1,8 +1,8 @@
-# This is a Chef recipe file. It can be used to specify resources which will
-# apply configuration to a server.
-
-log "Welcome to Chef, #{node["example"]["name"]}!" do
-  level :info
-end
-
-# For more information, see the documentation: https://docs.chef.io/essentials_cookbook_recipes.html
+# This is a Chef recipe file. It can be used to specify resources which will
+# apply configuration to a server.
+
+log "Welcome to Chef, #{node["example"]["name"]}!" do
+  level :info
+end
+
+# For more information, see the documentation: https://docs.chef.io/essentials_cookbook_recipes.html

data/lib/chef-dk/skeletons/code_generator/files/default/repo/data_bags/README.md

@@ -1,5 +1,4 @@
-Data Bags
----------
+# Data Bags
 
 This directory contains directories of the various data bags you create for your infrastructure. Each subdirectory corresponds to a data bag on the Chef Server, and contains JSON files of the items that go in the bag.
 
@@ -17,10 +16,9 @@ For more information on data bags, see the Chef wiki page:
 
 https://docs.chef.io/essentials_data_bags.html
 
-Encrypted Data Bags
--------------------
+# Encrypted Data Bags
 
-Added in Chef 0.10, encrypted data bags allow you to encrypt the contents of your data bags. The content of attributes will no longer be searchable. To use encrypted data bags, first you must have or create a secret key.
+Encrypted data bags allow you to encrypt the contents of your data bags. The content of attributes will no longer be searchable. To use encrypted data bags, first you must have or create a secret key.
 
     openssl rand -base64 512 > secret_key
 

data/lib/chef-dk/skeletons/code_generator/files/default/repo/data_bags/example/example_item.json

@@ -1,4 +1,4 @@
-{
-    "id": "example_item",
-    "key": "value"
+{
+    "id": "example_item",
+    "key": "value"
 }

data/lib/chef-dk/skeletons/code_generator/files/default/repo/dot-chef-repo.txt

@@ -1,6 +1,6 @@
-.chef-repo.txt
-==============
-
-This file gives ChefDK's generators a hint that you are using a Chef Repo and
-this is the root directory of your Chef Repo. ChefDK's generators use this to
-generate code that is designed to work with the Chef Repo workflow.
+.chef-repo.txt
+==============
+
+This file gives ChefDK's generators a hint that you are using a Chef Repo and
+this is the root directory of your Chef Repo. ChefDK's generators use this to
+generate code that is designed to work with the Chef Repo workflow.

data/lib/chef-dk/skeletons/code_generator/files/default/repo/environments/README.md

@@ -1,9 +1,9 @@
-Create environments here, in either the Role Ruby DSL (.rb) or JSON (.json) files. To install environments on the server, use knife.
-
-For example, in this directory you'll find an example environment file called `example.json` which can be uploaded to the Chef Server:
-
-    knife environment from file environments/example.json
-
-For more information on environments, see the Chef wiki page:
-
-https://docs.chef.io/environments.html
+Create environments here, in either the Role Ruby DSL (.rb) or JSON (.json) files. To install environments on the server, use knife.
+
+For example, in this directory you'll find an example environment file called `example.json` which can be uploaded to the Chef Server:
+
+    knife environment from file environments/example.json
+
+For more information on environments, see the Chef wiki page:
+
+https://docs.chef.io/environments.html

data/lib/chef-dk/skeletons/code_generator/files/default/repo/environments/example.json

@@ -1,13 +1,13 @@
-{
-    "name": "example",
-    "description": "This is an example environment defined as JSON",
-    "chef_type": "environment",
-    "json_class": "Chef::Environment",
-    "default_attributes": {
-    },
-    "override_attributes": {
-    },
-    "cookbook_versions": {
-        "example": "= 1.0.0"
-    }
+{
+    "name": "example",
+    "description": "This is an example environment defined as JSON",
+    "chef_type": "environment",
+    "json_class": "Chef::Environment",
+    "default_attributes": {
+    },
+    "override_attributes": {
+    },
+    "cookbook_versions": {
+        "example": "= 1.0.0"
+    }
 }

data/lib/chef-dk/skeletons/code_generator/files/default/repo/policies/README.md

@@ -1,24 +1,24 @@
-Create policyfiles here. When using a chef-repo, give your policyfiles
-the same filename as the name set in the policyfile itself, and use the
-`.rb` file extension.
-
-Compile the policy with a command like this:
-
-```
-chef install policies/my-app-frontend.rb
-```
-
-This will create a lockfile `policies/my-app-frontend.lock.json`.
-
-To update locked dependencies, run `chef update` like this:
-
-```
-chef update policies/my-app-frontend.rb
-```
-
-You can upload the policy (with associated cookbooks) to the server
-using a command like:
-
-```
-chef push staging policies/my-app-frontend.rb
-```
+Create policyfiles here. When using a chef-repo, give your policyfiles
+the same filename as the name set in the policyfile itself, and use the
+`.rb` file extension.
+
+Compile the policy with a command like this:
+
+```
+chef install policies/my-app-frontend.rb
+```
+
+This will create a lockfile `policies/my-app-frontend.lock.json`.
+
+To update locked dependencies, run `chef update` like this:
+
+```
+chef update policies/my-app-frontend.rb
+```
+
+You can upload the policy (with associated cookbooks) to the server
+using a command like:
+
+```
+chef push staging policies/my-app-frontend.rb
+```

data/lib/chef-dk/skeletons/code_generator/files/default/repo/roles/README.md

@@ -1,9 +1,9 @@
-Create roles here, in either the Role Ruby DSL (.rb) or JSON (.json) files. To install roles on the server, use knife.
-
-For example, in this directory you'll find an example role file called `example.json` which can be uploaded to the Chef Server:
-
-    knife role from file roles/example.json
-
-For more information on roles, see the Chef wiki page:
-
-https://docs.chef.io/essentials_roles.html
+Create roles here, in either the Role Ruby DSL (.rb) or JSON (.json) files. To install roles on the server, use knife.
+
+For example, in this directory you'll find an example role file called `example.json` which can be uploaded to the Chef Server:
+
+    knife role from file roles/example.json
+
+For more information on roles, see the Chef wiki page:
+
+https://docs.chef.io/essentials_roles.html

data/lib/chef-dk/skeletons/code_generator/files/default/repo/roles/example.json

@@ -1,13 +1,13 @@
-{
-    "name": "example",
-    "description": "This is an example role defined as JSON",
-    "chef_type": "role",
-    "json_class": "Chef::Role",
-    "default_attributes": {
-    },
-    "override_attributes": {
-    },
-    "run_list": [
-        "recipe[example]"
-    ]
+{
+    "name": "example",
+    "description": "This is an example role defined as JSON",
+    "chef_type": "role",
+    "json_class": "Chef::Role",
+    "default_attributes": {
+    },
+    "override_attributes": {
+    },
+    "run_list": [
+        "recipe[example]"
+    ]
 }

data/lib/chef-dk/skeletons/code_generator/files/default/spec_helper.rb

@@ -1,2 +1,2 @@
-require 'chefspec'
-require 'chefspec/berkshelf'
+require 'chefspec'
+require 'chefspec/berkshelf'

data/lib/chef-dk/skeletons/code_generator/files/default/spec_helper_policyfile.rb

@@ -1,2 +1,2 @@
-require 'chefspec'
-require 'chefspec/policyfile'
+require 'chefspec'
+require 'chefspec/policyfile'

data/lib/chef-dk/skeletons/code_generator/metadata.rb

@@ -1,8 +1,8 @@
-name             'code_generator'
-maintainer       'Chef Software, Inc.'
-maintainer_email 'dev@chef.io'
-license          'Apache 2 License'
-description      'Generates Chef code for Chef DK'
-long_description 'Generates Chef code for Chef DK'
-version          '0.1.0'
-
+name             'code_generator'
+maintainer       'Chef Software, Inc.'
+maintainer_email 'dev@chef.io'
+license          'Apache 2 License'
+description      'Generates Chef code for Chef DK'
+long_description 'Generates Chef code for Chef DK'
+version          '0.1.0'
+

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

@@ -10,27 +10,19 @@ directory app_dir
 
 # Top level files
 
-# TK
+# Test Kitchen
 template "#{app_dir}/.kitchen.yml" do
   source 'kitchen.yml.erb'
   helpers(ChefDK::Generator::TemplateHelper)
 end
 
-directory "#{app_dir}/test/integration/default/serverspec" do
+# Inspec
+directory "#{app_dir}/test/recipes" do
   recursive true
 end
 
-directory "#{app_dir}/test/integration/helpers/serverspec" do
-  recursive true
-end
-
-cookbook_file "#{app_dir}/test/integration/helpers/serverspec/spec_helper.rb" do
-  source 'serverspec_spec_helper.rb'
-  action :create_if_missing
-end
-
-template "#{app_dir}/test/integration/default/serverspec/default_spec.rb" do
-  source 'serverspec_default_spec.rb.erb'
+template "#{app_dir}/test/recipes/default_test.rb" do
+  source 'inspec_default_test.rb.erb'
   helpers(ChefDK::Generator::TemplateHelper)
   action :create_if_missing
 end

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