[Bug #21388] Install snapshots of gems

If a snapshot gem is built install it instead of the downloaded
release version.

Author: nobu

common.mk

@@ -310,6 +310,7 @@ INSTRUBY_ARGS =	$(SCRIPT_ARGS) \
 		--prog-mode=$(INSTALL_PROG_MODE) \
 		--installed-list $(INSTALLED_LIST) \
 		--mantype="$(MANTYPE)" \
+		--have-git=$(HAVE_GIT) \
 		$(INSTRUBY_OPTS)
 INSTALL_PROG_MODE = 0755
 INSTALL_DATA_MODE = 0644

tool/rbinstall.rb

@@ -96,6 +96,7 @@ def parse_args(argv = ARGV)
   opt.on('--[no-]strip') {|strip| $strip = strip}
   opt.on('--gnumake') {gnumake = true}
   opt.on('--debug-symbols=SUFFIX', /\w+/) {|name| $debug_symbols = ".#{name}"}
+  opt.on('--have-git=BOOL', %w[yes no]) {|git| $have_git = git == "yes"}
 
   unless $install_procs.empty?
     w = (w = ENV["COLUMNS"] and (w = w.to_i) > 80) ? w - 30 : 50
@@ -1135,19 +1136,23 @@ class << (w = [])
   # the newly installed ruby.
   ENV.delete('RUBYOPT')
 
-  File.foreach("#{srcdir}/gems/bundled_gems") do |name|
-    next if /^\s*(?:#|$)/ =~ name
-    next unless /^(\S+)\s+(\S+).*/ =~ name
-    gem = $1
-    gem_name = "#$1-#$2"
+  require_relative 'lib/bundled_gem'
+  BundledGem.each(snapshot: $have_git) do |gem, ver, _, rev|
+    gem_name = "#{gem}-#{ver}"
     path = [
-      # gemspec that removed duplicated dependencies of bundled gems
-      "#{srcdir}/.bundle/gems/#{gem_name}/#{gem}.gemspec",
+      # gemspec for snapshot C ext gems, It has the original dependencies
+      # ex .bundle/gems/debug-1.10.1.snapshot/debug-1.10.1.snapshot.gemspec
+      ".bundle/specifications/#{gem_name}.gemspec",
+
+      # original gemspec generated by rubygems
+      "#{srcdir}/.bundle/specifications/#{gem_name}.gemspec",
+
       # gemspec for C ext gems, It has the original dependencies
       # ex .bundle/gems/debug-1.7.1/debug-1.7.1.gemspec
       "#{srcdir}/.bundle/gems/#{gem_name}/#{gem_name}.gemspec",
-      # original gemspec generated by rubygems
-      "#{srcdir}/.bundle/specifications/#{gem_name}.gemspec"
+
+      # gemspec that removed duplicated dependencies of bundled gems
+      "#{srcdir}/.bundle/gems/#{gem_name}/#{gem}.gemspec",
     ].find { |gemspec| File.exist?(gemspec) }
     if path.nil?
       skipped[gem_name] = "gemspec not found"