From 8f71bb0e4f76ab12e469d33bc560bd76cc3aaf90 Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA Date: Wed, 5 Aug 2020 20:01:03 +0900 Subject: Fixed the inconsistency gemspec location with net-* gems. --- lib/net/imap/net-imap.gemspec | 32 -------------------------------- lib/net/net-imap.gemspec | 32 ++++++++++++++++++++++++++++++++ lib/net/net-pop.gemspec | 30 ++++++++++++++++++++++++++++++ lib/net/net-protocol.gemspec | 32 ++++++++++++++++++++++++++++++++ lib/net/net-smtp.gemspec | 31 +++++++++++++++++++++++++++++++ lib/net/pop/net-pop.gemspec | 30 ------------------------------ lib/net/protocol/net-protocol.gemspec | 32 -------------------------------- lib/net/smtp/net-smtp.gemspec | 31 ------------------------------- tool/sync_default_gems.rb | 20 ++++++++------------ 9 files changed, 133 insertions(+), 137 deletions(-) delete mode 100644 lib/net/imap/net-imap.gemspec create mode 100644 lib/net/net-imap.gemspec create mode 100644 lib/net/net-pop.gemspec create mode 100644 lib/net/net-protocol.gemspec create mode 100644 lib/net/net-smtp.gemspec delete mode 100644 lib/net/pop/net-pop.gemspec delete mode 100644 lib/net/protocol/net-protocol.gemspec delete mode 100644 lib/net/smtp/net-smtp.gemspec diff --git a/lib/net/imap/net-imap.gemspec b/lib/net/imap/net-imap.gemspec deleted file mode 100644 index 2426e0932d..0000000000 --- a/lib/net/imap/net-imap.gemspec +++ /dev/null @@ -1,32 +0,0 @@ -# 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@ruby-lang.org"] - - spec.summary = %q{Ruby client api for Internet Message Access Protocol} - spec.description = %q{Ruby client api for Internet Message Access Protocol} - spec.homepage = "https://github.com/ruby/net-imap" - spec.required_ruby_version = Gem::Requirement.new(">= 2.5.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-imap.gemspec b/lib/net/net-imap.gemspec new file mode 100644 index 0000000000..7a4556e4aa --- /dev/null +++ b/lib/net/net-imap.gemspec @@ -0,0 +1,32 @@ +# frozen_string_literal: true + +name = File.basename(__FILE__, ".gemspec") +version = ["lib", Array.new(name.count("-"), "..").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@ruby-lang.org"] + + spec.summary = %q{Ruby client api for Internet Message Access Protocol} + spec.description = %q{Ruby client api for Internet Message Access Protocol} + spec.homepage = "https://github.com/ruby/net-imap" + spec.required_ruby_version = Gem::Requirement.new(">= 2.5.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-pop.gemspec b/lib/net/net-pop.gemspec new file mode 100644 index 0000000000..12e633cc77 --- /dev/null +++ b/lib/net/net-pop.gemspec @@ -0,0 +1,30 @@ +# frozen_string_literal: true + +name = File.basename(__FILE__, ".gemspec") +version = ["lib", Array.new(name.count("-"), "..").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 = ["Yukihiro Matsumoto"] + spec.email = ["matz@ruby-lang.org"] + + spec.summary = %q{Ruby client library for POP3.} + spec.description = %q{Ruby client library for POP3.} + spec.homepage = "https://github.com/ruby/net-pop" + spec.license = "BSD-2-Clause" + + spec.metadata["homepage_uri"] = spec.homepage + spec.metadata["source_code_uri"] = spec.homepage + + 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-protocol.gemspec b/lib/net/net-protocol.gemspec new file mode 100644 index 0000000000..9653ddd378 --- /dev/null +++ b/lib/net/net-protocol.gemspec @@ -0,0 +1,32 @@ +# frozen_string_literal: true + +name = File.basename(__FILE__, ".gemspec") +version = ["lib", Array.new(name.count("-"), "..").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 = ["Yukihiro Matsumoto"] + spec.email = ["matz@ruby-lang.org"] + + spec.summary = %q{The abstruct interface for net-* client.} + spec.description = %q{The abstruct interface for net-* client.} + spec.homepage = "https://github.com/ruby/net-protocol" + 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-smtp.gemspec b/lib/net/net-smtp.gemspec new file mode 100644 index 0000000000..c547beb754 --- /dev/null +++ b/lib/net/net-smtp.gemspec @@ -0,0 +1,31 @@ +# frozen_string_literal: true + +name = File.basename(__FILE__, ".gemspec") +version = ["lib", Array.new(name.count("-"), "..").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 = ["Yukihiro Matsumoto"] + spec.email = ["matz@ruby-lang.org"] + + spec.summary = %q{Simple Mail Transfer Protocol client library for Ruby.} + spec.description = %q{Simple Mail Transfer Protocol client library for Ruby.} + spec.homepage = "https://github.com/ruby/net-smtp" + spec.license = "BSD-2-Clause" + spec.required_ruby_version = ">= 2.5.0" + + spec.metadata["homepage_uri"] = spec.homepage + spec.metadata["source_code_uri"] = spec.homepage + + 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/pop/net-pop.gemspec b/lib/net/pop/net-pop.gemspec deleted file mode 100644 index 90d594f14a..0000000000 --- a/lib/net/pop/net-pop.gemspec +++ /dev/null @@ -1,30 +0,0 @@ -# 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 = ["Yukihiro Matsumoto"] - spec.email = ["matz@ruby-lang.org"] - - spec.summary = %q{Ruby client library for POP3.} - spec.description = %q{Ruby client library for POP3.} - spec.homepage = "https://github.com/ruby/net-pop" - spec.license = "BSD-2-Clause" - - spec.metadata["homepage_uri"] = spec.homepage - spec.metadata["source_code_uri"] = spec.homepage - - 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/protocol/net-protocol.gemspec b/lib/net/protocol/net-protocol.gemspec deleted file mode 100644 index a277c301d5..0000000000 --- a/lib/net/protocol/net-protocol.gemspec +++ /dev/null @@ -1,32 +0,0 @@ -# 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 = ["Yukihiro Matsumoto"] - spec.email = ["matz@ruby-lang.org"] - - spec.summary = %q{The abstruct interface for net-* client.} - spec.description = %q{The abstruct interface for net-* client.} - spec.homepage = "https://github.com/ruby/net-protocol" - 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/smtp/net-smtp.gemspec b/lib/net/smtp/net-smtp.gemspec deleted file mode 100644 index 4c8c07810b..0000000000 --- a/lib/net/smtp/net-smtp.gemspec +++ /dev/null @@ -1,31 +0,0 @@ -# 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 = ["Yukihiro Matsumoto"] - spec.email = ["matz@ruby-lang.org"] - - spec.summary = %q{Simple Mail Transfer Protocol client library for Ruby.} - spec.description = %q{Simple Mail Transfer Protocol client library for Ruby.} - spec.homepage = "https://github.com/ruby/net-smtp" - spec.license = "BSD-2-Clause" - spec.required_ruby_version = ">= 2.5.0" - - spec.metadata["homepage_uri"] = spec.homepage - spec.metadata["source_code_uri"] = spec.homepage - - 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 e9c4b27d5b..af60185c3c 100644 --- a/tool/sync_default_gems.rb +++ b/tool/sync_default_gems.rb @@ -219,29 +219,25 @@ def sync_default_gems(gem) cp_r("#{upstream}/History.md", "ext/openssl") `git checkout ext/openssl/depend` when "net-pop" - rm_rf(%w[lib/net/pop.rb lib/net/pop test/net/pop]) + rm_rf(%w[lib/net/pop.rb lib/net/net-pop.gemspec test/net/pop]) cp_r("#{upstream}/lib/net/pop.rb", "lib/net") - cp_r("#{upstream}/lib/net/pop", "lib/net") cp_r("#{upstream}/test/net/pop", "test/net") - cp_r("#{upstream}/net-pop.gemspec", "lib/net/pop") + cp_r("#{upstream}/net-pop.gemspec", "lib/net") when "net-smtp" - rm_rf(%w[lib/net/smtp.rb lib/net/smtp test/net/smtp]) + rm_rf(%w[lib/net/smtp.rb lib/net/net-smtp.gemspec test/net/smtp]) cp_r("#{upstream}/lib/net/smtp.rb", "lib/net") - cp_r("#{upstream}/lib/net/smtp", "lib/net") cp_r("#{upstream}/test/net/smtp", "test/net") - cp_r("#{upstream}/net-smtp.gemspec", "lib/net/smtp") + cp_r("#{upstream}/net-smtp.gemspec", "lib/net") when "net-protocol" - rm_rf(%w[lib/net/protocol.rb lib/net/protocol test/net/protocol]) + rm_rf(%w[lib/net/protocol.rb lib/net/net-protocol.gemspec test/net/protocol]) cp_r("#{upstream}/lib/net/protocol.rb", "lib/net") - cp_r("#{upstream}/lib/net/protocol", "lib/net") cp_r("#{upstream}/test/net/protocol", "test/net") - cp_r("#{upstream}/net-protocol.gemspec", "lib/net/protocol") + cp_r("#{upstream}/net-protocol.gemspec", "lib/net") when "net-imap" - rm_rf(%w[lib/net/imap.rb lib/net/imap test/net/imap]) + rm_rf(%w[lib/net/imap.rb lib/net/net-imap.gemspec test/net/imap]) cp_r("#{upstream}/lib/net/imap.rb", "lib/net") - cp_r("#{upstream}/lib/net/imap", "lib/net") cp_r("#{upstream}/test/net/imap", "test/net") - cp_r("#{upstream}/net-imap.gemspec", "lib/net/imap") + cp_r("#{upstream}/net-imap.gemspec", "lib/net") when "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") -- cgit v1.2.3