From 3772c47d2f63ee948da1c0069d7c27588e97de4f Mon Sep 17 00:00:00 2001
From: hsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Wed, 25 Jul 2018 11:47:04 +0000
Subject: Support logger.gemspec

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@64040 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 tool/sync_default_gems.rb | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'tool')

diff --git a/tool/sync_default_gems.rb b/tool/sync_default_gems.rb
index 75094376e2..70d9ce9e39 100644
--- a/tool/sync_default_gems.rb
+++ b/tool/sync_default_gems.rb
@@ -203,11 +203,6 @@ def sync_default_gems(gem)
     `cp -rf ../ipaddr/lib/* lib`
     `cp -rf ../ipaddr/test/test_ipaddr.rb test`
     `cp -f ../ipaddr/ipaddr.gemspec lib`
-  when "logger"
-    `rm -rf lib/logger.rb test/logger`
-    `cp -rf ../logger/lib/* lib`
-    `cp -rf ../logger/test/logger test`
-    `cp -f ../logger/logger.gemspec lib`
   when "prime"
     `rm -rf lib/prime.rb test/test_prime.rb`
     `cp -rf ../prime/lib/* lib`
@@ -228,7 +223,7 @@ def sync_default_gems(gem)
     `cp -rf ../tracer/lib/* lib`
     `cp -rf ../tracer/test/test_tracer.rb test`
     `cp -f ../tracer/tracer.gemspec lib`
-  when "rexml", "rss", "matrix", "irb", "csv", "shell"
+  when "rexml", "rss", "matrix", "irb", "csv", "shell", "logger"
     sync_lib gem
   else
   end
@@ -238,7 +233,12 @@ def sync_lib(repo)
   `rm -rf lib/#{repo}.rb lib/#{repo}/* test/#{repo}`
   `cp -rf ../#{repo}/lib/* lib`
   `cp -rf ../#{repo}/test/#{repo} test`
-  `cp -f ../#{repo}/#{repo}.gemspec lib/#{repo}`
+  gemspec = if File.directory?("lib/#{repo}")
+              "lib/#{repo}/#{repo}.gemspec"
+            else
+              "lib/#{repo}.gemspec"
+            end
+  `cp -f ../#{repo}/#{repo}.gemspec #{gemspec}`
 end
 
 if ARGV[0]
-- 
cgit v1.2.3