allow to mangle ENV['GEM_PATH'] like we did before using jruby.rack.gem_path = 'env'

Author: kares

src/main/ruby/jruby/rack/booter.rb

@@ -104,9 +104,15 @@ def boot!
     protected
 
     def adjust_gem_path
+      gem_path = self.gem_path
       case gem_path?
-      when false then return false
-      when true  then
+      when false then # org.jruby.rack.RackLogger::DEBUG
+        if gem_path && ! gem_path.empty? &&
+          ( ! defined?(Gem.path) || ! Gem.path.include?(gem_path) )
+          @rack_context.log("Gem.path won't be updated although seems configured: #{gem_path}")
+        end
+        return false
+      when true then
         if env_gem_path = ENV['GEM_PATH']
           if gem_path.nil? || gem_path.empty?
             return # keep ENV['GEM_PATH'] as is
@@ -119,18 +125,27 @@ def adjust_gem_path
         else
           ENV['GEM_PATH'] = gem_path
         end
-      else # default
+      else # nil (default)
         begin
-          require 'rubygems'
+          require 'rubygems' unless defined? Gem.path
         rescue LoadError
         else
+          return if gem_path.nil? || gem_path.empty?
           Gem.path.unshift(gem_path) unless Gem.path.include?(gem_path)
         end
       end
     end
 
-    def gem_path? # TODO
-      @rack_context.getInitParameter('jruby.rack.env.gem_path') || nil
+    # @return whether to update Gem.path and/or the environment GEM_PATH
+    # - true/'env' forces ENV['GEM_PATH'] to be updated
+    # - false disabled Gem.path mangling for good (leaves all as is)
+    # - if not specified Gem.path will be updated based on setting
+    def gem_path?
+      return @_gem_path if defined? @_gem_path
+      gem_path = @rack_context.getInitParameter('jruby.rack.gem_path')
+      return @_gem_path = nil if gem_path.nil?
+      return @_gem_path = false if gem_path.empty? || gem_path == 'false'
+      @_gem_path = true # true / 'env'
     end
 
     # @note called during {#boot!}

src/spec/ruby/jruby/rack/booter_spec.rb

@@ -18,10 +18,12 @@
 
   @@rack_env = ENV['RACK_ENV']
   @@gem_path = Gem.path.dup
+  @@env_gem_path = ENV['GEM_PATH']
 
   after do
     @@rack_env.nil? ? ENV.delete('RACK_ENV') : ENV['RACK_ENV'] = @@rack_env
     Gem.path.replace(@@gem_path)
+    @@env_gem_path.nil? ? ENV.delete('GEM_PATH') : ENV['GEM_PATH'] = @@env_gem_path
   end
 
   it "should determine the public html root from the 'public.root' init parameter" do
@@ -101,22 +103,43 @@
     expect( Gem.path ).to eql [ "file:/home/gems", "/usr/local/gems" ]
   end
 
-#  it "prepends gem_path to ENV['GEM_PATH']" do
-#    ENV['GEM_PATH'] = '/opt/gems'
-#    @rack_context.should_receive(:getRealPath).
-#      with("/WEB-INF").and_return "/opt/deploy/sample.war!/WEB-INF"
-#    booter.boot!
-#
-#    ENV['GEM_PATH'].should == "/opt/deploy/sample.war!/WEB-INF/gems#{File::PATH_SEPARATOR}/opt/gems"
-#  end
+  it "does not change Gem.path if gem_path empty" do
+    Gem.path.replace [ '/opt/gems' ]
+    booter.gem_path = ""
+    booter.boot!
 
-#  it "prepends gem_path to ENV['GEM_PATH'] if not already present" do
-#    ENV['GEM_PATH'] = "/home/gems#{File::PATH_SEPARATOR}/usr/local/gems"
-#    booter.gem_path = '/usr/local/gems'
-#    booter.boot!
-#
-#    ENV['GEM_PATH'].should == "/home/gems#{File::PATH_SEPARATOR}/usr/local/gems"
-#  end
+    expect( Gem.path ).to eql [ '/opt/gems' ]
+  end
+
+  it "prepends gem_path to ENV['GEM_PATH'] if jruby.rack.gem_path set to env" do
+    @rack_context.should_receive(:getInitParameter).with("jruby.rack.gem_path").and_return "env"
+    ENV['GEM_PATH'] = '/opt/gems'
+    @rack_context.should_receive(:getRealPath).with("/WEB-INF").and_return "/opt/deploy/sample.war!/WEB-INF"
+    @rack_context.should_receive(:getRealPath).with("/WEB-INF/gems").and_return "/opt/deploy/sample.war!/WEB-INF/gems"
+
+    booter.boot!
+
+    ENV['GEM_PATH'].should == "/opt/deploy/sample.war!/WEB-INF/gems#{File::PATH_SEPARATOR}/opt/gems"
+  end
+
+  it "does not prepend gem_path to ENV['GEM_PATH'] if jruby.rack.gem_path set not set" do
+    ENV['GEM_PATH'] = '/opt/gems'
+    @rack_context.should_receive(:getRealPath).with("/WEB-INF").and_return "/opt/deploy/sample.war!/WEB-INF"
+    @rack_context.should_receive(:getRealPath).with("/WEB-INF/gems").and_return "/opt/deploy/sample.war!/WEB-INF/gems"
+
+    booter.boot!
+
+    ENV['GEM_PATH'].should == "/opt/gems"
+  end
+
+  it "prepends gem_path to ENV['GEM_PATH'] if not already present" do
+    @rack_context.should_receive(:getInitParameter).with("jruby.rack.gem_path").and_return "env"
+    ENV['GEM_PATH'] = "/home/gems#{File::PATH_SEPARATOR}/usr/local/gems"
+    booter.gem_path = '/usr/local/gems'
+    booter.boot!
+
+    ENV['GEM_PATH'].should == "/home/gems#{File::PATH_SEPARATOR}/usr/local/gems"
+  end
 
 #  it "keeps ENV['GEM_PATH'] when gem_path is nil" do
 #    ENV['GEM_PATH'] = '/usr/local/gems'
@@ -128,12 +151,16 @@
 #    ENV['GEM_PATH'].should == "/usr/local/gems"
 #  end
 
-#  it "sets ENV['GEM_PATH'] to the value of gem_path if ENV['GEM_PATH'] is not present" do
-#    ENV['GEM_PATH'] = nil
-#    @rack_context.should_receive(:getRealPath).with("/WEB-INF").and_return "/blah"
-#    booter.boot!
-#    ENV['GEM_PATH'].should == "/blah/gems"
-#  end
+  it "sets ENV['GEM_PATH'] to the value of gem_path if ENV['GEM_PATH'] is not present" do
+    @rack_context.should_receive(:getInitParameter).with("jruby.rack.gem_path").and_return 'true'
+    ENV.delete('GEM_PATH')
+    @rack_context.should_receive(:getRealPath).with("/WEB-INF").and_return "/blah"
+    @rack_context.should_receive(:getRealPath).with("/WEB-INF/gems").and_return "/blah/gems"
+
+    booter.boot!
+
+    ENV['GEM_PATH'].should == "/blah/gems"
+  end
 
   it "creates a logger that writes messages to the servlet context" do
     booter.boot!