semantic_range 0.2.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 713091878f31485514b30d0ab9e9f7281576a260
-  data.tar.gz: 0f6bf36a44b5e9b4a6e61c5e3f42dbd4aeb2f60c
+  metadata.gz: cb5291e42f7111e3e2a32c66c9ea3bf647b8476f
+  data.tar.gz: c56b165d6e765b0d9360f0ec32cc8bcd8014018a
 SHA512:
-  metadata.gz: 201e862b74b02896c79356d61ee4128ae31b35d7ebbd2e2548d028d0fe2294389bcb5b699fdf0e0e70630db19cc21b8f45c535ada00f3ab2bda9111f90c409aa
-  data.tar.gz: 1c16363476186d8d54f0d2c229f805f962af5afd43eb3cd4de8c7cc954c858b85c08612289d6fc621843124f23280d6c0e9af2d97c8d81a6c0a35ff58f197ca1
+  metadata.gz: 94c4fb6189ca2e27813a0a792516c90517456789818626f10a634dcebbf9e53d5eebd6608c5175c38f424f401f42b90fba722fb97fd880c25284a26276e20171
+  data.tar.gz: edeaddff9d68446766e4cfda74537d033342c6716054eaf95b663312cc644a616b459abdedfd2bbcbefe1f716edd500ce1c2afa6fd7077efd6f38e235215a295

data/lib/semantic_range.rb

@@ -46,7 +46,9 @@ module SemanticRange
   MAX_LENGTH = 256
 
   class InvalidIncrement < StandardError; end
-  class NoMatchFound < StandardError; end
+  class InvalidVersion < StandardError; end
+  class InvalidComparator < StandardError; end
+  class InvalidRange < StandardError; end
 
   def self.ltr(version, range, loose = false)
     outside(version, range, '<', loose)
@@ -151,8 +153,12 @@ module SemanticRange
     Range.new(range, loose).test(version)
   end
 
-  def self.max_satisfying(version, range, loose = false)
-    # TODO
+  def self.max_satisfying(versions, range, loose = false)
+    versions.select { |version|
+      satisfies(version, range, loose)
+    }.sort { |a, b|
+      rcompare(a, b, loose)
+    }[0] || nil
   end
 
   def self.valid_range(range, loose = false)
@@ -231,11 +237,7 @@ module SemanticRange
     rxp = loose ? LOOSE : FULL
     return nil if !rxp.match(version)
 
-    begin
-      Version.new(version, loose)
-    rescue
-      nil
-    end
+    Version.new(version, loose)
   end
 
   def self.increment!(version, release, loose, identifier)
@@ -245,7 +247,7 @@ module SemanticRange
     end
 
     Version.new(version, loose).increment!(release, identifier).version
-  rescue InvalidIncrement, NoMatchFound
+  rescue InvalidIncrement, InvalidVersion
     nil
   end
 
@@ -259,4 +261,10 @@ module SemanticRange
     return "#{pre}patch" if a.patch != b.patch
     return "prerelease"  if pre_diff
   end
+
+  def self.to_comparators(range, loose = false)
+    Range.new(range, loose).set.map do |comp|
+      comp.map(&:to_s)
+    end
+  end
 end

data/lib/semantic_range/comparator.rb

@@ -25,7 +25,7 @@ module SemanticRange
 
     def parse(comp)
       m = comp.match(@loose ? COMPARATORLOOSE : COMPARATOR)
-      raise "Invalid comparator: #{comp}" unless m
+      raise InvalidComparator.new(comp) unless m
 
       @operator = m[1]
       @operator = '' if @operator == '='

data/lib/semantic_range/pre_release.rb

@@ -60,5 +60,33 @@ module SemanticRange
         i += 1
       end
     end
+
+    def last_number_index
+      parts.rindex { |e| e.is_a? Fixnum }
+    end
+
+    def increment!(identifier = nil)
+      if empty?
+        zero!
+      else
+        if last_number_index
+          @parts[last_number_index] += 1
+        else
+          @parts << 0
+        end
+      end
+
+      if identifier
+        # 1.2.0-beta.1 bumps to 1.2.0-beta.2,
+        # 1.2.0-beta.fooblz or 1.2.0-beta bumps to 1.2.0-beta.0
+        if parts[0] == identifier
+          unless parts[1].kind_of?(Fixnum)
+            @parts = [identifier, 0]
+          end
+        else
+          @parts = [identifier, 0]
+        end
+      end
+    end
   end
 end

data/lib/semantic_range/range.rb

@@ -2,7 +2,7 @@ module SemanticRange
   class Range
     attr_reader :loose, :raw, :range, :set
 
-    def initialize(range, loose)
+    def initialize(range, loose = false)
       range = range.raw if range.is_a?(Range)
 
       @raw = range
@@ -10,9 +10,14 @@ module SemanticRange
       split = range.split(/\s*\|\|\s*/)
       split = ['', ''] if range == '||'
       split = [''] if split == []
-      @set = split.map {|range| parse_range(range.strip) }
 
-      raise 'Invalid SemVer Range: ' + range if @set.empty? || @set == [[]]
+      begin
+        @set = split.map {|range| parse_range(range.strip) }
+      rescue InvalidComparator
+        @set = []
+      end
+
+      raise InvalidRange.new(range) if @set.empty? || @set == [[]]
 
       format
     end
@@ -260,7 +265,7 @@ module SemanticRange
       elsif isX(tm)
         to = "<#{(tM.to_i + 1)}.0.0"
       elsif isX(tp)
-        to = "<#{tm}.#{(tm.to_i + 1)}.0"
+        to = "<#{tM}.#{(tm.to_i + 1)}.0"
       elsif tpr
         to = "<=#{tM}.#{tm}.#{tp}-#{tpr}"
       else

data/lib/semantic_range/version.rb

@@ -1,5 +1,5 @@
 module SemanticRange
-  VERSION = "0.2.0"
+  VERSION = "1.0.0"
 
   class Version
     attr_reader :major, :minor, :patch, :prerelease
@@ -10,9 +10,13 @@ module SemanticRange
 
       @raw = version.raw if version.is_a?(Version)
 
-      match = @raw.strip.match(loose ? LOOSE : FULL)
+      match = @raw.to_s.strip.match(loose ? LOOSE : FULL)
 
-      raise NoMatchFound.new(version) if match.nil?
+      raise InvalidVersion.new(version) if match.nil?
+
+      if String(version.to_s).length > MAX_LENGTH
+        raise InvalidVersion.new("#{version} is too long")
+      end
 
       @major = match[1] ? match[1].to_i : 0
       @minor = match[2] ? match[2].to_i : 0
@@ -140,35 +144,7 @@ module SemanticRange
         # This probably shouldn't be used publicly.
         # 1.0.0 "pre" would become 1.0.0-0 which is the wrong direction.
       when 'pre'
-        if @prerelease.empty?
-          @prerelease.zero!
-        else
-          parts = @prerelease.parts
-          i = parts.length
-          while i >= 0
-            if parts[i].is_a?(Fixnum)
-              parts[i] += 1
-              i = -2
-            else
-              i = i-1
-            end
-          end
-          if i == -1 # didn't increment anything
-            parts << 0
-          end
-          @prerelease = PreRelease.new(parts.join("."))
-        end
-        if identifier
-          # 1.2.0-beta.1 bumps to 1.2.0-beta.2,
-          # 1.2.0-beta.fooblz or 1.2.0-beta bumps to 1.2.0-beta.0
-          if @prerelease.parts[0] == identifier
-            unless @prerelease.parts[1].kind_of?(Fixnum)
-              @prerelease = PreRelease.new([identifier, 0].join('.'))
-            end
-          else
-            @prerelease = PreRelease.new([identifier, 0].join('.'))
-          end
-        end
+        @prerelease.increment!(identifier)
       else
         raise InvalidIncrement.new release
       end

data/semantic_range.gemspec

@@ -19,6 +19,6 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_development_dependency "bundler", "~> 1.10"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rspec"
+  spec.add_development_dependency "rake", "~> 10.4"
+  spec.add_development_dependency "rspec", "~> 3.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: semantic_range
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Andrew Nesbitt
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-11-17 00:00:00.000000000 Z
+date: 2015-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -30,28 +30,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '10.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '10.4'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.4'
 description: 
 email:
 - andrewnez@gmail.com