gem_pre_unversioned_install 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8c542b773abbd9ced9de46952b65180c28b0a3e1
-  data.tar.gz: 6d42201996f0d11a65ee60d1ee0e7b7f03bff047
+  metadata.gz: 47600b79f1ce0e5464b3e17ff16a1469e7474bc2
+  data.tar.gz: ad49a17321ea12ec9f1c31d4be0b945383f0e3a8
 SHA512:
-  metadata.gz: 92514f1d3bcbedaff847076d9ba2809c3fb8f1ab1c58c3ed4f45ef83ed4862289550f66d970f4c2e12e088417c82b62249eeeb3a1dea4e7c692cfbed5d2e1b48
-  data.tar.gz: 31d53c3e0abaff93898b85aa5daf978c49e41d0f23b367d0c1eac1f56a7280d8c85ff3f0acf4c10356548e58dc41834df352d3cc29c359e47d6607487a9f34ef
+  metadata.gz: 51ca024efbe8af603931725b722cc44c5f9db8f75f3a5f5c57ca78ac0c82c68058c4ccf9b378634b29e25bc696d196da3b44f6e25ee2593548525800275f2782
+  data.tar.gz: 7d4eb996d3cf6b7e5b391dcf5b540b404937d7ea41e7cb2b6e83a24e0d16e2443458dad4db2dafabd5e277e3d29460bbaa639ba26e8a135cf6a9e310a3dc817c

data/gem_pre_unversioned_install.gemspec

@@ -9,7 +9,7 @@ $LOAD_PATH.merge! [File.expand_path('../lib', __FILE__)]
 Gem::Specification.new do |spec|
   raise 'RubyGems 2.0 or newer is required.' unless spec.respond_to?(:metadata)
   spec.name = 'gem_pre_unversioned_install'
-  spec.version = '1.0.1'
+  spec.version = '1.0.2'
   spec.authors = ['Andrew Smith']
   spec.email = ['andrew.smith at moneysupermarket.com']
 

data/lib/gem_pre_unversioned_install.rb

@@ -1,5 +1,6 @@
 # Gem.pre_unversioned_install hook
 require 'rubygems'
+require 'rubygems/dependency'
 
 # Extend Gem module
 module Gem
@@ -22,19 +23,32 @@ module Gem
     @_unversioned_hooks |= [hook]
   end
 
-  # Reader only
-  def self._unversioned_hooks
-    # dup to protect collection integrity
-    @_unversioned_hooks.dup
+  # Dispatch unversioned hooks
+  def self.fire_unversioned_hooks(name, version)
+    rval = nil
+    # pre_install hooks can cause gem install to abort if they return false
+    # so we allow our plugins to do the same and trigger this behaviour
+    @_unversioned_hooks.each do |hook|
+      break if (rval = hook.call(name, version)) == false
+    end
+    rval
   end
 
-  # Monkey patch to capture gem name if latest_version? true
-  class Dependency
-    alias _latest_version? latest_version?
+  # Monkey patch through subclassing
+  class Dependency < remove_const(:Dependency)
 
-    # Stash any unversioned dependencies encountered
+    # Newer RubyGems use >=0 as a default requirement
+    def initialize(_name, *requirements)
+      super
+      return unless requirements.find do |req|
+        req.is_a?(Requirement) && req.none?
+      end
+      Gem.unversioned(@name)
+    end
+
+    # For older RubyGems versions
     def latest_version?
-      if (res = _latest_version?)
+      if (res = super)
         Gem.unversioned(@name)
       end
       res
@@ -46,11 +60,5 @@ end
 Gem.pre_install do |installer|
   spec = installer.spec
   next unless Gem.unversioned?(spec.name)
-  # pre_install hooks can cause gem install to abort if they return false
-  # so we allow our plugins to do the same and trigger this behaviour
-  rval = nil
-  Gem._unversioned_hooks.each do |hook|
-    break if (rval = hook.call(spec.name, spec.version)) == false
-  end
-  rval
+  Gem.fire_unversioned_hooks(spec.name, spec.version)
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gem_pre_unversioned_install
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Andrew Smith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-07 00:00:00.000000000 Z
+date: 2018-03-08 00:00:00.000000000 Z
 dependencies: []
 description: Allows custom actions in delivery pipelines for RubyGem installations
   that have no version specifications