yugui	2011-05-31 11:28:46 +0900 (Tue, 31 May 2011)

  New Revision: 31851

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=31851

  Log:
    merges r30798 from trunk into ruby_1_9_2.
    --
    * lib/test/unit/assertions.rb (assert_block): move from
      test/fileutils/fileasserts.rb.

  Modified files:
    branches/ruby_1_9_2/ChangeLog
    branches/ruby_1_9_2/lib/test/unit/assertions.rb
    branches/ruby_1_9_2/version.h

Index: ruby_1_9_2/ChangeLog
===================================================================
--- ruby_1_9_2/ChangeLog	(revision 31850)
+++ ruby_1_9_2/ChangeLog	(revision 31851)
@@ -472,8 +472,11 @@
 	* test/fileutils/fileasserts.rb (assert_block): little workaround
 	  for [ruby-dev:43174].
 
-Sat Feb  5 20:40:34 2011  Nobuyoshi Nakada  <nobu@r...>
+Sat Feb  5 21:22:21 2011  Nobuyoshi Nakada  <nobu@r...>
 
+	* lib/test/unit/assertions.rb (assert_block): move from
+	  test/fileutils/fileasserts.rb.
+
 	* test/fileutils/fileasserts.rb (assert_block): pass arguments
 	  as-is.  [ruby-dev:43174]
 
Index: ruby_1_9_2/lib/test/unit/assertions.rb
===================================================================
--- ruby_1_9_2/lib/test/unit/assertions.rb	(revision 31850)
+++ ruby_1_9_2/lib/test/unit/assertions.rb	(revision 31851)
@@ -19,6 +19,10 @@
         super
       end
 
+      def assert_block(*msgs)
+        assert yield, *msgs
+      end
+
       def assert_raise(*args, &b)
         assert_raises(*args, &b)
       end
Index: ruby_1_9_2/version.h
===================================================================
--- ruby_1_9_2/version.h	(revision 31850)
+++ ruby_1_9_2/version.h	(revision 31851)
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.2"
-#define RUBY_PATCHLEVEL 266
+#define RUBY_PATCHLEVEL 267
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/