From 3ca40d253132156f7a056a1f4be3b66c6745f98a Mon Sep 17 00:00:00 2001 From: nobu Date: Sun, 27 Jun 2010 01:41:40 +0000 Subject: * lib/rubygems/require_paths_builder.rb (write_require_paths_file_if_needed): no reason that bin directory should be included in $LOAD_PATH. it is for executable files, but not libraries. [ruby-core:25936] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@28447 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- lib/rubygems/require_paths_builder.rb | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) (limited to 'lib/rubygems') diff --git a/lib/rubygems/require_paths_builder.rb b/lib/rubygems/require_paths_builder.rb index a77818603b..5cf41b9da8 100644 --- a/lib/rubygems/require_paths_builder.rb +++ b/lib/rubygems/require_paths_builder.rb @@ -2,15 +2,11 @@ require 'rubygems' module Gem::RequirePathsBuilder def write_require_paths_file_if_needed(spec = @spec, gem_home = @gem_home) - return if spec.require_paths == ["lib"] && - (spec.bindir.nil? || spec.bindir == "bin") - file_name = File.join(gem_home, 'gems', "#{@spec.full_name}", ".require_paths") - file_name.untaint - File.open(file_name, "w") do |file| - spec.require_paths.each do |path| - file.puts path - end - file.puts spec.bindir if spec.bindir + require_paths = spec.require_paths + return if require_paths.size == 1 and require_paths.first == "lib" + file_name = "#{gem_home}/gems/#{@spec.full_name}/.require_paths".untaint + File.open(file_name, "wb") do |file| + file.puts require_paths end end end -- cgit v1.2.3