summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-03-13 05:47:54 +0000
committershyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-03-13 05:47:54 +0000
commit450bba6d3d92fa2ec1e2f884df36d8f1852ea475 (patch)
tree1fec187a1e2979c54155bc1024d4e103b50ae9f9
parent371e57550d211636917103b45175c2b11c7b9d40 (diff)
* test/fileutils/fileasserts.rb: Fix wrong error message.
* lib/fileutils.rb (FileUtils::mv): Type Error; should utilize Strings instead of Symbols here. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_5@12060 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog7
-rw-r--r--lib/fileutils.rb2
-rw-r--r--test/fileutils/fileasserts.rb6
-rw-r--r--version.h8
4 files changed, 15 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index 012898e06fa..e1de63e6c71 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 0c20362158b..043a24d2b56 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 65add2ac760..1fdc879cd56 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)
}
}
diff --git a/version.h b/version.h
index 705e53d04f3..82b9156f8bc 100644
--- a/version.h
+++ b/version.h
@@ -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[];