gem_install_unless_installed fix on newer rubygems (>= 2.3.0) - still not as expected ;(

Author: kares

Gemfile

@@ -1,4 +1,4 @@
-source "https://rubygems.org"
+source 'https://rubygems.org'
 
 group :default do
   if rack_version = ENV['RACK_VERSION']

src/spec/ruby/rack/application_spec.rb

@@ -311,12 +311,10 @@ def newRuntime() # use the current runtime instead of creating new
       end
 
       it "loads specified version of rack", :lib => :stub do
-        gem_install_rack_unless_installed '1.3.10'
+        gem_install_unless_installed 'rack', '1.3.10'
         set_config 'jruby.runtime.env', 'false'
 
-        script = "" +
-          "# rack.version: ~>1.3.6\n" +
-          "Proc.new { 'proc-rack-app' }"
+        script = "# rack.version: ~>1.3.6\n Proc.new { 'proc-rack-app' }"
         app_factory.setRackupScript script
         @runtime = app_factory.newRuntime
         @runtime.evalScriptlet "ENV['GEM_HOME'] = #{ENV['GEM_HOME'].inspect}"
@@ -330,7 +328,7 @@ def newRuntime() # use the current runtime instead of creating new
       end
 
       it "loads bundler with rack", :lib => :stub do
-        gem_install_rack_unless_installed '1.3.6'
+        gem_install_unless_installed 'rack', '1.3.6'
         set_config 'jruby.runtime.env', 'false'
 
         script = "# encoding: UTF-8\n" +
@@ -354,20 +352,6 @@ def newRuntime() # use the current runtime instead of creating new
         should_eval_as_eql_to "Gem.loaded_specs['rack'].version.to_s", '1.3.6'
       end
 
-      def gem_install_rack_unless_installed(version)
-        begin
-          if Gem::Specification.respond_to? :find_by_name
-            Gem::Specification.find_by_name 'rack', version
-          else
-            raise Gem::LoadError unless Gem.available? 'rack', version
-          end
-        rescue Gem::LoadError
-          require 'rubygems/dependency_installer'
-          installer = Gem::DependencyInstaller.new
-          installer.install 'rack', version
-        end
-      end
-
       # should not matter on 1.7.x due https://github.com/jruby/jruby/pull/123
       if JRUBY_VERSION < '1.7.0'
         it "does not load any features (until load path is adjusted)" do

src/spec/ruby/spec_helper.rb

@@ -84,6 +84,30 @@ def raise_logger(level = 'WARN')
     org.jruby.rack.logging.RaiseLogger.new(level, JRuby.runtime.out)
   end
 
+  def gem_install_unless_installed(name, version)
+    found = nil
+    begin
+      if Gem::Specification.respond_to? :find_all
+        all = Gem::Specification.find_all
+        found = all.find do |spec|
+          spec.name == name && spec.version.to_s == version
+        end
+      elsif Gem::Specification.respond_to? :find_by_name
+        found = Gem::Specification.find_by_name name, version
+      else
+        raise Gem::LoadError unless Gem.available? name, version
+      end
+    rescue Gem::LoadError
+      found = false
+    end
+    # NOTE: won't ever be found in RubyGems >= 2.3 likely due Bundler
+    unless found
+      require 'rubygems/dependency_installer'
+      installer = Gem::DependencyInstaller.new
+      installer.install name, version
+    end
+  end
+
   ExpectationNotMetError = RSpec::Expectations::ExpectationNotMetError
 
   def expect_eql_java_bytes(actual, expected)