halite 1.0.9 → 1.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fc5fe984b0094eeefa760ff15c5753f57fdb123f
-  data.tar.gz: 2fc9844e4861e76ed8d02e7341a861d8aba565b3
+  metadata.gz: bfddd38f30a6b70f4d5c636a50311acc6a6c2268
+  data.tar.gz: d6d37b99036f8f509c850f09b18ce6a2d0a0f4a6
 SHA512:
-  metadata.gz: 21781d4eb22ec0225fa959f25f0453c61a25ab1847fc6a8ad867683b7c543076cdb5183f8ba41c54641e97a1d65a6e4b0f8225217962377220d1696122b1ce80
-  data.tar.gz: fe34c9ed0e7eafa2b09ddbc83f35f5423dc9502834f51a61a7e6bf89a0c38c935b71945e75eda9f96146747b26e671bb29c9f1819fb40c0ef1449a17e6fbed4c
+  metadata.gz: 40e107d045a947e952122a4120f9531cbb2ca0e19dd13935a6aaa7ba0e1f945102ccaf6656d5f9d70cc9b656238cfc32ba9ef6188c0a1f013f0d747d6d7036f0
+  data.tar.gz: c80e0e7c0a7fe6ef816cd6eac1fc8c272432a17d1031dacd7ced3d2a7f1d9af0920eb07527c86906856418c1a8e2e34777d16644e8a330704ee760f4e6b9fe32

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## v1.0.10
+
+* Fewer potential pitfalls when using the Halite spec helper in a non-gem
+  cookbook. Still not 100%, but better.
+
 ## v1.0.9
 
 * Additional `StubSpecifications` fixes.

data/lib/halite/rake_helper.rb

@@ -37,20 +37,25 @@ module Halite
     def install
       extend Rake::DSL
       # Core Halite tasks
-      desc "Convert #{gemspec.name}-#{gemspec.version} to a cookbook in the pkg directory"
-      task 'chef:build' do
-        build_cookbook
-      end
+      unless options[:no_gem]
+        desc "Convert #{gemspec.name}-#{gemspec.version} to a cookbook in the pkg directory"
+        task 'chef:build' do
+          build_cookbook
+        end
 
-      desc "Push #{gemspec.name}-#{gemspec.version} to Supermarket"
-      task 'chef:release' => ['chef:build'] do
-        release_cookbook
-      end
+        desc "Push #{gemspec.name}-#{gemspec.version} to Supermarket"
+        task 'chef:release' => ['chef:build'] do
+          release_cookbook(pkg_path)
+        end
 
-      # Patch the core gem tasks to run ours too
-      unless options[:no_gem]
+        # Patch the core gem tasks to run ours too
         task 'build' => ['chef:build']
         task 'release' => ['chef:release']
+      else
+        desc "Push #{gem_name} to Supermarket"
+        task 'chef:release' do
+          release_cookbook(base)
+        end
       end
 
       # Foodcritic doesn't have a config file, so just always try to add it.
@@ -75,9 +80,14 @@ module Halite
 
       desc 'Run Foodcritic linter'
       task 'chef:foodcritic' do
-        Dir.mktmpdir('halite_test') do |path|
-          Halite.convert(gemspec, path)
-          sh("foodcritic --chef-version #{Chef::VERSION} --epic-fail any --tags ~FC054 '#{path}'")
+        foodcritic_cmd = "foodcritic --chef-version #{Chef::VERSION} --epic-fail any --tags ~FC054 '%{path}'"
+        if options[:no_gem]
+          sh(foodcritic_cmd % {path: base})
+        else
+          Dir.mktmpdir('halite_test') do |path|
+            Halite.convert(gemspec, path)
+            sh(foodcritic_cmd % {path: path})
+          end
         end
       end
 
@@ -111,10 +121,10 @@ module Halite
       shell.say("#{gemspec.name} #{gemspec.version} converted to pkg/#{gemspec.name}-#{gemspec.version}/.", :green)
     end
 
-    def release_cookbook
-      Dir.chdir(pkg_path) do
+    def release_cookbook(path)
+      Dir.chdir(path) do
         sh('stove --no-git')
-        shell.say("Pushed #{gemspec.name} #{gemspec.version} to supermarket.chef.io.", :green)
+        shell.say("Pushed #{gemspec.name} #{gemspec.version} to supermarket.chef.io.", :green) unless options[:no_gem]
       end
     end
 

data/lib/halite/spec_helper/runner.rb

@@ -56,7 +56,7 @@ module Halite
       def converge(*recipe_names, &block)
         raise Halite::Error.new('Cannot pass both recipe names and a recipe block to converge') if !recipe_names.empty? && block
         super(*recipe_names) do
-          add_halite_cookbook(node, @halite_gemspec) if @halite_gemspec
+          add_halite_cookbooks(node, @halite_gemspec) if @halite_gemspec
           if block
             recipe = Chef::Recipe.new(nil, nil, run_context)
             recipe.instance_exec(&block)
@@ -66,19 +66,21 @@ module Halite
 
       private
 
-      def add_halite_cookbook(node, gemspec)
-        gem_data = Halite::Gem.new(gemspec)
-        # Catch any dependency loops.
-        return if run_context.cookbook_collection.include?(gem_data.cookbook_name)
-        run_context.cookbook_collection[gem_data.cookbook_name] = gem_data.as_cookbook_version
-        gem_data.cookbook_dependencies.each do |dep|
-          add_halite_cookbook(node, dep.spec) if dep.spec
-        end
-        # Load attributes if any.
-        gem_data.each_file('chef/attributes') do |_full_path, rel_path|
-          raise Halite::Error.new("Chef does not support nested attribute files: #{rel_path}") if rel_path.include?(File::SEPARATOR)
-          name = File.basename(rel_path, '.rb')
-          node.include_attribute("#{gem_data.cookbook_name}::#{name}")
+      def add_halite_cookbooks(node, gemspecs)
+        Array(gemspecs).each do |gemspec|
+          gem_data = Halite::Gem.new(gemspec)
+          # Catch any dependency loops.
+          next if run_context.cookbook_collection.include?(gem_data.cookbook_name) && run_context.cookbook_collection[gem_data.cookbook_name].respond_to?(:halite_root)
+          run_context.cookbook_collection[gem_data.cookbook_name] = gem_data.as_cookbook_version
+          gem_data.cookbook_dependencies.each do |dep|
+            add_halite_cookbooks(node, dep.spec) if dep.spec
+          end
+          # Load attributes if any.
+          gem_data.each_file('chef/attributes') do |_full_path, rel_path|
+            raise Halite::Error.new("Chef does not support nested attribute files: #{rel_path}") if rel_path.include?(File::SEPARATOR)
+            name = File.basename(rel_path, '.rb')
+            node.include_attribute("#{gem_data.cookbook_name}::#{name}")
+          end
         end
       end
 

data/lib/halite/version.rb

@@ -17,5 +17,5 @@
 
 module Halite
   # Halite version.
-  VERSION = '1.0.9'
+  VERSION = '1.0.10'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: halite
 version: !ruby/object:Gem::Version
-  version: 1.0.9
+  version: 1.0.10
 platform: ruby
 authors:
 - Noah Kantrowitz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-17 00:00:00.000000000 Z
+date: 2015-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef