1 files changed, 21 insertions, 6 deletions
diff --git a/tool/fetch-bundled_gems.rb b/tool/fetch-bundled_gems.rb
index 90c5fbff37..f0d3c3cb89 100755
--- a/tool/fetch-bundled_gems.rb
+++ b/tool/fetch-bundled_gems.rb
@@ -1,6 +1,9 @@
 #!ruby -an
 BEGIN {
   require 'fileutils'
+  require_relative 'lib/colorize'
+
+  color = Colorize.new
 
   dir = ARGV.shift
   ARGF.eof?
@@ -10,22 +13,34 @@ BEGIN {
 
 n, v, u, r = $F
 
+next unless n
 next if n =~ /^#/
 
 if File.directory?(n)
-  puts "updating #{n} ..."
-  system("git", "fetch", chdir: n) or abort
+  puts "updating #{color.notice(n)} ..."
+  system("git", "fetch", "--all", chdir: n) or abort
 else
-  puts "retrieving #{n} ..."
+  puts "retrieving #{color.notice(n)} ..."
   system(*%W"git clone #{u} #{n}") or abort
 end
+
 if r
-  puts "fetching #{r} ..."
+  puts "fetching #{color.notice(r)} ..."
   system("git", "fetch", "origin", r, chdir: n) or abort
 end
+
 c = r || "v#{v}"
 checkout = %w"git -c advice.detachedHead=false checkout"
-puts "checking out #{c} (v=#{v}, r=#{r}) ..."
+print %[checking out #{color.notice(c)} (v=#{color.info(v)}]
+print %[, r=#{color.info(r)}] if r
+puts ") ..."
 unless system(*checkout, c, "--", chdir: n)
-  abort
+  abort if r or !system(*checkout, v, "--", chdir: n)
+end
+
+if r
+  unless File.exist? "#{n}/#{n}.gemspec"
+    require_relative "lib/bundled_gem"
+    BundledGem.dummy_gemspec("#{n}/#{n}.gemspec")
+  end
 end