r10k 1.1.1 → 1.1.2

data/lib/r10k/module/forge.rb

@@ -4,7 +4,7 @@ require 'r10k/logging'
 
 require 'fileutils'
 require 'systemu'
-require 'semver'
+require 'r10k/semver'
 require 'json'
 
 class R10K::Module::Forge < R10K::Module::Base
@@ -26,7 +26,7 @@ class R10K::Module::Forge < R10K::Module::Base
     @owner, @name = name.split('/')
 
     if args.is_a? String
-      @version = SemVer.new(args)
+      @version = R10K::SemVer.new(args)
     end
   end
 
@@ -62,12 +62,12 @@ class R10K::Module::Forge < R10K::Module::Base
     end
   end
 
-  # @return [SemVer, NilClass]
+  # @return [R10K::SemVer, NilClass]
   def version
     if metadata
-      SemVer.new(metadata['version'])
+      R10K::SemVer.new(metadata['version'])
     else
-      SemVer::MIN
+      R10K::SemVer::MIN
     end
   end
 

data/lib/{semver.rb → r10k/semver.rb}

@@ -3,6 +3,7 @@
 # We need to subclass Numeric to force range comparisons not to try to iterate over SemVer
 # and instead use numeric comparisons (eg >, <, >=, <=)
 # Ruby 1.8 already did this for all ranges, but Ruby 1.9 changed range include behavior
+module R10K
 class SemVer < Numeric
   include Comparable
 
@@ -122,3 +123,4 @@ class SemVer < Numeric
   MAX.instance_variable_set(:@major, (1.0/0)) # => Infinity
   MAX.instance_variable_set(:@vstring, 'vMAX')
 end
+end

data/lib/r10k/version.rb

@@ -1,3 +1,3 @@
 module R10K
-  VERSION = '1.1.1'
+  VERSION = '1.1.2'
 end

data/spec/unit/module/forge_spec.rb

@@ -1,5 +1,5 @@
 require 'r10k/module/forge'
-require 'semver'
+require 'r10k/semver'
 require 'spec_helper'
 
 describe R10K::Module::Forge do
@@ -78,7 +78,7 @@ describe R10K::Module::Forge do
       subject { described_class.new('branan/eight_hundred', empty_modulepath, '8.0.0') }
 
       it { should_not be_insync }
-      its(:version) { should eq SemVer::MIN }
+      its(:version) { should eq R10K::SemVer::MIN }
 
       it "should try to install the module" do
         expected = %w{install --version=8.0.0 --ignore-dependencies branan/eight_hundred}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: r10k
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-22 00:00:00.000000000 Z
+date: 2014-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colored
@@ -120,6 +120,7 @@ files:
 - lib/r10k.rb
 - lib/r10k/errors.rb
 - lib/r10k/logging.rb
+- lib/r10k/semver.rb
 - lib/r10k/registry.rb
 - lib/r10k/deployment.rb
 - lib/r10k/settings.rb
@@ -161,7 +162,6 @@ files:
 - lib/r10k/module/forge.rb
 - lib/r10k/module/git.rb
 - lib/r10k/version.rb
-- lib/semver.rb
 - spec/spec_helper.rb
 - spec/fixtures/module/forge/eight_hundred/metadata.json
 - spec/fixtures/module/forge/eight_hundred/Modulefile