matching_bundle 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 30269020c86fa6f75cb9f79d2dc1bc1aedffc0825f1e847e31910226d173b0ba
-  data.tar.gz: 2ccdaa16e32999bd55be285cb831f6430848970e1c6ceef7a1049101fa8364f4
+  metadata.gz: 75b42c65b3ed9d76d2d79994f218157b871f23011063c4b438f485770427077d
+  data.tar.gz: bdecd14f3a4058096179c85512b81b500619b6daaf4efa18701271f237562265
 SHA512:
-  metadata.gz: 40a048bb2e8e6b7d8b05346a03d7d6eed6f7c2ad636e845e2b919f99286793661e7fd83626b9048eeeab7cadb2810c78cf40e26c9a47816abdd86357a8f494ad
-  data.tar.gz: 7f9afbb816f26e7a10be12bd953453b15f93c36999e95e7b536a4c5d43937593c0811a90d70f35e82e08e81e46a915bfcdcea1261f8ad5dbb2da89293aa5853e
+  metadata.gz: 8653da4c7b788a4377371f88c57791016b937675088efbcf1f637d8de5d3b06c221a8668e7e29d7f0496be79fd5fbcfeae42fcc64637a904258a7cf844f76a47
+  data.tar.gz: 5bb8216afc6bc1a67dd718053933aac8bdc242baf97f8376ffbf075b32da6bfca1ad68c0df4c0da5ce1c602cfd8150c34ea81b1d8bb5950520326d94d7fb358d

data/lib/matching_bundle/version.rb

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

data/lib/matching_bundle.rb

@@ -5,14 +5,15 @@ 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?
 
-      if version = find_matching_local_bundler_version(requirement)
+      if version = find_matching_local_bundler_version(requirements)
         warn "Found bundler #{version}"
         return version
       end
 
-      return unless version = find_matching_remote_bundler_version(requirement)
+      return unless version = find_matching_remote_bundler_version(requirements)
 
       warn "Installing bundler #{version}"
       abort unless system "gem", "install", "bundler", "-v", version
@@ -21,19 +22,19 @@ 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|
+    def find_satisfied(requirements, versions)
+      requirement = Gem::Requirement.new(*requirements)
+      versions.reverse.find do |version|
         requirement.satisfied_by? Gem::Version.new(version)
       end
     end
@@ -44,10 +45,12 @@ 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)
+      gemfile_content.
+        split("DEPENDENCIES").last.to_s.
+        split("Current Bundler version").first.to_s.
+        scan(/^\s*bundler \((.*)\)/).flatten.
+        flat_map { |r| r.split(", ") }
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: matching_bundle
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Michael Grosser