nobu	2011-07-30 23:19:11 +0900 (Sat, 30 Jul 2011)

  New Revision: 32759

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

  Log:
    * defs/default_gems: separate from tool/rbinstall.rb.

  Added files:
    branches/ruby_1_9_3/defs/default_gems
    trunk/defs/default_gems
  Modified files:
    branches/ruby_1_9_3/ChangeLog
    branches/ruby_1_9_3/tool/rbinstall.rb
    trunk/ChangeLog
    trunk/tool/rbinstall.rb

Index: defs/default_gems
===================================================================
--- defs/default_gems	(revision 0)
+++ defs/default_gems	(revision 32759)
@@ -0,0 +1,7 @@
+# gem		versioning file			[executable files under bin]
+rake		lib/rake/version.rb		[rake]
+rdoc		lib/rdoc.rb			[rdoc ri]
+minitest	lib/minitest/unit.rb
+json		ext/json/lib/json/version.rb
+io-console	ext/io/console/io-console.gemspec
+bigdecimal	ext/bigdecimal/bigdecimal.gemspec

Property changes on: defs/default_gems
___________________________________________________________________
Added: svn:eol-style
   + LF

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 32758)
+++ ChangeLog	(revision 32759)
@@ -1,3 +1,7 @@
+Sat Jul 30 23:19:09 2011  Nobuyoshi Nakada  <nobu@r...>
+
+	* defs/default_gems: separate from tool/rbinstall.rb.
+
 Sat Jul 30 23:14:44 2011  Nobuyoshi Nakada  <nobu@r...>
 
 	* io.c (rb_io_each_byte): rbuf can be refreshed during yield.
Index: tool/rbinstall.rb
===================================================================
--- tool/rbinstall.rb	(revision 32758)
+++ tool/rbinstall.rb	(revision 32759)
@@ -540,16 +540,16 @@
   prepare "default gems", gem_dir, directories
 
   spec_dir = File.join(gem_dir, directories.grep(/^spec/)[0])
-  default_gems = [
-    ['rake', 'lib/rake/version.rb', ['rake']],
-    ['rdoc', 'lib/rdoc.rb', ['rdoc', 'ri']],
-    ['minitest', 'lib/minitest/unit.rb'],
-    ['json', 'ext/json/lib/json/version.rb'],
-    ['io-console', 'ext/io/console/io-console.gemspec'],
-    ['bigdecimal', 'ext/bigdecimal/bigdecimal.gemspec'],
-  ]
-
-  default_gems.each do |name, src, execs|
+  File.foreach(File.join(srcdir, "defs/default_gems")) do |line|
+    line.chomp!
+    line.sub!(/\s*#.*/, '')
+    next if line.empty?
+    words = []
+    line.scan(/\G\s*([^\[\]\s]+|\[([^\[\]]*)\])/) do
+      words << ($2 ? $2.split : $1)
+    end
+    name, src, execs = *words
+    next unless name and src
     execs ||= []
     src = File.join(srcdir, src)
     version = open(src) {|f| f.find {|s| /^\s*\w*VERSION\s*=(?!=)/ =~ s}} or next
Index: ruby_1_9_3/defs/default_gems
===================================================================
--- ruby_1_9_3/defs/default_gems	(revision 0)
+++ ruby_1_9_3/defs/default_gems	(revision 32759)
@@ -0,0 +1,7 @@
+# gem		versioning file			[executable files under bin]
+rake		lib/rake/version.rb		[rake]
+rdoc		lib/rdoc.rb			[rdoc ri]
+minitest	lib/minitest/unit.rb
+json		ext/json/lib/json/version.rb
+io-console	ext/io/console/io-console.gemspec
+bigdecimal	ext/bigdecimal/bigdecimal.gemspec

Property changes on: ruby_1_9_3/defs/default_gems
___________________________________________________________________
Added: svn:eol-style
   + LF

Index: ruby_1_9_3/ChangeLog
===================================================================
--- ruby_1_9_3/ChangeLog	(revision 32758)
+++ ruby_1_9_3/ChangeLog	(revision 32759)
@@ -1,3 +1,7 @@
+Sat Jul 30 23:19:09 2011  Nobuyoshi Nakada  <nobu@r...>
+
+	* defs/default_gems: separate from tool/rbinstall.rb.
+
 Sat Jul 30 23:14:44 2011  Nobuyoshi Nakada  <nobu@r...>
 
 	* io.c (rb_io_each_byte): rbuf can be refreshed during yield.
Index: ruby_1_9_3/tool/rbinstall.rb
===================================================================
--- ruby_1_9_3/tool/rbinstall.rb	(revision 32758)
+++ ruby_1_9_3/tool/rbinstall.rb	(revision 32759)
@@ -539,16 +539,16 @@
   prepare "default gems", gem_dir, directories
 
   spec_dir = File.join(gem_dir, directories.grep(/^spec/)[0])
-  default_gems = [
-    ['rake', 'lib/rake/version.rb', ['rake']],
-    ['rdoc', 'lib/rdoc.rb', ['rdoc', 'ri']],
-    ['minitest', 'lib/minitest/unit.rb'],
-    ['json', 'ext/json/lib/json/version.rb'],
-    ['io-console', 'ext/io/console/io-console.gemspec'],
-    ['bigdecimal', 'ext/bigdecimal/bigdecimal.gemspec'],
-  ]
-
-  default_gems.each do |name, src, execs|
+  File.foreach(File.join(srcdir, "defs/default_gems")) do |line|
+    line.chomp!
+    line.sub!(/\s*#.*/, '')
+    next if line.empty?
+    words = []
+    line.scan(/\G\s*([^\[\]\s]+|\[([^\[\]]*)\])/) do
+      words << ($2 ? $2.split : $1)
+    end
+    name, src, execs = *words
+    next unless name and src
     execs ||= []
     src = File.join(srcdir, src)
     version = open(src) {|f| f.find {|s| /^\s*\w*VERSION\s*=(?!=)/ =~ s}} or next

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