pub_grub 0.5.0.alpha1 → 0.5.0.alpha2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 40eaa44c58fc07be35463658fd5e546ecb100c7a9f7222727f6139fcde705255
-  data.tar.gz: 46b6c0d957a206c2c31e7f600c752b3922faeba47c8e178b4be937871f539e59
+  metadata.gz: e5d938331a11c5c808f24935dbecaba4ddebf099c5b511fe9d4308eedbafcf9c
+  data.tar.gz: 1c728638783ac576a475b29269b05d486c049b0d4725dd5fd030f95045f61390
 SHA512:
-  metadata.gz: 3eb6abe0326f02d43cf493520df863c542037f151a993f258094353c06fe80a27f8b14122850d9f595690213394bfec45cd14a55bc74e6c320c29eb16d77fef6
-  data.tar.gz: e300cec6c86b56eec0fe94030ea1cf7b59c150789a1e8b0dce22851fbd0f0dfb3f2713a364d7238661926efd335b8a67c47680d00bad42ca2308333d3d98542a
+  metadata.gz: 4ec023a28a5981e6835d5f20cee1534c05b98494c0f97638e161049f18bd9e11ee353563f0b705b119af52c318da829fe2056c773db200c09db077e674ee22eb
+  data.tar.gz: 88f857cbe30f1e30426fa68be1d3d293ea269e05fac2fdbcdadc83d6c928b9c9e360322da55e2ba5d0ccf512659010260cbc713787b42a0d39541db2f83e8f4e

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    pub_grub (0.4.3)
+    pub_grub (0.5.0.alpha2)
 
 GEM
   remote: https://rubygems.org/
@@ -25,4 +25,4 @@ DEPENDENCIES
   stackprof (~> 0.2.12)
 
 BUNDLED WITH
-   1.16.4
+   1.17.3

data/lib/pub_grub/incompatibility.rb

@@ -22,6 +22,15 @@ module PubGrub
       end
     end
 
+    def hash
+      cause.hash ^ terms.hash
+    end
+
+    def eql?(other)
+      cause.eql?(other.cause) &&
+        terms.eql?(other.terms)
+    end
+
     def failure?
       terms.empty? || (terms.length == 1 && terms[0].package == Package.root && terms[0].positive?)
     end

data/lib/pub_grub/rubygems.rb

@@ -6,8 +6,9 @@ module PubGrub
       ranges = requirement.requirements.map do |(op, ver)|
         case op
         when "~>"
+          name = "~> #{ver}"
           bump = ver.class.new(ver.bump.to_s + ".A")
-          VersionRange.new(min: ver, max: bump, include_min: true)
+          VersionRange.new(name: name, min: ver, max: bump, include_min: true)
         when ">"
           VersionRange.new(min: ver)
         when ">="

data/lib/pub_grub/term.rb

@@ -18,6 +18,15 @@ module PubGrub
       end
     end
 
+    def hash
+      constraint.hash ^ positive.hash
+    end
+
+    def eql?(other)
+      positive == other.positive &&
+        constraint.eql?(other.constraint)
+    end
+
     def invert
       self.class.new(@constraint, !@positive)
     end

data/lib/pub_grub/version.rb

@@ -1,3 +1,3 @@
 module PubGrub
-  VERSION = "0.5.0.alpha1"
+  VERSION = "0.5.0.alpha2"
 end

data/lib/pub_grub/version_constraint.rb

@@ -11,6 +11,15 @@ module PubGrub
       @range = range
     end
 
+    def hash
+      package.hash ^ range.hash
+    end
+
+    def eql?(other)
+      package.eql?(other.package) &&
+        range.eql?(other.range)
+    end
+
     class << self
       def exact(package, version)
         range = VersionRange.new(min: version, max: version, include_min: true, include_max: true)

data/lib/pub_grub/version_range.rb

@@ -19,10 +19,18 @@ module PubGrub
         true
       end
 
+      def eql?
+        other.empty?
+      end
+
       def intersects?(_)
         false
       end
 
+      def intersect(other)
+        self
+      end
+
       def allows_all?(other)
         other.empty?
       end
@@ -35,8 +43,8 @@ module PubGrub
         false
       end
 
-      def constraints
-        ["(no versions)"]
+      def to_s
+        "(no versions)"
       end
 
       def ==(other)
@@ -52,27 +60,33 @@ module PubGrub
       end
     end
 
+    EMPTY = Empty.new
+
     def self.empty
-      Empty.new
+      EMPTY
     end
 
     def self.any
       new
     end
 
-    def initialize(min: nil, max: nil, include_min: false, include_max: false)
+    def initialize(min: nil, max: nil, include_min: false, include_max: false, name: nil)
       @min = min
       @max = max
       @include_min = include_min
       @include_max = include_max
+      @name = name
+    end
 
-      if min && max
-        if min > max
-          raise ArgumentError, "min version #{min} must be less than max #{max}"
-        elsif min == max && (!include_min || !include_max)
-          raise ArgumentError, "include_min and include_max must be true when min == max"
-        end
-      end
+    def hash
+      min.hash ^ max.hash ^ include_min.hash ^ include_max.hash
+    end
+
+    def eql?(other)
+      min.eql?(other.min) &&
+        max.eql?(other.max) &&
+        include_min.eql?(other.include_min) &&
+        include_max.eql?(other.include_max)
     end
 
     def ranges
@@ -173,7 +187,7 @@ module PubGrub
     alias_method :allows_any?, :intersects?
 
     def intersect(other)
-      return self.class.empty unless intersects?(other)
+      return other if other.empty?
       return other.intersect(self) if other.is_a?(VersionUnion)
 
       min_range =
@@ -208,7 +222,19 @@ module PubGrub
           end
         end
 
-      self.class.new(
+      if !min_range.equal?(max_range) && min_range.min && max_range.max
+        case min_range.min <=> max_range.max
+        when -1
+        when 0
+          if !min_range.include_min || !max_range.include_max
+            return EMPTY
+          end
+        when 1
+          return EMPTY
+        end
+      end
+
+      VersionRange.new(
         min: min_range.min,
         include_min: min_range.include_min,
         max: max_range.max,
@@ -255,7 +281,7 @@ module PubGrub
           end
         end
 
-      self.class.new(
+      VersionRange.new(
         min: min_range.min,
         include_min: min_range.include_min,
         max: max_range.max,
@@ -285,7 +311,7 @@ module PubGrub
       return true if other.empty?
 
       if other.is_a?(VersionUnion)
-        return other.ranges.all? { |r| allows_all?(r) }
+        return VersionUnion.new([self]).allows_all?(other)
       end
 
       return false if max && !other.max
@@ -314,21 +340,6 @@ module PubGrub
       true
     end
 
-    def constraints
-      return ["any"] if any?
-      return ["#{min}"] if min == max
-
-      # FIXME: remove this
-      if min && max && include_min && !include_max && min.respond_to?(:bump) && (min.bump.to_s + ".A") == max.to_s
-        return ["~> #{min}"]
-      end
-
-      c = []
-      c << "#{include_min ? ">=" : ">"} #{min}" if min
-      c << "#{include_max ? "<=" : "<"} #{max}" if max
-      c
-    end
-
     def any?
       !min && !max
     end
@@ -338,7 +349,7 @@ module PubGrub
     end
 
     def to_s
-      constraints.join(", ")
+      @name ||= constraints.join(", ")
     end
 
     def inspect
@@ -367,5 +378,18 @@ module PubGrub
         include_min == other.include_min &&
         include_max == other.include_max
     end
+
+    private
+
+    def constraints
+      return ["any"] if any?
+      return ["= #{min}"] if min == max
+
+      c = []
+      c << "#{include_min ? ">=" : ">"} #{min}" if min
+      c << "#{include_max ? "<=" : "<"} #{max}" if max
+      c
+    end
+
   end
 end

data/lib/pub_grub/version_solver.rb

@@ -16,6 +16,8 @@ module PubGrub
         h[k] = []
       end
 
+      @seen_incompatibilities = Set.new
+
       @solution = PartialSolution.new
 
       @package_depth = { root => 0 }
@@ -130,6 +132,12 @@ module PubGrub
       conflict = false
 
       source.incompatibilities_for(package, version).each do |incompatibility|
+        if @seen_incompatibilities.include?(incompatibility)
+          logger.debug { "knew: #{incompatibility}" }
+          next
+        end
+        @seen_incompatibilities.add(incompatibility)
+
         add_incompatibility incompatibility
 
         conflict ||= incompatibility.terms.all? do |term|

data/lib/pub_grub/version_union.rb

@@ -44,6 +44,14 @@ module PubGrub
       @ranges = ranges
     end
 
+    def hash
+      ranges.hash
+    end
+
+    def eql?(other)
+      ranges.eql?(other.ranges)
+    end
+
     def include?(version)
       !!ranges.bsearch {|r| r.compare_version(version) }
     end
@@ -79,12 +87,17 @@ module PubGrub
     alias_method :allows_any?, :intersects?
 
     def allows_all?(other)
-      other_ranges = other.ranges
+      my_ranges = ranges.dup
+
+      my_range = my_ranges.shift
 
-      other_ranges.all? do |other_range|
-        ranges.any? do |range|
-          range.allows_all?(other_range)
+      other.ranges.all? do |other_range|
+        while my_range
+          break if my_range.allows_all?(other_range)
+          my_range = my_ranges.shift
         end
+
+        !!my_range
       end
     end
 
@@ -97,10 +110,22 @@ module PubGrub
     end
 
     def intersect(other)
-      new_ranges = ranges.map{ |r| r.intersect(other) }
-      new_ranges = new_ranges.flat_map { |r| r.ranges }
-      new_ranges.reject!(&:empty?)
+      my_ranges = ranges.dup
+      other_ranges = other.ranges.dup
+      new_ranges = []
 
+      my_range = my_ranges.shift
+      other_range = other_ranges.shift
+      while my_range && other_range
+        new_ranges << my_range.intersect(other_range)
+
+        if !my_range.max || (other_range.max && other_range.max < my_range.max)
+          other_range = other_ranges.shift
+        else
+          my_range = my_ranges.shift
+        end
+      end
+      new_ranges.reject!(&:empty?)
       VersionUnion.union(new_ranges, normalize: false)
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pub_grub
 version: !ruby/object:Gem::Version
-  version: 0.5.0.alpha1
+  version: 0.5.0.alpha2
 platform: ruby
 authors:
 - John Hawthorn
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-01-04 00:00:00.000000000 Z
+date: 2019-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -135,7 +135,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: A version solver based on dart's PubGrub