From 6466df87a6e94663c0e2ea4f745bcf14f3335635 Mon Sep 17 00:00:00 2001 From: nobu Date: Sat, 30 Jul 2011 14:19:11 +0000 Subject: * defs/default_gems: separate from tool/rbinstall.rb. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@32759 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- tool/rbinstall.rb | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'tool') diff --git a/tool/rbinstall.rb b/tool/rbinstall.rb index f58d790f01..4c5904b349 100755 --- a/tool/rbinstall.rb +++ b/tool/rbinstall.rb @@ -540,16 +540,16 @@ install?(:ext, :comm, :gem) do 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 -- cgit v1.2.3