matching_bundle 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 75b42c65b3ed9d76d2d79994f218157b871f23011063c4b438f485770427077d
-  data.tar.gz: bdecd14f3a4058096179c85512b81b500619b6daaf4efa18701271f237562265
+  metadata.gz: 9ca9513c79ddc3fc104126b26a8f1e9eef50e4181fad32f99547a4b618d61533
+  data.tar.gz: 20d63f0558de27171f15b5aec36994fc32c1a9f092ecc4087c611c693597b592
 SHA512:
-  metadata.gz: 8653da4c7b788a4377371f88c57791016b937675088efbcf1f637d8de5d3b06c221a8668e7e29d7f0496be79fd5fbcfeae42fcc64637a904258a7cf844f76a47
-  data.tar.gz: 5bb8216afc6bc1a67dd718053933aac8bdc242baf97f8376ffbf075b32da6bfca1ad68c0df4c0da5ce1c602cfd8150c34ea81b1d8bb5950520326d94d7fb358d
+  metadata.gz: 2c5fa45b739754e5ee18630c91311fb8fd4f52e9ad83878e2135cb87809df03af2017a4d092f34999202272b0fd8dcd33ccd43f8e3c585e0801d062d4674e1e9
+  data.tar.gz: 8cb59d7948788bed17a7350e92ed28c5863125045d8930df1636898ef3abf55d4c78183007324ddbbd1d3351bdeeb5fa2c0e036325af0d69df77508867e58e24

data/bin/matching_bundle

@@ -18,6 +18,9 @@ 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
+else
+  exec "bundle", *ARGV
 end

data/lib/matching_bundle.rb

@@ -6,14 +6,17 @@ module MatchingBundle
   class << self
     def find_or_install_matching_version(gemfile_content)
       requirements = bundler_requirements(gemfile_content)
-      return if requirements.empty?
+      return if requirements.empty? # just use whatever
 
       if version = find_matching_local_bundler_version(requirements)
-        warn "Found bundler #{version}"
+        warn "Using installed bundler #{version}"
         return version
       end
 
-      return unless version = find_matching_remote_bundler_version(requirements)
+      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
@@ -34,9 +37,10 @@ module MatchingBundle
 
     def find_satisfied(requirements, versions)
       requirement = Gem::Requirement.new(*requirements)
-      versions.reverse.find do |version|
-        requirement.satisfied_by? Gem::Version.new(version)
+      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
@@ -46,11 +50,18 @@ module MatchingBundle
     end
 
     def bundler_requirements(gemfile_content)
-      gemfile_content.
-        split("DEPENDENCIES").last.to_s.
-        split("Current Bundler version").first.to_s.
-        scan(/^\s*bundler \((.*)\)/).flatten.
-        flat_map { |r| r.split(", ") }
+      requirements =
+        gemfile_content.
+          split("Current Bundler version").first.to_s.
+          scan(/^\s*bundler \((.*)\)/).flatten.
+          flat_map { |r| r.split(", ") }
+
+      # needs to be >= to avoid warnings and the same major version to not fail
+      if gemfile_content =~ /BUNDLED WITH\n\s+(.*)/
+        requirements += [">= #{$1}", "~> #{$1[/\d+\.\d+/]}"]
+      end
+
+      requirements
     end
   end
 end

data/lib/matching_bundle/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: matching_bundle
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-01 00:00:00.000000000 Z
+date: 2019-06-02 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.0.3
 signing_key: 
 specification_version: 4
 summary: Find a matching bundler version for a Gemfile and use it