matching_bundle 0.3.0 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 30269020c86fa6f75cb9f79d2dc1bc1aedffc0825f1e847e31910226d173b0ba
-  data.tar.gz: 2ccdaa16e32999bd55be285cb831f6430848970e1c6ceef7a1049101fa8364f4
+  metadata.gz: 705bb25abef68815226829e668898018d40da2b472e84e6afb462e07c0634350
+  data.tar.gz: 848dad272c218c10632b87459ecfb7f96ede0888e602d4b119e9df8c5140da87
 SHA512:
-  metadata.gz: 40a048bb2e8e6b7d8b05346a03d7d6eed6f7c2ad636e845e2b919f99286793661e7fd83626b9048eeeab7cadb2810c78cf40e26c9a47816abdd86357a8f494ad
-  data.tar.gz: 7f9afbb816f26e7a10be12bd953453b15f93c36999e95e7b536a4c5d43937593c0811a90d70f35e82e08e81e46a915bfcdcea1261f8ad5dbb2da89293aa5853e
+  metadata.gz: c70324b3b09871d77c1d392201bccae47408ddfb382a005c6f2814a4ee578e26478a5518c89fff3d4f60204cafa3494edc40cd2eacf146562c945783beb94166
+  data.tar.gz: ac6d9184aa5630526c4a966fb401393a096c2ad77a5e91681cd95671983a82af9eab38ae1d5bb1a5ff49eaa8e975dc86848fc9c0f7dd6edcb7ff0482a5bfbb00

data/bin/matching_bundle

@@ -18,6 +18,13 @@ else
 end
 
 require 'matching_bundle'
+# require_relative '../lib/matching_bundle' # use this for local debugging
 if version = MatchingBundle.find_or_install_matching_version(content)
-  exec "bundle", "_#{version}_", *ARGV
+  # some gem/ruby combinations do not support `bundle _1.2.3_` and exists with 0
+  if `bundle _#{version}_ --version 2>&1`.include?("Could not find command")
+    warn "Unable to use _#{version}_, falling back to default version"
+  else
+    exec "bundle", "_#{version}_", *ARGV
+  end
 end
+exec "bundle", *ARGV

data/lib/matching_bundle.rb

@@ -5,14 +5,18 @@ require 'json'
 module MatchingBundle
   class << self
     def find_or_install_matching_version(gemfile_content)
-      return unless requirement = bundler_requirement(gemfile_content)
+      requirements = bundler_requirements(gemfile_content)
+      return if requirements.empty? # just use whatever
 
-      if version = find_matching_local_bundler_version(requirement)
-        warn "Found bundler #{version}"
+      if version = find_matching_local_bundler_version(requirements)
+        warn "Using installed bundler #{version}"
         return version
       end
 
-      return unless version = find_matching_remote_bundler_version(requirement)
+      unless version = find_matching_remote_bundler_version(requirements)
+        warn "No remote version of bundler satisfies #{requirements.join(", ")}"
+        return
+      end
 
       warn "Installing bundler #{version}"
       abort unless system "gem", "install", "bundler", "-v", version
@@ -21,21 +25,22 @@ module MatchingBundle
 
     private
 
-    def find_matching_remote_bundler_version(requirement)
+    def find_matching_remote_bundler_version(requirements)
       json = open('https://rubygems.org/api/v1/versions/bundler.json').read
       versions = JSON.load(json).map { |v| v["number"] }
-      find_satisfied(requirement, versions)
+      find_satisfied(requirements, versions)
     end
 
-    def find_matching_local_bundler_version(requirement)
-      find_satisfied(requirement, installed_bundler_versions)
+    def find_matching_local_bundler_version(requirements)
+      find_satisfied(requirements, installed_bundler_versions)
     end
 
-    def find_satisfied(requirement, versions)
-      requirement = Gem::Requirement.new(requirement)
-      versions.find do |version|
-        requirement.satisfied_by? Gem::Version.new(version)
+    def find_satisfied(requirements, versions)
+      requirement = Gem::Requirement.new(*requirements)
+      version = versions.map { |v| Gem::Version.new(v) }.sort!.reverse!.find do |version|
+        requirement.satisfied_by? version
       end
+      version.to_s if version
     end
 
     def installed_bundler_versions
@@ -44,10 +49,19 @@ module MatchingBundle
         map { |spec| spec.version.to_s }
     end
 
-    def bundler_requirement(gemfile_content)
-      found = gemfile_content.scan(/^\s*bundler \((.*)\)/)
-      versions = found.map(&:last)
-      versions.grep(/^=\s*\d/).first || versions.first
+    def bundler_requirements(gemfile_content)
+      requirements =
+        gemfile_content.
+          split("Current Bundler version").first.to_s.
+          scan(/^\s*bundler \((.*)\)/).flatten.
+          flat_map { |r| r.split(", ") }
+
+      # saw 2.2.16 fail on 2.2.3 ... so we need exact match
+      if gemfile_content =~ /BUNDLED WITH\n\s+(.*)/
+        requirements << "= #{$1}"
+      end
+
+      requirements
     end
   end
 end

data/lib/matching_bundle/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module MatchingBundle
-  VERSION = "0.3.0"
+  VERSION = "0.3.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: matching_bundle
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.5
 platform: ruby
 authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-01 00:00:00.000000000 Z
+date: 2021-04-18 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: michael@grosser.it
@@ -40,8 +40,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.2.16
 signing_key: 
 specification_version: 4
 summary: Find a matching bundler version for a Gemfile and use it