double_take 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6eb8186c5d898a2e6550db26a607b2d4f09145719c28886834a6ad2167ba2f36
-  data.tar.gz: c05ccc9225617434b6840361516c7c51aabc8ca2fa9b55e9392cd8117f398dcd
+  metadata.gz: 9597d31af06477de2ac02b29a24fc6f99bde3ba1cb83ac030f66eef2c608ec30
+  data.tar.gz: 364983fc62bc579cbde20b80d6694f58daf76fe182c1544b8a83ecae28df3068
 SHA512:
-  metadata.gz: 3dc20a938039245f9e7372ffa238131ee1eef66e2837f192a7c443818b04638f741aec6c20d2619a19dd09d5347f9c1d70930494b09429a70506a26ad7ca3e9e
-  data.tar.gz: 0636f9ed64f7e537bbfbd56596db2129be64dd60f172cf270723f0813176e4998e4fac04af52ab9a9efcda6bcea6e3cccf4b534144cbfd2426ba9b38822afffe
+  metadata.gz: 251a382afd4ff42b5f28a8e02491feeae5bf6d98793a5a41d5c8f88347a99c74d983dadcd00662022b6324f11ff5032eaf68d0f3ab018a3a4cc9098c3fd240ff
+  data.tar.gz: e95acc20e76bb6dc5f48f287ad767c62582dcf4b68b617014cd5f8a3e1c40034d0e62b1af28cd349ee5869a4682bdb5ffad7f6f14fad5f42b05ceb42edcfec66

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # double_take
 
+## 0.2.0
+- Remove registering command and hooks at file loadtime
+- Create method for loading and registering command and hooks and add to `plugins.rb`
+- Bundle "next" lockfile on plugin install, removing the need to `bundle` twice
+
 ## 0.1.2
 - Fix helper method
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    double_take (0.1.2)
+    double_take (0.2.0)
 
 GEM
   remote: https://rubygems.org/

data/README.md

@@ -20,7 +20,7 @@ And then execute:
 
 ## Usage
 
-The plugin is installed with an initial `bundle`. Then, every subsequent `bundle` will install all gems from both `Gemfile.lock` and `Gemfile_next.lock`.
+The plugin is installed with `bundle install`. It will also install all gems from both `Gemfile.lock` and `Gemfile_next.lock` on the initial `bundle` and every subsequent one as well.
 
 _NOTE_: This plugin does not generate a `Gemfile_next.lock`, keep both lockfiles in sync over gem bumps, nor does it implement any strategy for bifurcating the `Gemfile` to load different gems. For those reasons, this plugin pairs really well with [`bootboot`](https://github.com/Shopify/bootboot). For more info on dual booting I recommend reading its `README`.
 

data/lib/double_take.rb

@@ -18,7 +18,11 @@ module DoubleTake
   ensure
     ENV.delete("DEPENDENCIES_NEXT")
   end
-end
 
-DoubleTake::Clean.new.register_command
-DoubleTake::Hook.new.register
+  def self.load
+    DoubleTake::Clean.new.register_command
+    hook = DoubleTake::Hook.new
+    hook.bundle_next unless Bundler::Plugin.installed?("double_take")
+    hook.register
+  end
+end

data/lib/double_take/hook.rb

@@ -2,6 +2,9 @@
 
 module DoubleTake
   class Hook < Bundler::Plugin::API
+    EMPTY_ARRAY = [].freeze
+    EMPTY_UNLOCK = { gems: EMPTY_ARRAY, sources: EMPTY_ARRAY, ruby: false }.freeze
+
     def register
       self.class.hook("before-install-all") do
         next if !GEMFILE_NEXT_LOCK.file?
@@ -15,17 +18,27 @@ module DoubleTake
         current_definition = Bundler.definition
         unlock = current_definition.instance_variable_get(:@unlock)
 
-        DoubleTake.with_dependency_next do
-          next_definition = Bundler::Definition
-            .build(GEMFILE, GEMFILE_NEXT_LOCK, unlock)
+        if current_definition.to_lock == @previous_lockfile
+          bundle_next(unlock)
+        end
+      end
+    end
+
+    def bundle_next(unlock = EMPTY_UNLOCK)
+      return if ENV["DEPENDENCIES_NEXT"] || !GEMFILE_NEXT_LOCK.file?
 
-          if current_definition.to_lock == @previous_lockfile
-            Bundler.ui.confirm("Installing bundle for NEXT")
+      # this method memoizes an instance of the current definition
+      # so we need to fill that cache for other bundler internals to use
+      Bundler.definition
 
-            # TODO: pass options parameter to installer
-            Bundler::Installer.new(Bundler.root, next_definition).run({})
-          end
-        end
+      DoubleTake.with_dependency_next do
+        next_definition = Bundler::Definition
+          .build(GEMFILE, GEMFILE_NEXT_LOCK, unlock)
+
+        Bundler.ui.confirm("Installing bundle for NEXT")
+
+        # TODO: pass options parameter to installer
+        Bundler::Installer.new(Bundler.root, next_definition).run({})
       end
     end
   end

data/lib/double_take/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module DoubleTake
-  VERSION = "0.1.2"
+  VERSION = "0.2.0"
 end

data/plugins.rb

@@ -1,3 +1,5 @@
 # frozen_string_literal: true
 
 require_relative "lib/double_take"
+
+DoubleTake.load

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: double_take
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Tyler Ewing
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-07-07 00:00:00.000000000 Z
+date: 2020-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler