halite 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bce33914c9ed0fcf28bc4739ef04bf41b5528b9a
-  data.tar.gz: d5af9a38530b3b346deb1b49315266e47996670c
+  metadata.gz: 577aff0788b35c31b43e31a40d5fe5eddc9018a1
+  data.tar.gz: 7c967c99985629798dc8dacb7c5a92bb5d3f43cd
 SHA512:
-  metadata.gz: ec86cb776cc8eb7850c9b6e84506486dff8180df57ffb6c1b41e87d60e6a1a98c08c989e4ef8d21502def4d8432da422db805f3ca78bd022372d3d38023696bc
-  data.tar.gz: ad00a903f3a5d7af87334fff1d7a083e047fde44aa69de1217bcc74022250a25f5b96f8e70af3c237b995c04da72a8c1180b8049ac29592d2a34ee55da105c6a
+  metadata.gz: 18a8ae4db88b1bf4a08cf8b365bee9317e21080879447d925ddbd0262ffc0236ee02b8886b8fbe920e002133db551f36317d6a4b399b9ea07952a709a5dca2ac
+  data.tar.gz: 2429414aade1578d376d5dee34bf8df98c141ba4276512121ca40855b1ef5bbfa3ff99bdf0dab1b476bf3bc18c3608e2e368737b52facb889fb0ef78b93dc00c

data/lib/halite/berkshelf/source.rb

@@ -38,7 +38,8 @@ module Halite
         ::Gem::Specification.stubs.map do |spec|
           Gem.new(spec)
         end.select do |cook|
-          cook.is_halite_cookbook?
+          # Make sure this is a cookbook, and that it isn't a pre-release.
+          cook.is_halite_cookbook? && cook.version == cook.cookbook_version
         end.map do |cook|
           # Build a fake "remote" cookbook
           ::Berkshelf::APIClient::RemoteCookbook.new(

data/lib/halite/dependencies.rb

@@ -100,11 +100,15 @@ module Halite
     end
 
     def self.clean_version(ver)
-      segments = ver.segments
-      # Various ways Chef differs from Rubygems
+      segments = ver.segments.dup
+      # Various ways Chef differs from Rubygems.
+      # Strip any pre-release tags in the version.
+      segments = segments.take_while {|s| s.to_s =~ /^\d+$/ }
+      # Must be x or x.y or x.y.z.
       raise InvalidDependencyError.new("Chef only supports two or three version segments: #{ver}") if segments.length < 1 || segments.length > 3
-      segments.each {|s| raise InvalidDependencyError.new("Chef does not support pre-release version numbers: #{ver}") unless s.is_a?(Integer) }
+      # If x, convert to x.0 because Chef requires two segments.
       segments << 0 if segments.length == 1
+      # Convert 0.0 or 0.0.0 to just 0.
       segments = [0] if segments.all? {|s| s == 0 }
       ::Gem::Version.new(segments.join('.'))
     end

data/lib/halite/version.rb

@@ -17,5 +17,5 @@
 
 module Halite
   # Halite version.
-  VERSION = '1.0.2'
+  VERSION = '1.0.3'
 end

data/spec/dependencies_spec.rb

@@ -205,7 +205,12 @@ describe Halite::Dependencies do
 
     context 'with 1.0.a' do
       let(:version) { '1.0.a' }
-      it { expect { subject }.to raise_error Halite::InvalidDependencyError }
+      it { is_expected.to eq '1.0' }
+    end
+
+    context 'with 2.3.rc.0' do
+      let(:version) { '2.3.rc.0' }
+      it { is_expected.to eq '2.3' }
     end
 
     context 'with 1.2.3.4' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: halite
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Noah Kantrowitz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-23 00:00:00.000000000 Z
+date: 2015-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef