chef-gen-flavor-base 0.9.0 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8de1c97585788c79d1613949960f551e08333be8
-  data.tar.gz: b6192add19f7a575a67f9a4304a5247b82eae21b
+  metadata.gz: e74e421598cb4ca1570fd9028f100b5fffdd9881
+  data.tar.gz: 763afcf18335998f31b265edfbc6340513f796f2
 SHA512:
-  metadata.gz: f816f07eef02675086c44b518f784a5df10ef4a6e60cc92acc9fd0e013ff312af5d3fee8d46be1b622eb4f30403be6d8df27e8dd8cbc54d10f297bab8d8e0ee9
-  data.tar.gz: d5a5b0dee4f4bc59af10859e3fc37772e44a62a7e987f5fac527cd09fe476b327bd50bdcad8feb5f1774dccb8c698df2b31b900e0f1bc9db04e52d62cb465ac1
+  metadata.gz: df01054e776bbf59627531a1205cf1f1a8f132088cc7ef3e5bddb3e3fa0b9d605abf47f5094306dd3328c3290c7d0e894f0f46c1c81e8c12007f134f3da305bb
+  data.tar.gz: cb16d89c75eaf524b126f1eab685d502c2489381cf625fc9608658b2bff23cf4fc0a8ead6a74bc4e4fc2c8cb47e7b8d50ff65e49382147b5914fa8d0aae313d2

data/History.md

@@ -1,5 +1,10 @@
 # Changelog for chef-gen-flavor-base
 
+## 0.9.1
+
+* update #static_content_path to take a flavor or snippet name arg rather than relying on the NAME constant in the class, because this fails when you have C < B < FlavorBase (B would try to copy files from a directory named for C)
+* disable feature tests on CircleCI because it's failing with a bundler error that we don't see during local tests
+
 ## 0.9.0
 
 * extracted ChefGen::FlavorBase and the snippets in the namespace ChefGen::Snippets into a seperate gem

data/README.md

@@ -157,7 +157,7 @@ directory that chef-gen-flavors will pass to ChefDK:
 
 ```ruby
 do_add_content do
-  @tocopy << [File.expand_path(File.join(static_content_path(__FILE__))) + '/.']
+  @tocopy << [File.expand_path(File.join(static_content_path(__FILE__, 'flavor_name'))) + '/.']
 end
 ```
 
@@ -264,7 +264,7 @@ module ChefGen
       NAME = 'awesome_override1'
 
       before_copy_content do
-        @tocopy << [File.expand_path(File.join(static_content_path(__FILE__))) + '/.']
+        @tocopy << [File.expand_path(File.join(static_content_path(__FILE__, 'awesome_override1'))) + '/.']
       end
     end
   end
@@ -284,7 +284,7 @@ module ChefGen
 
       def initialize_generate
         @flavor.class.before_copy_content do
-          @tocopy << [File.expand_path(File.join(static_content_path(__FILE__))) + '/.']
+          @tocopy << [File.expand_path(File.join(static_content_path(__FILE__, 'before_copy_content'))) + '/.']
         end
       end
     end
@@ -450,7 +450,7 @@ using the name.
 
 ```ruby
 def initialize_setup
-  snippet_content_path = File.expand_path(File.join(static_content_path(__FILE__))) + '/.'
+  snippet_content_path = File.expand_path(File.join(static_content_path(__FILE__, 'snippet_name'))) + '/.'
   @flavor.class.do_add_content do
     tocopy << [snippet_content_path]
   end
@@ -699,7 +699,7 @@ module ChefGen
       NAME = 'almost_perfect'
 
       before_copy_content do
-        @tocopy << [File.expand_path(File.join(static_content_path(__FILE__))) + '/.']
+        @tocopy << [File.expand_path(File.join(static_content_path(__FILE__, 'almost_perfect'))) + '/.']
       end
     end
   end

data/chef-gen-flavor-base.gemspec

@@ -1,14 +1,14 @@
 # -*- encoding: utf-8 -*-
-# stub: chef-gen-flavor-base 0.9.0.20150909153100 ruby lib
+# stub: chef-gen-flavor-base 0.9.1.20150910100832 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "chef-gen-flavor-base"
-  s.version = "0.9.0.20150909153100"
+  s.version = "0.9.1.20150910100832"
 
   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-09-09"
+  s.date = "2015-09-10"
   s.description = "chef-gen-flavor-base is a base class to make it easy to create 'flavors'\nfor use with\n[chef-gen-flavors](https://github.com/jf647/chef-gen-flavors).\n\nchef-gen-flavors plugs into the 'chef generate' command provided by\nChefDK to let you provide an alternate template for cookbooks and other\nchef components.\n\nThis gem simply provides a class your flavor can derive from; templates\nare provided by separate gems, which you can host privately for use\nwithin your organization or publicly for the Chef community to use.\n\nAn example flavor that demonstrates how to use this gem is distributed\nseparately:\n[chef-gen-flavor-example](https://github.com/jf647/chef-gen-flavor-example)\n\nAt present this is focused primarily on providing templates for\ngeneration of cookbooks, as this is where most organization-specific\ncustomization takes place. Support for the other artifacts that ChefDK\ncan generate may work, but is not the focus of early releases."
   s.email = ["james@nadt.net"]
   s.extra_rdoc_files = ["History.md", "Manifest.txt", "README.md"]

data/lib/chef_gen/flavor_base.rb

@@ -12,7 +12,7 @@ module ChefGen
     include ChefGen::FlavorBase::ResourceHelpers
 
     # the version of the gem
-    VERSION = '0.9.0'
+    VERSION = '0.9.1'
 
     # define common hooks
     define_hooks :before_initialize, :after_initialize,

data/lib/chef_gen/flavor_base/copy_helpers.rb

@@ -31,12 +31,13 @@ module ChefGen
 
       # returns the path to static content distributed with a flavor
       # @param file [String] the file to generate the path from
+      # @param flavor [String] the name of the flavor
       # @return [String] the path the static content relative to the file
       # @api private
-      def static_content_path(file)
+      def static_content_path(file, flavor)
         File.expand_path(
           File.join(
-            File.dirname(file), '..', '..', '..', 'shared', 'flavor', self.class::NAME
+            File.dirname(file), '..', '..', '..', 'shared', 'flavor', flavor
           )
         )
       end

data/lib/chef_gen/snippet/attributes.rb

@@ -14,7 +14,7 @@ module ChefGen
       # @api private
       def initialize_setup
         super
-        snippet_content_path = File.expand_path(File.join(static_content_path(__FILE__))) + '/.'
+        snippet_content_path = File.expand_path(File.join(static_content_path(__FILE__, 'attributes'))) + '/.'
         @flavor.class.do_add_content do
           tocopy << [snippet_content_path]
         end

data/lib/chef_gen/snippet/chef_spec.rb

@@ -14,7 +14,7 @@ module ChefGen
       # @api private
       def initialize_setup
         super
-        snippet_content_path = File.expand_path(File.join(static_content_path(__FILE__))) + '/.'
+        snippet_content_path = File.expand_path(File.join(static_content_path(__FILE__, 'chef_spec'))) + '/.'
         @flavor.class.do_add_content do
           tocopy << [snippet_content_path]
         end

data/lib/chef_gen/snippet/cookbook_base.rb

@@ -30,7 +30,7 @@ module ChefGen
       # @api private
       def initialize_setup
         super
-        snippet_content_path = File.expand_path(File.join(static_content_path(__FILE__))) + '/.'
+        snippet_content_path = File.expand_path(File.join(static_content_path(__FILE__, 'cookbook_base'))) + '/.'
         @flavor.class.do_add_content do
           tocopy << [snippet_content_path]
         end

data/lib/chef_gen/snippet/example_file.rb

@@ -14,7 +14,7 @@ module ChefGen
       # @api private
       def initialize_setup
         super
-        snippet_content_path = File.expand_path(File.join(static_content_path(__FILE__))) + '/.'
+        snippet_content_path = File.expand_path(File.join(static_content_path(__FILE__, 'example_file'))) + '/.'
         @flavor.class.do_add_content do
           tocopy << [snippet_content_path]
         end

data/lib/chef_gen/snippet/example_template.rb

@@ -14,7 +14,7 @@ module ChefGen
       # @api private
       def initialize_setup
         super
-        snippet_content_path = File.expand_path(File.join(static_content_path(__FILE__))) + '/.'
+        snippet_content_path = File.expand_path(File.join(static_content_path(__FILE__, 'example_template'))) + '/.'
         @flavor.class.do_add_content do
           tocopy << [snippet_content_path]
         end

data/lib/chef_gen/snippet/guard.rb

@@ -19,7 +19,7 @@ module ChefGen
       # @api private
       def initialize_setup
         super
-        snippet_content_path = File.expand_path(File.join(static_content_path(__FILE__))) + '/.'
+        snippet_content_path = File.expand_path(File.join(static_content_path(__FILE__, 'guard'))) + '/.'
         @flavor.class.do_add_content do
           tocopy << [snippet_content_path]
         end

data/lib/chef_gen/snippet/recipes.rb

@@ -14,7 +14,7 @@ module ChefGen
       # @api private
       def initialize_setup
         super
-        snippet_content_path = File.expand_path(File.join(static_content_path(__FILE__))) + '/.'
+        snippet_content_path = File.expand_path(File.join(static_content_path(__FILE__, 'recipes'))) + '/.'
         @flavor.class.do_add_content do
           tocopy << [snippet_content_path]
         end

data/lib/chef_gen/snippet/resource_provider.rb

@@ -14,7 +14,7 @@ module ChefGen
       # @api private
       def initialize_setup
         super
-        snippet_content_path = File.expand_path(File.join(static_content_path(__FILE__))) + '/.'
+        snippet_content_path = File.expand_path(File.join(static_content_path(__FILE__, 'resource_provider'))) + '/.'
         @flavor.class.do_add_content do
           tocopy << [snippet_content_path]
         end

data/lib/chef_gen/snippet/style_rubocop.rb

@@ -14,7 +14,7 @@ module ChefGen
       # @api private
       def initialize_setup
         super
-        snippet_content_path = File.expand_path(File.join(static_content_path(__FILE__))) + '/.'
+        snippet_content_path = File.expand_path(File.join(static_content_path(__FILE__, 'style_rubocop'))) + '/.'
         @flavor.class.do_add_content do
           tocopy << [snippet_content_path]
         end

data/lib/chef_gen/snippet/test_kitchen.rb

@@ -14,7 +14,7 @@ module ChefGen
       # @api private
       def initialize_setup
         super
-        snippet_content_path = File.expand_path(File.join(static_content_path(__FILE__))) + '/.'
+        snippet_content_path = File.expand_path(File.join(static_content_path(__FILE__, 'test_kitchen'))) + '/.'
         @flavor.class.do_add_content do
           tocopy << [snippet_content_path]
         end

data/lib/chef_gen/snippet_base.rb

@@ -33,12 +33,13 @@ module ChefGen
 
     # returns the path to static content distributed with a snippet
     # @param file [String] the file to generate the path from
+    # @param snippet [String] the name of the snippet
     # @return [String] the path the static content relative to the file
     # @api private
-    def static_content_path(file)
+    def static_content_path(file, snippet)
       File.expand_path(
         File.join(
-          File.dirname(file), '..', '..', '..', 'shared', 'snippet', self.class::NAME
+          File.dirname(file), '..', '..', '..', 'shared', 'snippet', snippet
         )
       )
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-gen-flavor-base
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
 platform: ruby
 authors:
 - James FitzGibbon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-09 00:00:00.000000000 Z
+date: 2015-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef-gen-flavors