bundler-override 0.1.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7c4b2fe832df4a34e38e9cbb7834a91bc043ec7e56cd098bc4b964b7a146cb42
-  data.tar.gz: ad9fd9af2ae024234f79d25bebc2a6282f7d1d2f47f00ccafe2a498cbf4d9987
+  metadata.gz: f0e1422d7af788242f04d6d27ba6e1460c9fffef3ea3c708de7055937d8f6327
+  data.tar.gz: 153ac33a2db604be438f9044ad6ba738d5fc45dca4a07a844c10e57720a4c05f
 SHA512:
-  metadata.gz: 1a8186b8b0824d16c84cff8cf1cc93371095af98885b09bc6c172ac95ae5e451f4a0a6f5f82c88f7bfb90c79728c67fc0d71eab916eaea45b38bade99c85f319
-  data.tar.gz: fc94923f1dbbb0d634c735033e435f6d654e9259e6d9e3e5cc25fcb44dc835f584294830fef9c24fc75209af97dff6a068bfe00a2435cc913eea7e7e5c512563
+  metadata.gz: 5bc04eb178bcd69a86e178927d8e29aedc09b5a29b3f3a470cf35c1dde5e7c875b3553ac116373026ea75323bd73bba4c2741861cb0267fb6cb7bd5aca84658d
+  data.tar.gz: bf5a8a689cee01ff98be4c35ef4e71f8d246fb1329d186a374b1ee26e92e8742a7aa6312001bf2182e20a007b5209e2f3600a8e7ec3c97e922623c7089b26b59

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 ## [Unreleased]
 
-## [0.1.0] - 2023-07-20
+## [0.2.0] - 2024-05-06
+
+- Fix for bundler 2.3.x and explicitly support only later versions of bundler
+
+## [0.1.0] - 2023-08-30
 
 - Initial release

data/README.md

@@ -5,10 +5,16 @@ It can be helpful in situation when a developer needs to use some other dependen
 
 ## Requirements
 
-_Ruby_ 3.2 and _Bundler_ 2.4.14 are mostly tested versions.
+_Ruby_ >= 3.0 and _Bundler_ >= 2.3.x are required. For detailed compatibility matrix please refer to [test pipeline versions configuration](https://github.com/tarnowsc/bundler-override/blob/main/.github/workflows/ruby.yml#L24).
 
 ## Installation
 
+### For normal usage
+~~~console
+bundle plugin install "bundler-override"
+~~~
+
+### For development
 1. Clone this project to your disk.
 
 2. Install plugin from local git folder
@@ -31,29 +37,40 @@ require File.join(Bundler::Plugin.index.load_paths("bundler-override")[0], "bund
 2. Add _'override'_ block to the _Gemfile_, e.g.:
 
 ~~~ruby
-override 'chef-config', :drop => ['chef-utils', 'mixlib-config']
+if Bundler::Plugin.installed?('bundler-override')
+  override 'chef-config', :drop => ['chef-utils', 'mixlib-config']
+end
 ~~~
 
 or
 
 ~~~ruby
-override 'chef-config', :drop => 'mixlib-config', :requirements => {
-  'chef-utils' => '17.10.68'
-}
+if Bundler::Plugin.installed?('bundler-override')
+  override 'chef-config', :drop => 'mixlib-config', :requirements => {
+    'chef-utils' => '17.10.68'
+  }
+end
 ~~~
 
 or
 
 ~~~ruby
-override 'chef-config', :requirements => {
-  'chef-utils' => '17.10.68',
-  'mixlib-config' => '2.0.0'
-}
+if Bundler::Plugin.installed?('bundler-override')
+  override 'chef-config', :requirements => {
+    'chef-utils' => '17.10.68',
+    'mixlib-config' => '2.0.0'
+  }
+end
 ~~~
 
+
+
 ### override
 
-`override` is a command that allows to replace dependency for a gem with desired version
+`override` is a command that allows to drop or replace dependency for a gem with desired version
+
+It is a good practice to check if the plugin is installed since it will allow bundler to install it
+automatically if it is missing.
 
 ### drop
 

data/lib/bundler/override/dependency_patch.rb

@@ -0,0 +1,49 @@
+module Bundler
+  module Override
+    module DependencyPatch
+      def self.included(base)
+        base.class_eval do
+          alias_method :dependencies_orig, :dependencies
+
+          def dependencies
+            override_dependencies || []
+          end
+
+          def override_dependencies
+            deps = dependencies_orig
+            return deps unless Bundler::Override.override? name
+            param = Bundler::Override.params(name)
+            drop = Array(param[:drop])
+            requirements = param[:requirements]
+            if requirements && !requirements.empty?
+              requirements.each do |name, requirement|
+                existing = deps.find { |d| d.name == name }
+                deps.delete_if { |d| d.name == name }
+                deps << Gem::Dependency.new(name, requirement, existing&.type || :runtime)
+              end
+            end
+            deps.delete_if { |d| drop.include? d.name }
+
+            deps
+          end
+        end
+      end
+    end
+  end
+end
+
+module Bundler
+  class RemoteSpecification
+    include Override::DependencyPatch
+  end
+
+  class EndpointSpecification
+    include Override::DependencyPatch
+  end
+end
+
+module Gem
+  class Specification
+    include Bundler::Override::DependencyPatch
+  end
+end

data/lib/bundler/override/version.rb

@@ -2,6 +2,6 @@
 
 module Bundler
   module Override
-    VERSION = "0.1.0"
+    VERSION = "0.3.0"
   end
 end

data/lib/bundler-override.rb

@@ -1,8 +1,7 @@
 # frozen_string_literal: true
 require "set"
 require_relative "bundler/override/dsl_patch"
-require_relative "bundler/override/specset_patch"
-require_relative "bundler/override/sharedhelpers_patch"
+require_relative "bundler/override/dependency_patch"
 require "bundler/friendly_errors.rb"
 
 module Bundler
@@ -24,7 +23,7 @@ module Bundler
         return if @gems.include? name
         @gems << name
         @params = Array.new unless @params
-        @params << { :name=>name, :drop=>drop || [], :requirements=>requirements }
+        @params << { :name => name, :drop => drop || [], :requirements => requirements }
       end
     end
   end
@@ -34,7 +33,3 @@ Bundler::Dsl.prepend(Bundler::Override::DslPatch)
 ObjectSpace.each_object(Bundler::Dsl) do |o|
   o.singleton_class.prepend(Bundler::Override::DslPatch)
 end
-
-Bundler::SpecSet.prepend(Bundler::Override::SpecSetPatch)
-
-Bundler::SharedHelpers.prepend(Bundler::Override::SharedHelpersPatch)

metadata

@@ -1,16 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: bundler-override
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Cezary Tarnowski
 - Tomasz Wojcik
 - Marek Jakubowski
-autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-08-30 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -96,7 +95,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.21.2
-description:
 email:
 - non-exiting@email.dont.use
 executables: []
@@ -109,11 +107,11 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- coverage/.keep
 - events.rb
 - lib/bundler-override.rb
+- lib/bundler/override/dependency_patch.rb
 - lib/bundler/override/dsl_patch.rb
-- lib/bundler/override/sharedhelpers_patch.rb
-- lib/bundler/override/specset_patch.rb
 - lib/bundler/override/version.rb
 - plugins.rb
 - sig/bundler_override.rbs
@@ -125,7 +123,6 @@ metadata:
   homepage_uri: https://github.com/tarnowsc/bundler-override
   source_code_uri: https://github.com/tarnowsc/bundler-override
   changelog_uri: https://github.com/tarnowsc/bundler-override/blob/main/CHANGELOG.md
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -133,17 +130,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 3.0.0
+      version: 3.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.19
-signing_key:
+rubygems_version: 3.6.9
 specification_version: 4
-summary: This bundler plugin allows to change dependencies for a gem. It can be helpful
+summary: 'This bundler plugin allows to change dependencies for a gem. It can be helpful
   in situation when a developer needs to use some other dependency than default for
-  the gem.
+  the gem. For usage details, please see: https://github.com/tarnowsc/bundler-override#usage'
 test_files: []

data/lib/bundler/override/sharedhelpers_patch.rb

@@ -1,14 +0,0 @@
-module Bundler
-  module Override
-    module SharedHelpersPatch
-
-      def ensure_same_dependencies(spec, old_deps, new_deps)
-        if Bundler::Override.override? spec.name
-          new_deps.clear()
-          new_deps.push(*old_deps)
-        end
-        super
-      end
-    end
-  end
-end

data/lib/bundler/override/specset_patch.rb

@@ -1,27 +0,0 @@
-require "set"
-
-module Bundler
-  module Override
-    module SpecSetPatch
-
-      def specs_for_dependency(dep, platform)
-        spec = super
-        return spec if spec.empty?
-        if Bundler::Override.override? dep.name
-          s = spec.first
-          param = Bundler::Override.params(dep.name)
-          drop = param[:drop]
-          s.dependencies.delete_if { |d| drop.include? d.name }
-          requirements = param[:requirements]
-          if requirements
-            gems = Set.new(requirements.keys)
-            s.dependencies.delete_if { |d| gems.include? d.name }
-            requirements.each { |name, requirement| s.dependencies << Gem::Dependency.new(name, requirement) }
-          end 
-        end
-        spec
-      end
-
-    end
-  end
-end