chef-gen-flavors 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f986fa7d81233486a88d6010323746dc1ca359ef
-  data.tar.gz: 70605598307fb2db0301044b2b38ce41105c3c91
+  metadata.gz: fdf1906af1dbba1c06bbea05337a3014905994dc
+  data.tar.gz: 32c134e20c8c23c093010ed8ba1fe138c7af14ef
 SHA512:
-  metadata.gz: a7e46da100ad456de5d3c5496f5da32dcfb953c0c969d897f9f1d3135a99b76d1b0e8eb40aea1fccdd9d222119e180b1e25f477bc0abba986aad9a933969d270
-  data.tar.gz: b0495ba337a03df57cb01d9fb5a694aa88ae037ac2c2ead79dad5b816344d97bab42160ffd5b41a1685d7706c959fe39563f86a75808b6ca4f9e946775f078fc
+  metadata.gz: 82cb00c61ab851036a62ed662d2d8b6402e619d7a4a932fe4c38463389f8119d0c9e48523c38800c1ce9d59f63aaaa04bb4ecd593530bb234b9862029e4ec2fe
+  data.tar.gz: 84843f80e10c3391e9f0f7734217745d88890cc4f8d222a045aa2440124a8509c3a8b1b87776a2558b98c1b4ddf3510b30353450e9335608062dd9e6e7ef980c

data/History.md

@@ -1,5 +1,11 @@
 # Changelog for chef-gen-flavors
 
+## 0.8.0
+
+* give snippets the ability to use the add_render to construct resources with additional attributes
+* add local override inclusion for Gemfile, Berksfile and Guardfile to snippets
+* allow the CookbookBase snippet's @cookbook_gems hash to take an String or Array value.  A string is a constraint, an Array is a constraint plus 0..n extra args (like a git source)
+
 ## 0.7.0
 
 Major re-organization around snippets

data/chef-gen-flavors.gemspec

@@ -1,14 +1,14 @@
 # -*- encoding: utf-8 -*-
-# stub: chef-gen-flavors 0.7.0.20150609141116 ruby lib
+# stub: chef-gen-flavors 0.8.0.20150618104356 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "chef-gen-flavors"
-  s.version = "0.7.0.20150609141116"
+  s.version = "0.8.0.20150618104356"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["James FitzGibbon"]
-  s.date = "2015-06-09"
+  s.date = "2015-06-18"
   s.description = "chef-gen-flavors is a framework for creating custom templates for the\n'chef generate' command provided by ChefDK.\n\nThis gem simply provides a framework; templates are provided by separate\ngems, which you can host privately for use within your organization or\npublicly for the Chef community to use.\n\nAt present this is focused primarily on providing templates for generation of\ncookbooks, as this is where most organization-specific customization takes place.\nSupport for the other artifacts that ChefDK can generate may work, but is not\nthe focus of early releases."
   s.email = ["james.i.fitzgibbon@nordstrom.com"]
   s.extra_rdoc_files = ["ARUBA_STEPS.md", "History.md", "Manifest.txt", "README.md"]

data/lib/chef_gen/flavor_base.rb

@@ -171,11 +171,13 @@ module ChefGen
     # @return [void]
     # @api private
     def add_files
-      _add_files(
-        @files, nil, @fail_on_clobber, :cookbook_file, :create
+      add_render(
+        @files,
+        suffix: '', resource: :cookbook_file, resource_action: :create
       )
-      _add_files(
-        @files_if_missing, nil, false, :cookbook_file, :create_if_missing
+      add_render(
+        @files_if_missing,
+        suffix: '', clobberfail: false, resource: :cookbook_file
       )
     end
 
@@ -184,43 +186,55 @@ module ChefGen
     # @return [void]
     # @api private
     def add_templates
-      _add_files(
-        @templates, '.erb', @fail_on_clobber, :template, :create
-      )
-      _add_files(
-        @templates_if_missing, '.erb', false, :template, :create_if_missing
-      )
+      add_render(@templates, resource_action: :create)
+      add_render(@templates_if_missing, clobberfail: false)
     end
 
     # does the heavy lifting for add_files and add_templates
-    # @param files [Array] the list of things to declare
+    # @param things [Array] the list of things to declare
     # @param suffix [String] a suffix to add to the source file
     # @param clobberfail [Boolean] whether to protect against
     #   overwriting files
     # @param resource [Symbol] the symbolized Chef resource to declare
     # @param resource_action [Symbol] the action to give the resource
+    # @param attrs [Hash] additional attributes to send to the resource.
+    #   Keys are methods, values are parameters
     # @return [void]
     # @api private
-    def _add_files(files, suffix, clobberfail, resource, resource_action)
-      files.flatten.each do |filename|
+    def add_render( # rubocop:disable Metrics/ParameterLists
+      things,
+      suffix: '.erb', clobberfail: @fail_on_clobber,
+      resource: :template, resource_action: :create_if_missing,
+      attrs: {}
+    )
+      things.flatten.each do |filename|
         src = "#{source_path(filename)}#{suffix}"
         dst = File.join(@target_path, filename)
         if clobberfail && File.exist?(dst)
           @failures << "tried to overwrite file #{dst}"
         else
-          @recipe.send(resource, dst) do
-            # :nocov:
-            source src
-            action resource_action
-            helpers(ChefDK::Generator::TemplateHelper) \
-              if :template == resource
-            # :nocov:
-          end
-          @actions_taken << "create file #{dst}"
+          _add_resource(resource, src, dst, resource_action, attrs)
         end
       end
     end
 
+    # adds a resource to the recipe
+    # @api private
+    def _add_resource(type, src, dst, action, attrs)
+      @recipe.send(type, dst) do
+        # :nocov:
+        source src
+        action action
+        helpers(ChefDK::Generator::TemplateHelper) \
+          if :template == type
+        attrs.each do |attr, value|
+          send attr, value
+        end
+        # :nocov:
+      end
+      @actions_taken << "add resource #{type}[#{dst}]"
+    end
+
     # reports on the actions taken by the plugin
     # @param actions [Array] the list of actions taken
     # @return [void]

data/lib/chef_gen/flavors.rb

@@ -8,7 +8,7 @@ module ChefGen
   # a plugin framework for creating ChefDK generator flavors
   class Flavors
     # the version of the gem
-    VERSION = '0.7.0'
+    VERSION = '0.8.0'
 
     extend LittlePlugger path: 'chef_gen/flavor',
                          module: ChefGen::Flavor

data/lib/chef_gen/flavors/cucumber/kitchen.rb

@@ -1,4 +1,3 @@
 Given(/^I list the kitchen suites$/) do
-  unset_bundler_env_vars
   run_simple 'bundle exec kitchen list'
 end

data/lib/chef_gen/flavors/cucumber/rake.rb

@@ -1,14 +1,11 @@
 Given(/^I run a style test$/) do
-  unset_bundler_env_vars
-  run_simple 'bundle exec rake style', true, 10
+  run_simple 'bundle exec rake style', true, @aruba_timeout_seconds
 end
 
 Given(/^I run a unit test$/) do
-  unset_bundler_env_vars
-  run_simple 'bundle exec rake spec', true, 10
+  run_simple 'bundle exec rake spec', true, @aruba_timeout_seconds
 end
 
 Given(/^I list the rake tasks$/) do
-  unset_bundler_env_vars
   run_simple 'bundle exec rake -T'
 end

data/lib/chef_gen/snippet/cookbook_base.rb

@@ -1,5 +1,7 @@
 # rubocop:disable Metrics/MethodLength
 
+require 'chef/mixin/params_validate'
+
 module ChefGen
   module Snippet
     # creates the basic files that every cookbook should have
@@ -28,13 +30,13 @@ module ChefGen
         @rake_tasks = {}
         @guard_sets = {}
         @cookbook_gems = {
-          rake: '~> 10.4',
-          pry: '~> 0.10',
+          'rake' => '~> 10.4',
+          'pry' => '~> 0.10',
           'pry-byebug' => '~> 3.1',
           'pry-rescue' => '~> 1.4',
           'pry-stack_explorer' => '~> 0.4',
-          berkshelf: '~> 3.2',
-          guard: '~> 2.12'
+          'berkshelf' => '~> 3.2',
+          'guard' => '~> 2.12'
         }
       end
 
@@ -55,12 +57,16 @@ module ChefGen
       def snippet_cookbookbase_gemfile(recipe)
         gems = @cookbook_gems
         sources = @gem_sources
-        # :nocov:
-        recipe.send(:template, File.join(@target_path, 'Gemfile')) do
-          helpers(ChefDK::Generator::TemplateHelper)
-          variables lazy { { gems: gems, sources: sources } }
+        lazy_vars = Chef::DelayedEvaluator.new do
+          { gems: gems, sources: sources }
         end
         # :nocov:
+        add_render(
+          %w(Gemfile),
+          resource_action: :create,
+          attrs: { variables: lazy_vars }
+        )
+        # :nocov:
       end
 
       # declares the Berksfile with lazy evaluation of the sources
@@ -69,12 +75,16 @@ module ChefGen
       # @return [void]
       def snippet_cookbookbase_berksfile(recipe)
         sources = @berks_sources
-        # :nocov:
-        recipe.send(:template, File.join(@target_path, 'Berksfile')) do
-          helpers(ChefDK::Generator::TemplateHelper)
-          variables lazy { { sources: sources } }
+        lazy_vars = Chef::DelayedEvaluator.new do
+          { sources: sources }
         end
         # :nocov:
+        add_render(
+          %w(Berksfile),
+          resource_action: :create,
+          attrs: { variables: lazy_vars }
+        )
+        # :nocov:
       end
 
       # declares the Rakefile with lazy evaluation of the tasks
@@ -83,12 +93,16 @@ module ChefGen
       # @return [void]
       def snippet_cookbookbase_rakefile(recipe)
         tasks = @rake_tasks
-        # :nocov:
-        recipe.send(:template, File.join(@target_path, 'Rakefile')) do
-          helpers(ChefDK::Generator::TemplateHelper)
-          variables lazy { { tasks: tasks } }
+        lazy_vars = Chef::DelayedEvaluator.new do
+          { tasks: tasks }
         end
         # :nocov:
+        add_render(
+          %w(Rakefile),
+          resource_action: :create,
+          attrs: { variables: lazy_vars }
+        )
+        # :nocov:
       end
 
       # declares the Guardfile with lazy evaluation of the guards
@@ -97,12 +111,16 @@ module ChefGen
       # @return [void]
       def snippet_cookbookbase_guardfile(recipe)
         guards = @guard_sets
-        # :nocov:
-        recipe.send(:template, File.join(@target_path, 'Guardfile')) do
-          helpers(ChefDK::Generator::TemplateHelper)
-          variables lazy { { guards: guards } }
+        lazy_vars = Chef::DelayedEvaluator.new do
+          { guards: guards }
         end
         # :nocov:
+        add_render(
+          %w(Guardfile),
+          resource_action: :create,
+          attrs: { variables: lazy_vars }
+        )
+        # :nocov:
       end
 
       # adds base files to the git and chefignore patterns
@@ -112,10 +130,7 @@ module ChefGen
       def snippet_cookbookbase_ignore(recipe)
         return unless respond_to?(:chefignore_patterns)
         %w(
-          Gemfile
-          Rakefile
-          Guardfile
-          Berksfile
+          Gemfile Rakefile Guardfile Berksfile
         ).each do |e|
           chefignore_patterns << e
         end
@@ -126,13 +141,8 @@ module ChefGen
       # @return [void]
       def content_cookbookbase_files(path)
         %w(
-          Gemfile.erb
-          Berksfile.erb
-          Rakefile.erb
-          Guardfile.erb
-          metadata_rb.erb
-          README_md.erb
-          CHANGELOG_md.erb
+          Gemfile.erb Berksfile.erb Rakefile.erb Guardfile.erb
+          metadata_rb.erb README_md.erb CHANGELOG_md.erb
         ).each do |file|
           # :nocov:
           copy_snippet_file(

data/shared/snippet/cookbookbase/Berksfile.erb

@@ -3,3 +3,10 @@ source '<%= source %>'
 <% end -%>
 
 metadata
+
+# load local overrides
+berksfile_dir = File.absolute_path(File.join('.', 'lib', 'berksfile'))
+Dir.glob(File.join(berksfile_dir, '*.berks')).each do |snippet|
+  # rubocop:disable Lint/Eval
+  eval File.read(snippet), nil, snippet
+end

data/shared/snippet/cookbookbase/Gemfile.erb

@@ -2,6 +2,18 @@
 source '<%= source %>'
 <% end -%>
 
-<% @gems.each do |gem, constraint| -%>
-gem '<%= gem %>', '<%= constraint %>'
+# rubocop:disable Metrics/LineLength
+<% @gems.each do |gem, config| -%>
+<% if config.is_a?(Array) -%>
+gem '<%= gem %>', '<%= config[0] %>', <%= config[1..-1].join(', ') %>
+<% else -%>
+gem '<%= gem %>', '<%= config %>'
 <% end -%>
+<% end -%>
+
+# load local overrides
+gemfile_dir = File.absolute_path(File.join('.', 'lib', 'gemfile'))
+Dir.glob(File.join(gemfile_dir, '*.bundler')).each do |snippet|
+  # rubocop:disable Lint/Eval
+  eval File.read(snippet), nil, snippet
+end

data/shared/snippet/cookbookbase/Guardfile.erb

@@ -8,3 +8,9 @@ interactor :off
 <%= guard %>
 
 <% end -%>
+
+# load local overrides
+guardfile_dir = File.absolute_path(File.join('.', 'lib', 'guardfile'))
+Dir.glob(File.join(guardfile_dir, '*.guard')).each do |snippet|
+  eval File.read(snippet), nil, snippet # rubocop:disable Lint/Eval
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-gen-flavors
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - James FitzGibbon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-09 00:00:00.000000000 Z
+date: 2015-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: little-plugger