https://git.ruby-lang.org/ruby.git/commit/?id=2346e2f0db

From 2346e2f0db50c577af6568e5697d39553d7ddb67 Mon Sep 17 00:00:00 2001
From: Hiroshi SHIBATA <hsbt@r...>
Date: Mon, 3 Aug 2020 17:40:05 +0900
Subject: Followed up b2d96abb42abbe2e01f010ffc9ac51f0f9a50002 for net-ftp.


diff --git a/lib/net/ftp/net-ftp.gemspec b/lib/net/ftp/net-ftp.gemspec
deleted file mode 100644
index 893305c..0000000
--- a/lib/net/ftp/net-ftp.gemspec
+++ /dev/null
@@ -1,32 +0,0 @@ https://github.com/ruby/ruby/blob/trunk/#L0
-# frozen_string_literal: true
-
-name = File.basename(__FILE__, ".gemspec")
-version = ["lib", Array.new(name.count("-")+1, "..").join("/")].find do |dir|
-  break File.foreach(File.join(__dir__, dir, "#{name.tr('-', '/')}.rb")) do |line|
-    /^\s*VERSION\s*=\s*"(.*)"/ =~ line and break $1
-  end rescue nil
-end
-
-Gem::Specification.new do |spec|
-  spec.name          = name
-  spec.version       = version
-  spec.authors       = ["Shugo Maeda"]
-  spec.email         = ["shugo@r..."]
-
-  spec.summary       = %q{Support for the File Transfer Protocol.}
-  spec.description   = %q{Support for the File Transfer Protocol.}
-  spec.homepage      = "https://github.com/ruby/net-ftp"
-  spec.required_ruby_version = Gem::Requirement.new(">= 2.3.0")
-
-  spec.metadata["homepage_uri"] = spec.homepage
-  spec.metadata["source_code_uri"] = spec.homepage
-
-  # Specify which files should be added to the gem when it is released.
-  # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
-  spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
-    `git ls-files -z 2>/dev/null`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
-  end
-  spec.bindir        = "exe"
-  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
-end
diff --git a/lib/net/net-ftp.gemspec b/lib/net/net-ftp.gemspec
new file mode 100644
index 0000000..893305c
--- /dev/null
+++ b/lib/net/net-ftp.gemspec
@@ -0,0 +1,32 @@ https://github.com/ruby/ruby/blob/trunk/lib/net/net-ftp.gemspec#L1
+# frozen_string_literal: true
+
+name = File.basename(__FILE__, ".gemspec")
+version = ["lib", Array.new(name.count("-")+1, "..").join("/")].find do |dir|
+  break File.foreach(File.join(__dir__, dir, "#{name.tr('-', '/')}.rb")) do |line|
+    /^\s*VERSION\s*=\s*"(.*)"/ =~ line and break $1
+  end rescue nil
+end
+
+Gem::Specification.new do |spec|
+  spec.name          = name
+  spec.version       = version
+  spec.authors       = ["Shugo Maeda"]
+  spec.email         = ["shugo@r..."]
+
+  spec.summary       = %q{Support for the File Transfer Protocol.}
+  spec.description   = %q{Support for the File Transfer Protocol.}
+  spec.homepage      = "https://github.com/ruby/net-ftp"
+  spec.required_ruby_version = Gem::Requirement.new(">= 2.3.0")
+
+  spec.metadata["homepage_uri"] = spec.homepage
+  spec.metadata["source_code_uri"] = spec.homepage
+
+  # Specify which files should be added to the gem when it is released.
+  # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
+  spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
+    `git ls-files -z 2>/dev/null`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  end
+  spec.bindir        = "exe"
+  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.require_paths = ["lib"]
+end
diff --git a/tool/sync_default_gems.rb b/tool/sync_default_gems.rb
index 2b36265..e9c4b27 100644
--- a/tool/sync_default_gems.rb
+++ b/tool/sync_default_gems.rb
@@ -243,11 +243,10 @@ def sync_default_gems(gem) https://github.com/ruby/ruby/blob/trunk/tool/sync_default_gems.rb#L243
     cp_r("#{upstream}/test/net/imap", "test/net")
     cp_r("#{upstream}/net-imap.gemspec", "lib/net/imap")
   when "net-ftp"
-    rm_rf(%w[lib/net/ftp.rb lib/net/ftp test/net/ftp])
+    rm_rf(%w[lib/net/ftp.rb lib/net/net-ftp.gemspec test/net/ftp])
     cp_r("#{upstream}/lib/net/ftp.rb", "lib/net")
-    cp_r("#{upstream}/lib/net/ftp", "lib/net")
     cp_r("#{upstream}/test/net/ftp", "test/net")
-    cp_r("#{upstream}/net-ftp.gemspec", "lib/net/ftp")
+    cp_r("#{upstream}/net-ftp.gemspec", "lib/net")
   when "net-http"
     rm_rf(%w[lib/net/http.rb lib/net/http test/net/http])
     cp_r("#{upstream}/lib/net/http.rb", "lib/net")
-- 
cgit v0.10.2


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/