halite 1.4.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 383a870b42dac4047e9b88c03a02af8b9c99ebaa
-  data.tar.gz: c6d8081b5b781d66fa1d91aa4862476fc032f3e1
+  metadata.gz: 1e31ce37e3c552a468e47471ddca26379265e6ee
+  data.tar.gz: 0b3404564d2f9687e26c0b132d6b0efcdb075cd8
 SHA512:
-  metadata.gz: bf3bfea8cf053b1ee3efa0f66c0945b472282fc34ebaaeb4fd44d038fe57964ed4808eded5a758f082447a39baaee48fb611e55db2815cf75052a4d45e967bad
-  data.tar.gz: 2d51de40d5d43315fad759cc8c2ad275ca239c094c5f0e19ffcca4dcd1816c25cca51e5ae4bb708131f836969ef9dcfcc0f39ed6e18647a7ea9588e302eebbd3
+  metadata.gz: 8a1d326bf0b05463d54b2eee1d75d99bcf975a8f396b313183b29ecd61e40874e3da881f66510d1aa4beee89f55dda5663c16db39b410f2777f8aa7dd5c728f0
+  data.tar.gz: d5bc501dc9431f2a2af53b63084da17c3f2150ace12000e52b7dee2b06759cc1815e447bb4a92c4911e78cea14e90cfd5b4f40f74fe42a065cff3a84d6cdd305

data/.travis.yml

@@ -2,8 +2,8 @@ sudo: false
 cache: bundler
 language: ruby
 rvm:
-- "2.2.5"
-- "2.3.1"
+- "2.3.3"
+# - "2.4.1"
 gemfile:
 - gemfiles/chef-12.0.gemfile
 - gemfiles/chef-12.1.gemfile
@@ -26,4 +26,6 @@ before_install:
 - gem --version
 - gem install bundler
 - bundle --version
+- bundle config --local path ${BUNDLE_PATH:-vendor/bundle}
+install: bundle update --jobs=3 --retry=3
 script: bundle exec rake integration

data/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Halite Changelog
 
+## v1.5.0
+
+* Set the default spec platform and version even when using the Halite runner
+  API directly.
+* Allow setting the chef_version constraints on a cookbook through a normal
+  gem dependency on the `chef` gem.
+* The default chef_version constraint has been changed from `~> 12.0` to `>= 12`
+  to allow for better interaction with the upcoming Chef 13 release.
+* Bump Stove dependency from 4.x to 5.x. This removes Ruby 2.0 compat. Sorry.
+* No longer testing on Ruby 2.2, which happens to be entering security-maintenance
+  mode today. Don't use it.
+
 ## v1.4.0
 
 * Set a default platform and version in ChefSpec because Fauxhai is trying to

data/gemfiles/master.gemfile

@@ -17,6 +17,7 @@
 eval_gemfile File.expand_path('../../Gemfile', __FILE__)
 
 gem 'chef', github: 'chef/chef'
+gem 'ohai', github: 'chef/ohai'
 gem 'poise', github: 'poise/poise'
 gem 'poise-boiler', github: 'poise/poise-boiler'
 gem 'poise-profiler', github: 'poise/poise-profiler'

data/halite.gemspec

@@ -33,8 +33,8 @@ Gem::Specification.new do |spec|
   spec.test_files = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = %w{lib}
 
-  spec.add_dependency 'chef', '~> 12.0'
-  spec.add_dependency 'stove', '~> 4.0'
+  spec.add_dependency 'chef', '>= 12.0', '< 14.0'
+  spec.add_dependency 'stove', '~> 5.0'
   spec.add_dependency 'bundler' # Used for Bundler.load_gemspec
   spec.add_dependency 'thor' # Used for Thor::Shell
 

data/lib/halite/converter/metadata.rb

@@ -47,7 +47,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"
+          buf << "chef_version(*#{gem_data.chef_version_requirement.inspect}) if defined?(chef_version)\n"
         end
       end
 

data/lib/halite/gem.rb

@@ -206,6 +206,21 @@ module Halite
       nil
     end
 
+    # Figure out which version of Chef this cookbook requires. Returns an array
+    # of Gem::Requirement-style string like `~> 12.0`.
+    #
+    # @return [Array<String>]
+    def chef_version_requirement
+      if spec.metadata['halite_chef_version']
+        # Manually overridden by gem metadata, use that.
+        [spec.metadata['halite_chef_version']]
+      elsif dep = spec.dependencies.find {|dep| dep.name == 'chef' && !dep.requirement.none? }
+        dep.requirement.as_list
+      else
+        ['>= 12']
+      end
+    end
+
     private
 
     # Find a spec given a dependency.

data/lib/halite/spec_helper/runner.rb

@@ -43,6 +43,9 @@ module Halite
       end
 
       def initialize(options={})
+        # Repeating the detault platform.
+        options[:platform] ||= 'ubuntu'
+        options[:version] ||= '16.04'
         super(options) do |node|
           # Allow inserting arbitrary attribute data in to the node
           node.attributes.default = Chef::Mixin::DeepMerge.merge(node.attributes.default, options[:default_attributes]) if options[:default_attributes]

data/lib/halite/version.rb

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

data/spec/converter/metadata_spec.rb

@@ -25,6 +25,7 @@ describe Halite::Converter::Metadata do
     let(:issues_url) { nil }
     let(:cookbook_dependencies) { [] }
     let(:gem_metadata) { {} }
+    let(:chef_version_requirement) { ['>= 12'] }
     let(:spec) do
       instance_double('Gem::Specification',
         author: nil,
@@ -48,6 +49,7 @@ describe Halite::Converter::Metadata do
         version: version,
         cookbook_version: cookbook_version,
         issues_url: issues_url,
+        chef_version_requirement: chef_version_requirement,
       )
     end
     subject { described_class.generate(gem_data) }
@@ -56,7 +58,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)
+chef_version(*[">= 12"]) if defined?(chef_version)
 EOH
     end # /context with simple data
 
@@ -68,7 +70,7 @@ EOH
 # header
 name "mygem"
 version "1.0.0"
-chef_version "~> 12" if defined?(chef_version)
+chef_version(*[">= 12"]) if defined?(chef_version)
 EOH
     end # /context with a license header
 
@@ -78,7 +80,7 @@ EOH
 name "mygem"
 version "1.0.0"
 depends "other"
-chef_version "~> 12" if defined?(chef_version)
+chef_version(*[">= 12"]) if defined?(chef_version)
 EOH
     end # /context with one dependency
 
@@ -89,7 +91,7 @@ name "mygem"
 version "1.0.0"
 depends "other", "~> 1.0"
 depends "another", "~> 2.0.0"
-chef_version "~> 12" if defined?(chef_version)
+chef_version(*[">= 12"]) if defined?(chef_version)
 EOH
     end # /context with two dependencies
 
@@ -102,7 +104,7 @@ EOH
 name "mygem"
 version "1.0.0"
 description "My awesome library!"
-chef_version "~> 12" if defined?(chef_version)
+chef_version(*[">= 12"]) if defined?(chef_version)
 EOH
     end # /context with a description
 
@@ -116,17 +118,17 @@ EOH
 name "mygem"
 version "1.0.0"
 long_description "My awesome readme!\\nCopyright me.\\n"
-chef_version "~> 12" if defined?(chef_version)
+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'} }
+      let(:chef_version_requirement) { ['>= 0'] }
 
       it { is_expected.to eq <<-EOH }
 name "mygem"
 version "1.0.0"
-chef_version ">= 0" if defined?(chef_version)
+chef_version(*[">= 0"]) if defined?(chef_version)
 EOH
     end # /context with a chef_version
 
@@ -137,7 +139,7 @@ EOH
 name "mygem"
 version "1.0.0"
 issues_url "http://issues" if defined?(issues_url)
-chef_version "~> 12" if defined?(chef_version)
+chef_version(*[">= 12"]) if defined?(chef_version)
 EOH
     end # /context with an issues_url
   end # /describe #generate

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

@@ -6,4 +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)
+chef_version(*[">= 12"]) if defined?(chef_version)

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

@@ -6,4 +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)
+chef_version(*[">= 12"]) if defined?(chef_version)

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

@@ -6,4 +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)
+chef_version(*[">= 3"]) if defined?(chef_version)

data/spec/fixtures/cookbooks/test4/files/halite_gem/test4/version.rb

@@ -0,0 +1,3 @@
+module Test4
+  VERSION = '2.3.1.rc.1'
+end

data/spec/fixtures/cookbooks/test4/libraries/default.rb

@@ -0,0 +1,3 @@
+# coding: utf-8
+raise 'Halite is not compatible with no_lazy_load false, please set no_lazy_load true in your Chef configuration file.' unless Chef::Config[:no_lazy_load]
+$LOAD_PATH << File.expand_path('../../files/halite_gem', __FILE__)

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

@@ -0,0 +1,9 @@
+# coding: utf-8
+name "test4"
+version "2.3.1"
+maintainer "Noah Kantrowitz"
+maintainer_email "noah@coderanger.net"
+source_url "http://example.com/" if defined?(source_url)
+issues_url "http://issues" if defined?(issues_url)
+license "Apache 2.0"
+chef_version(*[">= 1"]) if defined?(chef_version)

data/spec/fixtures/gems/test3/test3.gemspec

@@ -13,6 +13,7 @@ Gem::Specification.new do |spec|
   spec.homepage = 'http://example.com/'
   spec.license = 'Apache 2.0'
   spec.metadata['halite_entry_point'] = 'test3/dsl'
+  spec.metadata['halite_chef_version'] = '>= 3'
 
   spec.files = `cd #{File.expand_path('..', __FILE__)} && git ls-files`.split($/)
   spec.executables = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }

data/spec/fixtures/gems/test4/lib/test4.rb

@@ -0,0 +1,2 @@
+module Test4
+end

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

@@ -20,6 +20,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = %w{lib}
 
   spec.add_dependency 'halite'
+  spec.add_dependency 'chef', '>= 1'
 
   spec.add_development_dependency 'rake'
 end

data/spec/gem_spec.rb

@@ -66,6 +66,7 @@ describe Halite::Gem do
     its(:cookbook_dependencies) { is_expected.to eq [] }
     its(:is_halite_cookbook?) { is_expected.to be_truthy }
     its(:issues_url) { is_expected.to be_nil }
+    its(:chef_version_requirement) { is_expected.to eq [">= 12"] }
 
     describe '#each_file' do
       context 'with no prefixes' do
@@ -104,6 +105,7 @@ describe Halite::Gem do
     its(:cookbook_dependencies) { is_expected.to eq [Halite::Dependencies::Dependency.new('testdep', '>= 0', :requirements)] }
     its(:is_halite_cookbook?) { is_expected.to be_truthy }
     its(:issues_url) { is_expected.to be_nil }
+    its(:chef_version_requirement) { is_expected.to eq [">= 12"] }
 
     describe '#each_file' do
       context 'with no prefixes' do
@@ -139,6 +141,7 @@ describe Halite::Gem do
     its(:cookbook_dependencies) { is_expected.to eq [Halite::Dependencies::Dependency.new('test2', '~> 4.5.6', :dependencies)] }
     its(:is_halite_cookbook?) { is_expected.to be_truthy }
     its(:issues_url) { is_expected.to be_nil }
+    its(:chef_version_requirement) { is_expected.to eq [">= 3"] }
   end # /context when loading test3
 
   context 'when loading test4' do
@@ -147,6 +150,7 @@ describe Halite::Gem do
     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' }
+    its(:chef_version_requirement) { is_expected.to eq [">= 1"] }
   end # /context when loading test4
 
   context 'when loading a Gem::Dependency' do

data/spec/integration_spec.rb

@@ -77,4 +77,8 @@ describe 'integration tests' do
     let(:expect_output) { '!!!!!!!!!!test34.5.6' }
     it_should_behave_like 'an integration test', 'test3', '7.8.9', [['testdep', '1.0.0']]
   end # /context with test3 gem
+
+  context 'with test4 gem', integration: true do
+    it_should_behave_like 'an integration test', 'test4', '2.3.1.rc.1'
+  end # /context with test1 gem
 end

metadata

@@ -1,43 +1,49 @@
 --- !ruby/object:Gem::Specification
 name: halite
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.0
 platform: ruby
 authors:
 - Noah Kantrowitz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-25 00:00:00.000000000 Z
+date: 2017-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '12.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '14.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '12.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '14.0'
 - !ruby/object:Gem::Dependency
   name: stove
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -183,6 +189,10 @@ files:
 - spec/fixtures/cookbooks/test3/libraries/default.rb
 - spec/fixtures/cookbooks/test3/metadata.rb
 - spec/fixtures/cookbooks/test3/recipes/default.rb
+- spec/fixtures/cookbooks/test4/files/halite_gem/test4.rb
+- spec/fixtures/cookbooks/test4/files/halite_gem/test4/version.rb
+- spec/fixtures/cookbooks/test4/libraries/default.rb
+- spec/fixtures/cookbooks/test4/metadata.rb
 - spec/fixtures/gems/test1/Rakefile
 - spec/fixtures/gems/test1/lib/test1.rb
 - spec/fixtures/gems/test1/lib/test1/version.rb
@@ -202,7 +212,7 @@ files:
 - spec/fixtures/gems/test3/lib/test3/version.rb
 - spec/fixtures/gems/test3/test3.gemspec
 - spec/fixtures/gems/test4/Rakefile
-- spec/fixtures/gems/test4/lib/test1.rb
+- spec/fixtures/gems/test4/lib/test4.rb
 - spec/fixtures/gems/test4/lib/test4/version.rb
 - spec/fixtures/gems/test4/test4.gemspec
 - spec/gem_spec.rb
@@ -262,6 +272,10 @@ test_files:
 - spec/fixtures/cookbooks/test3/libraries/default.rb
 - spec/fixtures/cookbooks/test3/metadata.rb
 - spec/fixtures/cookbooks/test3/recipes/default.rb
+- spec/fixtures/cookbooks/test4/files/halite_gem/test4.rb
+- spec/fixtures/cookbooks/test4/files/halite_gem/test4/version.rb
+- spec/fixtures/cookbooks/test4/libraries/default.rb
+- spec/fixtures/cookbooks/test4/metadata.rb
 - spec/fixtures/gems/test1/Rakefile
 - spec/fixtures/gems/test1/lib/test1.rb
 - spec/fixtures/gems/test1/lib/test1/version.rb
@@ -281,7 +295,7 @@ test_files:
 - spec/fixtures/gems/test3/lib/test3/version.rb
 - spec/fixtures/gems/test3/test3.gemspec
 - spec/fixtures/gems/test4/Rakefile
-- spec/fixtures/gems/test4/lib/test1.rb
+- spec/fixtures/gems/test4/lib/test4.rb
 - spec/fixtures/gems/test4/lib/test4/version.rb
 - spec/fixtures/gems/test4/test4.gemspec
 - spec/gem_spec.rb