1
0
Fork 0
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_6@22283 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
shyouhei 2009-02-13 10:18:12 +00:00
parent 59356f7343
commit daccc3c197
4 changed files with 12 additions and 3 deletions

View file

@ -1,3 +1,8 @@
Fri Feb 13 19:17:29 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:06 2009 Keiju Ishitsuka <keiju@ruby-lang.org> Fri Feb 13 19:04:06 2009 Keiju Ishitsuka <keiju@ruby-lang.org>
* shell/command-processor.rb: undefined method `top_level_test' in * shell/command-processor.rb: undefined method `top_level_test' in

View file

@ -170,8 +170,8 @@ require 'monitor'
class Logger class Logger
VERSION = "1.2.6" VERSION = "1.2.6"
/: (\S+),v (\S+)/ =~ %q$Id$ id, name, rev = %w$Id$
ProgName = "#{$1}/#{$2}" ProgName = "#{name.chomp(",v")}/#{rev}"
class Error < RuntimeError; end class Error < RuntimeError; end
class ShiftingError < Error; end class ShiftingError < Error; end

View file

@ -23,6 +23,10 @@ class TestLogger < Test::Unit::TestCase
@logger = Logger.new(nil) @logger = Logger.new(nil)
end end
def test_const_progname
assert %r!\Alogger\.rb/\S+\z! === Logger::ProgName
end
class Log class Log
attr_reader :label, :datetime, :pid, :severity, :progname, :msg attr_reader :label, :datetime, :pid, :severity, :progname, :msg
def initialize(line) def initialize(line)

View file

@ -2,7 +2,7 @@
#define RUBY_RELEASE_DATE "2009-02-13" #define RUBY_RELEASE_DATE "2009-02-13"
#define RUBY_VERSION_CODE 186 #define RUBY_VERSION_CODE 186
#define RUBY_RELEASE_CODE 20090213 #define RUBY_RELEASE_CODE 20090213
#define RUBY_PATCHLEVEL 329 #define RUBY_PATCHLEVEL 330
#define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 8 #define RUBY_VERSION_MINOR 8