halite 1.8.1 → 1.8.2

data/lib/halite/version.rb

@@ -17,5 +17,5 @@
 
 module Halite
   # Halite version.
-  VERSION = '1.8.1'
+  VERSION = '1.8.2'
 end

data/spec/example_resources/custom.rb

@@ -0,0 +1,29 @@
+#
+# Copyright 2018, Noah Kantrowitz
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require 'chef/resource'
+require 'chef/provider'
+
+
+# A `halite_test_custom` resource for use in Halite's unit tests.
+class HaliteTestCustom < Chef::Resource
+  resource_name(:halite_test_custom)
+  action(:run) do
+    ruby_block new_resource.name do
+      block { }
+    end
+  end
+end

data/spec/example_resources/simple.rb

@@ -21,21 +21,15 @@ require 'chef/provider'
 # A `halite_test_simple` resource for use in Halite's unit tests.
 class Chef
   class Resource::HaliteTestSimple < Resource
-    provides(:halite_test_simple) # For Chef >= 12.4
-
-    def initialize(*args)
-      super
-      @resource_name = :halite_test_simple
-      @action = :run
-      @allowed_actions << :run
-    end
+    resource_name(:halite_test_simple)
+    # actions(:run)
+    default_action(:run)
   end
 
   class Provider::HaliteTestSimple < Provider
+    provides(:halite_test_simple)
     include Chef::DSL::Recipe
 
-    provides(:halite_test_simple) # For Chef >= 12.4
-
     def load_current_resource
     end
 

data/spec/runner_spec.rb

@@ -22,40 +22,10 @@ require 'halite/spec_helper/runner'
 
 describe Halite::SpecHelper::Runner do
   let(:options) { Hash.new }
-  subject { described_class.new(options) }
-
-  describe 'Runner.converge' do
-    let(:instance) { double('Runner instance') }
-    before do
-      expect(described_class).to receive(:new).with(options).and_return(instance)
-    end
-
-    context 'with a block' do
-      it do
-        expect(instance).to receive(:converge) do |&block|
-          expect(block).to be_a(Proc)
-        end
-        described_class.converge { ruby_block 'test' }
-      end
-    end # /context with a block
-
-    context 'with a recipe' do
-      it do
-        expect(instance).to receive(:converge).with('test')
-        described_class.converge('test')
-      end
-    end # /context with a recipe
-
-    context 'with options' do
-      let(:options) { {dry_run: true} }
-      it do
-        expect(instance).to receive(:converge).with('test')
-        described_class.converge('test', dry_run: true)
-      end
-    end # /context with options
-  end # /describe Runner.converge
+  subject { described_class.new(options.merge(platform: 'ubuntu')) }
 
   describe '#initialize' do
+    before { subject.converge }
 
     context 'with a simple option' do
       let(:options) { {dry_run: true} }
@@ -64,7 +34,7 @@ describe Halite::SpecHelper::Runner do
 
     context 'with default_attributes' do
       let(:options) { {default_attributes: {halite: 'test'}} }
-      it { expect(subject.node.default['halite']).to eq('test') }
+      it { expect(subject.node.role_default['halite']).to eq('test') }
       it { expect(subject.node['halite']).to eq('test') }
     end # /context with default_attributes
 
@@ -76,33 +46,25 @@ describe Halite::SpecHelper::Runner do
 
     context 'with override_attributes' do
       let(:options) { {override_attributes: {halite: 'test'}} }
-      it { expect(subject.node.override['halite']).to eq('test') }
+      it { expect(subject.node.role_override['halite']).to eq('test') }
       it { expect(subject.node['halite']).to eq('test') }
     end # /context with override_attributes
   end # /describe #initialize
 
   describe '#converge' do
-    context 'with a block' do
-      it do
-        sentinel = [false]
-        subject.converge { sentinel[0] = true }
-        expect(sentinel[0]).to eq(true)
-      end
-    end # /context with a block
+    let(:options) { {dry_run: true} }
 
-    context 'with a recipe' do
-      let(:options) { {dry_run: true} }
-
-      it do
-        expect(subject.node.run_list).to receive(:add).with('test')
-        subject.converge('test')
-      end
-    end # /context with a recipe
-
-    context 'with both a block and a recipe' do
-      it do
-        expect { subject.converge('test') { } }.to raise_error(Halite::Error)
-      end
-    end # /context with both a block and a recipe
+    it do
+      expect(subject.node.run_list).to receive(:add).with('test')
+      subject.converge('test')
+    end
   end # /describe #converge
+
+  describe '#converge_block' do
+    it do
+      sentinel = [false]
+      subject.converge_block { sentinel[0] = true }
+      expect(sentinel[0]).to eq(true)
+    end
+  end # /describe #converge_block
 end

data/spec/spec_helper.rb

@@ -17,5 +17,7 @@
 require 'poise_boiler/helpers/spec_helper'
 PoiseBoiler::Helpers::SpecHelper.install(no_halite: true)
 require 'halite'
+require 'chefspec'
 require 'example_resources/simple'
 require 'example_resources/poise'
+require 'example_resources/custom'

data/spec/spec_helper_spec.rb

@@ -58,9 +58,9 @@ describe Halite::SpecHelper do
       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(Array(subject.new(nil, nil).action)).to eq([:run]) }
-      it { expect(subject.new(nil, nil).allowed_actions).to eq([:nothing, :run]) }
+      it { expect(subject.new('test', nil).resource_name).to eq(:halite_test) }
+      it { expect(Array(subject.new('test', nil).action)).to eq([:run]) }
+      it { expect(subject.new('test', nil).allowed_actions).to eq([:nothing, :run]) }
     end # /context with defaults
 
     context 'with auto:false' do
@@ -68,9 +68,9 @@ describe Halite::SpecHelper do
       it { is_expected.to be_a(Class) }
       it { is_expected.to be < Chef::Resource }
       # #resource_name was added upstream in 12.4 so ignore this test there.
-      it { expect(subject.new(nil, nil).resource_name).to be_nil } unless defined?(Chef::Resource.resource_name)
-      it { expect(Array(subject.new(nil, nil).action)).to eq [:nothing] }
-      it { expect(subject.new(nil, nil).allowed_actions).to eq [:nothing] }
+      it { expect(subject.new('test', nil).resource_name).to be_nil } unless defined?(Chef::Resource.resource_name)
+      it { expect(Array(subject.new('test', nil).action)).to eq [:nothing] }
+      it { expect(subject.new('test', nil).allowed_actions).to eq [:nothing] }
     end # /context with auto:false
 
     context 'with a parent' do
@@ -79,7 +79,7 @@ describe Halite::SpecHelper do
       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) }
+      it { expect(subject.new('test', nil).resource_name).to eq(:halite_test) }
     end # /context with a parent
 
     context 'with a helper-defined parent' do
@@ -89,7 +89,7 @@ describe Halite::SpecHelper do
       it { is_expected.to be < Chef::Resource }
       it { is_expected.to be < resource('halite_parent') }
       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('test', 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
@@ -109,7 +109,7 @@ describe Halite::SpecHelper do
           :parent
         end
       end
-      subject { resource(:halite_test).new(nil, nil).value }
+      subject { resource(:halite_test).new('test', nil).value }
 
       context 'sibling' do
         resource(:halite_parent) do
@@ -157,7 +157,7 @@ describe Halite::SpecHelper do
       end # /context on the class
 
       context 'on the instance' do
-        subject { super().new(nil, nil) }
+        subject { super().new('test', nil) }
         its(:example_group) { is_expected.to be_truthy }
         its(:described_class) { is_expected.to eq Halite::SpecHelper }
       end # /context on the instance
@@ -183,7 +183,7 @@ describe Halite::SpecHelper do
       end # /context on the class
 
       context 'on the instance' do
-        subject { super().new(nil, nil) }
+        subject { super().new(double(name: 'test', cookbook_name: 'test', resource_name: :halite_test), nil) }
         its(:example_group) { is_expected.to be_truthy }
         its(:described_class) { is_expected.to eq Halite::SpecHelper }
       end # /context on the instance
@@ -228,12 +228,34 @@ 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
+
+    context 'with a custom resource' do
+      recipe do
+        halite_test_custom 'test'
+      end
+
+      context 'with step_into' do
+        step_into(:halite_test_custom)
+        it { is_expected.to run_halite_test_custom('test') }
+        it { is_expected.to run_ruby_block('test') }
+        it { expect(chef_run.halite_test_custom('test')).to be_a(Chef::Resource) }
+      end # /context with step_into
+
+      context 'without step_into' do
+        it { is_expected.to run_halite_test_custom('test') }
+        it { is_expected.to_not run_ruby_block('test') }
+        it { expect(chef_run.halite_test_custom('test')).to be_a(Chef::Resource) }
+      end # /context without step_into
+    end # /context with a custom resource
   end # /describe #step_into
 
   describe 'patcher' do
     #let(:chefspec_options) { {log_level: :debug} }
     resource(:halite_test)
-    subject { resource(:halite_test).new('test', chef_run.run_context).provider_for_action(:run) }
+    subject do
+      chef_runner.converge
+      resource(:halite_test).new('test', chef_runner.run_context).provider_for_action(:run)
+    end
 
     context 'with a provider in scope' do
       provider(:halite_test)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: halite
 version: !ruby/object:Gem::Version
-  version: 1.8.1
+  version: 1.8.2
 platform: ruby
 authors:
 - Noah Kantrowitz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-20 00:00:00.000000000 Z
+date: 2018-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
@@ -130,18 +130,31 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- gemfiles/chef-12.0.gemfile
-- gemfiles/chef-12.1.gemfile
-- gemfiles/chef-12.2.gemfile
-- gemfiles/chef-12.3.gemfile
-- gemfiles/chef-12.4.0.gemfile
-- gemfiles/chef-12.4.gemfile
-- gemfiles/chef-12.5.gemfile
-- gemfiles/chef-12.6.gemfile
-- gemfiles/chef-12.7.gemfile
+- gemfiles/chef-12.16.gemfile
+- gemfiles/chef-12.17.gemfile
+- gemfiles/chef-12.18.gemfile
+- gemfiles/chef-12.19.gemfile
+- gemfiles/chef-12.20.gemfile
+- gemfiles/chef-12.21.gemfile
 - gemfiles/chef-12.gemfile
-- gemfiles/chef-13.7.16.gemfile
+- gemfiles/chef-13.0.gemfile
+- gemfiles/chef-13.1.gemfile
+- gemfiles/chef-13.10.gemfile
+- gemfiles/chef-13.2.gemfile
+- gemfiles/chef-13.3.gemfile
+- gemfiles/chef-13.4.gemfile
+- gemfiles/chef-13.5.gemfile
+- gemfiles/chef-13.6.gemfile
+- gemfiles/chef-13.7.gemfile
+- gemfiles/chef-13.8.gemfile
+- gemfiles/chef-13.9.gemfile
 - gemfiles/chef-13.gemfile
+- gemfiles/chef-14.0.gemfile
+- gemfiles/chef-14.1.gemfile
+- gemfiles/chef-14.2.gemfile
+- gemfiles/chef-14.3.gemfile
+- gemfiles/chef-14.4.gemfile
+- gemfiles/chef-14.gemfile
 - gemfiles/master.gemfile
 - halite.gemspec
 - lib/berkshelf/halite.rb
@@ -171,6 +184,7 @@ files:
 - spec/converter/misc_spec.rb
 - spec/converter_spec.rb
 - spec/dependencies_spec.rb
+- spec/example_resources/custom.rb
 - spec/example_resources/poise.rb
 - spec/example_resources/simple.rb
 - spec/fixtures/cookbooks/test1/files/halite_gem/test1.rb
@@ -243,7 +257,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: A set of helpers to write Chef cookbooks as Ruby gems.
@@ -254,6 +268,7 @@ test_files:
 - spec/converter/misc_spec.rb
 - spec/converter_spec.rb
 - spec/dependencies_spec.rb
+- spec/example_resources/custom.rb
 - spec/example_resources/poise.rb
 - spec/example_resources/simple.rb
 - spec/fixtures/cookbooks/test1/files/halite_gem/test1.rb

data/gemfiles/chef-12.4.gemfile

@@ -1,19 +0,0 @@
-#
-# Copyright 2015, Noah Kantrowitz
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-eval_gemfile File.expand_path('../../Gemfile', __FILE__)
-
-gem 'chef', '~> 12.4.3'

data/gemfiles/chef-12.5.gemfile

@@ -1,19 +0,0 @@
-#
-# Copyright 2015, Noah Kantrowitz
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-eval_gemfile File.expand_path('../../Gemfile', __FILE__)
-
-gem 'chef', '~> 12.5.1'

data/gemfiles/chef-12.6.gemfile

@@ -1,19 +0,0 @@
-#
-# Copyright 2015, Noah Kantrowitz
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-eval_gemfile File.expand_path('../../Gemfile', __FILE__)
-
-gem 'chef', '~> 12.6.0'

data/gemfiles/chef-12.7.gemfile

@@ -1,19 +0,0 @@
-#
-# Copyright 2015, Noah Kantrowitz
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-eval_gemfile File.expand_path('../../Gemfile', __FILE__)
-
-gem 'chef', '~> 12.7.2'

data/gemfiles/chef-13.7.16.gemfile

@@ -1,21 +0,0 @@
-#
-# Copyright 2015, Noah Kantrowitz
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-eval_gemfile File.expand_path('../../Gemfile', __FILE__)
-
-# this tests a very specific node_map edge case that existed only in 13.7.16 in
-# the released gem line and which affected halite.
-gem 'chef', '= 13.7.16'