halite 1.7.0 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1a37de991e3e0d1627ffdef876685f8eec08df61
-  data.tar.gz: 6299278206fcadb36f2b6c6b5f6b33b63a563c58
+  metadata.gz: fd168969c0914dcf6682b1245ab25654227a79aa
+  data.tar.gz: 0b56dedf7b66e2fb3a485d426c9d8f05c16186d0
 SHA512:
-  metadata.gz: 3e584b28d05cad1e885c1050c149e0b0541b8157e8493ecdbd9b50bad174379e51f0185b56284f8d50d61ee290ea2f15e2ef5babe02bf91e004b28967ad3f8c5
-  data.tar.gz: 0fdac57fd61e32efcc2017d937c3db4c58d5ec1673f9db36e73ba6057e5a8fc1697eac98242f398a0e48e2a8c08f6a759b4f22eb2baa4450c4970f1e09801ad4
+  metadata.gz: e2bc627bd0db8fbf3606928e8aa4bbd2468a35f76887dfab64c04a1c44e0300f5c2d533d0243a13bb689d22f265327271df1bedb7ff4c2a4ad728bf1670392cf
+  data.tar.gz: d26476e368199e290eb4fc78ffd0d93e763c7bf3e148309ae89be7d75c36edf238d92415fc642fd5e94f6b5edf92faa40467890451507bd035f04a36fa7372df

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Halite Changelog
 
+## v1.8.0
+
+* Give recipes created using the block helper (`recipe do ... end`) a name when
+  possible.
+* Fix support for the Berkshelf plugin on Berks 6.1 and above.
+
 ## v1.7.0
 
 * Allow specifying which platforms a cookbook supports via gem metadata:

data/lib/halite/berkshelf/helper.rb

@@ -49,7 +49,7 @@ module Halite
               []
             end
             # Make sure we never add two halite sources.
-            original_sources.reject {|s| s.is_a?(::Halite::Berkshelf::Source) } + [::Halite::Berkshelf::Source.new]
+            original_sources.reject {|s| s.is_a?(::Halite::Berkshelf::Source) } + [::Halite::Berkshelf::Source.new(self)]
           end
         end
 

data/lib/halite/berkshelf/source.rb

@@ -27,10 +27,12 @@ module Halite
     # @since 1.0.0
     # @api private
     class Source < ::Berkshelf::Source
-      def initialize
-        # Pretend our URL is set even though it isn't used. Otherwise berks
-        # complains.
-        super 'https://supermarket.chef.io'
+      def initialize(berksfile)
+          # 6.1+ mode.
+        super(berksfile, {halite: 'halite://'})
+      rescue ArgumentError
+        # Legacy mode.
+        super('halite://')
       end
 
       def build_universe

data/lib/halite/spec_helper/runner.rb

@@ -61,7 +61,12 @@ module Halite
         super(*recipe_names) do
           add_halite_cookbooks(node, @halite_gemspec) if @halite_gemspec
           if block
-            recipe = Chef::Recipe.new(nil, nil, run_context)
+            cookbook_name = if @halite_gemspec
+              Halite::Gem.new(Array(@halite_gemspec).first).cookbook_name + '_spec'
+            else
+              nil
+            end
+            recipe = Chef::Recipe.new(cookbook_name, nil, run_context)
             recipe.instance_exec(&block)
           end
         end

data/lib/halite/version.rb

@@ -17,5 +17,5 @@
 
 module Halite
   # Halite version.
-  VERSION = '1.7.0'
+  VERSION = '1.8.0'
 end

data/spec/spec_helper_spec.rb

@@ -228,29 +228,6 @@ describe Halite::SpecHelper do
         it { expect(chef_run.halite_test_poise('test')).to be_a(Chef::Resource) }
       end # /context without step_into
     end # /context with a Poise resource
-
-    describe 'without step-into there should be no ChefSpec resource-level matcher' do
-      provider(:halite_test_help)
-
-      context 'helper-created resource' do
-        resource(:halite_test_helper, step_into: false)
-        recipe do
-          halite_test_helper 'test'
-        end
-        it { expect { chef_run.halite_test_helper('test' ) }.to raise_error NoMethodError }
-      end # /context helper-created resource
-
-      context 'helper-created resource with Poise' do
-        resource(:halite_test_helper_poise, step_into: false) do
-          include Poise
-          provides(:halite_test_helper_poise)
-        end
-        recipe do
-          halite_test_helper_poise 'test'
-        end
-        it { expect(chef_run.halite_test_helper_poise('test' )).to be_a(Chef::Resource) }
-      end # /context helper-created resource with Poise
-    end # describe without step-into there should be no ChefSpec resource-level matcher
   end # /describe #step_into
 
   describe 'patcher' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: halite
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.8.0
 platform: ruby
 authors:
 - Noah Kantrowitz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-07 00:00:00.000000000 Z
+date: 2017-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef