chef-gen-flavors 0.9.0 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4b0953fd114c2f2abb72a230b6a78bf0e020000a
-  data.tar.gz: 771448a5c60f983e57ceace57260c6e0944cdd5d
+  metadata.gz: 3aa5262facacb59d8862d1a034f03c27af1746ae
+  data.tar.gz: 17b454f5047c4aed4e75704b84de6a45b418213e
 SHA512:
-  metadata.gz: af181b0de509ad3c4e1925f1cb11eee12cc55844a5178a3d0253d9e351c2453cad52494aec943efbc174434fa4c3e0e346bd2919d2789d30a8553cb159779741
-  data.tar.gz: 0968b5d2044d14bb0fcf6185a66fcc2f29bc709f49c70c224d3c7bd8fb563ea71d3db95af85a72e52478b8995d09c647a3c9ad1d8ac3a3493d6e3dd55ae247a2
+  metadata.gz: adfa27c9b067528290e40dce3689dd75d66ba7e48fee1550a46693f6950758a161e3bf58671798289e58bb9da43eaba55e995ae44fe8e3a3cac0f7b9325dff4c
+  data.tar.gz: f0f555110c7aa4abcd1c341881d66f791e0c7d183dfe941ba3d51624ec0126a246ae84897a7f8d53218908597ac23dfea33b364bd319e097a0a31c0cfe7ad034

data/History.md

@@ -1,5 +1,9 @@
 # Changelog for chef-gen-flavors
 
+## 0.9.1
+
+* fix bug that prevented using CHEFDK_FLAVOR=1 in ENV to get the built-in code generator
+
 ## 0.9.0
 
 * removed ChefGen::FlavorBase (and the snippets it uses) from this distribution and moved into a separate gem: [chef-gen-flavor-base](https://github.com/jf647/chef-gen-flavor-base)

data/chef-gen-flavors.gemspec

@@ -1,15 +1,15 @@
 # -*- encoding: utf-8 -*-
-# stub: chef-gen-flavors 0.9.0.20150904171033 ruby lib
+# stub: chef-gen-flavors 0.9.1.20150911132844 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "chef-gen-flavors"
-  s.version = "0.9.0.20150904171033"
+  s.version = "0.9.1.20150911132844"
 
   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-05"
-  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.date = "2015-09-11"
+  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\n[chef-gen-flavor-base](https://github.com/jf647/chef-gen-flavor-base) is\na base class that makes it easy to compose a flavor from reusable\nsnippets of functionality, and using it is highly recommended.  Using\nchef-gen-flavors on its own is only suitable if you already have a\ntemplate which is a copy of the skeleton provided by ChefDK.\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 = ["ARUBA_STEPS.md", "History.md", "Manifest.txt", "README.md"]
   s.files = ["ARUBA_STEPS.md", "History.md", "LICENSE", "Manifest.txt", "README.md", "chef-gen-flavors.gemspec", "lib/chef_gen/flavor.rb", "lib/chef_gen/flavors.rb", "lib/chef_gen/flavors/cucumber.rb", "lib/chef_gen/flavors/cucumber/bundle.rb", "lib/chef_gen/flavors/cucumber/chefdk.rb", "lib/chef_gen/flavors/cucumber/kitchen.rb", "lib/chef_gen/flavors/cucumber/knife.rb", "lib/chef_gen/flavors/cucumber/rake.rb", "lib/chef_gen/flavors/cucumber/regex.rb"]

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.9.0'
+    VERSION = '0.9.1'
 
     extend LittlePlugger path: 'chef_gen/flavor',
                          module: ChefGen::Flavor
@@ -28,7 +28,7 @@ module ChefGen
         $stdout.puts "using ChefGen flavor '#{selected}'"
 
         # return early if we're using the builtin flavor
-        return nil if :builtin == selected
+        return chefdk_generator_cookbook_path if :builtin == selected
 
         # get a temp dir
         tmpdir = create_tmpdir(selected)
@@ -61,7 +61,7 @@ module ChefGen
       def plugin_from_env
         if ENV.key?('CHEFGEN_FLAVOR')
           candidate = ENV['CHEFGEN_FLAVOR'].downcase.to_sym
-          return candidate if plugins.key?(candidate)
+          return candidate if @plugins.key?(candidate)
         end
         nil
       end
@@ -135,6 +135,17 @@ module ChefGen
         descr
       end
       # :nocov:
+
+      # return the path to the code_generator cookbook that comes with ChefDK
+      # @return [String] the path to the code_generator cookbook
+      # @api private
+      def chefdk_generator_cookbook_path
+        require 'rubygems'
+        spec = Gem::Specification.find_by_name('chef-dk')
+        File.join(
+          spec.gem_dir, 'lib', 'chef-dk', 'skeletons', 'code_generator'
+        )
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-gen-flavors
 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-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: little-plugger