bootboot 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 14236a9169a7dea04af00afeb9f53f20cd53e70d969944f12824ba98f76e525a
-  data.tar.gz: 9a31116c9844389ef5a40e234c15a6cdbfaaf031ed67ceaf47856dd2c3496fa7
+  metadata.gz: e9d43952cbfd83694c174233e724fadcd4003f1ddaf8a33b79089782334cb74f
+  data.tar.gz: c569400d898e2d7ed519579d595c3ea79e0cc96e13300e3176c28728af49b001
 SHA512:
-  metadata.gz: add7b5ca8aa44d3bed18fdcc09b61cf12cc02174a9b2dc947393e22592b0ffa6bea5c4409a8f70564f7d4b501c2233e65a6a292a24c549c915fdd817d46a65f9
-  data.tar.gz: 1114c2d69483098dab6180f7b7ed9b59aea471386c95be1df06ed38f242a021ee2fcf5a21181ebe6eb35a3b73e5b90cedbec26198d20716d4c1a3ee5b3861b0e
+  metadata.gz: 00ed13d606f63cc3eed624aab9dd314b33e9b227716524c2f891ac7089acc6d6ae50e5ba68f7644af94246eaf58da7c373e76dfdc05b603d092685a9450ae746
+  data.tar.gz: 99bd2435970d06ea198ca27e53be25d438cb1a633cc2df6a76f551be94b8f5fc893400774b5b98d2497e3843399a708f65665230178afde35bf3f0475b61bc5c

data/README.md

@@ -1,4 +1,4 @@
-## 👢👢 Bootboot   - [![Build Status](https://travis-ci.com/Shopify/bootboot.svg?branch=master)](https://travis-ci.com/Shopify/bootboot)
+## 👢👢 Bootboot   - [![Build Status](https://github.com/Shopify/bootboot/actions/workflows/ci.yml/badge.svg)](https://github.com/Shopify/bootboot/actions/workflows/ci.yml)
 
 Introduction
 ------------
@@ -44,7 +44,7 @@ Installation
 ------------
 1) In your Gemfile, add this
 ```ruby
-plugin 'bootboot', '~> 0.1.1'
+plugin 'bootboot', '~> 0.2.1'
 ```
 2) Run `bundle install && bundle bootboot`
 3) You're done. Commit the Gemfile and the Gemfile_next.lock

data/lib/bootboot/bundler_patch.rb

@@ -16,15 +16,17 @@ end
 
 module RubyVersionPatch
   def system
-    if ENV["BOOTBOOT_UPDATING_ALTERNATE_LOCKFILE"]
-      # If we're updating the alternate file and the ruby version specified in
-      # the Gemfile is different from the Ruby version currently running, we
-      # want to write the version specified in `Gemfile` for the current
-      # dependency set to the lock file
-      Bundler::Definition.build(Bootboot::GEMFILE, nil, false).ruby_version || super
-    else
-      super
-    end
+    # Only monkey-patch if we're updating the alternate file
+    return super unless ENV["BOOTBOOT_UPDATING_ALTERNATE_LOCKFILE"]
+
+    # Bail out if the Gemfile doesn't specify a Ruby requirement
+    requested_ruby = Bundler::Definition.build(Bootboot::GEMFILE, nil, false).ruby_version
+    return super unless requested_ruby
+
+    # If the requirement is for an exact Ruby version, we should substitute the
+    # system version with the requirement so that it gets written to the lock file
+    requirement = Gem::Requirement.new(requested_ruby.versions)
+    requirement.exact? ? requested_ruby : super
   end
 end
 

data/lib/bootboot/ruby_source.rb

@@ -18,15 +18,30 @@ module Bootboot
 
     def specs
       Bundler::Index.build do |idx|
-        # If the ruby version specified in the Gemfile is different from the
-        # Ruby version currently running, we want to build a definition without
-        # a lockfile (so that `ruby_version` in the Gemfile isn't overridden by
-        # the lockfile) and get its `ruby_version`. This will be used both
-        # during dependency resolution so that we can pretend the intended Ruby
-        # version is present, as well as when updating the lockfile itself.
-        ruby_version = Bundler::Definition.build(Bootboot::GEMFILE, nil, false).ruby_version
-        ruby_version ||= Bundler::RubyVersion.system
-        ruby_spec = Gem::Specification.new(ruby_spec_name, ruby_version.gem_version)
+        requested_ruby = Bundler::Definition.build(Bootboot::GEMFILE, nil, false).ruby_version
+        system_version = Bundler::RubyVersion.system.gem_version
+        requirement = Gem::Requirement.new(requested_ruby.versions) if requested_ruby
+
+        # This will be used both during dependency resolution so that we can pretend
+        # the intended Ruby version is present, as well as when updating the lock file.
+        ruby_spec_version = if requested_ruby.nil?
+          # if the Gemfile doesn't request a specific Ruby version, just use system
+          system_version
+        elsif !requirement.exact? && requirement.satisfied_by?(system_version)
+          # if the Gemfile requests a non-exact Ruby version which is satisfied by
+          # the currently running Ruby, use that when updating the lock file
+          system_version
+        else
+          # If we're here, there's either an exact requirement for the Ruby version
+          # (in which case we should substitue it instead of current Ruby version),
+          # else the currently running Ruby doesn't satisfy the non-exact requirement
+          # (in which case an error will be thrown by bundler). Not sure how we can
+          # improve the error message, which will be vague due to using #gem_version
+          # of the unsatisified requirement.
+          requested_ruby.gem_version
+        end
+
+        ruby_spec = Gem::Specification.new(ruby_spec_name, ruby_spec_version)
         ruby_spec.source = self
         idx << ruby_spec
       end

data/lib/bootboot/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Bootboot
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bootboot
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Shopify
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-04-21 00:00:00.000000000 Z
+date: 2023-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -82,7 +82,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.20
+rubygems_version: 3.3.3
 signing_key: 
 specification_version: 4
 summary: Dualbooting your ruby app made easy.