akr	2009-02-02 16:07:59 +0900 (Mon, 02 Feb 2009)

  New Revision: 21951

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

  Log:
    * version.h: bump up to 1.9.2 patchlevel -1.
      yugui recommend "-1" strongly.
    * lib/rubygems/version.rb: accept negative patchlevel.

  Modified files:
    trunk/ChangeLog
    trunk/lib/rubygems/version.rb
    trunk/test/ruby/test_rubyoptions.rb
    trunk/version.h

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 21950)
+++ ChangeLog	(revision 21951)
@@ -1,3 +1,10 @@
+Mon Feb  2 16:06:10 2009  Tanaka Akira  <akr@f...>
+
+	* version.h: bump up to 1.9.2 patchlevel -1.
+	  yugui recommend "-1" strongly.
+
+	* lib/rubygems/version.rb: accept negative patchlevel.
+
 Mon Feb  2 14:53:35 2009  Tanaka Akira  <akr@f...>
 
 	* ext/socket/socket.c (sock_initialize): make 3rd argument, protocol,
Index: lib/rubygems/version.rb
===================================================================
--- lib/rubygems/version.rb	(revision 21950)
+++ lib/rubygems/version.rb	(revision 21951)
@@ -22,7 +22,7 @@
 
   def self.correct?(version)
     case version
-    when Integer, /\A\s*(\d+(\.\d+)*)*\s*\z/ then true
+    when Integer, /\A\s*(\d+(\.-?\d+)*)*\s*\z/ then true
     else false
     end
   end
Index: version.h
===================================================================
--- version.h	(revision 21950)
+++ version.h	(revision 21951)
@@ -1,11 +1,11 @@
-#define RUBY_VERSION "1.9.1"
+#define RUBY_VERSION "1.9.2"
 #define RUBY_RELEASE_DATE "2009-02-02"
-#define RUBY_PATCHLEVEL 5000
+#define RUBY_PATCHLEVEL -1
 #define RUBY_BRANCH_NAME "trunk"
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
-#define RUBY_VERSION_TEENY 1
+#define RUBY_VERSION_TEENY 2
 #define RUBY_RELEASE_YEAR 2009
 #define RUBY_RELEASE_MONTH 2
 #define RUBY_RELEASE_DAY 2
@@ -24,7 +24,11 @@
 #define RUBY_BIRTH_MONTH 2
 #define RUBY_BIRTH_DAY 24
 
+#if RUBY_PATCHLEVEL == -1
+#define RUBY_PATCHLEVEL_STR "dev"
+#else
 #define RUBY_PATCHLEVEL_STR "p"STRINGIZE(RUBY_PATCHLEVEL)
+#endif
 
 #ifndef RUBY_REVISION
 # include "revision.h"
Index: test/ruby/test_rubyoptions.rb
===================================================================
--- test/ruby/test_rubyoptions.rb	(revision 21950)
+++ test/ruby/test_rubyoptions.rb	(revision 21951)
@@ -60,7 +60,7 @@
 
   def test_verbose
     assert_in_out_err(%w(-vve) + [""]) do |r, e|
-      assert_match(/^ruby #{RUBY_VERSION}[p ].*? \[#{RUBY_PLATFORM}\]$/, r.join)
+      assert_match(/^ruby #{RUBY_VERSION}(?:[p ]|dev).*? \[#{RUBY_PLATFORM}\]$/, r.join)
       assert_equal RUBY_DESCRIPTION, r.join.chomp
       assert_equal([], e)
     end
@@ -106,7 +106,7 @@
 
   def test_version
     assert_in_out_err(%w(--version)) do |r, e|
-      assert_match(/^ruby #{RUBY_VERSION}[p ].*? \[#{RUBY_PLATFORM}\]$/, r.join)
+      assert_match(/^ruby #{RUBY_VERSION}(?:[p ]|dev).*? \[#{RUBY_PLATFORM}\]$/, r.join)
       assert_equal RUBY_DESCRIPTION, r.join.chomp
       assert_equal([], e)
     end

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