diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | lib/fileutils.rb | 2 | ||||
| -rw-r--r-- | test/fileutils/fileasserts.rb | 6 | ||||
| -rw-r--r-- | version.h | 8 |
4 files changed, 15 insertions, 8 deletions
@@ -1,3 +1,10 @@ +Tue Mar 13 14:42:10 2007 URABE Shyouhei <shyouhei@ruby-lang.org> + + * test/fileutils/fileasserts.rb: Fix wrong error message. + + * lib/fileutils.rb (FileUtils::mv): Type Error; should utilize + Strings instead of Symbols here. + Mon Mar 12 17:22:44 2007 NAKAMURA Usaku <usa@ruby-lang.org> * lib/fileutils.rb (FileUtils::mv): fix incomplete backport of diff --git a/lib/fileutils.rb b/lib/fileutils.rb index 0c20362158..043a24d2b5 100644 --- a/lib/fileutils.rb +++ b/lib/fileutils.rb @@ -518,7 +518,7 @@ module FileUtils module_function :move OPT_TABLE['mv'] = - OPT_TABLE['move'] = [:force, :noop, :verbose, :secure] + OPT_TABLE['move'] = %w[force noop verbose secure] def rename_cannot_overwrite_file? #:nodoc: /djgpp|cygwin|mswin|mingw|bccwin|wince|emx/ =~ RUBY_PLATFORM diff --git a/test/fileutils/fileasserts.rb b/test/fileutils/fileasserts.rb index 65add2ac76..1fdc879cd5 100644 --- a/test/fileutils/fileasserts.rb +++ b/test/fileutils/fileasserts.rb @@ -24,7 +24,7 @@ module Test def assert_file_exist(path) _wrap_assertion { - assert_block("file not exist: #{path}") { + assert_block("file not exists: #{path}") { File.exist?(path) } } @@ -32,7 +32,7 @@ module Test def assert_file_not_exist(path) _wrap_assertion { - assert_block("file not exist: #{path}") { + assert_block("file does exist: #{path}") { not File.exist?(path) } } @@ -40,7 +40,7 @@ module Test def assert_directory(path) _wrap_assertion { - assert_block("is not directory: #{path}") { + assert_block("is not a directory: #{path}") { File.directory?(path) } } @@ -1,15 +1,15 @@ #define RUBY_VERSION "1.8.5" -#define RUBY_RELEASE_DATE "2007-03-12" +#define RUBY_RELEASE_DATE "2007-03-13" #define RUBY_VERSION_CODE 185 -#define RUBY_RELEASE_CODE 20070312 -#define RUBY_PATCHLEVEL 33 +#define RUBY_RELEASE_CODE 20070313 +#define RUBY_PATCHLEVEL 34 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 #define RUBY_VERSION_TEENY 5 #define RUBY_RELEASE_YEAR 2007 #define RUBY_RELEASE_MONTH 3 -#define RUBY_RELEASE_DAY 12 +#define RUBY_RELEASE_DAY 13 #ifdef RUBY_EXTERN RUBY_EXTERN const char ruby_version[]; |