halite 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a88c79b838190b373a56d00ee972a3a5f3c20761
-  data.tar.gz: be4c14b8249c98d21a99120ae282a624a251b13a
+  metadata.gz: 5249265d5c7c72220587865b41b064803b947f6a
+  data.tar.gz: 7c9793d015ef7a1bcdac708ffeb8f97abeff9ce1
 SHA512:
-  metadata.gz: 601bfbadd49b631708e0825fcaa67b0c0aae0bc5f733cb023ec6466dfcad5d2713a63ed8303ec98b3340f74ffb93126c4f2e962ff53b6c89ce7cdd7d05f373fa
-  data.tar.gz: 1ebae3856cf9e7f5907f6e20e42b8102f698907c273d40a5d1d552a2f8e2ef491b53d65597ac62f66093e1fc9352e565a5ffd381601fac831171dfdb3269555f
+  metadata.gz: 8a1e2e4de4f7bd411cf491cb4c8032803d24d74606f42b339c243cf40b721e17743e6e4705f328f67bee7b0ee643c3aeeb77bf61e3bd7465d1c6b44f28d4c452
+  data.tar.gz: ac647c3327ada3bfefa57f1b96bd1181da4c03fb1583f786d437183aca9245f0f0bf8d1ecc4fb98f1cd6a0a6f3f166c3f702d87d3f6b2816b42067dbf9b675e5

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## v1.0.1
+
+Fix issues with pre-release version numbers.
+
 ## v1.0.0
 
 Initial release!

data/README.md

@@ -1,9 +1,9 @@
 # Halite
 
-[![Build Status](https://img.shields.io/travis/coderanger/halite.svg)](https://travis-ci.org/coderanger/halite)
+[![Build Status](https://img.shields.io/travis/poise/halite.svg)](https://travis-ci.org/poise/halite)
 [![Gem Version](https://img.shields.io/gem/v/halite.svg)](https://rubygems.org/gems/halite)
-[![Coverage](https://img.shields.io/codecov/c/github/coderanger/halite.svg)](https://codecov.io/github/coderanger/halite)
-[![Gemnasium](https://img.shields.io/gemnasium/coderanger/halite.svg)](https://gemnasium.com/coderanger/halite)
+[![Coverage](https://img.shields.io/codecov/c/github/poise/halite.svg)](https://codecov.io/github/poise/halite)
+[![Gemnasium](https://img.shields.io/gemnasium/poise/halite.svg)](https://gemnasium.com/poise/halite)
 [![License](https://img.shields.io/badge/license-Apache_2-blue.svg)](https://www.apache.org/licenses/LICENSE-2.0)
 
 Write as a gem, release as a cookbook.

data/lib/halite/gem.rb

@@ -17,6 +17,7 @@
 require 'chef/cookbook_version'
 
 require 'halite/dependencies'
+require 'halite/error'
 
 
 module Halite
@@ -32,7 +33,8 @@ module Halite
     # name can be either a string name, Gem::Dependency, or Gem::Specification
     # @param name [String, Gem::Dependency, Gem::Specification]
     def initialize(name, version=nil)
-      name = name.to_spec if name.is_a?(::Gem::Dependency) # Allow passing a Dependency by just grabbing its spec.
+      # Allow passing a Dependency by just grabbing its spec.
+      name = dependency_to_spec(name) if name.is_a?(::Gem::Dependency)
       if name.is_a?(::Gem::Specification)
         raise Error.new("Cannot pass version when using an explicit specficiation") if version
         @spec = name
@@ -45,7 +47,7 @@ module Halite
     end
 
     def spec
-      @spec ||= ::Gem::Dependency.new(@name, ::Gem::Requirement.new(@version)).to_spec
+      @spec ||= dependency_to_spec(::Gem::Dependency.new(@name, ::Gem::Requirement.new(@version)))
     end
 
     def version
@@ -163,5 +165,22 @@ module Halite
       # Didn't find anything
       nil
     end
+
+    private
+
+    # Find a spec given a dependency.
+    #
+    # @since 1.0.1
+    # @param dep [Gem::Dependency] Dependency to solve.
+    # @return [Gem::Specificiation]
+    def dependency_to_spec(dep)
+      # #to_spec doesn't allow prereleases unless the requirement is
+      # for a prerelease. Just use the last valid spec if possible.
+      spec = dep.to_spec || dep.to_specs.last
+      raise Error.new("Cannot find a gem to satisfy #{dep}") unless spec
+      spec
+    rescue Gem::LoadError => ex
+      raise Error.new("Cannot find a gem to satisfy #{dep}: #{ex}")
+    end
   end
 end

data/lib/halite/version.rb

@@ -17,5 +17,5 @@
 
 module Halite
   # Halite version.
-  VERSION = '1.0.0'
+  VERSION = '1.0.1'
 end

data/spec/fixtures/gems/test4/Rakefile

@@ -0,0 +1 @@
+require 'halite/rake_tasks'

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

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

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

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

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

@@ -0,0 +1,24 @@
+# coding: utf-8
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'test4/version'
+
+Gem::Specification.new do |spec|
+  spec.name = 'test4'
+  spec.version = Test4::VERSION
+  spec.authors = ['Noah Kantrowitz']
+  spec.email = %w{noah@coderanger.net}
+  spec.description = %q||
+  spec.summary = %q||
+  spec.homepage = ''
+  spec.license = 'Apache 2.0'
+
+  spec.files = `cd #{File.expand_path('..', __FILE__)} && git ls-files`.split($/)
+  spec.executables = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.test_files = spec.files.grep(%r{^(test|spec|features)/})
+  spec.require_paths = %w{lib}
+
+  spec.add_dependency 'halite'
+
+  spec.add_development_dependency 'rake'
+end

data/spec/gem_spec.rb

@@ -127,6 +127,44 @@ describe Halite::Gem do
     its(:is_halite_cookbook?) { is_expected.to be_truthy }
   end # /context when loading test3
 
+  context 'when loading a Gem::Dependency' do
+    let(:dependency) do
+      reqs = []
+      reqs << Gem::Requirement.create(gem_version) if gem_version
+      Gem::Dependency.new(gem_name, *reqs)
+    end
+    subject { described_class.new(dependency) }
+
+    context 'test1' do
+      let(:gem_name) { 'test1' }
+      its(:version) { is_expected.to eq '1.2.3' }
+    end # /context test1
+
+    context 'test1 > 1.2.0' do
+      let(:gem_name) { 'test1' }
+      let(:gem_version) { '> 1.2.0' }
+      its(:version) { is_expected.to eq '1.2.3' }
+    end # /context test1 > 1.2.0
+
+    context 'test1 > 1.3.0' do
+      let(:gem_name) { 'test1' }
+      let(:gem_version) { '> 1.3.0' }
+      it { expect { subject }.to raise_error Halite::Error }
+    end # /context test1 > 1.3.0
+
+    context 'test1 ~> 1.2' do
+      let(:gem_name) { 'test1' }
+      let(:gem_version) { '~> 1.2' }
+      its(:version) { is_expected.to eq '1.2.3' }
+    end # /context test1 ~> 1.2
+
+    context 'test4 ~> 2.3' do
+      let(:gem_name) { 'test4' }
+      let(:gem_version) { '~> 2.3' }
+      its(:version) { is_expected.to eq '2.3.1.rc.1' }
+    end # /context test4 ~> 2.3
+  end # /context when loading a Gem::Dependency
+
   describe '#cookbook_name' do
     let(:metadata) { {} }
     subject { described_class.new(Gem::Specification.new {|s| s.name = gem_name; s.metadata.update(metadata) }).cookbook_name }
@@ -170,5 +208,5 @@ describe Halite::Gem do
       let(:gem_name) { 'mycompany-mygem' }
       it { is_expected.to eq 'mycompany-mygem' }
     end
-  end
+  end # /describe #cookbook_name
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: halite
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Noah Kantrowitz
@@ -198,6 +198,10 @@ files:
 - spec/fixtures/gems/test3/lib/test3/dsl.rb
 - 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/version.rb
+- spec/fixtures/gems/test4/test4.gemspec
 - spec/gem_spec.rb
 - spec/integration_spec.rb
 - spec/runner_spec.rb
@@ -272,6 +276,10 @@ test_files:
 - spec/fixtures/gems/test3/lib/test3/dsl.rb
 - 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/version.rb
+- spec/fixtures/gems/test4/test4.gemspec
 - spec/gem_spec.rb
 - spec/integration_spec.rb
 - spec/runner_spec.rb