halite 1.0.7 → 1.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 17db882da6b0bae3c6e9ce2b831d14ae2c5807c7
-  data.tar.gz: 5a0968925d77b2d5c18e2185aa1fa82bdd21adda
+  metadata.gz: f892bb4f8c0e111fef64f6116f3e2568a52ca35a
+  data.tar.gz: 3b71aeff4cefc32a256ad6f3b34c1b9b6cae538f
 SHA512:
-  metadata.gz: 6262b355b9183ebb3d365a98dd477d6dba0235226bbf7aa48023b560c7c9afe670149cff67517f4933be6cef47549c07bf99b41dcd44e28a843b4bfce24d906c
-  data.tar.gz: 46d28077eac059e3137dbf792e6fa5ccbc00751ae17d65f6f8dd976eb20ce4b22726683fc9e96a2beaa235d424f45ea692f2ae154d7c2b8bf5322623c3f04598
+  metadata.gz: 5e09f81f9f0df32a793d2bd8efd63d99a54cf24a907f14ff35635b6d771f7631539434de8ca0a23e24817690b9e4f7b2b298010f2f306165ed9b9af8b30e02ca
+  data.tar.gz: 87a8a9d98dff4d5864b19aab65e4f72ee10fde8240755e1f1fb0a0823e832d1f4afb7edaf5d61bbe701c4daf0d91ca4fbca5774baedc935cbf5e3f70be6061dc

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## v1.0.8
+
+* Expose `example_group` inside `SpecHelper`-created resources and providers.
+* Handle `StubSpecifications` in the gem environment.
+
 ## v1.0.7
 
 * More fixes for Chef 12.4.1.

data/README.md

@@ -160,6 +160,41 @@ These helper resources and providers are only available within the scope of
 recipes defined on that example group or groups nested inside it. Helper
 resources are automatically `step_into`'d.
 
+## Using a Pre-release Version of a Cookbook
+
+When a Halite-based cookbook is released, a converted copy is generally uploaded
+to [the Supermarket](https://supermarket.chef.io/). To use unreleased versions,
+you need to pull in the code from git via bundler and then tell the Berkshelf
+extension to convert it for you.
+
+To grab the pre-release gem, add a line like the following to your Gemfile:
+
+```ruby
+gem 'poise-application', github: 'poise/application'
+```
+
+You will need one `gem` line for each Halite-based cookbook you want to use,
+possibly including dependencies if you want to use pre-release versions of
+those as well.
+
+Next you need to use Berkshelf to convert the gem to its cookbook form:
+
+```ruby
+source 'https://supermarket.chef.io/'
+extension 'halite'
+cookbook 'application', gem: 'poise-application'
+```
+
+Again you will need one `cookbook` line per Halite based cookbook you want to
+use. Also make sure to check the correct names for the gem and cookbook, they
+may not be the same though for other Poise cookbooks they generally follow the
+same pattern.
+
+If you are using something that integrates with Berkshelf like Test-Kitchen or
+ChefSpec, this is all you need to do. You could use `berks upload` to push a
+converted copy of all cookbooks to a Chef Server, though running pre-release
+code in production should be done with great care.
+
 ## License
 
 Copyright 2015, Noah Kantrowitz

data/lib/halite/gem.rb

@@ -35,6 +35,8 @@ module Halite
     def initialize(name, version=nil)
       # Allow passing a Dependency by just grabbing its spec.
       name = dependency_to_spec(name) if name.is_a?(::Gem::Dependency)
+      # Stubs don't load enough data for us, grab the real spec. RIP IOPS.
+      name = name.to_spec if name.is_a?(::Gem::StubSpecification)
       if name.is_a?(::Gem::Specification)
         raise Error.new("Cannot pass version when using an explicit specficiation") if version
         @spec = name

data/lib/halite/spec_helper.rb

@@ -261,8 +261,8 @@ module Halite
       def resource(name, auto: true, parent: Chef::Resource, step_into: true, unwrap_notifying_block: true, defined_at: caller[0], &block)
         parent = resources[parent] if parent.is_a?(Symbol)
         raise Halite::Error.new("Parent class for #{name} is not a class: #{parent.inspect}") unless parent.is_a?(Class)
-        # Pull out the example metadata for use in the class.
-        metadata = self.metadata
+        # Pull out the example group for use in the class.
+        example_group = self
         # Create the resource class.
         resource_class = Class.new(parent) do
           # Make the anonymous class pretend to have a name.
@@ -276,23 +276,26 @@ module Halite
           end
 
           # Create magic delegators for various metadata.
-          %i{described_class}.each do |key|
-            define_method(key) { metadata[key] }
-            define_singleton_method(key) { metadata[key] }
+          {
+            example_group: example_group,
+            described_class: example_group.metadata[:described_class],
+          }.each do |key, value|
+            define_method(key) { value }
+            define_singleton_method(key) { value }
           end
 
           # Evaluate the class body.
           class_exec(&block) if block
 
-
           # Optional initialization steps. Disable for special unicorn tests.
           if auto
             # Fill in a :run action by default.
             old_init = instance_method(:initialize)
             define_method(:initialize) do |*args|
-              # Fill in the resource name because I know it
-              @resource_name = name.to_sym
               old_init.bind(self).call(*args)
+              # Fill in the resource name because I know it, but don't
+              # overwrite because a parent might have done this already.
+              @resource_name = name.to_sym
               # ChefSpec doesn't seem to work well with action :nothing
               if Array(@action) == [:nothing]
                 @action = :run
@@ -358,8 +361,8 @@ module Halite
       def provider(name, auto: true, rspec: true, parent: Chef::Provider, defined_at: caller[0], &block)
         parent = providers[parent] if parent.is_a?(Symbol)
         raise Halite::Error.new("Parent class for #{name} is not a class: #{options[:parent].inspect}") unless parent.is_a?(Class)
-        # Pull out the example metadata for use in the class.
-        metadata = self.metadata
+        # Pull out the example group for use in the class.
+        example_group = self
         # Create the provider class.
         provider_class = Class.new(parent) do
           # Pull in RSpec expectations.
@@ -389,9 +392,12 @@ module Halite
           end
 
           # Create magic delegators for various metadata.
-          %i{described_class}.each do |key|
-            define_method(key) { metadata[key] }
-            define_singleton_method(key) { metadata[key] }
+          {
+            example_group: example_group,
+            described_class: example_group.metadata[:described_class],
+          }.each do |key, value|
+            define_method(key) { value }
+            define_singleton_method(key) { value }
           end
 
           # Evaluate the class body.

data/lib/halite/spec_helper/patcher.rb

@@ -59,6 +59,8 @@ module Halite
       # @param klass [Class] Newly created class.
       # @return [void]
       def self.post_create_cleanup(name, klass)
+        # Remove from DSL.
+        Chef::DSL::Resources.remove_resource_dsl(name) if defined?(Chef::DSL::Resources.remove_resource_dsl)
         # Remove from DescendantsTracker.
         Chef::Mixin::DescendantsTracker.direct_descendants(klass.superclass).delete(klass)
         # Remove from the priority and handler maps.

data/lib/halite/version.rb

@@ -17,5 +17,5 @@
 
 module Halite
   # Halite version.
-  VERSION = '1.0.7'
+  VERSION = '1.0.8'
 end

data/spec/spec_helper_spec.rb

@@ -57,6 +57,7 @@ describe Halite::SpecHelper do
       resource(:halite_test)
       it { is_expected.to be_a(Class) }
       it { is_expected.to be < Chef::Resource }
+      its(:resource_name) { is_expected.to eq :halite_test } if defined?(Chef::Resource.resource_name)
       it { expect(subject.new(nil, nil).resource_name).to eq(:halite_test) }
       it { expect(subject.new(nil, nil).action).to eq(:run) }
       it { expect(subject.new(nil, nil).allowed_actions).to eq([:nothing, :run]) }
@@ -77,6 +78,8 @@ describe Halite::SpecHelper do
       it { is_expected.to be_a(Class) }
       it { is_expected.to be < Chef::Resource }
       it { is_expected.to be < Chef::Resource::File }
+      its(:resource_name) { is_expected.to eq :halite_test } if defined?(Chef::Resource.resource_name)
+      it { expect(subject.new(nil, nil).resource_name).to eq(:halite_test) }
     end # /context with a parent
 
     context 'with a helper-defined parent' do
@@ -85,6 +88,8 @@ describe Halite::SpecHelper do
       it { is_expected.to be_a(Class) }
       it { is_expected.to be < Chef::Resource }
       it { is_expected.to be < Chef::Resource::HaliteParent }
+      its(:resource_name) { is_expected.to eq :halite_test } if defined?(Chef::Resource.resource_name)
+      it { expect(subject.new(nil, nil).resource_name).to eq(:halite_test) }
     end # /context with a helper-defined parent
 
     context 'with a helper-defined parent in an enclosing context' do
@@ -142,6 +147,21 @@ describe Halite::SpecHelper do
       it { is_expected.to run_halite_test('test') }
       it { is_expected.to_not run_ruby_block('inner') }
     end # /context with step_into:false
+
+    describe 'with magic helpers' do
+      resource(:halite_test)
+
+      context 'on the class' do
+        its(:example_group) { is_expected.to be_truthy }
+        its(:described_class) { is_expected.to eq Halite::SpecHelper }
+      end # /context on the class
+
+      context 'on the instance' do
+        subject { super().new(nil, nil) }
+        its(:example_group) { is_expected.to be_truthy }
+        its(:described_class) { is_expected.to eq Halite::SpecHelper }
+      end # /context on the instance
+    end # /describe with magic helpers
   end # /describe #resource
 
   describe '#provider' do
@@ -153,6 +173,21 @@ describe Halite::SpecHelper do
       it { is_expected.to be < Chef::Provider }
       its(:instance_methods) { are_expected.to include(:action_run) }
     end # /context with defaults
+
+    context 'with magic helpers' do
+      provider(:halite_test)
+
+      context 'on the class' do
+        its(:example_group) { is_expected.to be_truthy }
+        its(:described_class) { is_expected.to eq Halite::SpecHelper }
+      end # /context on the class
+
+      context 'on the instance' do
+        subject { super().new(nil, nil) }
+        its(:example_group) { is_expected.to be_truthy }
+        its(:described_class) { is_expected.to eq Halite::SpecHelper }
+      end # /context on the instance
+    end # /describe with magic helpers
   end # /describe #provider
 
   describe '#step_into' do

metadata

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