matching_bundle 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ee7ae4447cd671e2fd003ec60d24737a5d650caa805c493af0e600d45836b193
-  data.tar.gz: fb7c70f0103e317cf84747626e1fb452a3a2bdcea9ee16823c0dc655efe122cb
+  metadata.gz: 30269020c86fa6f75cb9f79d2dc1bc1aedffc0825f1e847e31910226d173b0ba
+  data.tar.gz: 2ccdaa16e32999bd55be285cb831f6430848970e1c6ceef7a1049101fa8364f4
 SHA512:
-  metadata.gz: 6d5a4ba494cb2004fec6f419aac66fd9404cce23be8bafe99c66914a4f4338395b6a00a7188c3ed49630e8aa810c4ac1ca649bf6ef136839aaa306ad5522f739
-  data.tar.gz: 9d5d6d22b7ee375dedeb4258958d1c06394f53f621b44e83496b1f1dc29e8b59447cc35d89d958bc9b01993ba8ef27cf53892c63db6b57a676e05215282a5815
+  metadata.gz: 40a048bb2e8e6b7d8b05346a03d7d6eed6f7c2ad636e845e2b919f99286793661e7fd83626b9048eeeab7cadb2810c78cf40e26c9a47816abdd86357a8f494ad
+  data.tar.gz: 7f9afbb816f26e7a10be12bd953453b15f93c36999e95e7b536a4c5d43937593c0811a90d70f35e82e08e81e46a915bfcdcea1261f8ad5dbb2da89293aa5853e

data/bin/matching_bundle

@@ -2,13 +2,22 @@
 # frozen_string_literal: true
 
 gemfile = ENV["BUNDLE_GEMFILE"] || "Gemfile"
+
+unless File.exist?(gemfile)
+  warn "#{gemfile} not found"
+  exec "bundle", *ARGV
+end
+
 lockfile = "#{gemfile}.lock"
-exec "bundle", *ARGV unless File.exist?(lockfile) # nothing we can do, regular bundle it is
+if File.exist?(lockfile)
+  content = File.read(lockfile)
+else
+  warn "Locking #{lockfile}"
+  content = `bundle lock 2>&1`
+  exec "bundle", *ARGV if $?.success?
+end
 
 require 'matching_bundle'
-
-content = File.read(lockfile)
 if version = MatchingBundle.find_or_install_matching_version(content)
-  warn "Using bundler #{version}"
   exec "bundle", "_#{version}_", *ARGV
 end

data/lib/matching_bundle/version.rb

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

data/lib/matching_bundle.rb

@@ -8,6 +8,7 @@ module MatchingBundle
       return unless requirement = bundler_requirement(gemfile_content)
 
       if version = find_matching_local_bundler_version(requirement)
+        warn "Found bundler #{version}"
         return version
       end
 
@@ -46,7 +47,7 @@ module MatchingBundle
     def bundler_requirement(gemfile_content)
       found = gemfile_content.scan(/^\s*bundler \((.*)\)/)
       versions = found.map(&:last)
-      versions.find { |version| version =~ /^=\s*\d/ } || versions.first
+      versions.grep(/^=\s*\d/).first || versions.first
     end
   end
 end

metadata

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