semantic_range 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 40689a4a60d1676915d3c80166fa016fed599e9e
-  data.tar.gz: a6797c03b699280fbb46196f83b6b9d29de102e3
+  metadata.gz: 713091878f31485514b30d0ab9e9f7281576a260
+  data.tar.gz: 0f6bf36a44b5e9b4a6e61c5e3f42dbd4aeb2f60c
 SHA512:
-  metadata.gz: 227c788ef4eab62cb0458ce01d21d31e392f17d5b5eba966d9269cd14d2e8a669d5d9df99d9afad7da4c08525f10729768a13a45ee22e6d5ed30f7af68db2da1
-  data.tar.gz: 8de84d61c1823fddc13d53ce579e5838289675c7e3f8cac392ab9ea479bdc25b16dd7d79a445e0f956be1ecb94f035ca97e074b1a4e530bf45f55c6aa33682bb
+  metadata.gz: 201e862b74b02896c79356d61ee4128ae31b35d7ebbd2e2548d028d0fe2294389bcb5b699fdf0e0e70630db19cc21b8f45c535ada00f3ab2bda9111f90c409aa
+  data.tar.gz: 1c16363476186d8d54f0d2c229f805f962af5afd43eb3cd4de8c7cc954c858b85c08612289d6fc621843124f23280d6c0e9af2d97c8d81a6c0a35ff58f197ca1

data/lib/semantic_range/comparator.rb

@@ -1,41 +1,22 @@
 module SemanticRange
   class Comparator
+    attr_reader :semver, :operator, :value
     def initialize(comp, loose)
-      @loose = loose
-
       if comp.is_a?(Comparator)
-        if comp.loose == loose
-          return comp
-        else
-          @comp = comp.value
-        end
+        return comp if comp.loose == loose
+        @comp = comp.value
       end
 
+      @loose = loose
       parse(comp)
 
-      if @semver == ANY
-        @value = ''
-      else
-        @value = @operator + @semver.version
-      end
-    end
-
-    def semver
-      @semver
-    end
-
-    def operator
-      @operator
+      @value = @semver == ANY ? '' : @operator + @semver.version
     end
 
     def to_s
       @value
     end
 
-    def value
-      @value
-    end
-
     def test(version)
       return true if @semver == ANY
       version = Version.new(version, @loose) if version.is_a?(String)
@@ -44,16 +25,12 @@ module SemanticRange
 
     def parse(comp)
       m = comp.match(@loose ? COMPARATORLOOSE : COMPARATOR)
-      raise 'Invalid comparator: ' + comp unless m
+      raise "Invalid comparator: #{comp}" unless m
 
       @operator = m[1]
       @operator = '' if @operator == '='
 
-      if !m[2]
-        @semver = ANY
-      else
-        @semver = Version.new(m[2], @loose)
-      end
+      @semver = !m[2] ? ANY : Version.new(m[2], @loose)
     end
   end
 end

data/lib/semantic_range/pre_release.rb

@@ -0,0 +1,64 @@
+module SemanticRange
+  class PreRelease
+    attr_reader :parts
+
+    def initialize(input)
+      @parts = parse(input)
+    end
+
+    def parse(str)
+      str.to_s.split('.').map { |id| convert(id) }
+    end
+
+    def convert(str)
+      str.match(/^[0-9]+$/) ? str.to_i : str
+    end
+
+    def length
+      parts.length
+    end
+
+    def empty?
+      parts.empty?
+    end
+
+    def to_s
+      parts.join '.'
+    end
+
+    def clear!
+      @parts = []
+    end
+
+    def zero!
+      @parts = [0]
+    end
+
+    def <=>(other)
+      return unless other.is_a?(self.class)
+
+      return -1 if parts.any? && !other.parts.any?
+      return 1 if !parts.any? && other.parts.any?
+      return 0 if !parts.any? && !other.parts.any?
+
+      i = 0
+      while true
+        a = parts[i]
+        b = other.parts[i]
+
+        if a.nil? && b.nil?
+          return 0
+        elsif b.nil?
+          return 1
+        elsif a.nil?
+          return -1
+        elsif a == b
+
+        else
+          return Version.compare_identifiers(a, b)
+        end
+        i += 1
+      end
+    end
+  end
+end

data/lib/semantic_range/range.rb

@@ -1,5 +1,7 @@
 module SemanticRange
   class Range
+    attr_reader :loose, :raw, :range, :set
+
     def initialize(range, loose)
       range = range.raw if range.is_a?(Range)
 
@@ -8,27 +10,13 @@ module SemanticRange
       split = range.split(/\s*\|\|\s*/)
       split = ['', ''] if range == '||'
       split = [''] if split == []
-      @set = split.map do |range|
-        parse_range(range.strip)
-      end
+      @set = split.map {|range| parse_range(range.strip) }
 
-      raise 'Invalid SemVer Range: ' + range if @set.empty?
+      raise 'Invalid SemVer Range: ' + range if @set.empty? || @set == [[]]
 
       format
     end
 
-    def loose
-      @loose
-    end
-
-    def raw
-      @raw
-    end
-
-    def range
-      @range
-    end
-
     def format
       @range = @set.map do |comps|
         comps.join(' ').strip
@@ -36,23 +24,14 @@ module SemanticRange
       @range
     end
 
-    def set
-      @set
-    end
-
     def test(version)
       return false if !version
       version = Version.new(version, @loose) if version.is_a?(String)
-      @set.each do |s|
-        return true if test_set(s, version)
-      end
-      false
+      @set.any?{|s| test_set(s, version) }
     end
 
     def test_set(set, version)
-      set.each do |comp|
-        return false if !comp.test(version)
-      end
+      return false if set.any? {|comp| !comp.test(version) }
       if version.prerelease.length > 0
         set.each do |comp|
           next if comp.semver == ANY
@@ -119,14 +98,14 @@ module SemanticRange
         pr = match[4]
 
         if isX(mj)
-          ret = ''
+          ''
         elsif isX(m)
-          ret = ">=#{mj}.0.0 <#{(mj.to_i + 1)}.0.0"
+          ">=#{mj}.0.0 <#{(mj.to_i + 1)}.0.0"
         elsif isX(p)
           if mj == '0'
-            ret = ">=#{mj}.#{m}.0 <#{mj}.#{(m.to_i + 1)}.0"
+            ">=#{mj}.#{m}.0 <#{mj}.#{(m.to_i + 1)}.0"
           else
-            ret = ">=#{mj}.#{m}.0 <#{(mj.to_i + 1)}.0.0"
+            ">=#{mj}.#{m}.0 <#{(mj.to_i + 1)}.0.0"
           end
         elsif pr
           if pr[0] != '-'
@@ -134,25 +113,24 @@ module SemanticRange
           end
           if mj == '0'
             if m == '0'
-              ret = ">=#{mj}.#{m}.#{p}#{pr} <#{mj}.#{m}.#{(p.to_i + 1)}"
+              ">=#{mj}.#{m}.#{p}#{pr} <#{mj}.#{m}.#{(p.to_i + 1)}"
             else
-              ret = ">=#{mj}.#{m}.#{p}#{pr} <#{mj}.#{(m.to_i + 1)}.0"
+              ">=#{mj}.#{m}.#{p}#{pr} <#{mj}.#{(m.to_i + 1)}.0"
             end
           else
-            ret = ">=#{mj}.#{m}.#{p}#{pr} <#{(mj.to_i + 1)}.0.0"
+            ">=#{mj}.#{m}.#{p}#{pr} <#{(mj.to_i + 1)}.0.0"
           end
         else
           if mj == '0'
             if m == '0'
-              ret = ">=#{mj}.#{m}.#{p} <#{mj}.#{m}.#{(p.to_i + 1)}"
+              ">=#{mj}.#{m}.#{p} <#{mj}.#{m}.#{(p.to_i + 1)}"
             else
-              ret = ">=#{mj}.#{m}.#{p} <#{mj}.#{(m.to_i + 1)}.0"
+              ">=#{mj}.#{m}.#{p} <#{mj}.#{(m.to_i + 1)}.0"
             end
           else
-            ret = ">=#{mj}.#{m}.#{p} <#{(mj.to_i + 1)}.0.0"
+            ">=#{mj}.#{m}.#{p} <#{(mj.to_i + 1)}.0.0"
           end
         end
-        ret
       end
     end
 
@@ -171,18 +149,17 @@ module SemanticRange
         pr = match[4]
 
         if isX(mj)
-          ret = ''
+          ''
         elsif isX(m)
-          ret = ">=#{mj}.0.0 <#{(mj.to_i + 1)}.0.0"
+          ">=#{mj}.0.0 <#{(mj.to_i + 1)}.0.0"
         elsif isX(p)
-          ret = ">=#{mj}.#{m}.0 <#{mj}.#{(m.to_i + 1)}.0"
+          ">=#{mj}.#{m}.0 <#{mj}.#{(m.to_i + 1)}.0"
         elsif pr
           pr = '-' + pr if (pr[0] != '-')
-          ret = ">=#{mj}.#{m}.#{p}#{pr} <#{mj}.#{(m.to_i + 1)}.0"
+          ">=#{mj}.#{m}.#{p}#{pr} <#{mj}.#{(m.to_i + 1)}.0"
         else
-          ret = ">=#{mj}.#{m}.#{p} <#{mj}.#{(m.to_i + 1)}.0"
+          ">=#{mj}.#{m}.#{p} <#{mj}.#{(m.to_i + 1)}.0"
         end
-        ret
       end
     end
 
@@ -212,9 +189,9 @@ module SemanticRange
 
         if xM
           if gtlt == '>' || gtlt == '<'
-            ret = '<0.0.0'
+            '<0.0.0'
           else
-            ret = '*'
+            '*'
           end
         elsif !gtlt.nil? && gtlt != '' && anyX
           m = 0 if xm
@@ -239,14 +216,14 @@ module SemanticRange
             end
           end
 
-          ret = "#{gtlt}#{mj}.#{m}.#{p}"
+          "#{gtlt}#{mj}.#{m}.#{p}"
         elsif xm
-          ret = ">=#{mj}.0.0 <#{(mj.to_i + 1)}.0.0"
+          ">=#{mj}.0.0 <#{(mj.to_i + 1)}.0.0"
         elsif xp
-          ret = ">=#{mj}.#{m}.0 <#{mj}.#{(m.to_i + 1)}.0"
+          ">=#{mj}.#{m}.0 <#{mj}.#{(m.to_i + 1)}.0"
+        else
+          ret
         end
-
-        ret
       end
     end
 

data/lib/semantic_range/version.rb

@@ -1,77 +1,45 @@
 module SemanticRange
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
 
   class Version
-    def initialize(version, loose)
+    attr_reader :major, :minor, :patch, :prerelease
+
+    def initialize(version, loose = false)
       @raw = version
       @loose = loose
 
-      if version.is_a?(Version)
-        @raw = version = version.raw
-      end
+      @raw = version.raw if version.is_a?(Version)
 
-      match = version.strip.match(loose ? LOOSE : FULL)
-      # TODO error handling
+      match = @raw.strip.match(loose ? LOOSE : FULL)
+
+      raise NoMatchFound.new(version) if match.nil?
 
       @major = match[1] ? match[1].to_i : 0
       @minor = match[2] ? match[2].to_i : 0
       @patch = match[3] ? match[3].to_i : 0
 
-      # TODO error handling
-
-      if !match[4]
-        @prerelease = []
-      else
-        @prerelease = match[4].split('.').map do |id|
-          if /^[0-9]+$/.match(id)
-            num = id.to_i
-            # TODO error handling
-          else
-            id
-          end
-        end
-      end
+      @prerelease = PreRelease.new match[4]
 
       @build = match[5] ? match[5].split('.') : []
-      @version = format
-    end
-
-    def version
-      @version
-    end
-
-    def raw
-      @raw
-    end
-
-    def major
-      @major
-    end
-
-    def minor
-      @minor
-    end
-
-    def patch
-      @patch
-    end
-
-    def prerelease
-      @prerelease
     end
 
     def format
       v = "#{@major}.#{@minor}.#{@patch}"
-      if @prerelease.length > 0
-        v += '-' + @prerelease.join('.')
-      end
-      v
+      prerelease.length > 0 ? "#{v}-#{prerelease}" : v
     end
 
     def to_s
       @version
     end
 
+    def version
+      format
+    end
+
+    def raw
+      version
+    end
+
     def compare(other)
       other = Version.new(other, @loose) unless other.is_a?(Version)
       res = truthy(compare_main(other)) || truthy(compare_pre(other))
@@ -80,7 +48,9 @@ module SemanticRange
 
     def compare_main(other)
       other = Version.new(other, @loose) unless other.is_a?(Version)
-      truthy(compare_identifiers(@major, other.major)) || truthy(compare_identifiers(@minor, other.minor)) || truthy(compare_identifiers(@patch, other.patch))
+      truthy(self.class.compare_identifiers(@major, other.major)) ||
+      truthy(self.class.compare_identifiers(@minor, other.minor)) ||
+      truthy(self.class.compare_identifiers(@patch, other.patch))
     end
 
     def truthy(val)
@@ -89,35 +59,10 @@ module SemanticRange
     end
 
     def compare_pre(other)
-      other = Version.new(other, @loose) unless other.is_a?(Version)
-
-      return -1 if truthy(@prerelease.length) && !truthy(other.prerelease.length)
-
-      return 1 if !truthy(@prerelease.length) && truthy(other.prerelease.length)
-
-      return 0 if !truthy(@prerelease.length) && !truthy(other.prerelease.length)
-
-      i = 0
-      while true
-        a = @prerelease[i]
-        b = other.prerelease[i]
-
-        if a.nil? && b.nil?
-          return 0
-        elsif b.nil?
-          return 1
-        elsif a.nil?
-          return -1
-        elsif a == b
-
-        else
-          return compare_identifiers(a, b)
-        end
-        i += 1
-      end
+      prerelease <=> other.prerelease
     end
 
-    def compare_identifiers(a,b)
+    def self.compare_identifiers(a,b)
       anum = /^[0-9]+$/.match(a.to_s)
       bnum = /^[0-9]+$/.match(b.to_s)
 
@@ -132,5 +77,103 @@ module SemanticRange
              a > b ? 1 :
              0;
     end
+
+    def increment!(release, identifier)
+      case release
+      when 'premajor'
+        @prerelease.clear!
+        @patch = 0
+        @minor = 0
+        @major = @major + 1
+        increment! 'pre', identifier
+      when 'preminor'
+        @prerelease.clear!
+        @patch = 0
+        @minor = @minor + 1
+        increment! 'pre', identifier
+      when 'prepatch'
+        # If this is already a prerelease, it will bump to the next version
+        # drop any prereleases that might already exist, since they are not
+        # relevant at this point.
+        @prerelease.clear!
+        increment! 'patch', identifier
+        increment! 'pre', identifier
+
+        # If the input is a non-prerelease version, this acts the same as
+        # prepatch.
+      when 'prerelease'
+        if @prerelease.empty?
+          increment! 'patch', identifier
+        end
+        increment! 'pre', identifier
+      when 'major'
+        # If this is a pre-major version, bump up to the same major version.
+        # Otherwise increment major.
+        # 1.0.0-5 bumps to 1.0.0
+        # 1.1.0 bumps to 2.0.0
+        if @minor != 0 || @patch != 0 || @prerelease.empty?
+          @major = @major + 1
+        end
+        @minor = 0
+        @patch = 0
+        @prerelease.clear!
+      when 'minor'
+        # If this is a pre-minor version, bump up to the same minor version.
+        # Otherwise increment minor.
+        # 1.2.0-5 bumps to 1.2.0
+        # 1.2.1 bumps to 1.3.0
+        if @patch != 0 || @prerelease.empty?
+          @minor = @minor + 1
+        end
+        @patch = 0
+        @prerelease.clear!
+      when 'patch'
+        # If this is not a pre-release version, it will increment the patch.
+        # If it is a pre-release it will bump up to the same patch version.
+        # 1.2.0-5 patches to 1.2.0
+        # 1.2.0 patches to 1.2.1
+        if @prerelease.empty?
+          @patch = @patch + 1
+        end
+        @prerelease.clear!
+
+        # 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
+      else
+        raise InvalidIncrement.new release
+      end
+
+      self
+    end
   end
 end

data/lib/semantic_range.rb

@@ -1,4 +1,5 @@
 require "semantic_range/version"
+require "semantic_range/pre_release"
 require "semantic_range/range"
 require "semantic_range/comparator"
 
@@ -44,6 +45,9 @@ module SemanticRange
 
   MAX_LENGTH = 256
 
+  class InvalidIncrement < StandardError; end
+  class NoMatchFound < StandardError; end
+
   def self.ltr(version, range, loose = false)
     outside(version, range, '<', loose)
   end
@@ -143,6 +147,7 @@ module SemanticRange
   end
 
   def self.satisfies(version, range, loose = false)
+    return false if !valid_range(range, loose)
     Range.new(range, loose).test(version)
   end
 
@@ -232,4 +237,26 @@ module SemanticRange
       nil
     end
   end
+
+  def self.increment!(version, release, loose, identifier)
+    if loose.is_a? String
+      identifier = loose
+      loose = false
+    end
+
+    Version.new(version, loose).increment!(release, identifier).version
+  rescue InvalidIncrement, NoMatchFound
+    nil
+  end
+
+  def self.diff(a, b)
+    a = Version.new(a, false) unless a.kind_of?(Version)
+    b = Version.new(b, false) unless b.kind_of?(Version)
+    pre_diff = a.prerelease.to_s != b.prerelease.to_s
+    pre = pre_diff ? 'pre' : ''
+    return "#{pre}major" if a.major != b.major
+    return "#{pre}minor" if a.minor != b.minor
+    return "#{pre}patch" if a.patch != b.patch
+    return "prerelease"  if pre_diff
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: semantic_range
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Andrew Nesbitt
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-11-13 00:00:00.000000000 Z
+date: 2015-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -72,6 +72,7 @@ files:
 - bin/setup
 - lib/semantic_range.rb
 - lib/semantic_range/comparator.rb
+- lib/semantic_range/pre_release.rb
 - lib/semantic_range/range.rb
 - lib/semantic_range/version.rb
 - semantic_range.gemspec