pub_grub 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 906d1263305a0df7b8082cf01fd1abb3ddbd92f294744b1d9131603396be31a1
-  data.tar.gz: 6566971cf3a8ed458d15d21233614351d12b407c3e056f3bc580b0efe810fef0
+  metadata.gz: 90903e9ac8d79a7f74af0ef80ad36f53bd485e3c359369a861b609426b3146a9
+  data.tar.gz: 6d3e1d1f6989e4b22825eeed08bfd8476b138efd0d436ea2ab707391a2e759c3
 SHA512:
-  metadata.gz: 2d793abfc4b0481e6a056f2355310c60e8450058f777754284e011369d2e420a14c37939a8631b3d1ae01ec3f7b1f7c4250234a245ba4b2b6d6d4fc4ea90a5ee
-  data.tar.gz: 526cc6588093a2ec82b44fdad8a2bf6c09f3520c02d1c9a248e11576ca80e6c2817dc8564573b95d8da637e29ea5bed80379632f176a8729bb7c4eecba227950
+  metadata.gz: 10d228e102328e2d112c79eaebd50b35e77667b290986ef36685081eb517101f68f741b489accbab9a46e8f5628b757924b57faf265d7a3913c38333eabb0088
+  data.tar.gz: 90dcf1cfe0921f95cef532d92affe813ac30bbef2c57e736cc706d55265a2fb4f42a6e4e0886c0b667c8d0f4f7a3e7f4f73c858436ff0c01295648479937632b

data/Gemfile.lock

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

data/lib/pub_grub/incompatibility.rb

@@ -18,7 +18,7 @@ module PubGrub
       @terms = cleanup_terms(terms)
 
       if cause == :dependency && @terms.length != 2
-        raise ArgumentError, "a dependency Incompatibility must have exactly two terms. Got #{terms.inspect}"
+        raise ArgumentError, "a dependency Incompatibility must have exactly two terms. Got #{@terms.inspect}"
       end
     end
 

data/lib/pub_grub/version_solver.rb

@@ -37,9 +37,9 @@ module PubGrub
       propagate(next_package)
 
       if solved?
-        logger.info "Solution found after #{solution.attempted_solutions} attempts:"
+        logger.info { "Solution found after #{solution.attempted_solutions} attempts:" }
         solution.decisions.each do |package, version|
-          logger.info "* #{package} #{version}"
+          logger.info { "* #{package} #{version}" }
         end
 
         false
@@ -92,7 +92,7 @@ module PubGrub
         return :conflict
       end
 
-      logger.debug("derived: #{unsatisfied.invert}")
+      logger.debug { "derived: #{unsatisfied.invert}" }
 
       solution.derive(unsatisfied.invert, incompatibility)
 
@@ -135,7 +135,7 @@ module PubGrub
       end
 
       unless conflict
-        logger.info("selecting #{package} #{version}")
+        logger.info { "selecting #{package} #{version}" }
 
         solution.decide(package, version)
       end
@@ -144,7 +144,7 @@ module PubGrub
     end
 
     def resolve_conflict(incompatibility)
-      logger.info "conflict: #{incompatibility}"
+      logger.info { "conflict: #{incompatibility}" }
 
       new_incompatibility = false
 
@@ -184,7 +184,7 @@ module PubGrub
         if previous_level < most_recent_satisfier.decision_level ||
             most_recent_satisfier.decision?
 
-          logger.info "backtracking to #{previous_level}"
+          logger.info { "backtracking to #{previous_level}" }
           solution.backtrack(previous_level)
 
           if new_incompatibility
@@ -208,16 +208,16 @@ module PubGrub
         new_incompatibility = true
 
         partially = difference ? " partially" : ""
-        logger.info "! #{most_recent_term} is#{partially} satisfied by #{most_recent_satisfier.term}"
-        logger.info "! which is caused by #{most_recent_satisfier.cause}"
-        logger.info "! thus #{incompatibility}"
+        logger.info { "! #{most_recent_term} is#{partially} satisfied by #{most_recent_satisfier.term}" }
+        logger.info { "! which is caused by #{most_recent_satisfier.cause}" }
+        logger.info { "! thus #{incompatibility}" }
       end
 
       raise SolveFailure.new(incompatibility)
     end
 
     def add_incompatibility(incompatibility)
-      logger.debug("fact: #{incompatibility}");
+      logger.debug { "fact: #{incompatibility}" }
       incompatibility.terms.each do |term|
         package = term.package
         @incompatibilities[package] << incompatibility

data/lib/pub_grub/version_union.rb

@@ -18,7 +18,7 @@ module PubGrub
       return [] if ranges.empty?
 
       mins, ranges = ranges.partition { |r| !r.min }
-      original_ranges = mins + ranges.sort_by { |r| [r.include_min ? 0 : 1, r.min] }
+      original_ranges = mins + ranges.sort_by { |r| [r.min, r.include_min ? 0 : 1] }
       ranges = [original_ranges.shift]
       original_ranges.each do |range|
         if ranges.last.contiguous_to?(range)
@@ -124,7 +124,28 @@ module PubGrub
     end
 
     def to_s
-      ranges.map(&:to_s).join(" OR ")
+      output = []
+
+      ranges = self.ranges.dup
+      while !ranges.empty?
+        ne = []
+        range = ranges.shift
+        while !ranges.empty? && ranges[0].min == range.max
+          ne << range.max
+          range = range.span(ranges.shift)
+        end
+
+        ne.map! {|x| "!= #{x}" }
+        if ne.empty?
+          output << range.to_s
+        elsif range.any?
+          output << ne.join(', ')
+        else
+          output << "#{range}, #{ne.join(', ')}"
+        end
+      end
+
+      output.join(" OR ")
     end
 
     def inspect

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.0"
+  spec.version       = "0.4.1"
   spec.authors       = ["John Hawthorn"]
   spec.email         = ["john@hawthorn.email"]
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pub_grub
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - John Hawthorn
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-12-28 00:00:00.000000000 Z
+date: 2018-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler