mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
merge revision(s) 20245,20247:
* lib/logger.rb (ProgName): fixed for svn, based on a patch from Nobuhiro IMAI at [ruby-dev:37108]. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@22285 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
0aac18678d
commit
5dbb5cbdd9
4 changed files with 12 additions and 3 deletions
|
@ -1,3 +1,8 @@
|
|||
Fri Feb 13 19:18:42 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
||||
|
||||
* lib/logger.rb (ProgName): fixed for svn, based on a patch from
|
||||
Nobuhiro IMAI at [ruby-dev:37108].
|
||||
|
||||
Fri Feb 13 19:04:54 2009 Keiju Ishitsuka <keiju@ruby-lang.org>
|
||||
|
||||
* shell/command-processor.rb: undefined method `top_level_test' in
|
||||
|
|
|
@ -170,8 +170,8 @@ require 'monitor'
|
|||
|
||||
class Logger
|
||||
VERSION = "1.2.6"
|
||||
/: (\S+),v (\S+)/ =~ %q$Id$
|
||||
ProgName = "#{$1}/#{$2}"
|
||||
id, name, rev = %w$Id$
|
||||
ProgName = "#{name.chomp(",v")}/#{rev}"
|
||||
|
||||
class Error < RuntimeError; end
|
||||
class ShiftingError < Error; end
|
||||
|
|
|
@ -23,6 +23,10 @@ class TestLogger < Test::Unit::TestCase
|
|||
@logger = Logger.new(nil)
|
||||
end
|
||||
|
||||
def test_const_progname
|
||||
assert %r!\Alogger\.rb/\S+\z! === Logger::ProgName
|
||||
end
|
||||
|
||||
class Log
|
||||
attr_reader :label, :datetime, :pid, :severity, :progname, :msg
|
||||
def initialize(line)
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
#define RUBY_RELEASE_DATE "2009-02-13"
|
||||
#define RUBY_VERSION_CODE 187
|
||||
#define RUBY_RELEASE_CODE 20090213
|
||||
#define RUBY_PATCHLEVEL 115
|
||||
#define RUBY_PATCHLEVEL 116
|
||||
|
||||
#define RUBY_VERSION_MAJOR 1
|
||||
#define RUBY_VERSION_MINOR 8
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue