summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-08-01 09:35:00 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-08-01 09:35:00 +0000
commit5a5355e84f93b84245e7e66af0bd87a4b3300d4a (patch)
tree4b9be706d26fea44bb835e4b5e02b7808e27818f
parent17dc5b35189d39a45689cfdb0fb07dfd1775cc27 (diff)
* tool/rbinstall.rb (gem): suppressed warnings.
cf: [ruby-dev:38975] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@24346 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rwxr-xr-xtool/rbinstall.rb13
2 files changed, 12 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 9eac1dd169c..7e030b63310 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Aug 1 18:34:52 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * tool/rbinstall.rb (gem): suppressed warnings.
+ cf: [ruby-dev:38975]
+
Sat Aug 1 05:18:36 2009 NARUSE, Yui <naruse@ruby-lang.org>
* string.c (tr_trans): can't use singlebyte optimization when
diff --git a/tool/rbinstall.rb b/tool/rbinstall.rb
index 621fffc70d8..b1077265620 100755
--- a/tool/rbinstall.rb
+++ b/tool/rbinstall.rb
@@ -516,15 +516,16 @@ install?(:ext, :comm, :gem) do
['rdoc', 'rdoc.rb'],
['minitest', 'minitest/unit.rb'],
]
- default_gems.each do |name, lib|
- lib = File.join(srcdir, "lib", lib)
- version = open(lib) {|f| f.find {|s| /^\s*\w*VERSION\s*=(?!=)/ =~ s}} or next
- version = version.split(%r"=\s*", 2)[1].strip
- open_for_install(File.join(destdir, "#{name}.gemspec"), $data_mode) do |f|
+ default_gems.each do |name, src|
+ src = File.join(srcdir, "lib", src)
+ version = open(src) {|f| f.find {|s| /^\s*\w*VERSION\s*=(?!=)/ =~ s}} or next
+ version = version.split(%r"=\s*", 2)[1].strip[/\A([\'\"])(.*?)\1/, 2]
+ puts "#{" "*30}#{name} #{version}"
+ open_for_install(File.join(destdir, "#{name}.gemspec"), $data_mode) do
<<-GEMSPEC
Gem::Specification.new do |s|
s.name = #{name.dump}
- s.version = #{version}
+ s.version = #{version.dump}
s.summary = "This #{name} is bundled with Ruby"
end
GEMSPEC