halite 1.5.0 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1e31ce37e3c552a468e47471ddca26379265e6ee
-  data.tar.gz: 0b3404564d2f9687e26c0b132d6b0efcdb075cd8
+  metadata.gz: 3bd9453c15ddb7b58021da152d53ee281e00e13e
+  data.tar.gz: 641b09025f131006f0707625a4f22a475deac522
 SHA512:
-  metadata.gz: 8a1d326bf0b05463d54b2eee1d75d99bcf975a8f396b313183b29ecd61e40874e3da881f66510d1aa4beee89f55dda5663c16db39b410f2777f8aa7dd5c728f0
-  data.tar.gz: d5bc501dc9431f2a2af53b63084da17c3f2150ace12000e52b7dee2b06759cc1815e447bb4a92c4911e78cea14e90cfd5b4f40f74fe42a065cff3a84d6cdd305
+  metadata.gz: 7bdb648670ef4bc5afdb954e7c5f769c8bf643f8e58c6065c63211e90e4bfc5336cf358d68313585e53b31e0bad5c70b647c858f2f51d917cb921fbc603e7c19
+  data.tar.gz: 36c524bb699a35b9a7c3f772e56d74cf220cc8e1a41df349dfcb632f52d9a815f0fc515922999457394d54fdc71ff91cc4c3cb097876df0b898301c247899c44

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Halite Changelog
 
+## v1.6.0
+
+* Chef 13 compatibility.
+* Structural supports for gathering development dependencies for cookbook gems.
+
 ## v1.5.0
 
 * Set the default spec platform and version even when using the Halite runner

data/lib/halite/dependencies.rb

@@ -39,11 +39,17 @@ module Halite
       end
     end
 
-    def self.extract(spec)
+    # Extract the cookbook dependencies from a gem specification.
+    #
+    # @since 1.6.0 Added development parameter.
+    # @param spec [Gem::Specification] Gem to extract from.
+    # @param development [Boolean] If true, consider development depencies.
+    # @return [Array<Halite::Dependencies::Dependency>]
+    def self.extract(spec, development: false)
       deps = []
       deps += clean_and_tag(extract_from_requirements(spec), :requirements)
       deps += clean_and_tag(extract_from_metadata(spec), :metadata)
-      deps += clean_and_tag(extract_from_dependencies(spec), :dependencies)
+      deps += clean_and_tag(extract_from_dependencies(spec, development: development), :dependencies)
       deps
     end
 
@@ -58,10 +64,10 @@ module Halite
       spec.metadata.fetch('halite_dependencies', '').split(/,/)
     end
 
-    def self.extract_from_dependencies(spec)
+    def self.extract_from_dependencies(spec, development: false)
       # Find any gem dependencies that are cookbooks in disguise.
       spec.dependencies.select do |dep|
-        dep.type == :runtime && Gem.new(dep).is_halite_cookbook?
+        (development || dep.type == :runtime) && Gem.new(dep).is_halite_cookbook?
       end.map do |dep|
         gem = Gem.new(dep)
         [gem.cookbook_name] + dep.requirements_list + [gem.spec]

data/lib/halite/gem.rb

@@ -156,8 +156,8 @@ module Halite
       each_file(spec.require_paths, &block)
     end
 
-    def cookbook_dependencies
-      @cookbook_dependencies ||= Dependencies.extract(spec)
+    def cookbook_dependencies(development: false)
+      Dependencies.extract(spec, development: development)
     end
 
     # Is this gem really a cookbook? (anything that depends directly on halite and doesn't have the ignore flag)
@@ -175,10 +175,17 @@ module Halite
       # Put this in a local variable for a closure below.
       path = spec.full_gem_path
       Chef::CookbookVersion.new(cookbook_name, File.join(path, 'chef')).tap do |c|
-        c.attribute_filenames = each_file('chef/attributes').map(&:first)
-        c.file_filenames = each_file('chef/files').map(&:first)
-        c.recipe_filenames = each_file('chef/recipes').map(&:first)
-        c.template_filenames = each_file('chef/templates').map(&:first)
+        # Use CookbookVersion#files_for as a feature test for ManifestV2. This
+        # can be changed to ::Gem::Requirement.create('>= 13').satisfied_by?(::Gem::Version.create(Chef::VERSION))
+        # once https://github.com/chef/chef/pull/5929 is merged.
+        if defined?(c.files_for)
+          c.all_files = each_file('chef').map(&:first)
+        else
+          c.attribute_filenames = each_file('chef/attributes').map(&:first)
+          c.file_filenames = each_file('chef/files').map(&:first)
+          c.recipe_filenames = each_file('chef/recipes').map(&:first)
+          c.template_filenames = each_file('chef/templates').map(&:first)
+        end
         # Haxx, rewire the filevendor for this cookbook to look up in our folder.
         # This is touching two different internal interfaces, but ¯\_(ツ)_/¯
         c.send(:file_vendor).define_singleton_method(:get_filename) do |filename|

data/lib/halite/spec_helper.rb

@@ -264,7 +264,7 @@ module Halite
       #     end
       #     it { is_expected.to run_my_resource('test').with(path: '/tmp') }
       #   end
-      def resource(name, auto: true, parent: Chef::Resource, step_into: true, unwrap_notifying_block: true, defined_at: caller[0], &block)
+      def resource(name, auto: true, parent: Chef::Resource, step_into: true, unwrap_notifying_block: true, patch: 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 group for use in the class.
@@ -320,7 +320,7 @@ module Halite
         end
 
         # Clean up any global registration that happens on class compile.
-        Patcher.post_create_cleanup(name, resource_class)
+        Patcher.post_create_cleanup(name, resource_class) if patch
 
         # Store for use up with the parent system
         halite_helpers[:resources][name.to_sym] = resource_class
@@ -329,7 +329,7 @@ module Halite
         step_into(resource_class, name, unwrap_notifying_block: unwrap_notifying_block) if step_into
 
         around do |ex|
-          if resource(name) == resource_class
+          if patch && resource(name) == resource_class
             # We haven't been overridden from a nested scope.
             Patcher.patch(name, resource_class, Chef::Resource) { ex.run }
           else
@@ -367,9 +367,9 @@ module Halite
       #     it { is_expected.to run_my_resource('test') }
       #     it { is_expected.to run_ruby_block('test') }
       #   end
-      def provider(name, auto: true, rspec: true, parent: Chef::Provider, defined_at: caller[0], &block)
+      def provider(name, auto: true, rspec: true, parent: Chef::Provider, patch: true, 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)
+        raise Halite::Error.new("Parent class for #{name} is not a class: #{parent.inspect}") unless parent.is_a?(Class)
         # Pull out the example group for use in the class.
         example_group = self
         # Create the provider class.
@@ -414,13 +414,13 @@ module Halite
         end
 
         # Clean up any global registration that happens on class compile.
-        Patcher.post_create_cleanup(name, provider_class)
+        Patcher.post_create_cleanup(name, provider_class) if patch
 
         # Store for use up with the parent system
         halite_helpers[:providers][name.to_sym] = provider_class
 
         around do |ex|
-          if provider(name) == provider_class
+          if patch && provider(name) == provider_class
             # We haven't been overridden from a nested scope.
             Patcher.patch(name, provider_class, Chef::Provider) { ex.run }
           else

data/lib/halite/spec_helper/patcher.rb

@@ -15,6 +15,7 @@
 #
 
 require 'chef/resource'
+require 'chef/version'
 
 
 module Halite
@@ -25,6 +26,9 @@ module Halite
     # @since 1.0.0
     # @api private
     module Patcher
+      # Flag to disable module-name patching.
+      DISABLE_PATCH_MODULE = ::Gem::Requirement.create('>= 13').satisfied_by?(::Gem::Version.create(Chef::VERSION))
+
       # Patch a class in to Chef for the duration of a block.
       #
       # @param name [String, Symbol] Name to create in snake-case (eg. :my_name).
@@ -90,6 +94,7 @@ module Halite
       # @param block [Proc] Block to execute while the name is available.
       # @return [void]
       def self.patch_module(mod, name, obj, &block)
+        return block.call if DISABLE_PATCH_MODULE
         class_name = Chef::Mixin::ConvertToClassName.convert_to_class_name(name.to_s)
         if mod.const_defined?(class_name, false)
           old_class = mod.const_get(class_name, false)

data/lib/halite/version.rb

@@ -17,5 +17,5 @@
 
 module Halite
   # Halite version.
-  VERSION = '1.5.0'
+  VERSION = '1.6.0'
 end

data/spec/dependencies_spec.rb

@@ -98,6 +98,25 @@ describe Halite::Dependencies do
       let(:gemspec) { fake_gem {|s| s.add_development_dependency 'gem1' } }
       it { is_expected.to eq [] }
     end
+
+    context 'with development mode' do
+      subject { described_class.extract_from_dependencies(gemspec, development: true) }
+
+      context 'with a halite-ish dependency' do
+        let(:gemspec) { fake_gem {|s| s.add_dependency 'gem3' } }
+        it { is_expected.to eq [['gem3', '>= 0', gem_stubs[2]]] }
+      end
+
+      context 'with a development dependency' do
+        let(:gemspec) { fake_gem {|s| s.add_development_dependency 'gem3' } }
+        it { is_expected.to eq [['gem3', '>= 0', gem_stubs[2]]] }
+      end
+
+      context 'with a non-halite dependency' do
+        let(:gemspec) { fake_gem {|s| s.add_development_dependency 'gem1' } }
+        it { is_expected.to eq [] }
+      end
+    end # /context with development mode
   end # /describe #extract_from_dependencies
 
   describe '#clean' do

data/spec/fixtures/gems/test4/test4.gemspec

@@ -23,4 +23,5 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'chef', '>= 1'
 
   spec.add_development_dependency 'rake'
+  spec.add_development_dependency 'test2', '~> 4.5.6'
 end

data/spec/gem_spec.rb

@@ -147,6 +147,8 @@ describe Halite::Gem do
   context 'when loading test4' do
     let(:gem_name) { 'test4' }
     its(:cookbook_name) { is_expected.to eq 'test4' }
+    its(:cookbook_dependencies) { is_expected.to eq [] }
+    it { expect(subject.cookbook_dependencies(development: true)).to eq [Halite::Dependencies::Dependency.new('test2', '~> 4.5.6', :dependencies)] }
     its(:version) { is_expected.to eq '2.3.1.rc.1' }
     its(:cookbook_version) { is_expected.to eq '2.3.1' }
     its(:issues_url) { is_expected.to eq 'http://issues' }

data/spec/spec_helper_spec.rb

@@ -87,7 +87,7 @@ describe Halite::SpecHelper do
       resource(:halite_test, parent: :halite_parent)
       it { is_expected.to be_a(Class) }
       it { is_expected.to be < Chef::Resource }
-      it { is_expected.to be < Chef::Resource::HaliteParent }
+      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) }
     end # /context with a helper-defined parent

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: halite
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.6.0
 platform: ruby
 authors:
 - Noah Kantrowitz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-29 00:00:00.000000000 Z
+date: 2017-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
@@ -241,7 +241,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.4
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: A set of helpers to write Chef cookbooks as Ruby gems.