From fdfad905227a0e2e4c224d87181041fb75d5082e Mon Sep 17 00:00:00 2001
From: Hiroshi SHIBATA <hsbt@ruby-lang.org>
Date: Sat, 9 Nov 2019 20:14:17 +0900
Subject: Revert "Promote uri to default gems"

This reverts commit c5b4d2a2592942766dc2789f46105b91eba7026a.

  This commit affects with activation feature of RubyGems.
  [Bug #16337][ruby-core:95768]
---
 doc/maintainers.rdoc      |  5 ++---
 doc/standard_library.rdoc |  2 +-
 lib/uri.rb                |  6 +++++-
 lib/uri/uri.gemspec       | 29 -----------------------------
 lib/uri/version.rb        |  6 ------
 tool/sync_default_gems.rb |  2 --
 6 files changed, 8 insertions(+), 42 deletions(-)
 delete mode 100644 lib/uri/uri.gemspec
 delete mode 100644 lib/uri/version.rb

diff --git a/doc/maintainers.rdoc b/doc/maintainers.rdoc
index 1f32b2dd6e..f486729f26 100644
--- a/doc/maintainers.rdoc
+++ b/doc/maintainers.rdoc
@@ -99,6 +99,8 @@ Zachary Scott (zzak)
   WATANABE Hirofumi (eban)
 [lib/unicode_normalize.rb, lib/unicode_normalize/*]
   Martin J. Dürst
+[lib/uri.rb, lib/uri/*]
+  YAMADA, Akira (akira)
 [lib/weakref.rb]
   _unmaintained_
 
@@ -261,9 +263,6 @@ Zachary Scott (zzak)
 [lib/tracer.rb]
   Keiju ISHITSUKA (keiju)
   https://github.com/ruby/tracer
-[lib/uri.rb, lib/uri/*]
-  YAMADA, Akira (akira)
-  https://github.com/ruby/uri
 [lib/webrick.rb, lib/webrick/*]
   Eric Wong (normalperson)
   https://bugs.ruby-lang.org/
diff --git a/doc/standard_library.rdoc b/doc/standard_library.rdoc
index b8b445acf0..4927ea1be8 100644
--- a/doc/standard_library.rdoc
+++ b/doc/standard_library.rdoc
@@ -37,6 +37,7 @@ Time:: Extends the Time class with methods for parsing and conversion
 tmpdir.rb:: Extends the Dir class to manage the OS temporary file path
 TSort:: Topological sorting using Tarjan's algorithm
 un.rb:: Utilities to replace common UNIX commands
+URI:: A Ruby module providing support for Uniform Resource Identifiers
 WeakRef:: Allows a referenced object to be garbage-collected
 
 == Extensions
@@ -85,7 +86,6 @@ RSS:: Family of libraries that support various formats of XML "feeds"
 Singleton:: Implementation of the Singleton pattern for Ruby
 Timeout:: Auto-terminate potentially long-running operations in Ruby
 Tracer:: Outputs a source level execution trace of a Ruby program
-URI:: A Ruby module providing support for Uniform Resource Identifiers
 WEBrick:: An HTTP server toolkit for Ruby
 YAML:: Ruby client library for the Psych YAML implementation
 
diff --git a/lib/uri.rb b/lib/uri.rb
index ea8ea3e18c..9b6bde91c0 100644
--- a/lib/uri.rb
+++ b/lib/uri.rb
@@ -90,9 +90,13 @@
 #
 
 module URI
+  # :stopdoc:
+  VERSION_CODE = '001000'.freeze
+  VERSION = VERSION_CODE.scan(/../).collect{|n| n.to_i}.join('.').freeze
+  # :startdoc:
+
 end
 
-require 'uri/version'
 require 'uri/common'
 require 'uri/generic'
 require 'uri/file'
diff --git a/lib/uri/uri.gemspec b/lib/uri/uri.gemspec
deleted file mode 100644
index 5c51721755..0000000000
--- a/lib/uri/uri.gemspec
+++ /dev/null
@@ -1,29 +0,0 @@
-begin
-  require_relative "lib/uri/version"
-rescue LoadError # Fallback to load version file in ruby core repository
-  require_relative "version"
-end
-
-Gem::Specification.new do |spec|
-  spec.name          = "uri"
-  spec.version       = URI::VERSION
-  spec.authors       = ["Akira Yamada"]
-  spec.email         = ["akira@ruby-lang.org"]
-
-  spec.summary       = %q{URI is a module providing classes to handle Uniform Resource Identifiers}
-  spec.description   = spec.summary
-  spec.homepage      = "https://github.com/ruby/uri"
-  spec.license       = "BSD-2-Clause"
-
-  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`.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/uri/version.rb b/lib/uri/version.rb
deleted file mode 100644
index 4f54113393..0000000000
--- a/lib/uri/version.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-module URI
-  # :stopdoc:
-  VERSION_CODE = '001000'.freeze
-  VERSION = VERSION_CODE.scan(/../).collect{|n| n.to_i}.join('.').freeze
-  # :startdoc:
-end
diff --git a/tool/sync_default_gems.rb b/tool/sync_default_gems.rb
index 81e687d336..edebeb330f 100644
--- a/tool/sync_default_gems.rb
+++ b/tool/sync_default_gems.rb
@@ -47,7 +47,6 @@
 # * https://github.com/ruby/observer
 # * https://github.com/ruby/timeout
 # * https://github.com/ruby/yaml
-# * https://github.com/ruby/uri
 #
 
 require 'fileutils'
@@ -102,7 +101,6 @@ $repositories = {
   observer: "ruby/observer",
   timeout: "ruby/timeout",
   yaml: "ruby/yaml",
-  uri: "ruby/uri",
 }
 
 def sync_default_gems(gem)
-- 
cgit v1.2.3