chef-gen-flavor-example 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6b3d59969317a570e5d2dd34c1f39ab51b4100dd
-  data.tar.gz: eb064eaf7354a81925a26637e0f1882ddcf1040f
+  metadata.gz: a20b3d8328c9bd9edd3e83d34ee9c8c8e6ded651
+  data.tar.gz: ab15529d579b8be432cf504034cf98955c647ebe
 SHA512:
-  metadata.gz: f9a4f04fd32bf95bcb28b037a019a0521d7f9e5e9bd608f40edae4fcffff71603239bb6c3269bc0e7e3566dd69354c18cfc8084bdce19f14d37fbb5cb8dd965b
-  data.tar.gz: 0eca167dd2d0ca1067e7f0180468cb61b4d0fa22dd9564ad243d69db0119e47416360bb6e9967e933e40b716be1ef25fa0037e9695e098777f498fb1bf884fac
+  metadata.gz: 755ea8b3b2ef8e21b3ce4cd25149a45db44ddd58deb33f5ff2a8f7f2d2cf650092f40c820bc52504165826442b1c8d37c4b2693a857f4d77ddf586e461f11792
+  data.tar.gz: 1d0e474dce1159cdcfe06a8b41be29c880f4d958a88aad0e59d9cd3221dbc90d6a47cc042e1e09cf1f800b7fb3c69c5539b98e5f14ebe2072c0bec9cd70dd326

data/History.md

@@ -1,5 +1,13 @@
 # Changelog for chef-gen-flavor-example
 
+## 0.6.0
+
+* update for compatibility with chef-gen-flavor-base 0.9.0
+
+## 0.5.0
+
+* pin aruba to older version
+
 ## 0.4.0
 
 * use the step definitions provided by chef-gen-flavors v0.5

data/LICENSE

@@ -2,6 +2,8 @@
 
 Copyright 2015 Nordstrom, Inc.
 
+Copyright 2015 James FitzGibbon
+
 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

data/Manifest.txt

@@ -3,9 +3,9 @@ LICENSE
 Manifest.txt
 README.md
 chef-gen-flavor-example.gemspec
-code_generator/metadata.rb
-code_generator/recipes/cookbook.rb
-code_generator_2/metadata.rb
-code_generator_2/recipes/cookbook.rb
 lib/chef_gen/flavor/example.rb
 lib/chef_gen/flavor/example2.rb
+shared/flavor/example/metadata.rb
+shared/flavor/example/recipes/cookbook.rb
+shared/flavor/example2/metadata.rb
+shared/flavor/example2/recipes/cookbook.rb

data/README.md

@@ -1,20 +1,26 @@
 # chef-gen-flavor-example
 
-* home :: https://github.com/Nordstrom/chef-gen-flavor-example
+* home :: https://github.com/jf647/chef-gen-flavor-example
 * license :: [Apache2](http://www.apache.org/licenses/LICENSE-2.0)
 * gem version :: [![Gem Version](https://badge.fury.io/rb/chef-gen-flavor-example.png)](http://badge.fury.io/rb/chef-gen-flavor-example)
-* build status :: [![Circle CI](https://circleci.com/gh/Nordstrom/chef-gen-flavor-example.svg?style=svg)](https://circleci.com/gh/Nordstrom/chef-gen-flavor-example)
-* code climate :: [![Code Climate](https://codeclimate.com/github/Nordstrom/chef-gen-flavor-example/badges/gpa.svg)](https://codeclimate.com/github/Nordstrom/chef-gen-flavor-example)
-* docs :: [![Inline docs](http://inch-ci.org/github/nordstrom/chef-gen-flavor-example.svg?branch=master)](http://inch-ci.org/github/nordstrom/chef-gen-flavor-example)
+* build status :: [![Circle CI](https://circleci.com/gh/jf647/chef-gen-flavor-example.svg?style=svg)](https://circleci.com/gh/jf647/chef-gen-flavor-example)
+* code climate :: [![Code Climate](https://codeclimate.com/github/jf647/chef-gen-flavor-example/badges/gpa.svg)](https://codeclimate.com/github/jf647/chef-gen-flavor-example)
+* docs :: [![Inline docs](http://inch-ci.org/github/jf647/chef-gen-flavor-example.svg?branch=master)](http://inch-ci.org/github/jf647/chef-gen-flavor-example)
 
 ## DESCRIPTION
 
 An example plugin for [chef-gen-flavors](https://rubygems.org/gems/chef-gen-flavors).
 
-This plugin makes use of most of the snippets available, and is meant as a
-reference implementation than for actual use. It demonstrates how to create
-a flavor with tests and serves as a good example of how to get
-started writing your own flavors for distribution.
+This plugin makes use of all the snippets provided by
+chef-gen-flavor-base, is meant as a reference implementation than for
+actual use. It demonstrates how to create a flavor with tests and serves
+as a good example of how to get started writing your own flavors for
+distribution.
+
+There are two flavors in this gem:
+
+* example: includes all the snippets in their default form
+* example2: inherits from example but removes ExampleFile and ExampleTemplate from the list of snippets to use
 
 # INSTALLATION
 
@@ -25,7 +31,8 @@ To install the latest public gem version:
 To install from (possibly modified) source:
 
     bundle
-    bundle exec rake install_gem
+    bundle exec rake package
+    chef gem install pkg/chef-gen-flavor-example-X.Y.Z.gem
 
 ## USAGE
 
@@ -35,7 +42,7 @@ This should generate the following cookbook:
 
 ```
 $ chef generate cookbook foo
-using ChefGen flavor in /home/james/.chefdk/gem/ruby/2.1.0/gems/chef-gen-flavor-example-0.1.0/code_generator
+using ChefGen flavor 'example'
 Compiling Cookbooks...
 Recipe: code_generator::cookbook
   * directory[/home/james/foo/] action create
@@ -155,12 +162,14 @@ unit tests run cleanly, and that the kitchen suites can be listed.
 
 ## AUTHOR
 
-James FitzGibbon - james.i.fitzgibbon@nordstrom.com - Nordstrom Inc.
+[James FitzGibbon](https://github.com/jf647)
 
 ## LICENSE
 
 Copyright 2015 Nordstrom, Inc.
 
+Copyright 2015 James FitzGibbon
+
 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

data/chef-gen-flavor-example.gemspec

@@ -1,19 +1,19 @@
 # -*- encoding: utf-8 -*-
-# stub: chef-gen-flavor-example 0.5.0.20150609142215 ruby lib
+# stub: chef-gen-flavor-example 0.6.0.20150909153225 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "chef-gen-flavor-example"
-  s.version = "0.5.0.20150609142215"
+  s.version = "0.6.0.20150909153225"
 
   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.description = "An example plugin for [chef-gen-flavors](https://rubygems.org/gems/chef-gen-flavors).\n\nThis plugin makes use of most of the snippets available, and is meant as a\nreference implementation than for actual use. It demonstrates how to create\na flavor with tests and serves as a good example of how to get\nstarted writing your own flavors for distribution."
-  s.email = ["james.i.fitzgibbon@nordstrom.com"]
+  s.date = "2015-09-09"
+  s.description = "An example plugin for [chef-gen-flavors](https://rubygems.org/gems/chef-gen-flavors).\n\nThis plugin makes use of all the snippets provided by\nchef-gen-flavor-base, is meant as a reference implementation than for\nactual use. It demonstrates how to create a flavor with tests and serves\nas a good example of how to get started writing your own flavors for\ndistribution.\n\nThere are two flavors in this gem:\n\n* example: includes all the snippets in their default form\n* example2: inherits from example but removes ExampleFile and ExampleTemplate from the list of snippets to use"
+  s.email = ["james.i.fitzgibbon@jf647.com"]
   s.extra_rdoc_files = ["History.md", "Manifest.txt", "README.md"]
-  s.files = ["History.md", "LICENSE", "Manifest.txt", "README.md", "chef-gen-flavor-example.gemspec", "code_generator/metadata.rb", "code_generator/recipes/cookbook.rb", "code_generator_2/metadata.rb", "code_generator_2/recipes/cookbook.rb", "lib/chef_gen/flavor/example.rb", "lib/chef_gen/flavor/example2.rb"]
-  s.homepage = "https://github.com/Nordstrom/chef-gen-flavor-example"
+  s.files = ["History.md", "LICENSE", "Manifest.txt", "README.md", "chef-gen-flavor-example.gemspec", "lib/chef_gen/flavor/example.rb", "lib/chef_gen/flavor/example2.rb", "shared/flavor/example/metadata.rb", "shared/flavor/example/recipes/cookbook.rb", "shared/flavor/example2/metadata.rb", "shared/flavor/example2/recipes/cookbook.rb"]
+  s.homepage = "https://github.com/jf647/chef-gen-flavor-example"
   s.licenses = ["apache2"]
   s.rdoc_options = ["--main", "README.md"]
   s.rubygems_version = "2.4.4"
@@ -23,7 +23,7 @@ Gem::Specification.new do |s|
     s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<chef-gen-flavors>, ["~> 0.7"])
+      s.add_runtime_dependency(%q<chef-gen-flavor-base>, ["~> 0.9"])
       s.add_development_dependency(%q<rdoc>, ["~> 4.0"])
       s.add_development_dependency(%q<chef-dk>, ["~> 0.5"])
       s.add_development_dependency(%q<hoe>, ["~> 3.13"])
@@ -37,10 +37,10 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<simplecov>, ["~> 0.9"])
       s.add_development_dependency(%q<simplecov-console>, ["~> 0.2"])
       s.add_development_dependency(%q<yard>, ["~> 0.8"])
-      s.add_development_dependency(%q<aruba>, ["~> 0.6"])
+      s.add_development_dependency(%q<aruba>, ["~> 0.6.2"])
       s.add_development_dependency(%q<rspec_junit_formatter>, ["~> 0.2"])
     else
-      s.add_dependency(%q<chef-gen-flavors>, ["~> 0.7"])
+      s.add_dependency(%q<chef-gen-flavor-base>, ["~> 0.9"])
       s.add_dependency(%q<rdoc>, ["~> 4.0"])
       s.add_dependency(%q<chef-dk>, ["~> 0.5"])
       s.add_dependency(%q<hoe>, ["~> 3.13"])
@@ -54,11 +54,11 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<simplecov>, ["~> 0.9"])
       s.add_dependency(%q<simplecov-console>, ["~> 0.2"])
       s.add_dependency(%q<yard>, ["~> 0.8"])
-      s.add_dependency(%q<aruba>, ["~> 0.6"])
+      s.add_dependency(%q<aruba>, ["~> 0.6.2"])
       s.add_dependency(%q<rspec_junit_formatter>, ["~> 0.2"])
     end
   else
-    s.add_dependency(%q<chef-gen-flavors>, ["~> 0.7"])
+    s.add_dependency(%q<chef-gen-flavor-base>, ["~> 0.9"])
     s.add_dependency(%q<rdoc>, ["~> 4.0"])
     s.add_dependency(%q<chef-dk>, ["~> 0.5"])
     s.add_dependency(%q<hoe>, ["~> 3.13"])
@@ -72,7 +72,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<simplecov>, ["~> 0.9"])
     s.add_dependency(%q<simplecov-console>, ["~> 0.2"])
     s.add_dependency(%q<yard>, ["~> 0.8"])
-    s.add_dependency(%q<aruba>, ["~> 0.6"])
+    s.add_dependency(%q<aruba>, ["~> 0.6.2"])
     s.add_dependency(%q<rspec_junit_formatter>, ["~> 0.2"])
   end
 end

data/lib/chef_gen/flavor/example.rb

@@ -6,30 +6,35 @@ module ChefGen
   # a pluggable framework for distributing templates as ruby gems
   module Flavor
     # an example plugin for chef-gen-template
-    class Example < FlavorBase
-      include ChefGen::Snippet::CookbookBase
-      include ChefGen::Snippet::Attributes
-      include ChefGen::Snippet::Recipes
-      include ChefGen::Snippet::ChefSpec
-      include ChefGen::Snippet::TestKitchen
-      include ChefGen::Snippet::StandardIgnore
-      include ChefGen::Snippet::StyleRubocop
-      include ChefGen::Snippet::StyleTailor
-      include ChefGen::Snippet::StyleFoodcritic
-      include ChefGen::Snippet::GitInit
-      include ChefGen::Snippet::ExampleFile
-      include ChefGen::Snippet::ExampleTemplate
-      include ChefGen::Snippet::ResourceProvider
+    class Example < ChefGen::FlavorBase
+      NAME = 'example'
+      DESC = 'include ALL the snippets'
+      VERSION = '0.6.0'
 
-      # the version of the gem
-      VERSION ||= '0.5.0'
+      def initialize(temp_path: nil, type: nil, recipe: nil)
+        super
+        @snippets << ChefGen::Snippet::CookbookBase
+        @snippets << ChefGen::Snippet::ActionsTaken
+        @snippets << ChefGen::Snippet::Attributes
+        @snippets << ChefGen::Snippet::ChefSpec
+        @snippets << ChefGen::Snippet::Debugging
+        @snippets << ChefGen::Snippet::ExampleFile
+        @snippets << ChefGen::Snippet::ExampleTemplate
+        @snippets << ChefGen::Snippet::Guard
+        @snippets << ChefGen::Snippet::GitInit
+        @snippets << ChefGen::Snippet::NextSteps
+        @snippets << ChefGen::Snippet::NoClobber
+        @snippets << ChefGen::Snippet::Recipes
+        @snippets << ChefGen::Snippet::ResourceProvider
+        @snippets << ChefGen::Snippet::StandardIgnore
+        @snippets << ChefGen::Snippet::StyleFoodcritic
+        @snippets << ChefGen::Snippet::StyleRubocop
+        @snippets << ChefGen::Snippet::StyleTailor
+        @snippets << ChefGen::Snippet::TestKitchen
+      end
 
-      class << self
-        # :nocov:
-        def description
-          'Example cookbook template'
-        end
-        # :nocov:
+      do_add_content do
+        @tocopy << [File.expand_path(File.join(static_content_path(__FILE__))) + '/.']
       end
     end
   end

data/lib/chef_gen/flavor/example2.rb

@@ -5,40 +5,21 @@ module ChefGen
   # a pluggable framework for distributing templates as ruby gems
   module Flavor
     # a flavor that inherits from ChefGen::Flavor::Example
-    class Example2 < Example
-      # the version of the gem
-      VERSION ||= '0.5.0'
+    class Example2 < ChefGen::Flavor::Example
+      NAME = 'example2'
+      DESC = 'remove example files'
+      VERSION = '0.6.0'
 
-      class << self
-        # :nocov:
-        def description
-          'Example 2 cookbook template'
-        end
-        # :nocov:
-
-        def code_generator_path(classfile)
-          File.expand_path(
-            File.join(
-              classfile,
-              '..', '..', '..', '..',
-              'code_generator_2'
-            )
-          )
+      def initialize(temp_path: nil, type: nil, recipe: nil)
+        super
+        # remove ExampleFile and ExampleTemplate snippets
+        @snippets.reject! do |e|
+          e == ChefGen::Snippet::ExampleFile || e == ChefGen::Snippet::ExampleTemplate
         end
       end
 
-      # hook after run_snippets to remove examples files
-      def after_run_snippets
-        toremove = [
-          'files',
-          File.join('files', 'default'),
-          File.join('files', 'default', 'example.conf'),
-          'templates',
-          File.join('templates', 'default'),
-          File.join('templates', 'default', 'example.conf.erb')
-        ]
-        @directories.reject! { |e| toremove.include? e }
-        @files_if_missing.reject! { |e| toremove.include? e }
+      do_add_content do
+        @tocopy << [File.expand_path(File.join(static_content_path(__FILE__))) + '/.']
       end
     end
   end

data/shared/flavor/example/metadata.rb

@@ -0,0 +1,2 @@
+name 'example'
+version '0.0.0'

data/{code_generator → shared/flavor/example}/recipes/cookbook.rb

@@ -1,11 +1,17 @@
-template = ChefGen::Flavor::Example.new(self)
-template.next_steps = <<END
+f = ChefGen::Flavor::Example.new(
+  type: 'cookbook', recipe: self
+)
 
+f.class.after_declare_resources do
+  self.next_steps = <<END
 
 Now cd into the generated cookbook directory and run
   'bundle' to install Ruby gems needed for local testing and
   'bundle exec rake -T' to see which testing tasks you can run.
 
   You are now ready to begin writing your first recipe.
+
 END
-template.generate
+end
+
+f.declare_resources

data/shared/flavor/example2/metadata.rb

@@ -0,0 +1,2 @@
+name 'example2'
+version '0.0.0'

data/shared/flavor/example2/recipes/cookbook.rb

@@ -0,0 +1,3 @@
+ChefGen::Flavor::Example2.new(
+  type: 'cookbook', recipe: self
+).declare_resources

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: chef-gen-flavor-example
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - James FitzGibbon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-09 00:00:00.000000000 Z
+date: 2015-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: chef-gen-flavors
+  name: chef-gen-flavor-base
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -212,14 +212,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: 0.6.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: 0.6.2
 - !ruby/object:Gem::Dependency
   name: rspec_junit_formatter
   requirement: !ruby/object:Gem::Requirement
@@ -237,12 +237,18 @@ dependencies:
 description: |-
   An example plugin for [chef-gen-flavors](https://rubygems.org/gems/chef-gen-flavors).
 
-  This plugin makes use of most of the snippets available, and is meant as a
-  reference implementation than for actual use. It demonstrates how to create
-  a flavor with tests and serves as a good example of how to get
-  started writing your own flavors for distribution.
+  This plugin makes use of all the snippets provided by
+  chef-gen-flavor-base, is meant as a reference implementation than for
+  actual use. It demonstrates how to create a flavor with tests and serves
+  as a good example of how to get started writing your own flavors for
+  distribution.
+
+  There are two flavors in this gem:
+
+  * example: includes all the snippets in their default form
+  * example2: inherits from example but removes ExampleFile and ExampleTemplate from the list of snippets to use
 email:
-- james.i.fitzgibbon@nordstrom.com
+- james.i.fitzgibbon@jf647.com
 executables: []
 extensions: []
 extra_rdoc_files:
@@ -255,13 +261,13 @@ files:
 - Manifest.txt
 - README.md
 - chef-gen-flavor-example.gemspec
-- code_generator/metadata.rb
-- code_generator/recipes/cookbook.rb
-- code_generator_2/metadata.rb
-- code_generator_2/recipes/cookbook.rb
 - lib/chef_gen/flavor/example.rb
 - lib/chef_gen/flavor/example2.rb
-homepage: https://github.com/Nordstrom/chef-gen-flavor-example
+- shared/flavor/example/metadata.rb
+- shared/flavor/example/recipes/cookbook.rb
+- shared/flavor/example2/metadata.rb
+- shared/flavor/example2/recipes/cookbook.rb
+homepage: https://github.com/jf647/chef-gen-flavor-example
 licenses:
 - apache2
 metadata: {}

data/code_generator/metadata.rb

@@ -1,2 +0,0 @@
-name 'code_generator'
-version '0.0.0'

data/code_generator_2/metadata.rb

@@ -1,2 +0,0 @@
-name 'code_generator_2'
-version '0.0.0'

data/code_generator_2/recipes/cookbook.rb

@@ -1,2 +0,0 @@
-template = ChefGen::Flavor::Example2.new(self)
-template.generate