double_take 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9597d31af06477de2ac02b29a24fc6f99bde3ba1cb83ac030f66eef2c608ec30
-  data.tar.gz: 364983fc62bc579cbde20b80d6694f58daf76fe182c1544b8a83ecae28df3068
+  metadata.gz: d9455c1db7368b61d5fe30f402cfc3a7e6af7571092361cb22bcc1bc810dc769
+  data.tar.gz: dbd6c295e58704c2ca28a65b0bc3dd1f6a106952e971f4ca8f99bc522820a5fc
 SHA512:
-  metadata.gz: 251a382afd4ff42b5f28a8e02491feeae5bf6d98793a5a41d5c8f88347a99c74d983dadcd00662022b6324f11ff5032eaf68d0f3ab018a3a4cc9098c3fd240ff
-  data.tar.gz: e95acc20e76bb6dc5f48f287ad767c62582dcf4b68b617014cd5f8a3e1c40034d0e62b1af28cd349ee5869a4682bdb5ffad7f6f14fad5f42b05ceb42edcfec66
+  metadata.gz: cc7d049ead496d5edf7d47f76d13ee7dd2bb2debae26b73c21e9e17ad5912309e3a354a0790e4658ddbae6ff7e2d76eeea2b6f8615bcb6abcfcd161bfeb691fc
+  data.tar.gz: ac0217a8223410ff6f64150bd6543cebd25dfbc783e92235a8722a7773a38f2f2899d5741f76227409c6a38dd31b98c23f701a26a280077224829cb4a34093bf

data/.github/workflows/ruby.yml

@@ -0,0 +1,67 @@
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+# This workflow will download a prebuilt Ruby version, install dependencies and run tests with Rake
+# For more information see: https://github.com/marketplace/actions/setup-ruby-jruby-and-truffleruby
+
+name: CI
+
+on:
+  push:
+    branches: [ master, te-test ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  lint:
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Ruby
+    # To automatically get bug fixes and new Ruby versions for ruby/setup-ruby,
+    # change this to (see https://github.com/ruby/setup-ruby#versioning):
+    # uses: ruby/setup-ruby@v1
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: 2.6
+
+    - name: Install dependencies
+      run: bundle install
+
+    - name: Run linting
+      run: bundle exec rubocop
+
+  test:
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: 2.6
+
+    - name: Install dependencies
+      run: bundle install
+
+    # Unfortunately, we can't use the `appraisal` gem and need to manually
+    # install each bundler version we want to test with.
+    - name: Install bundler v1.17.x
+      run: gem install bundler -v "~> 1.17.0"
+
+    - name: Run tests with bundler v1.17.x
+      run: TEST_BUNDLER_VERSION=1.17 bundle exec rake
+
+    - name: Install bundler v2.0.x
+      run: gem install bundler -v "~> 2.0.0"
+
+    - name: Run tests with bundler v2.0.x
+      run: bundle update --bundler && TEST_BUNDLER_VERSION=2.0 bundle exec rake
+
+    - name: Install bundler v2.1.x
+      run: gem install bundler -v "~> 2.1.0"
+
+    - name: Run tests with bundler v2.1.x
+      run: bundle update --bundler && TEST_BUNDLER_VERSION=2.1 bundle exec rake

data/.rubocop.yml

@@ -0,0 +1,43 @@
+AllCops:
+  NewCops: enable
+
+Gemspec/RequiredRubyVersion:
+  Enabled: false
+
+Layout/MultilineMethodCallIndentation:
+  EnforcedStyle: indented
+
+Metrics/AbcSize:
+  Max: 25
+
+Metrics/BlockLength:
+  Exclude:
+  - spec/**/*.rb
+  - double_take.gemspec
+
+Metrics/MethodLength:
+  Max: 15
+
+Style/CommandLiteral:
+  Enabled: false
+
+Style/Documentation:
+  Enabled: false
+
+Style/ExpandPathArguments:
+  Enabled: false
+
+Style/GuardClause:
+  Enabled: false
+
+Style/IfUnlessModifier:
+  Enabled: false
+
+Style/NegatedIf:
+  Enabled: false
+
+Style/StringLiterals:
+  EnforcedStyle: double_quotes
+
+Style/TrailingCommaInHashLiteral:
+  EnforcedStyleForMultiline: consistent_comma

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # double_take
 
+## 0.2.1
+- Added rubocop and fixed violations
+- Added running test suite against bundler version 1.17.x to 2.1.x in CI
+- Fixed bundler method deprecation warning
+
 ## 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`

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}" }
 
 # Specify your gem's dependencies in double_take.gemspec
 gemspec

data/Gemfile.lock

@@ -1,13 +1,30 @@
 PATH
   remote: .
   specs:
-    double_take (0.2.0)
+    double_take (0.2.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
+    ast (2.4.1)
+    byebug (11.1.3)
+    climate_control (0.2.0)
+    coderay (1.1.3)
     diff-lcs (1.4.4)
+    method_source (1.0.0)
+    parallel (1.19.2)
+    parser (2.7.1.4)
+      ast (~> 2.4.1)
+    pry (0.13.1)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    pry-byebug (3.9.0)
+      byebug (~> 11.0)
+      pry (~> 0.13.0)
+    rainbow (3.0.0)
     rake (12.3.3)
+    regexp_parser (1.7.1)
+    rexml (3.2.4)
     rspec (3.9.0)
       rspec-core (~> 3.9.0)
       rspec-expectations (~> 3.9.0)
@@ -21,15 +38,31 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
     rspec-support (3.9.3)
+    rubocop (0.90.0)
+      parallel (~> 1.10)
+      parser (>= 2.7.1.1)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.7)
+      rexml
+      rubocop-ast (>= 0.3.0, < 1.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 1.4.0, < 2.0)
+    rubocop-ast (0.3.0)
+      parser (>= 2.7.1.4)
+    ruby-progressbar (1.10.1)
+    unicode-display_width (1.7.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   bundler (>= 1.17.0, < 2.2)
+  climate_control
   double_take!
+  pry-byebug
   rake (~> 12.3.3)
   rspec (~> 3.0)
+  rubocop (~> 0.90)
 
 BUNDLED WITH
    1.17.3

data/README.md

@@ -1,4 +1,4 @@
-# DoubleTake
+# DoubleTake :eyes: :eyes:
 
 DoubleTake is a [bundler plugin](https://bundler.io/v2.0/guides/bundler_plugins.html) that doubly bundles gems from multiple lockfiles for projects that are using a [dual boot strategy](https://www.youtube.com/watch?v=I-2Xy3RS1ns&t=368s).
 
@@ -12,7 +12,7 @@ Add this line to your application's Gemfile:
 plugin "double_take"
 ```
 
-_NOTE_: We use the `plugin` method, not `gem`.
+_NOTE_: We use the `plugin` method, not `gem`. Did you do a ...double take? (I promise there won't be any more jokes)
 
 And then execute:
 
@@ -22,9 +22,9 @@ And then execute:
 
 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`.
+_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 the `README` for `bootboot`.
 
-As mentioned in the `bootboot` plugin the `Gemfile` needs to be bifurcated with the environment variable `DEPENDENCIES_NEXT`.
+As mentioned in the `bootboot` plugin the `Gemfile` needs to be bifurcated with the environment variable `DEPENDENCIES_NEXT`. As of now, this library does not support custom environment variables for bifurcating.
 
 
 ### Clean
@@ -39,12 +39,23 @@ It accepts all options that bundler's clean command does:
     $ bundle double_take clean --force
 
 
+### Supported Versions
+This plugin is intended to be used with `bundler` versions 1.17.x to 2.1.x. The test suite is run against 1.17.x, 2.0.x, and 2.1.x in CI.
+
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
 
 To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
 
+
+### Testing Versions
+To run the test suite against a specific version of bundler you can use the `TEST_BUNDLER_VERSION` environment variable. It supports full versions ie. `1.17.3` or abbreviated minor level versions ie. `2.0` and will choose the latest patch version. If a version is not specified the default bundler version will be used. This can all be verified with output that is printed before the spec suite runs.
+
+Because of the backward incompatibilities between versions 1.x and 2.x you will have to run `bundle update --bundler` to properly test for 2.x versions. Please do not commit the changed `Gemfile.lock` if you are contributing code.
+
+
 ## Contributing
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/zoso10/double_take. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.

data/Rakefile

@@ -1,6 +1,8 @@
+# frozen_string_literal: true
+
 require "bundler/gem_tasks"
 require "rspec/core/rake_task"
 
 RSpec::Core::RakeTask.new(:spec)
 
-task :default => :spec
+task default: :spec

data/bin/console

@@ -1,5 +1,7 @@
 #!/usr/bin/env ruby
 
+# frozen_string_literal: true
+
 require "bundler/setup"
 require "double_take"
 

data/double_take.gemspec

@@ -5,14 +5,14 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require "double_take/version"
 
 Gem::Specification.new do |spec|
-  spec.name          = "double_take"
-  spec.version       = DoubleTake::VERSION
-  spec.authors       = ["Tyler Ewing"]
-  spec.email         = ["tewing10@gmail.com"]
+  spec.name = "double_take"
+  spec.version = DoubleTake::VERSION
+  spec.authors = ["Tyler Ewing"]
+  spec.email = ["tewing10@gmail.com"]
 
-  spec.summary       = %q{A bundler plugin to install multiple sets of dependencies.}
-  spec.homepage      = "https://github.com/zoso10/double_take"
-  spec.license       = "MIT"
+  spec.summary = "A bundler plugin to install multiple sets of dependencies."
+  spec.homepage = "https://github.com/zoso10/double_take"
+  spec.license = "MIT"
 
   if spec.respond_to?(:metadata)
     spec.metadata["homepage_uri"] = spec.homepage
@@ -22,16 +22,17 @@ Gem::Specification.new do |spec|
     raise "RubyGems 2.0 or newer is required to protect against public gem pushes."
   end
 
-  # Specify which files should be added to the gem when it is released.
-  # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
-  spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
+  spec.files = Dir.chdir(File.expand_path("..", __FILE__)) do
     `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   end
-  spec.bindir        = "exe"
-  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.bindir = "exe"
+  spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
   spec.add_development_dependency "bundler", ">= 1.17.0", "< 2.2"
+  spec.add_development_dependency "climate_control"
+  spec.add_development_dependency "pry-byebug"
   spec.add_development_dependency "rake", "~> 12.3.3"
   spec.add_development_dependency "rspec", "~> 3.0"
+  spec.add_development_dependency "rubocop", "~> 0.90"
 end

data/lib/double_take/clean.rb

@@ -10,7 +10,7 @@ module DoubleTake
                else
                  requested_dependencies
                end
-        next_specs = Bundler::Definition
+        Bundler::Definition
           .build(GEMFILE, GEMFILE_NEXT_LOCK, nil)
           .resolve
           .materialize(deps)

data/lib/double_take/hook.rb

@@ -24,8 +24,8 @@ module DoubleTake
       end
     end
 
-    def bundle_next(unlock = EMPTY_UNLOCK)
-      return if ENV["DEPENDENCIES_NEXT"] || !GEMFILE_NEXT_LOCK.file?
+    def bundle_next(unlock = EMPTY_UNLOCK, next_lockfile = GEMFILE_NEXT_LOCK)
+      return if ENV["DEPENDENCIES_NEXT"] || !next_lockfile.file?
 
       # this method memoizes an instance of the current definition
       # so we need to fill that cache for other bundler internals to use
@@ -33,7 +33,7 @@ module DoubleTake
 
       DoubleTake.with_dependency_next do
         next_definition = Bundler::Definition
-          .build(GEMFILE, GEMFILE_NEXT_LOCK, unlock)
+          .build(GEMFILE, next_lockfile, unlock)
 
         Bundler.ui.confirm("Installing bundle for NEXT")
 

data/lib/double_take/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: double_take
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Tyler Ewing
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-07-16 00:00:00.000000000 Z
+date: 2020-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -30,6 +30,34 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '2.2'
+- !ruby/object:Gem::Dependency
+  name: climate_control
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry-byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -58,6 +86,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.90'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.90'
 description: 
 email:
 - tewing10@gmail.com
@@ -65,8 +107,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ruby.yml"
 - ".gitignore"
 - ".rspec"
+- ".rubocop.yml"
 - ".travis.yml"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md