halite 1.0.13 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e66ab65e7c5063df1c488321abb0195686fbf0ca
-  data.tar.gz: e604f24d753db8d091b1b42657b2f74cf9574fc6
+  metadata.gz: 35d989833c7bbf082dd1025c03c64fd7fa678f5c
+  data.tar.gz: a8b72aea467f681b63a5a35de73323811b5be3a6
 SHA512:
-  metadata.gz: e3e86e39e18f6940f45392764754bf3b08464c7e48ba5c7a28f86f3c308d6dfd07a23312ab71e3e4e6bf46b33da67ce273fd8900b7e529c7b51d84ba999e8f04
-  data.tar.gz: 421b19411862494f282275d98f443676dc77c5d3aa35277205906b0aacf3c6e6300bfa65b9a8ed01b2ce9bb9f1cbc6bb7d72191f6a9e1fa5f6d791caf7462144
+  metadata.gz: 2b2904e09a894cd47f2e74a919c88749958edbc6c9cf158b6d5ba5b435aea7d7ce61e923434018872c2ea81348f41b7b35c21fa23ff7bb812fd8d402fda8e463
+  data.tar.gz: 18615c97d14307608a9ebf8f6fde591e3543ee65e9257001eaa17a498f5f042431e5b99b19f681a66763cb4454a0c96ac34de1d4a5e4d3829decb97781ce8e6a

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 # Halite Changelog
 
+## v1.1.0
+
+* Support the new `chef_version` metadata field through gem metadata. Defaults
+  to `~> 12` for now.
+* Make spec helper resources look more like normal Chef resources when in auto
+  mode.
+* Add Halite's synthetic cookbooks to the cookbook compiler too, for
+  include_recipe and friends.
+
 ## v1.0.13
 
 * Additional cookbook metadata to work with Foodcritic 5.1.

data/README.md

@@ -48,6 +48,17 @@ automatically converted to cookbook dependencies.
 Any files under `chef/` in the gem will be written as is in to the cookbook.
 For example you can add a recipe to your gem via `chef/recipes/default.rb`.
 
+## Chef Version
+
+By default cookbooks will be generated with `chef_version '~> 12'` to require
+Chef 12.x. This can be overridden using the `halite_chef_version` metadata field:
+
+```ruby
+Gem::Specification.new do |spec|
+  spec.metadata['halite_dependencies'] = '>= 12.0.0'
+end
+```
+
 ## Rake Tasks
 
 The `halite/rake_tasks` module provides quick defaults. Gem name will be

data/lib/halite/converter/metadata.rb

@@ -46,6 +46,7 @@ module Halite
             buf << ", #{dep.requirement.inspect}" if dep.requirement != '>= 0'
             buf << "\n"
           end
+          buf << "chef_version #{(gem_data.spec.metadata['halite_chef_version'] || '~> 12').inspect} if defined?(chef_version)\n"
         end
       end
 

data/lib/halite/spec_helper.rb

@@ -304,6 +304,9 @@ module Halite
                 @action = :run
                 @allowed_actions |= [:run]
               end
+              if defined?(self.class.default_action) && Array(self.class.default_action) == [:nothing]
+                self.class.default_action(:run)
+              end
             end
           end
         end

data/lib/halite/spec_helper/runner.rb

@@ -75,6 +75,10 @@ module Halite
           gem_data.cookbook_dependencies.each do |dep|
             add_halite_cookbooks(node, dep.spec) if dep.spec
           end
+          # Add to the compiler for RunContext#unreachable_cookbook?
+          cookbook_order = run_context.instance_variable_get(:@cookbook_compiler).cookbook_order
+          name_sym = gem_data.cookbook_name.to_sym
+          cookbook_order << name_sym unless cookbook_order.include?(name_sym)
           # 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)

data/lib/halite/version.rb

@@ -17,5 +17,5 @@
 
 module Halite
   # Halite version.
-  VERSION = '1.0.13'
+  VERSION = '1.1.0'
 end

data/spec/converter/metadata_spec.rb

@@ -23,6 +23,7 @@ describe Halite::Converter::Metadata do
     let(:version) { '1.0.0' }
     let(:cookbook_version) { version }
     let(:cookbook_dependencies) { [] }
+    let(:gem_metadata) { {} }
     let(:spec) do
       instance_double('Gem::Specification',
         author: nil,
@@ -32,6 +33,7 @@ describe Halite::Converter::Metadata do
         homepage: nil,
         license: nil,
         licenses: [],
+        metadata: gem_metadata,
       )
     end
     let(:gem_data) do
@@ -52,6 +54,7 @@ describe Halite::Converter::Metadata do
       it { is_expected.to eq <<-EOH }
 name "mygem"
 version "1.0.0"
+chef_version "~> 12" if defined?(chef_version)
 EOH
     end # /context with simple data
 
@@ -63,6 +66,7 @@ EOH
 # header
 name "mygem"
 version "1.0.0"
+chef_version "~> 12" if defined?(chef_version)
 EOH
     end # /context with a license header
 
@@ -72,6 +76,7 @@ EOH
 name "mygem"
 version "1.0.0"
 depends "other"
+chef_version "~> 12" if defined?(chef_version)
 EOH
     end # /context with one dependency
 
@@ -82,6 +87,7 @@ name "mygem"
 version "1.0.0"
 depends "other", "~> 1.0"
 depends "another", "~> 2.0.0"
+chef_version "~> 12" if defined?(chef_version)
 EOH
     end # /context with two dependencies
 
@@ -94,6 +100,7 @@ EOH
 name "mygem"
 version "1.0.0"
 description "My awesome library!"
+chef_version "~> 12" if defined?(chef_version)
 EOH
     end # /context with a description
 
@@ -103,12 +110,23 @@ EOH
         allow(IO).to receive(:read).with('/source/README.md').and_return("My awesome readme!\nCopyright me.\n")
       end
 
-      it { is_expected.to eq <<-'EOH' }
+      it { is_expected.to eq <<-EOH }
 name "mygem"
 version "1.0.0"
-long_description "My awesome readme!\nCopyright me.\n"
+long_description "My awesome readme!\\nCopyright me.\\n"
+chef_version "~> 12" if defined?(chef_version)
 EOH
     end # /context with a readme
+
+    context 'with a chef_version' do
+      let(:gem_metadata) { {'halite_chef_version' => '>= 0'} }
+
+      it { is_expected.to eq <<-EOH }
+name "mygem"
+version "1.0.0"
+chef_version ">= 0" if defined?(chef_version)
+EOH
+    end # /context with a chef_version
   end # /describe #generate
 
   describe '#write' do

data/spec/fixtures/cookbooks/test1/metadata.rb

@@ -6,3 +6,4 @@ maintainer "Noah Kantrowitz"
 maintainer_email "noah@coderanger.net"
 source_url "http://example.com/" if defined?(source_url)
 license "Apache 2.0"
+chef_version "~> 12" if defined?(chef_version)

data/spec/fixtures/cookbooks/test2/metadata.rb

@@ -6,3 +6,4 @@ maintainer_email "noah@coderanger.net"
 source_url "http://example.com/" if defined?(source_url)
 license "Apache 2.0"
 depends "testdep"
+chef_version "~> 12" if defined?(chef_version)

data/spec/fixtures/cookbooks/test3/metadata.rb

@@ -6,3 +6,4 @@ maintainer_email "noah@coderanger.net"
 source_url "http://example.com/" if defined?(source_url)
 license "Apache 2.0"
 depends "test2", "~> 4.5.6"
+chef_version "~> 12" if defined?(chef_version)

data/spec/spec_helper_spec.rb

@@ -59,7 +59,7 @@ describe Halite::SpecHelper do
       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(Array(subject.new(nil, nil).action)).to eq([:run]) }
       it { expect(subject.new(nil, nil).allowed_actions).to eq([:nothing, :run]) }
     end # /context with defaults
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: halite
 version: !ruby/object:Gem::Version
-  version: 1.0.13
+  version: 1.1.0
 platform: ruby
 authors:
 - Noah Kantrowitz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-13 00:00:00.000000000 Z
+date: 2015-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef