bootboot 0.2.0 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a660b842166734ab9e7a05d31ac2a4ed989628737715b66ece5c1842a05a897e
-  data.tar.gz: 87e2fe884bf5757b777556d33d2e055c4dbac0f6e4e861488bc68af4add5656c
+  metadata.gz: e9d43952cbfd83694c174233e724fadcd4003f1ddaf8a33b79089782334cb74f
+  data.tar.gz: c569400d898e2d7ed519579d595c3ea79e0cc96e13300e3176c28728af49b001
 SHA512:
-  metadata.gz: bb199cfc6cd3f26b4ff430acdf99269d7d94a07d5270610a9504550380a331f75e800980bcace2ae26ce734511f9476b5bda3c89426e25d9658c5b09c63b2114
-  data.tar.gz: 37e249e6377c0b148e7326ff40deaaa6df0244f86ab098407f96e29d7f4aa0aa70be936575a66b3c07f5ea1ba603b2909bde174152e72ae2591405ae08928eb7
+  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

@@ -4,7 +4,7 @@ require "bootboot/ruby_source"
 
 module DefinitionPatch
   def initialize(wrong_lock, *args)
-    lockfile = if ENV['BOOTBOOT_UPDATING_ALTERNATE_LOCKFILE']
+    lockfile = if ENV["BOOTBOOT_UPDATING_ALTERNATE_LOCKFILE"]
       wrong_lock
     else
       Bootboot::GEMFILE_NEXT_LOCK
@@ -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
 
@@ -54,7 +56,7 @@ Bundler::Dsl.class_eval do
     Bundler::SharedHelpers.singleton_class.prepend(SharedHelpersPatch)
     Bundler::Settings.prepend(Module.new do
       def app_cache_path
-        'vendor/cache-next'
+        "vendor/cache-next"
       end
     end)
   end

data/lib/bootboot/command.rb

@@ -1,27 +1,27 @@
 # frozen_string_literal: true
 
-require 'fileutils'
+require "fileutils"
 
 module Bootboot
   class Command < Bundler::Plugin::API
     def setup
-      self.class.command('bootboot')
+      self.class.command("bootboot")
     end
 
     def exec(_cmd, _args)
       FileUtils.cp(GEMFILE_LOCK, GEMFILE_NEXT_LOCK)
 
-      File.open(GEMFILE, 'a+') do |f|
-        f.write(<<-EOM)
-Plugin.send(:load_plugin, 'bootboot') if Plugin.installed?('bootboot')
+      File.open(GEMFILE, "a+") do |f|
+        f.write(<<~EOM)
+          Plugin.send(:load_plugin, 'bootboot') if Plugin.installed?('bootboot')
 
-if ENV['#{Bootboot.env_next}']
-  enable_dual_booting if Plugin.installed?('bootboot')
+          if ENV['#{Bootboot.env_next}']
+            enable_dual_booting if Plugin.installed?('bootboot')
 
-  # Add any gem you want here, they will be loaded only when running
-  # bundler command prefixed with `#{Bootboot.env_next}=1`.
-end
-EOM
+            # Add any gem you want here, they will be loaded only when running
+            # bundler command prefixed with `#{Bootboot.env_next}=1`.
+          end
+        EOM
       end
     end
   end

data/lib/bootboot/gemfile_next_auto_sync.rb

@@ -23,7 +23,7 @@ module Bootboot
     end
 
     def opt_in
-      self.class.hook('before-install-all') do
+      self.class.hook("before-install-all") do
         @previous_lock = Bundler.default_lockfile.read
       end
 
@@ -31,9 +31,9 @@ module Bootboot
         current_definition = Bundler.definition
 
         next if !GEMFILE_NEXT_LOCK.exist? ||
-                nothing_changed?(current_definition) ||
-                ENV[Bootboot.env_next] ||
-                ENV[Bootboot.env_previous]
+          nothing_changed?(current_definition) ||
+          ENV[Bootboot.env_next] ||
+          ENV[Bootboot.env_previous]
 
         update!(current_definition)
       end
@@ -48,8 +48,8 @@ module Bootboot
       lock = which_lock
 
       Bundler.ui.confirm("Updating the #{lock}")
-      ENV[env] = '1'
-      ENV['BOOTBOOT_UPDATING_ALTERNATE_LOCKFILE'] = '1'
+      ENV[env] = "1"
+      ENV["BOOTBOOT_UPDATING_ALTERNATE_LOCKFILE"] = "1"
 
       unlock = current_definition.instance_variable_get(:@unlock)
       definition = Bundler::Definition.build(GEMFILE, lock, unlock)
@@ -57,7 +57,7 @@ module Bootboot
       definition.lock(lock)
     ensure
       ENV.delete(env)
-      ENV.delete('BOOTBOOT_UPDATING_ALTERNATE_LOCKFILE')
+      ENV.delete("BOOTBOOT_UPDATING_ALTERNATE_LOCKFILE")
     end
 
     def which_env

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.to_gem_version_with_patchlevel)
+        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.0"
+  VERSION = "0.2.2"
 end

data/lib/bootboot.rb

@@ -8,22 +8,22 @@ module Bootboot
   GEMFILE_LOCK = Pathname("#{GEMFILE}.lock")
   GEMFILE_NEXT_LOCK = Pathname("#{GEMFILE}_next.lock")
 
-  autoload :GemfileNextAutoSync, 'bootboot/gemfile_next_auto_sync'
-  autoload :Command,             'bootboot/command'
+  autoload :GemfileNextAutoSync, "bootboot/gemfile_next_auto_sync"
+  autoload :Command,             "bootboot/command"
 
   class << self
     def env_next
-      env_prefix + '_NEXT'
+      env_prefix + "_NEXT"
     end
 
     def env_previous
-      env_prefix + '_PREVIOUS'
+      env_prefix + "_PREVIOUS"
     end
 
     private
 
     def env_prefix
-      Bundler.settings['bootboot_env_prefix'] || 'DEPENDENCIES'
+      Bundler.settings["bootboot_env_prefix"] || "DEPENDENCIES"
     end
   end
 end

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: bootboot
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.2
 platform: ruby
 authors:
 - Shopify
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-14 00:00:00.000000000 Z
+date: 2023-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '5.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '10.0'
 description: " This gem remove the overhead of monkeypatching your Gemfile in order
   to dualboot your app using the Gemfile_next lock strategy It also ensure that dependencies
   in the Gemfile lock and Gemfile_next lock are in sync whenever someone updates a
@@ -82,7 +82,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.3.3
 signing_key: 
 specification_version: 4
 summary: Dualbooting your ruby app made easy.