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

* lib/pathname.rb (chop_basename, prepend_prefix): use o option.

Browse source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@21779 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2009-01-26 06:49:46 +00:00
parent 083bddec3e
commit 5225998612
3 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
Mon Jan 26 15:49:42 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/pathname.rb (chop_basename, prepend_prefix): use o option.
Sun Jan 25 16:35:44 2009 Tanaka Akira <akr@fsij.org> Sun Jan 25 16:35:44 2009 Tanaka Akira <akr@fsij.org>
* ext/socket/socket.c (socket_s_ip_address_list): renamed from * ext/socket/socket.c (socket_s_ip_address_list): renamed from

4
lib/pathname.rb
View file

@ -274,7 +274,7 @@ class Pathname
# chop_basename(path) -> [pre-basename, basename] or nil # chop_basename(path) -> [pre-basename, basename] or nil
def chop_basename(path) def chop_basename(path)
base = File.basename(path) base = File.basename(path)
if /\A#{SEPARATOR_PAT}?\z/ =~ base if /\A#{SEPARATOR_PAT}?\z/o =~ base
return nil return nil
else else
return path[0, path.rindex(base)], base return path[0, path.rindex(base)], base
@ -296,7 +296,7 @@ class Pathname
def prepend_prefix(prefix, relpath) def prepend_prefix(prefix, relpath)
if relpath.empty? if relpath.empty?
File.dirname(prefix) File.dirname(prefix)
elsif /#{SEPARATOR_PAT}/ =~ prefix elsif /#{SEPARATOR_PAT}/o =~ prefix
prefix = File.dirname(prefix) prefix = File.dirname(prefix)
prefix = File.join(prefix, "") if File.basename(prefix + 'a') != 'a' prefix = File.join(prefix, "") if File.basename(prefix + 'a') != 'a'
prefix + relpath prefix + relpath

4
version.h
View file

@ -1,5 +1,5 @@
#define RUBY_VERSION "1.9.1" #define RUBY_VERSION "1.9.1"
#define RUBY_RELEASE_DATE "2009-01-25" #define RUBY_RELEASE_DATE "2009-01-26"
#define RUBY_PATCHLEVEL 5000 #define RUBY_PATCHLEVEL 5000
#define RUBY_BRANCH_NAME "trunk" #define RUBY_BRANCH_NAME "trunk"
@ -8,7 +8,7 @@
#define RUBY_VERSION_TEENY 1 #define RUBY_VERSION_TEENY 1
#define RUBY_RELEASE_YEAR 2009 #define RUBY_RELEASE_YEAR 2009
#define RUBY_RELEASE_MONTH 1 #define RUBY_RELEASE_MONTH 1
#define RUBY_RELEASE_DAY 25 #define RUBY_RELEASE_DAY 26
#ifdef RUBY_EXTERN #ifdef RUBY_EXTERN
RUBY_EXTERN const char ruby_version[]; RUBY_EXTERN const char ruby_version[];