bundler-explain 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 71233be6dbcd5f33d7b78ba62fd540ab48ea6d678847f5e98c254f96771a13dd
-  data.tar.gz: 8178fbaf874bd939475a7f27fdbc0c5a61779d7a1f56867f9fd059ce7da800cf
+  metadata.gz: e8d63967f4fd9dd1648af8eeb3330127d2ecd62e9f68e9584083f4cf7ad3034d
+  data.tar.gz: b9ac527443c2b9da6fc5eedd8cff907bd7e3169b47c210349f0ae7d06000eb72
 SHA512:
-  metadata.gz: 6ccd871f7efa7dd3f4cf4539249fc3d5703332ad774d014004f49af062616c1b08425b996496ae6dab6969cee9be280e9fb94e1b40a7915923dddec0e5abd33f
-  data.tar.gz: f1800d2772a5683d0dcacd5d4c1c891cd1e6d3e12eaf9a1834035ac6c310d2ebf8875713730666d7de2dfc40037f3a477d9a0e7cf0f5399d97a63581e3668998
+  metadata.gz: 57ca6ba698a1c3d180cf0b726d1f8b0cb445ecb58595d417438298e751a82df3ec85079a7c1af2e1d7992bc3466fae7e92204c81bb5530bcfb6f702bd7996232
+  data.tar.gz: 1cbfaa3d30afbf3c16297922d93d0ef85cb01a7418b05a06c144b6dbff46c4e0328601ec37d461a1d0fe5bad6e995d430acf2b0ee8df5f987b1d6311e79c048f

data/README.md

@@ -56,6 +56,7 @@ determine the cause of the failure.
 ## Installation and Usage
 
 ```
+$ gem i pub_grub # Needs to be installed first
 $ bundler plugin install bundler-explain
 ```
 

data/bundler-explain.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "bundler", "~> 1.16"
-  spec.add_dependency "pub_grub", "~> 0.2.0"
+  spec.add_dependency "pub_grub", "~> 0.3.0"
 
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "minitest", "~> 5.0"

data/lib/bundler/explain/source.rb

@@ -17,12 +17,7 @@ module Bundler
         end
 
         @package_by_name = Hash.new do |h, name|
-          h[name] =
-            PubGrub::Package.new(name) do |package|
-              @specs_by_name[name].each do |spec_group|
-                package.add_version spec_group.version.to_s
-              end
-            end
+          h[name] = PubGrub::Package.new(name)
         end
 
         @deps_by_spec = Hash.new do |h, s|
@@ -32,13 +27,25 @@ module Bundler
         end
       end
 
-      def incompatibilities_for(version)
-        return enum_for(__method__, version) unless block_given?
+      def root_package
+        PubGrub::Package.root
+      end
+
+      def versions_for(package, range)
+        return [PubGrub::Package.root_version] if package == root_package
 
-        package = version.package
+        @specs_by_name[package.name].map do |spec_group|
+          spec_group.version
+        end.select do |version|
+          range.include?(version)
+        end
+      end
 
-        if version == PubGrub::Package.root_version
-          source_constraint = PubGrub::VersionConstraint.exact(version)
+      def incompatibilities_for(package, version)
+        return enum_for(__method__, package, version) unless block_given?
+
+        if package == root_package
+          source_constraint = PubGrub::VersionConstraint.exact(package, version)
           source_term = PubGrub::Term.new(source_constraint, true)
 
           @requirements.each do |dependency|
@@ -48,8 +55,8 @@ module Bundler
             yield PubGrub::Incompatibility.new([source_term, target_term], cause: :dependency)
           end
         else
-          specs = @specs_by_name[version.package.name]
-          spec = specs.detect { |s| s.version.to_s == version.name }
+          specs = @specs_by_name[package.name]
+          spec = specs.detect { |s| s.version == version }
           raise "can't find spec" unless spec
 
           @deps_by_spec[spec].each do |dep_name, dep_requirement|
@@ -92,7 +99,7 @@ module Bundler
         v = original_version
         s = original_version.segments
 
-        return [] unless s.length == 3
+        return [] unless s.length >= 3
 
         yield Gem::Requirement.new(">= #{s[0]}.#{s[1]}.a", "< #{v.release}")
         yield Gem::Requirement.new(["~> #{s[0]}.#{s[1]}.0"])
@@ -121,11 +128,10 @@ module Bundler
         if !low_spec && !high_spec
           PubGrub::VersionConstraint.any(package)
         elsif low_spec == high_spec
-          PubGrub::VersionConstraint.exact(package.version(low_version.to_s))
+          PubGrub::VersionConstraint.exact(package, low_version)
         else
-          low = ">= #{low_version}" if low_spec
-          high = "<= #{high_version}" if high_spec
-          PubGrub::VersionConstraint.new(package, [low, high].compact)
+          range = PubGrub::VersionRange.new(min: low_version, max: high_version, include_min: true)
+          PubGrub::VersionConstraint.new(package, range: range)
         end
       end
 
@@ -152,16 +158,13 @@ module Bundler
           break unless yield(sorted_list[low])
         end
 
-        [low && low + 1, high && high - 1]
+        [low && low + 1, high]
       end
 
       def constraint_for_dep(name, requirement)
         package = @package_by_name[name]
 
-        # This is awful. We should try to reuse Gem::Requirement
-        requirement = requirement.to_s.split(", ")
-
-        PubGrub::VersionConstraint.new(package, requirement)
+        PubGrub::RubyGems.requirement_to_constraint(package, requirement)
       end
     end
   end

data/lib/bundler/explain/version.rb

@@ -1,5 +1,5 @@
 module Bundler
   module Explain
-    VERSION = "0.1.0"
+    VERSION = "0.2.0"
   end
 end

data/test.rb

@@ -1,8 +1,8 @@
-$LOAD_PATH.unshift "./lib"
+$LOAD_PATH.unshift "#{__dir__}/lib"
+$LOAD_PATH.unshift "#{__dir__}/../pub_grub/lib"
 require 'bundler/explain'
 require 'pub_grub'
-
-ENV['DEBUG'] = 'true'
+require 'pub_grub/rubygems'
 
 Bundler.ui = Bundler::UI::Shell.new
 PubGrub.logger.level = Logger::DEBUG

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bundler-explain
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - John Hawthorn
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-08-15 00:00:00.000000000 Z
+date: 2018-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -109,7 +109,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Explains bundle update conflicts