summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
-rwxr-xr-xtool/instruby.rb14
2 files changed, 16 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 9b16bd3e78..13e6b6f32f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,12 @@
+Sun Jun 28 19:03:46 2009 Yuki Sonoda (Yugui) <yugui@yugui.jp>
+
+ * tool/instruby.rb (:gem): registers the bundled version
+ of minitest as a gem as rdoc or rake.
+ c.f. [ruby-dev:38692].
+
Sun Jun 28 19:02:07 2009 Yuki Sonoda (Yugui) <yugui@yugui.jp>
- * lib/rubygems.rb (ConfigMap[:rubylibprefix]): new entry
+ * lib/rubygems.rb (ConfigMap[:rubylibprefix]): new entry.
* lib/rubygems/defaults.rb (Gem.default_dir): considers
"--with-rubylibprefix" configure option.
diff --git a/tool/instruby.rb b/tool/instruby.rb
index 730a9151d4..26f75bbbf6 100755
--- a/tool/instruby.rb
+++ b/tool/instruby.rb
@@ -511,13 +511,17 @@ install?(:ext, :comm, :gem) do
prepare "default gems", gpath, directories
destdir = File.join(gpath, directories.grep(/^spec/)[0])
- gems = %w[rake rdoc]
- gems.each do |gem|
- lib = File.join(srcdir, "lib/#{gem}.rb")
+ default_gems = [
+ ['rake', 'rake.rb'],
+ ['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, "#{gem}.gemspec"), $data_mode) do |f|
- "Gem::Specification.new {|s| s.name, s.version = #{gem.dump}, #{version}}\n"
+ open_for_install(File.join(destdir, "#{name}.gemspec"), $data_mode) do |f|
+ "Gem::Specification.new {|s| s.name, s.version = #{name.dump}, #{version}}\n"
end
end
end