nobu	2010-06-27 10:41:40 +0900 (Sun, 27 Jun 2010)

  New Revision: 28447

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=28447

  Log:
    * 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]

  Modified files:
    branches/ruby_1_9_2/ChangeLog
    branches/ruby_1_9_2/lib/rubygems/require_paths_builder.rb
    branches/ruby_1_9_2/version.h
    trunk/ChangeLog
    trunk/lib/rubygems/require_paths_builder.rb
    trunk/version.h

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 28446)
+++ ChangeLog	(revision 28447)
@@ -1,3 +1,9 @@
+Sun Jun 27 10:41:38 2010  Nobuyoshi Nakada  <nobu@r...>
+
+	* 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]
+
 Sat Jun 26 13:07:09 2010  Nobuyoshi Nakada  <nobu@r...>
 
 	* configure.in (enable-debug-env): option for RUBY_DEBUG env.
Index: lib/rubygems/require_paths_builder.rb
===================================================================
--- lib/rubygems/require_paths_builder.rb	(revision 28446)
+++ lib/rubygems/require_paths_builder.rb	(revision 28447)
@@ -2,15 +2,11 @@
 
 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
Index: version.h
===================================================================
--- version.h	(revision 28446)
+++ version.h	(revision 28447)
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.3"
-#define RUBY_RELEASE_DATE "2010-06-26"
+#define RUBY_RELEASE_DATE "2010-06-27"
 #define RUBY_PATCHLEVEL -1
 #define RUBY_BRANCH_NAME "trunk"
 
@@ -8,7 +8,7 @@
 #define RUBY_VERSION_TEENY 1
 #define RUBY_RELEASE_YEAR 2010
 #define RUBY_RELEASE_MONTH 6
-#define RUBY_RELEASE_DAY 26
+#define RUBY_RELEASE_DAY 27
 
 #include "ruby/version.h"
 
Index: ruby_1_9_2/ChangeLog
===================================================================
--- ruby_1_9_2/ChangeLog	(revision 28446)
+++ ruby_1_9_2/ChangeLog	(revision 28447)
@@ -1,3 +1,9 @@
+Sun Jun 27 10:41:38 2010  Nobuyoshi Nakada  <nobu@r...>
+
+	* 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]
+
 Sat Jun 26 11:56:31 2010  Nobuyoshi Nakada  <nobu@r...>
 
 	* common.mk (clear-installed-list): put redirection before set
Index: ruby_1_9_2/lib/rubygems/require_paths_builder.rb
===================================================================
--- ruby_1_9_2/lib/rubygems/require_paths_builder.rb	(revision 28446)
+++ ruby_1_9_2/lib/rubygems/require_paths_builder.rb	(revision 28447)
@@ -2,15 +2,11 @@
 
 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
Index: ruby_1_9_2/version.h
===================================================================
--- ruby_1_9_2/version.h	(revision 28446)
+++ ruby_1_9_2/version.h	(revision 28447)
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.2"
-#define RUBY_RELEASE_DATE "2010-06-26"
+#define RUBY_RELEASE_DATE "2010-06-27"
 #define RUBY_PATCHLEVEL -1
 
 #define RUBY_VERSION_MAJOR 1
@@ -7,7 +7,7 @@
 #define RUBY_VERSION_TEENY 1
 #define RUBY_RELEASE_YEAR 2010
 #define RUBY_RELEASE_MONTH 6
-#define RUBY_RELEASE_DAY 26
+#define RUBY_RELEASE_DAY 27
 
 #include "ruby/version.h"
 

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/