bundler-inject 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 25b3400016d442200c1a6f29666d07e91ac273b6d2926c31c8ca4bd198af07b1
-  data.tar.gz: 7fc849b9e6becf2ce112be77a84416aca98b49fc2ff26ff46985a3965cc7bd4b
+  metadata.gz: 2242653c6fcf2c5a650a7a04463a1c90eb8c432f40dd590e9882f168faf1f9f0
+  data.tar.gz: 2bf3b7781f285f4d7be9b4ed137158c3859022934427d8328fc9e8cb8f0315d8
 SHA512:
-  metadata.gz: a02c79078741a7d8573d64a3584ddd4f01c68384ff47b697cfcbe2c6ed2f0d4e04b3a2f7dbb4579c7a69c98f9fdbd435e79096f5c6204d3622b5e522fd42c19e
-  data.tar.gz: fd9a7dc81f857689fea84b09cd935b01d061f08102a89737a2171c617536e591c76de241d16649367c3f27c0486d9ba843cc071ce4d3e66dd75bfeadc2e0b340
+  metadata.gz: aaacd8b7d630a81188417f100b30acccb690318cef37c65006225ba7a52d35b869d13a73ae7e68fb7c7d8f6f07f65b2694d10e10882e0075a7b69985fea50457
+  data.tar.gz: 4d20624d891c22507001a59bc4f79d6a6b7fdf790192a1ac463e6b83aa5f0241724bb98e0728e8c7c7bc5b8b2094a63941cc83902b10755b66569738bc8a2e14

data/.github/workflows/ci.yaml

@@ -0,0 +1,45 @@
+name: CI
+
+on:
+  push:
+  pull_request:
+  schedule:
+  - cron: '0 0 * * 0'
+
+jobs:
+  ci:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby-version:
+        - '2.7'
+        - '3.0'
+        - '3.1'
+        - '3.2'
+        bundler-version:
+        - '2.1'
+        - '2.2'
+        - '2.3'
+        - '2.4'
+        include:
+        - ruby-version: '2.6'
+          bundler-version: '2.0'
+    env:
+      TEST_BUNDLER_VERSION: ${{ matrix.bundler-version }}
+      CC_TEST_REPORTER_ID: ${{ secrets.CC_TEST_REPORTER_ID }}
+    steps:
+    - uses: actions/checkout@v4
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby-version }}
+        bundler: ${{ matrix.bundler-version }}
+        bundler-cache: true
+      timeout-minutes: 30
+    - name: Run tests
+      run: bundle exec rake
+    - name: Report code coverage
+      if: ${{ github.ref == 'refs/heads/master' && matrix.ruby-version == '3.2' && matrix.bundler-version == '2.4' }}
+      continue-on-error: true
+      uses: paambaati/codeclimate-action@v5

data/.rspec

@@ -1,4 +1,3 @@
---format documentation
---color
 --require spec_helper
+--color
 --order random

data/.whitesource

@@ -0,0 +1,3 @@
+{
+  "settingsInheritedFrom": "ManageIQ/whitesource-config@master"
+}

data/CHANGELOG.md

@@ -7,11 +7,25 @@ a nice looking [Changelog](http://keepachangelog.com).
 
 ## Version [HEAD] <sub><sup>now</sub></sup>
 
+## Version [2.1.0] <sub><sup>2024-01-09</sub></sup>
+
+### Fixed
+* Remove remnants of bundler 1.x support ([#20](https://github.com/ManageIQ/bundler-inject/pull/20))
+* Fix detection of bundler version ([#21](https://github.com/ManageIQ/bundler-inject/pull/21))
+* Fix spec issues after release of bundler 2.4.17 ([#32](https://github.com/ManageIQ/bundler-inject/pull/32))
+
+### Added
+* Switch to GitHub Actions ([#25](https://github.com/ManageIQ/bundler-inject/pull/25))
+* Add bundler 2.4 to the test matrix ([#28](https://github.com/ManageIQ/bundler-inject/pull/28))
+* Add Ruby 3.1 and 3.2 to test matrix ([#29](https://github.com/ManageIQ/bundler-inject/pull/29))
+* Allow user to specify a PATH to search for gem overrides ([#34](https://github.com/ManageIQ/bundler-inject/pull/34))
+
 ## Version [2.0.0] <sub><sup>2021-05-01</sub></sup>
 
 * **BREAKING**: Drops support for bundler below 2.0
 * **BREAKING**: Drops support for Ruby below 2.6
 * Adds support for running as a service (with no user / HOME set)
 
-[HEAD]: https://github.com/ManageIQ/bundler-inject/compare/v2.0.0...HEAD
+[HEAD]: https://github.com/ManageIQ/bundler-inject/compare/v2.1.0...HEAD
+[2.1.0]: https://github.com/ManageIQ/bundler-inject/compare/v2.0.0...v2.1.0
 [2.0.0]: https://github.com/ManageIQ/bundler-inject/compare/v1.1.0...v2.0.0

data/Gemfile

@@ -1,6 +1,4 @@
 source "https://rubygems.org"
 
-git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
-
 # Specify your gem's dependencies in bundler-inject.gemspec
 gemspec

data/README.md

@@ -1,9 +1,9 @@
 # bundler-inject
 
-[![Build Status](https://travis-ci.org/ManageIQ/bundler-inject.svg?branch=master)](https://travis-ci.org/ManageIQ/bundler-inject)
-[![Maintainability](https://api.codeclimate.com/v1/badges/e4650d6dd7cbcd981057/maintainability)](https://codeclimate.com/github/ManageIQ/bundler-inject/maintainability)
-[![Test Coverage](https://api.codeclimate.com/v1/badges/e4650d6dd7cbcd981057/test_coverage)](https://codeclimate.com/github/ManageIQ/bundler-inject/test_coverage)
-[![Security](https://hakiri.io/github/ManageIQ/bundler-inject/master.svg)](https://hakiri.io/github/ManageIQ/bundler-inject/master)
+[![Gem Version](https://badge.fury.io/rb/bundler-inject.svg)](http://badge.fury.io/rb/bundler-inject)
+[![CI](https://github.com/ManageIQ/bundler-inject/actions/workflows/ci.yaml/badge.svg)](https://github.com/ManageIQ/bundler-inject/actions/workflows/ci.yaml)
+[![Code Climate](https://codeclimate.com/github/ManageIQ/bundler-inject.svg)](https://codeclimate.com/github/ManageIQ/bundler-inject)
+[![Test Coverage](https://codeclimate.com/github/ManageIQ/bundler-inject/badges/coverage.svg)](https://codeclimate.com/github/ManageIQ/bundler-inject/coverage)
 
 **bundler-inject** is a [bundler plugin](https://bundler.io/guides/bundler_plugins.html)
 that allows a developer to extend a project with their own personal gems and/or
@@ -79,6 +79,8 @@ original declaration.
 
 ## Configuration
 
+### Disabling warnings
+
 To disable warnings that are output to the console when `override_gem` or
 `ensure_gem` is in use, you can update a bundler setting:
 
@@ -95,6 +97,32 @@ $ export BUNDLE_BUNDLER_INJECT__DISABLE_WARN_OVERRIDE_GEM=true
 There is a fallback for those that will check the `RAILS_ENV` environment
 variable, and will disable the warning when in `"production"`.
 
+### Specifying gem source directories
+
+Many developers checkout gems into a single directory for enhancement.
+Instead of specifying the full path of gems every time, specify a gem path
+to locate these directories. This can be defined with a bundler setting:
+
+```console
+$ bundle config bundler_inject.gem_path ~/src:~/gem_src
+```
+
+or use an environment variable:
+
+```console
+$ export BUNDLE_BUNDLER_INJECT__GEM_PATH=~/src:~/gem_src
+```
+
+An override will find a gem in either of these two directories or in the directory
+where the Gemfile override is located.
+
+```Gemfile
+# located in ~/src/ansi
+override_gem "ansi"
+# located in $PWD/mime_override
+override_gem "mime/type", path: "mime_override"
+```
+
 ## What is this sorcery?
 
 While this is technically a bundler plugin, bundler-inject does not use the

data/bundler-inject.gemspec

@@ -1,4 +1,4 @@
-lib = File.expand_path("../lib", __FILE__)
+lib = File.expand_path("lib", __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require "bundler/inject/version"
 
@@ -22,7 +22,7 @@ Gem::Specification.new do |spec|
 
   # 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(__dir__)) do
     `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   end
   spec.bindir        = "exe"
@@ -32,7 +32,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "colorize"
   spec.add_development_dependency "manageiq-style"
-  spec.add_development_dependency "rake",          "~> 10.0"
-  spec.add_development_dependency "rspec",         "~> 3.0"
-  spec.add_development_dependency "simplecov"
+  spec.add_development_dependency "rake"
+  spec.add_development_dependency "rspec",     "~> 3.0"
+  spec.add_development_dependency "simplecov", ">= 0.21.2"
 end

data/lib/bundler/inject/dsl_patch.rb

@@ -8,7 +8,7 @@ module Bundler
         calling_file = "#{calling_loc.path}:#{calling_loc.lineno}"
 
         remove_dependencies_and_sources(dependency)
-        expand_gem_path(args, calling_file)
+        expand_gem_path(name, args, calling_file)
         gem(name, *args).tap do
           warn_override_gem(calling_file, name, args)
         end
@@ -59,13 +59,21 @@ module Bundler
         end
       end
 
-      def expand_gem_path(args, calling_file)
+      # Determine the path for the gem
+      #
+      # This is used when an override has no options or a path is specified
+      # This path is turned into an absolute path
+      def expand_gem_path(name, args, calling_file)
+        args << {:path => name} if args.empty?
         return unless args.last.kind_of?(Hash) && args.last[:path]
-        args.last[:path] = File.expand_path(args.last[:path], File.dirname(calling_file))
+
+        possible_paths = [File.dirname(calling_file)] + bundler_inject_gem_path
+        full_path = possible_paths.map { |p| File.expand_path(args.last[:path], p) }.detect { |f| File.exist?(f) }
+        args.last[:path] = full_path if full_path
       end
 
       def extract_version_opts(args)
-        args.last.is_a?(Hash) ? [args[0..-2], args[-1]] : [args, {}]
+        args.last.kind_of?(Hash) ? [args[0..-2], args[-1]] : [args, {}]
       end
 
       def warn_override_gem(calling_file, name, args)
@@ -82,7 +90,7 @@ module Bundler
       end
 
       def load_global_bundler_d
-        if ENV["HOME"]
+        if Dir.home
           load_bundler_d(File.join(Dir.home, ".bundler.d"))
         end
       end
@@ -93,10 +101,26 @@ module Bundler
 
       def load_bundler_d(dir)
         Dir.glob(File.join(dir, '*.rb')).sort.each do |f|
-          Bundler.ui.debug "Injecting #{f}..."
+          Bundler.ui.debug("Injecting #{f}...")
           eval_gemfile(f)
         end
       end
+
+      # Path to search for override gems
+      #
+      # The gem path can be set in two ways:
+      #
+      # - Via bundler's Bundler::Settings
+      #
+      #     bundle config bundler_inject.gem_path ~/src:~/gems_src
+      #
+      # - Via an environment variable
+      #
+      #     BUNDLE_BUNDLER_INJECT__GEM_PATH=~/src:~/gems_src
+      #
+      def bundler_inject_gem_path
+        @bundler_inject_gem_path ||= (Bundler.settings["bundler_inject.gem_path"] || "").split(File::PATH_SEPARATOR)
+      end
     end
   end
 end

data/lib/bundler/inject/version.rb

@@ -1,5 +1,5 @@
 module Bundler
   module Inject
-    VERSION = "2.0.0"
+    VERSION = "2.1.0".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bundler-inject
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - ManageIQ Authors
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-05-04 00:00:00.000000000 Z
+date: 2024-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -56,16 +56,16 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.21.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.21.2
 description: bundler-inject is a bundler plugin that allows a developer to extend
   a project with their own personal gems and/or override existing gems, without having
   to modify the Gemfile, thus avoiding accidental modification of git history.
@@ -103,12 +103,13 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".codeclimate.yml"
+- ".github/workflows/ci.yaml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
 - ".rubocop_cc.yml"
 - ".rubocop_local.yml"
-- ".travis.yml"
+- ".whitesource"
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
@@ -144,7 +145,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.33
 signing_key:
 specification_version: 4
 summary: A bundler plugin that allows extension of a project with personal and overridden

data/.travis.yml

@@ -1,23 +0,0 @@
----
-language: ruby
-cache: bundler
-rvm:
-- 2.7.3
-- 3.0.1
-env:
-- TEST_BUNDLER_VERSION=2.1
-- TEST_BUNDLER_VERSION=2.2
-jobs:
-  include:
-  - rvm: 2.6.7
-    env: TEST_BUNDLER_VERSION=2.0
-before_install:
-- 'echo ''gem: --no-ri --no-rdoc --no-document'' > ~/.gemrc'
-- gem install bundler -v "~> $TEST_BUNDLER_VERSION.0"
-before_script:
-- curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64
-  > ./cc-test-reporter
-- chmod +x ./cc-test-reporter
-- "./cc-test-reporter before-build"
-after_script:
-- "./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT"