chef-dk 0.9.0 → 0.10.0

data/lib/chef-dk/skeletons/code_generator/templates/default/LICENSE.mit.erb

@@ -1,21 +1,21 @@
-The MIT License (MIT)
-
-Copyright (c) <%= year %> <%= copyright_holder %>
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
+The MIT License (MIT)
+
+Copyright (c) <%= year %> <%= copyright_holder %>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

data/lib/chef-dk/skeletons/code_generator/templates/default/Policyfile.rb.erb

@@ -1,20 +1,25 @@
-# Policyfile.rb - Describe how you want Chef to build your system.
-#
-# For more information on the Policyfile feature, visit
-# https://github.com/opscode/chef-dk/blob/master/POLICYFILE_README.md
-
-# A name that describes what the system you're building with Chef does.
-name "<%= policy_name %>"
-
-# Where to find external cookbooks:
-default_source :supermarket
-
-# run_list: chef-client will run these recipes in the order specified.
-run_list "<%= policy_run_list %>"
-
-# Specify a custom source for a single cookbook:
-<% if policy_local_cookbook.nil? %>
-# cookbook "example_cookbook", path: "../cookbooks/example_cookbook"
-<% else %>
-cookbook "<%= cookbook_name %>", path: "."
-<% end %>
+# Policyfile.rb - Describe how you want Chef to build your system.
+#
+# For more information on the Policyfile feature, visit
+# https://github.com/opscode/chef-dk/blob/master/POLICYFILE_README.md
+
+# A name that describes what the system you're building with Chef does.
+name "<%= policy_name %>"
+
+<% if include_chef_repo_source %>
+# This lets you source cookbooks from your chef-repo.
+default_source :chef_repo, "../"
+
+<% end -%>
+# Where to find external cookbooks:
+default_source :supermarket
+
+# run_list: chef-client will run these recipes in the order specified.
+run_list "<%= policy_run_list %>"
+
+# Specify a custom source for a single cookbook:
+<% if policy_local_cookbook.nil? %>
+# cookbook "example_cookbook", path: "../cookbooks/example_cookbook"
+<% else %>
+cookbook "<%= cookbook_name %>", path: "."
+<% end %>

data/lib/chef-dk/skeletons/code_generator/templates/default/README.md.erb

@@ -1,4 +1,4 @@
-# <%= cookbook_name %>
-
-TODO: Enter the cookbook description here.
-
+# <%= cookbook_name %>
+
+TODO: Enter the cookbook description here.
+

data/lib/chef-dk/skeletons/code_generator/templates/default/kitchen.yml.erb

@@ -1,16 +1,21 @@
----
-driver:
-  name: vagrant
-
-provisioner:
-  name: chef_zero
-
-platforms:
-  - name: ubuntu-14.04
-  - name: centos-7.1
-
-suites:
-  - name: default
-    run_list:
-      - recipe[<%= cookbook_name %>::default]
-    attributes:
+---
+driver:
+  name: vagrant
+
+provisioner:
+  name: chef_zero
+
+# Uncomment the following verifier to leverage Inspec instead of Busser (the
+# default verifier)
+# verifier:
+#   name: inspec
+
+platforms:
+  - name: ubuntu-14.04
+  - name: centos-7.1
+
+suites:
+  - name: default
+    run_list:
+      - recipe[<%= cookbook_name %>::default]
+    attributes:

data/lib/chef-dk/skeletons/code_generator/templates/default/kitchen_policyfile.yml.erb

@@ -1,27 +1,32 @@
----
-driver:
-  name: vagrant
-
-## The forwarded_port port feature lets you connect to ports on the VM guest via
-## localhost on the host.
-## see also: https://docs.vagrantup.com/v2/networking/forwarded_ports.html
-
-#  network:
-#    - ["forwarded_port", {guest: 80, host: 8080}]
-
-provisioner:
-  name: policyfile_zero
-
-## require_chef_omnibus specifies a specific chef version to install. You can
-## also set this to `true` to always use the latest version.
-## see also: https://docs.chef.io/config_yml_kitchen.html
-
-#  require_chef_omnibus: 12.5.0
-
-platforms:
-  - name: ubuntu-14.04
-  - name: centos-7.1
-
-suites:
-  - name: default
-    attributes:
+---
+driver:
+  name: vagrant
+
+## The forwarded_port port feature lets you connect to ports on the VM guest via
+## localhost on the host.
+## see also: https://docs.vagrantup.com/v2/networking/forwarded_ports.html
+
+#  network:
+#    - ["forwarded_port", {guest: 80, host: 8080}]
+
+provisioner:
+  name: policyfile_zero
+
+## require_chef_omnibus specifies a specific chef version to install. You can
+## also set this to `true` to always use the latest version.
+## see also: https://docs.chef.io/config_yml_kitchen.html
+
+#  require_chef_omnibus: 12.5.0
+
+# Uncomment the following verifier to leverage Inspec instead of Busser (the
+# default verifier)
+# verifier:
+#   name: inspec
+
+platforms:
+  - name: ubuntu-14.04
+  - name: centos-7.1
+
+suites:
+  - name: default
+    attributes:

data/lib/chef-dk/skeletons/code_generator/templates/default/metadata.rb.erb

@@ -1,7 +1,7 @@
-name '<%= cookbook_name %>'
-maintainer '<%= copyright_holder %>'
-maintainer_email '<%= email %>'
-license '<%= license %>'
-description 'Installs/Configures <%= cookbook_name %>'
-long_description 'Installs/Configures <%= cookbook_name %>'
-version '0.1.0'
+name '<%= cookbook_name %>'
+maintainer '<%= copyright_holder %>'
+maintainer_email '<%= email %>'
+license '<%= license %>'
+description 'Installs/Configures <%= cookbook_name %>'
+long_description 'Installs/Configures <%= cookbook_name %>'
+version '0.1.0'

data/lib/chef-dk/skeletons/code_generator/templates/default/recipe.rb.erb

@@ -1,5 +1,5 @@
-#
-# Cookbook Name:: <%= cookbook_name %>
-# Recipe:: <%= recipe_name %>
-#
-<%= license_description('#') %>
+#
+# Cookbook Name:: <%= cookbook_name %>
+# Recipe:: <%= recipe_name %>
+#
+<%= license_description('#') %>

data/lib/chef-dk/skeletons/code_generator/templates/default/recipe_spec.rb.erb

@@ -1,20 +1,20 @@
-#
-# Cookbook Name:: <%= cookbook_name %>
-# Spec:: default
-#
-<%= license_description('#') %>
-
-require 'spec_helper'
-
-describe '<%= cookbook_name %>::<%= recipe_name %>' do
-  context 'When all attributes are default, on an unspecified platform' do
-    let(:chef_run) do
-      runner = ChefSpec::ServerRunner.new
-      runner.converge(described_recipe)
-    end
-
-    it 'converges successfully' do
-      expect { chef_run }.to_not raise_error
-    end
-  end
-end
+#
+# Cookbook Name:: <%= cookbook_name %>
+# Spec:: default
+#
+<%= license_description('#') %>
+
+require 'spec_helper'
+
+describe '<%= cookbook_name %>::<%= recipe_name %>' do
+  context 'When all attributes are default, on an unspecified platform' do
+    let(:chef_run) do
+      runner = ChefSpec::ServerRunner.new
+      runner.converge(described_recipe)
+    end
+
+    it 'converges successfully' do
+      expect { chef_run }.to_not raise_error
+    end
+  end
+end

data/lib/chef-dk/skeletons/code_generator/templates/default/repo/gitignore.erb

@@ -1,11 +1,11 @@
-.rake_test_cache
-
-###
-# Ignore Chef key files and secrets
-###
-.chef/*.pem
-.chef/encrypted_data_bag_secret
-<%- if policy_only -%>
-cookbooks/**
-!cookbooks/README.md
-<%- end -%>
+.rake_test_cache
+
+###
+# Ignore Chef key files and secrets
+###
+.chef/*.pem
+.chef/encrypted_data_bag_secret
+<%- if policy_only -%>
+cookbooks/**
+!cookbooks/README.md
+<%- end -%>

data/lib/chef-dk/skeletons/code_generator/templates/default/serverspec_default_spec.rb.erb

@@ -1,9 +1,9 @@
-require 'spec_helper'
-
-describe '<%= cookbook_name %>::default' do
-  # Serverspec examples can be found at
-  # http://serverspec.org/resource_types.html
-  it 'does something' do
-    skip 'Replace this with meaningful tests'
-  end
-end
+require 'spec_helper'
+
+describe '<%= cookbook_name %>::default' do
+  # Serverspec examples can be found at
+  # http://serverspec.org/resource_types.html
+  it 'does something' do
+    skip 'Replace this with meaningful tests'
+  end
+end

data/lib/chef-dk/ui.rb

@@ -1,58 +1,58 @@
-#
-# Copyright:: Copyright (c) 2014 Chef Software Inc.
-# License:: Apache License, Version 2.0
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-module ChefDK
-  class UI
-
-    class NullStream
-
-      def puts(*anything)
-        nil
-      end
-
-      def print(*anything)
-        nil
-      end
-
-    end
-
-    def self.null
-      new(out: NullStream.new, err: NullStream.new)
-    end
-
-    attr_reader :out_stream
-    attr_reader :err_stream
-
-    def initialize(out: nil, err: nil)
-      @out_stream = out || $stdout
-      @err_stream = err || $stderr
-    end
-
-    def err(message)
-      @err_stream.puts(message)
-    end
-
-    def msg(message)
-      @out_stream.puts(message)
-    end
-
-    def print(message)
-      @out_stream.print(message)
-    end
-  end
-end
-
+#
+# Copyright:: Copyright (c) 2014 Chef Software Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+module ChefDK
+  class UI
+
+    class NullStream
+
+      def puts(*anything)
+        nil
+      end
+
+      def print(*anything)
+        nil
+      end
+
+    end
+
+    def self.null
+      new(out: NullStream.new, err: NullStream.new)
+    end
+
+    attr_reader :out_stream
+    attr_reader :err_stream
+
+    def initialize(out: nil, err: nil)
+      @out_stream = out || $stdout
+      @err_stream = err || $stderr
+    end
+
+    def err(message)
+      @err_stream.puts(message)
+    end
+
+    def msg(message)
+      @out_stream.puts(message)
+    end
+
+    def print(message)
+      @out_stream.print(message)
+    end
+  end
+end
+

data/lib/chef-dk/version.rb

@@ -1,20 +1,20 @@
-#
-# Copyright:: Copyright (c) 2014 Chef Software Inc.
-# License:: Apache License, Version 2.0
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-module ChefDK
-  VERSION = "0.9.0"
-end
+#
+# Copyright:: Copyright (c) 2014 Chef Software Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+module ChefDK
+  VERSION = "0.10.0"
+end