pub_grub 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 90903e9ac8d79a7f74af0ef80ad36f53bd485e3c359369a861b609426b3146a9
-  data.tar.gz: 6d3e1d1f6989e4b22825eeed08bfd8476b138efd0d436ea2ab707391a2e759c3
+  metadata.gz: 5b0b0a89dd31b84300d59b3a6d5b051136d0658cb7046d49412b6ad4518eeb30
+  data.tar.gz: dabfb9a2e6b1d00657f41933b89b48909ce61683de37ca62601abfdaad0cc89c
 SHA512:
-  metadata.gz: 10d228e102328e2d112c79eaebd50b35e77667b290986ef36685081eb517101f68f741b489accbab9a46e8f5628b757924b57faf265d7a3913c38333eabb0088
-  data.tar.gz: 90dcf1cfe0921f95cef532d92affe813ac30bbef2c57e736cc706d55265a2fb4f42a6e4e0886c0b667c8d0f4f7a3e7f4f73c858436ff0c01295648479937632b
+  metadata.gz: 35b94b554e04473d65c9e81d6036b1dd76025901b86b2c06a2551e7b116e94b8da3e8a91dcbb9308f03b645eed32f2dac8d51ab484a6e34e5a360a62e382a459
+  data.tar.gz: 4b38762754fc5226f034d5659ee62ac46ff22107038ac421d2823f3d2a54f146586ee0c6f321c1e3618b07fe3565130827bfc0fd94b355bb537a4108dc23e0c4

data/.gitmodules

@@ -0,0 +1,3 @@
+[submodule "test/molinillo_integration_specs"]
+	path = test/fixtures/molinillo_integration_specs
+	url = https://github.com/CocoaPods/Resolver-Integration-Specs

data/.travis.yml

@@ -4,4 +4,5 @@ rvm:
   - 2.3
   - 2.4
   - 2.5
+  - 2.6
 before_install: gem install bundler -v 1.16.1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    pub_grub (0.4.1)
+    pub_grub (0.4.2)
 
 GEM
   remote: https://rubygems.org/

data/bin/console

@@ -2,6 +2,7 @@
 
 require "bundler/setup"
 require "pub_grub"
+require "pub_grub/rubygems"
 
 source =
   PubGrub::StaticPackageSource.new do |s|
@@ -11,11 +12,11 @@ source =
 
     s.add "bar", "2.0.0"
     s.add "bar", "1.0.0"
-  end
 
-foo = source.get_package("foo")
-bar = source.get_package("bar")
+    s.root deps: { "foo" => ">= 0" }
+  end
 
+root = PubGrub::Package.root
 solver = PubGrub::VersionSolver.new(source: source)
 
 require 'irb'

data/lib/pub_grub/basic_package_source.rb

@@ -79,6 +79,16 @@ module PubGrub
       dependencies_for(@root_package, @root_version)
     end
 
+    # Override me (maybe)
+    #
+    # If not overridden, the order returned by all_versions_for will be used
+    #
+    # Returns: Array of versions in preferred order
+    def sort_versions_by_preferred(package, sorted_versions)
+      indexes = @version_indexes[package]
+      sorted_versions.sort_by { |version| indexes[version] }
+    end
+
     def initialize
       @root_package = Package.root
       @root_version = Package.root_version
@@ -91,6 +101,7 @@ module PubGrub
         end
       end
       @sorted_versions = Hash.new { |h,k| h[k] = @cached_versions[k].sort }
+      @version_indexes = Hash.new { |h,k| h[k] = @cached_versions[k].each.with_index.to_h }
 
       @cached_dependencies = Hash.new do |packages, package|
         if package == @root_package
@@ -106,9 +117,8 @@ module PubGrub
     end
 
     def versions_for(package, range=VersionRange.any)
-      @cached_versions[package].select do |version|
-        range.include?(version)
-      end
+      versions = range.select_versions(@sorted_versions[package])
+      sort_versions_by_preferred(package, versions)
     end
 
     def incompatibilities_for(package, version)

data/lib/pub_grub/rubygems.rb

@@ -1,5 +1,3 @@
-require 'rubygems/requirement'
-
 module PubGrub
   module RubyGems
     extend self
@@ -8,16 +6,12 @@ module PubGrub
       ranges = requirement.requirements.map do |(op, ver)|
         case op
         when "~>"
-          # TODO: not sure this is correct for prereleases
-          VersionRange.new(min: ver, max: ver.bump, include_min: true)
+          bump = ver.class.new(ver.bump.to_s + ".A")
+          VersionRange.new(min: ver, max: bump, include_min: true)
         when ">"
           VersionRange.new(min: ver)
         when ">="
-          if ver == Gem::Version.new("0")
-            VersionRange.any
-          else
-            VersionRange.new(min: ver, include_min: true)
-          end
+          VersionRange.new(min: ver, include_min: true)
         when "<"
           VersionRange.new(max: ver)
         when "<="

data/lib/pub_grub/term.rb

@@ -26,9 +26,6 @@ module PubGrub
     def intersect(other)
       raise ArgumentError, "packages must match" if package != other.package
 
-      return self if relation(other) == :subset
-      return other if other.relation(self) == :subset
-
       if positive? && other.positive?
         self.class.new(constraint.intersect(other.constraint), true)
       elsif negative? && other.negative?

data/lib/pub_grub/version_range.rb

@@ -75,6 +75,10 @@ module PubGrub
       end
     end
 
+    def ranges
+      [self]
+    end
+
     def include?(version)
       compare_version(version) == 0
     end
@@ -315,7 +319,7 @@ module PubGrub
       return ["#{min}"] if min == max
 
       # FIXME: remove this
-      if min && max && include_min && !include_max && min.respond_to?(:bump) && min.bump == max
+      if min && max && include_min && !include_max && min.respond_to?(:bump) && (min.bump.to_s + ".A") == max.to_s
         return ["~> #{min}"]
       end
 

data/lib/pub_grub/version_solver.rb

@@ -39,6 +39,7 @@ module PubGrub
       if solved?
         logger.info { "Solution found after #{solution.attempted_solutions} attempts:" }
         solution.decisions.each do |package, version|
+          next if package == Package.root
           logger.info { "* #{package} #{version}" }
         end
 

data/lib/pub_grub/version_union.rb

@@ -6,11 +6,7 @@ module PubGrub
 
     def self.normalize_ranges(ranges)
       ranges = ranges.flat_map do |range|
-        if range.is_a?(VersionUnion)
-          range.ranges
-        else
-          [range]
-        end
+        range.ranges
       end
 
       ranges.reject!(&:empty?)
@@ -31,8 +27,8 @@ module PubGrub
       ranges
     end
 
-    def self.union(ranges)
-      ranges = normalize_ranges(ranges)
+    def self.union(ranges, normalize: true)
+      ranges = normalize_ranges(ranges) if normalize
 
       if ranges.size == 0
         VersionRange.empty
@@ -64,12 +60,7 @@ module PubGrub
 
     def intersects?(other)
       my_ranges = ranges.dup
-      other_ranges =
-        if other.instance_of?(VersionRange)
-          [other]
-        else
-          other.ranges.dup
-        end
+      other_ranges = other.ranges.dup
 
       my_range = my_ranges.shift
       other_range = other_ranges.shift
@@ -88,12 +79,7 @@ module PubGrub
     alias_method :allows_any?, :intersects?
 
     def allows_all?(other)
-      other_ranges =
-        if other.is_a?(VersionUnion)
-          other.ranges
-        else
-          [other]
-        end
+      other_ranges = other.ranges
 
       other_ranges.all? do |other_range|
         ranges.any? do |range|
@@ -112,7 +98,10 @@ module PubGrub
 
     def intersect(other)
       new_ranges = ranges.map{ |r| r.intersect(other) }
-      VersionUnion.union(new_ranges)
+      new_ranges = new_ranges.flat_map { |r| r.ranges }
+      new_ranges.reject!(&:empty?)
+
+      VersionUnion.union(new_ranges, normalize: false)
     end
 
     def invert

data/pub_grub.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "pub_grub"
-  spec.version       = "0.4.1"
+  spec.version       = "0.4.2"
   spec.authors       = ["John Hawthorn"]
   spec.email         = ["john@hawthorn.email"]
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pub_grub
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - John Hawthorn
@@ -88,6 +88,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".gitmodules"
 - ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
@@ -133,7 +134,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: A version solver based on dart's PubGrub