kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

merge revision(s) 27398:

Browse source 
* eval.c (search_required): expand home relative path first.
	  [ruby-core:29610]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@28210 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
shyouhei 2010-06-08 06:30:35 +00:00
parent 1bb0917fa7
commit 6e37bdc69f
4 changed files with 38 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Tue Jun 8 15:27:00 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
* eval.c (search_required): expand home relative path first.
[ruby-core:29610]
Tue Jun 8 15:23:10 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/timeout.rb (Timeout#timeout): propagate errors to the

6
eval.c
View file

@ -7328,9 +7328,13 @@ search_required(fname, featurep, path)
const char *ext, *ftptr;
int type;
if (*(ftptr = RSTRING_PTR(fname)) == '~') {
fname = rb_file_expand_path(fname, Qnil);
ftptr = RSTRING_PTR(fname);
}
*featurep = fname;
*path = 0;
ext = strrchr(ftptr = RSTRING_PTR(fname), '.');
ext = strrchr(ftptr, '.');
if (ext && !strchr(ext, '/')) {
if (strcmp(".rb", ext) == 0) {
if (rb_feature_p(ftptr, ext, Qtrue)) {

27
test/ruby/test_require.rb Normal file
View file

@ -0,0 +1,27 @@
require 'test/unit'
require 'tempfile'
require File.expand_path('../envutil', __FILE__)
require 'tmpdir'
class TestRequire < Test::Unit::TestCase
def test_home_path
home = ENV["HOME"]
bug3171 = '[ruby-core:29610]'
Dir.mktmpdir do |tmp|
ENV["HOME"] = tmp
name = "loadtest#{$$}-1"
path = File.join(tmp, name) << ".rb"
open(path, "w") {}
require "~/#{name}"
assert_equal(path, $"[-1], bug3171)
name.succ!
path = File.join(tmp, name << ".rb")
open(path, "w") {}
require "~/#{name}"
assert_equal(path, $"[-1], bug3171)
end
ensure
ENV["HOME"] = home
end
end

2
version.h
View file

@ -2,7 +2,7 @@
#define RUBY_RELEASE_DATE "2010-06-08"
#define RUBY_VERSION_CODE 187
#define RUBY_RELEASE_CODE 20100608
#define RUBY_PATCHLEVEL 274
#define RUBY_PATCHLEVEL 275
#define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 8