start ajusting Gem.path directly instead of mangling with ENV['GEM_PATH']

Author: kares

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

@@ -77,12 +77,12 @@ def layout
     end
     attr_writer :layout
 
-    %w( app_path gem_path public_path ).each do |path|
-      # def app_path; layout.app_path; end
-      # def app_path=(path); layout.app_path = path; end
-      class_eval "def #{path}; layout.#{path}; end"
-      class_eval "def #{path}=(path); layout.#{path} = path; end"
-    end
+    def app_path; layout.app_path end
+    def app_path=(path); layout.app_path = path end
+    def gem_path; layout.gem_path end
+    def gem_path=(path); layout.gem_path = path end
+    def public_path; layout.public_path end
+    def public_path=(path); layout.public_path = path end
 
     # @deprecated use {JRuby::Rack#logger} instead
     # @return [Logger]
@@ -91,16 +91,8 @@ def logger; JRuby::Rack.logger; end
     # Boot-up this booter, preparing the environment for the application.
     def boot!
       adjust_load_path
+      adjust_gem_path
       ENV['RACK_ENV'] = rack_env
-      gem_path = layout.gem_path
-      if env_gem_path = ENV['GEM_PATH']
-        if gem_path.nil? || gem_path.empty?
-          gem_path = env_gem_path # keep ENV['GEM_PATH'] as is
-        elsif env_gem_path != gem_path
-          gem_path = "#{gem_path}#{File::PATH_SEPARATOR}#{env_gem_path}"
-        end
-      end
-      ENV['GEM_PATH'] = gem_path
       export_global_settings
       change_working_directory
       load_settings_from_init_rb
@@ -111,6 +103,36 @@ def boot!
 
     protected
 
+    def adjust_gem_path
+      case gem_path?
+      when false then 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
+          elsif env_gem_path != gem_path
+            separator = File::PATH_SEPARATOR
+            unless env_gem_path.split(separator).include?(gem_path)
+              ENV['GEM_PATH'] = "#{gem_path}#{separator}#{env_gem_path}"
+            end
+          end
+        else
+          ENV['GEM_PATH'] = gem_path
+        end
+      else # default
+        begin
+          require 'rubygems'
+        rescue LoadError
+        else
+          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
+    end
+
     # @note called during {#boot!}
     def export_global_settings
       JRuby::Rack.send(:instance_variable_set, :@booter, self) # TODO
@@ -233,6 +255,9 @@ def run_boot_hooks
       self.class.run_boot_hooks!
     end
 
+    def real_path(path); layout.real_path(path) end
+    def expand_path(path); layout.expand_path(path) end
+
     private
 
     def silence_warnings(&block)

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

@@ -17,9 +17,11 @@
   after(:all) { JRuby::Rack.context = nil }
 
   @@rack_env = ENV['RACK_ENV']
+  @@gem_path = Gem.path.dup
 
   after do
     @@rack_env.nil? ? ENV.delete('RACK_ENV') : ENV['RACK_ENV'] = @@rack_env
+    Gem.path.replace(@@gem_path)
   end
 
   it "should determine the public html root from the 'public.root' init parameter" do
@@ -50,22 +52,23 @@
 
   it "should determine the gem path from the gem.path init parameter" do
     @rack_context.should_receive(:getInitParameter).with("gem.path").and_return "/blah"
-    @rack_context.should_receive(:getRealPath).with("/blah").and_return "."
+    @rack_context.should_receive(:getRealPath).with("/blah").and_return "./blah"
     booter.boot!
-    booter.gem_path.should == "."
+    booter.gem_path.should == "./blah"
   end
 
   it "should also be able to determine the gem path from the gem.home init parameter" do
     @rack_context.should_receive(:getInitParameter).with("gem.home").and_return "/blah"
-    @rack_context.should_receive(:getRealPath).with("/blah").and_return "."
+    @rack_context.should_receive(:getRealPath).with("/blah").and_return "/home/kares/blah"
     booter.boot!
-    booter.gem_path.should == "."
+    booter.gem_path.should == "/home/kares/blah"
   end
 
   it "defaults gem path to '/WEB-INF/gems'" do
-    @rack_context.should_receive(:getRealPath).with("/WEB-INF").and_return "."
+    @rack_context.should_receive(:getRealPath).with("/WEB-INF").and_return "file:/home/kares/WEB-INF"
+    @rack_context.should_receive(:getRealPath).with("/WEB-INF/gems").and_return "file:/home/kares/WEB-INF/gems"
     booter.boot!
-    booter.gem_path.should == "./gems"
+    booter.gem_path.should == "file:/home/kares/WEB-INF/gems"
   end
 
   it "gets rack environment from rack.env" do
@@ -82,30 +85,56 @@
     booter.rack_env.should == 'production'
   end
 
-  it "prepends gem_path to ENV['GEM_PATH']" do
-    ENV['GEM_PATH'] = '/other/gems'
-    @rack_context.should_receive(:getRealPath).with("/WEB-INF").and_return "/blah"
+  it "prepends gem_path to Gem.path" do
+    Gem.path.replace [ '/opt/gems' ]
+    booter.gem_path = "wsjar:file:/opt/deploy/sample.war!/WEB-INF/gems"
     booter.boot!
-    ENV['GEM_PATH'].should == "/blah/gems#{File::PATH_SEPARATOR}/other/gems"
-  end
 
-  it "keeps ENV['GEM_PATH'] when gem_path is nil" do
-    ENV['GEM_PATH'] = '/some/other/gems'
-    booter.layout = layout = double('layout')
-    layout.stub(:app_path).and_return '.'
-    layout.stub(:public_path).and_return nil
-    layout.should_receive(:gem_path).and_return nil
-    booter.boot!
-    ENV['GEM_PATH'].should == "/some/other/gems"
+    expect( Gem.path ).to eql [ 'wsjar:file:/opt/deploy/sample.war!/WEB-INF/gems', '/opt/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"
+  it "prepends gem_path to Gem.path if not already present" do
+    Gem.path.replace [ "file:/home/gems", "/usr/local/gems" ]
+    booter.gem_path = '/usr/local/gems'
     booter.boot!
-    ENV['GEM_PATH'].should == "/blah/gems"
+
+    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 "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
+
+#  it "keeps ENV['GEM_PATH'] when gem_path is nil" do
+#    ENV['GEM_PATH'] = '/usr/local/gems'
+#    booter.layout = layout = double('layout')
+#    layout.stub(:app_path).and_return '.'
+#    layout.stub(:public_path).and_return nil
+#    layout.should_receive(:gem_path).and_return nil
+#    booter.boot!
+#    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 "creates a logger that writes messages to the servlet context" do
     booter.boot!
     @rack_context.should_receive(:log).with(/hello/)