bootboot 0.1.1 → 0.1.2

data/.rubocop.yml

@@ -0,0 +1,7 @@
+inherit_from:
+  - https://shopify.github.io/ruby-style-guide/rubocop.yml
+
+AllCops:
+  TargetRubyVersion: 2.3
+  Exclude:
+    - 'vendor/**/*'

data/.travis.yml

@@ -1,7 +1,8 @@
 sudo: false
 cache: bundler
 language: ruby
-before_install:
-  - gem update bundler
+script:
+  - bundle exec rubocop --config .rubocop.yml
+  - bundle exec rake test
 notifications:
   email: false

data/CHANGELOG.md

@@ -0,0 +1,9 @@
+# Change log
+
+## master (unreleased)
+
+## 0.1.2 (2019-01-09)
+
+### New features
+
+* [#15](https://github.com/Shopify/bootboot/pull/15): Add a way to configure the DEPENDENCIES_NEXT environment variable. (@Edouard-chin)

data/Gemfile

@@ -1,6 +1,8 @@
+# frozen_string_literal: true
+
 source "https://rubygems.org"
 
-git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
+git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }
 
 gemspec
 
@@ -8,3 +10,7 @@ group :deployment do
   gem 'package_cloud'
   gem 'rake'
 end
+
+group :test do
+  gem 'rubocop'
+end

data/Gemfile.lock

@@ -1,16 +1,18 @@
 PATH
   remote: .
   specs:
-    bootboot (0.1.1)
+    bootboot (0.1.2)
 
 GEM
   remote: https://rubygems.org/
   specs:
+    ast (2.4.0)
     domain_name (0.5.20180417)
       unf (>= 0.0.5, < 1.0.0)
     highline (1.6.20)
     http-cookie (1.0.3)
       domain_name (~> 0.5)
+    jaro_winkler (1.5.1)
     json_pure (1.8.1)
     mime-types (3.2.2)
       mime-types-data (~> 3.2015)
@@ -23,6 +25,10 @@ GEM
       rainbow (= 2.2.2)
       rest-client (~> 2.0)
       thor (~> 0.18)
+    parallel (1.12.1)
+    parser (2.5.3.0)
+      ast (~> 2.4.0)
+    powerpack (0.1.2)
     rainbow (2.2.2)
       rake
     rake (10.5.0)
@@ -30,10 +36,20 @@ GEM
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 4.0)
       netrc (~> 0.8)
+    rubocop (0.60.0)
+      jaro_winkler (~> 1.5.1)
+      parallel (~> 1.10)
+      parser (>= 2.5, != 2.5.1.1)
+      powerpack (~> 0.1)
+      rainbow (>= 2.2.2, < 4.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (~> 1.4.0)
+    ruby-progressbar (1.10.0)
     thor (0.20.3)
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.7.5)
+    unicode-display_width (1.4.0)
 
 PLATFORMS
   ruby
@@ -44,6 +60,7 @@ DEPENDENCIES
   minitest (~> 5.0)
   package_cloud
   rake
+  rubocop
 
 BUNDLED WITH
    1.17.1

data/README.md

@@ -1,4 +1,4 @@
-## 👢👢 Bootboot
+## 👢👢 Bootboot   - [![Build Status](https://travis-ci.com/Shopify/bootboot.svg?branch=master)](https://travis-ci.com/Shopify/bootboot)
 
 Introduction
 ------------
@@ -46,7 +46,7 @@ Installation
 ------------
 1) In your Gemfile, add this
 ```ruby
-plugin 'bootboot', '~> 0.1.1`
+plugin 'bootboot', '~> 0.1.1'
 ```
 2) Run `bundle install && bundle bootboot`
 3) You're done. Commit the Gemfile and the Gemfile_next.lock
@@ -55,8 +55,16 @@ Dual boot it!
 ------------
 If you want to boot using the dependencies from the `Gemfile_next.lock`, run any bundler command prefixed with the `DEPENDENCIES_NEXT=1` ENV variable. I.e. `DEPENDENCIES_NEXT=1 bundle exec irb`.
 
+Configuration (Optional)
+------------------------
+By default Bootboot will use the `DEPENDENCIES_NEXT` environment variable to update your Gemfile_next.lock. You can however configure it. For example, if you want the dualboot to happen when the `SHOPIFY_NEXT` env variable is present, you simply have to add this in your Gemfile:
 
-Keep` the Gemfile_next.lock` in sync
+```ruby
+# Gemfile
+Bundler.settings.set_local('bootboot_env_prefix', 'SHOPIFY')
+```
+
+Keep the `Gemfile_next.lock` in sync
 ------------
 When a developer bumps or adds a dependency, Bootboot will ensure that the `Gemfile_next.lock` snapshot gets updated.
 

data/Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "bundler/gem_tasks"
 require "rake/testtask"
 
@@ -7,4 +9,4 @@ Rake::TestTask.new(:test) do |t|
   t.test_files = FileList["test/**/*_test.rb"]
 end
 
-task :default => :test
+task default: :test

data/bootboot.gemspec

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require "bootboot/version"
@@ -5,8 +7,8 @@ require "bootboot/version"
 Gem::Specification.new do |spec|
   spec.name          = "bootboot"
   spec.version       = Bootboot::VERSION
-  spec.authors       = ["Shopify"]
-  spec.email         = ["rails@shopify.com"]
+  spec.authors       = %w(Shopify)
+  spec.email         = %w(rails@shopify.com)
 
   spec.summary       = "Dualbooting your ruby app made easy."
   spec.description   = <<-EOM.gsub(/\W+/, ' ')
@@ -22,10 +24,10 @@ Gem::Specification.new do |spec|
   spec.metadata["source_code_uri"] = "https://github.com/shopify/bootboot"
   spec.metadata["changelog_uri"] = "https://github.com/Shopify/bootboot/blob/master/CHANGELOG.md"
 
-  spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
-    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  spec.files = Dir.chdir(File.expand_path('..', __FILE__)) do
+    %x(git ls-files -z).split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   end
-  spec.require_paths = ["lib"]
+  spec.require_paths = %w(lib)
 
   spec.add_development_dependency "bundler", "~> 1.17"
   spec.add_development_dependency "rake", "~> 10.0"

data/lib/bootboot.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "bootboot/version"
 require "bootboot/bundler_patch"
 
@@ -5,11 +7,25 @@ module Bootboot
   GEMFILE = Bundler.default_gemfile
   GEMFILE_LOCK = Pathname("#{GEMFILE}.lock")
   GEMFILE_NEXT_LOCK = Pathname("#{GEMFILE}_next.lock")
-  DUALBOOT_NEXT = 'DEPENDENCIES_NEXT'
-  DUALBOOT_PREVIOUS = 'DEPENDENCIES_PREVIOUS'
 
   autoload :GemfileNextAutoSync, 'bootboot/gemfile_next_auto_sync'
   autoload :Command,             'bootboot/command'
+
+  class << self
+    def env_next
+      env_prefix + '_NEXT'
+    end
+
+    def env_previous
+      env_prefix + '_PREVIOUS'
+    end
+
+    private
+
+    def env_prefix
+      Bundler.settings['bootboot_env_prefix'] || 'DEPENDENCIES'
+    end
+  end
 end
 
 Bootboot::GemfileNextAutoSync.new.setup

data/lib/bootboot/command.rb

@@ -15,11 +15,11 @@ module Bootboot
         f.write(<<-EOM)
 Plugin.send(:load_plugin, 'bootboot') if Plugin.installed?('bootboot')
 
-if ENV['DEPENDENCIES_NEXT']
+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 `#{DUALBOOT_NEXT}=1`.
+  # bundler command prefixed with `#{Bootboot.env_next}=1`.
 end
 EOM
       end

data/lib/bootboot/gemfile_next_auto_sync.rb

@@ -32,8 +32,8 @@ module Bootboot
 
         next if !GEMFILE_NEXT_LOCK.exist? ||
                 nothing_changed?(current_definition) ||
-                ENV[DUALBOOT_NEXT] ||
-                ENV[DUALBOOT_PREVIOUS]
+                ENV[Bootboot.env_next] ||
+                ENV[Bootboot.env_previous]
 
         update!(current_definition)
       end
@@ -62,9 +62,9 @@ module Bootboot
 
     def which_env
       if Bundler.default_lockfile.to_s =~ /_next\.lock/
-        DUALBOOT_PREVIOUS
+        Bootboot.env_previous
       else
-        DUALBOOT_NEXT
+        Bootboot.env_next
       end
     end
 

data/lib/bootboot/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bootboot
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Shopify
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-20 00:00:00.000000000 Z
+date: 2019-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -63,13 +63,15 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rubocop-https---shopify-github-io-ruby-style-guide-rubocop-yml"
+- ".rubocop.yml"
 - ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
-- bin/console
 - bootboot.gemspec
 - lib/bootboot.rb
 - lib/bootboot/bundler_patch.rb
@@ -101,7 +103,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Dualbooting your ruby app made easy.

data/bin/console

@@ -1,14 +0,0 @@
-#!/usr/bin/env ruby
-
-require "bundler/setup"
-require "bootboot"
-
-# You can add fixtures and/or initialization code here to make experimenting
-# with your gem easier. You can also use a different console, if you like.
-
-# (If you use this, don't forget to add pry to your Gemfile!)
-# require "pry"
-# Pry.start
-
-require "irb"
-IRB.start(__FILE__)