From e859e668d2eb59f34ad18edb7458ce90076617e9 Mon Sep 17 00:00:00 2001 From: marcandre Date: Fri, 2 Nov 2018 17:52:33 +0000 Subject: [PATCH] lib/*: Prefer require_relative over require. [#15206] [Fix GH-1976] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@65505 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- lib/cgi/cookie.rb | 2 +- lib/cgi/core.rb | 10 ++++----- lib/cgi/session/pstore.rb | 2 +- lib/cgi/util.rb | 2 +- lib/drb/drb.rb | 4 ++-- lib/drb/extserv.rb | 2 +- lib/drb/extservm.rb | 2 +- lib/drb/gw.rb | 8 +++---- lib/drb/ssl.rb | 2 +- lib/drb/timeridconv.rb | 2 +- lib/drb/unix.rb | 2 +- lib/irb/cmd/load.rb | 2 +- lib/irb/context.rb | 4 ++-- lib/irb/ext/use-loader.rb | 4 ++-- lib/irb/init.rb | 2 +- lib/irb/input-method.rb | 2 +- lib/irb/ruby-lex.rb | 2 +- lib/irb/slex.rb | 2 +- lib/irb/xmp.rb | 2 +- lib/net/ftp.rb | 2 +- lib/net/http/status.rb | 2 +- lib/net/https.rb | 4 ++-- lib/net/imap.rb | 2 +- lib/net/pop.rb | 2 +- lib/net/smtp.rb | 2 +- lib/racc/parser.rb | 2 +- lib/rexml/attlistdecl.rb | 4 ++-- lib/rexml/attribute.rb | 4 ++-- lib/rexml/cdata.rb | 2 +- lib/rexml/child.rb | 2 +- lib/rexml/comment.rb | 2 +- lib/rexml/doctype.rb | 12 +++++----- lib/rexml/document.rb | 28 ++++++++++++------------ lib/rexml/dtd/attlistdecl.rb | 2 +- lib/rexml/dtd/dtd.rb | 12 +++++----- lib/rexml/dtd/elementdecl.rb | 2 +- lib/rexml/dtd/entitydecl.rb | 2 +- lib/rexml/dtd/notationdecl.rb | 2 +- lib/rexml/element.rb | 14 ++++++------ lib/rexml/entity.rb | 6 ++--- lib/rexml/formatters/pretty.rb | 2 +- lib/rexml/formatters/transitive.rb | 2 +- lib/rexml/instruction.rb | 4 ++-- lib/rexml/light/node.rb | 2 +- lib/rexml/namespace.rb | 2 +- lib/rexml/node.rb | 6 ++--- lib/rexml/output.rb | 2 +- lib/rexml/parent.rb | 2 +- lib/rexml/parsers/baseparser.rb | 6 ++--- lib/rexml/parsers/lightparser.rb | 6 ++--- lib/rexml/parsers/pullparser.rb | 6 ++--- lib/rexml/parsers/sax2parser.rb | 8 +++---- lib/rexml/parsers/streamparser.rb | 2 +- lib/rexml/parsers/treeparser.rb | 4 ++-- lib/rexml/parsers/ultralightparser.rb | 4 ++-- lib/rexml/parsers/xpathparser.rb | 4 ++-- lib/rexml/quickpath.rb | 4 ++-- lib/rexml/source.rb | 2 +- lib/rexml/text.rb | 12 +++++----- lib/rexml/undefinednamespaceexception.rb | 2 +- lib/rexml/validation/relaxng.rb | 4 ++-- lib/rexml/validation/validation.rb | 2 +- lib/rexml/xmldecl.rb | 4 ++-- lib/rexml/xpath.rb | 4 ++-- lib/rexml/xpath_parser.rb | 10 ++++----- lib/rinda/ring.rb | 2 +- lib/rinda/tuplespace.rb | 2 +- lib/rss/0.9.rb | 2 +- lib/rss/1.0.rb | 2 +- lib/rss/atom.rb | 2 +- lib/rss/content.rb | 2 +- lib/rss/converter.rb | 2 +- lib/rss/dublincore.rb | 4 ++-- lib/rss/dublincore/atom.rb | 2 +- lib/rss/image.rb | 2 +- lib/rss/maker.rb | 22 +++++++++---------- lib/rss/maker/0.9.rb | 2 +- lib/rss/maker/1.0.rb | 2 +- lib/rss/maker/atom.rb | 4 ++-- lib/rss/maker/base.rb | 2 +- lib/rss/maker/content.rb | 2 +- lib/rss/maker/dublincore.rb | 2 +- lib/rss/maker/entry.rb | 4 ++-- lib/rss/maker/feed.rb | 2 +- lib/rss/maker/image.rb | 4 ++-- lib/rss/maker/itunes.rb | 2 +- lib/rss/maker/slash.rb | 2 +- lib/rss/maker/syndication.rb | 2 +- lib/rss/maker/taxonomy.rb | 4 ++-- lib/rss/maker/trackback.rb | 2 +- lib/rss/parser.rb | 4 ++-- lib/rss/rss.rb | 4 ++-- lib/rss/taxonomy.rb | 2 +- lib/rss/xml-stylesheet.rb | 2 +- lib/rss/xml.rb | 2 +- lib/shell/builtin-command.rb | 2 +- lib/shell/command-processor.rb | 4 ++-- lib/shell/system-command.rb | 2 +- lib/uri/common.rb | 4 ++-- lib/uri/file.rb | 2 +- lib/uri/ftp.rb | 2 +- lib/uri/generic.rb | 2 +- lib/uri/http.rb | 2 +- lib/uri/https.rb | 2 +- lib/uri/ldap.rb | 2 +- lib/uri/ldaps.rb | 2 +- lib/uri/mailto.rb | 2 +- lib/webrick/cgi.rb | 6 ++--- lib/webrick/config.rb | 10 ++++----- lib/webrick/cookie.rb | 2 +- lib/webrick/httpauth.rb | 10 ++++----- lib/webrick/httpauth/basicauth.rb | 6 ++--- lib/webrick/httpauth/digestauth.rb | 6 ++--- lib/webrick/httpauth/htdigest.rb | 4 ++-- lib/webrick/httpauth/htpasswd.rb | 4 ++-- lib/webrick/httpproxy.rb | 2 +- lib/webrick/httprequest.rb | 8 +++---- lib/webrick/httpresponse.rb | 8 +++---- lib/webrick/https.rb | 4 ++-- lib/webrick/httpserver.rb | 14 ++++++------ lib/webrick/httpservlet.rb | 10 ++++----- lib/webrick/httpservlet/abstract.rb | 6 ++--- lib/webrick/httpservlet/cgihandler.rb | 4 ++-- lib/webrick/httpservlet/filehandler.rb | 6 ++--- lib/webrick/httpstatus.rb | 2 +- lib/webrick/server.rb | 4 ++-- 126 files changed, 256 insertions(+), 256 deletions(-) diff --git a/lib/cgi/cookie.rb b/lib/cgi/cookie.rb index a2155edb774421..9a0d41e2b8570b 100644 --- a/lib/cgi/cookie.rb +++ b/lib/cgi/cookie.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true -require 'cgi/util' +require_relative 'util' class CGI # Class representing an HTTP cookie. # diff --git a/lib/cgi/core.rb b/lib/cgi/core.rb index 73daae3e17c440..3fb8dbab542333 100644 --- a/lib/cgi/core.rb +++ b/lib/cgi/core.rb @@ -862,24 +862,24 @@ def initialize(options = {}, &block) # :yields: name, value case @options[:tag_maker] when "html3" - require 'cgi/html' + require_relative 'html' extend Html3 extend HtmlExtension when "html4" - require 'cgi/html' + require_relative 'html' extend Html4 extend HtmlExtension when "html4Tr" - require 'cgi/html' + require_relative 'html' extend Html4Tr extend HtmlExtension when "html4Fr" - require 'cgi/html' + require_relative 'html' extend Html4Tr extend Html4Fr extend HtmlExtension when "html5" - require 'cgi/html' + require_relative 'html' extend Html5 extend HtmlExtension end diff --git a/lib/cgi/session/pstore.rb b/lib/cgi/session/pstore.rb index cb0370b619e244..5a6e25d1374b23 100644 --- a/lib/cgi/session/pstore.rb +++ b/lib/cgi/session/pstore.rb @@ -10,7 +10,7 @@ # persistent of session data on top of the pstore library. See # cgi/session.rb for more details on session storage managers. -require 'cgi/session' +require_relative '../session' require 'pstore' class CGI diff --git a/lib/cgi/util.rb b/lib/cgi/util.rb index 464115262f6b90..840bd6d5d0591e 100644 --- a/lib/cgi/util.rb +++ b/lib/cgi/util.rb @@ -55,7 +55,7 @@ def escapeHTML(string) end begin - require 'cgi/escape' + require_relative 'escape' rescue LoadError end diff --git a/lib/drb/drb.rb b/lib/drb/drb.rb index 6da8c5f6a739d2..de57362f24211a 100644 --- a/lib/drb/drb.rb +++ b/lib/drb/drb.rb @@ -48,7 +48,7 @@ require 'socket' require 'io/wait' -require 'drb/eq' +require_relative 'eq' # # == Overview @@ -1638,7 +1638,7 @@ def perform_without_block end - require 'drb/invokemethod' + require_relative 'invokemethod' class InvokeMethod include InvokeMethod18Mixin end diff --git a/lib/drb/extserv.rb b/lib/drb/extserv.rb index 1cb1be47099b85..a93d5d1576e37c 100644 --- a/lib/drb/extserv.rb +++ b/lib/drb/extserv.rb @@ -4,7 +4,7 @@ Copyright (c) 2000,2002 Masatoshi SEKI =end -require 'drb/drb' +require_relative 'drb' require 'monitor' module DRb diff --git a/lib/drb/extservm.rb b/lib/drb/extservm.rb index 9cce962062a8f0..040e4e3e08ee3d 100644 --- a/lib/drb/extservm.rb +++ b/lib/drb/extservm.rb @@ -4,7 +4,7 @@ Copyright (c) 2000 Masatoshi SEKI =end -require 'drb/drb' +require_relative 'drb' require 'monitor' module DRb diff --git a/lib/drb/gw.rb b/lib/drb/gw.rb index d00050764456d3..5b7bf306b98188 100644 --- a/lib/drb/gw.rb +++ b/lib/drb/gw.rb @@ -1,5 +1,5 @@ # frozen_string_literal: false -require 'drb/drb' +require_relative 'drb' require 'monitor' module DRb @@ -109,7 +109,7 @@ def _dump(lv) =begin # foo.rb -require 'drb/drb' +require_relative 'drb' class Foo include DRbUndumped @@ -127,7 +127,7 @@ def ping(obj) =begin # gw_a.rb -require 'drb/unix' +require_relative 'unix' require 'foo' obj = Foo.new('a') @@ -141,7 +141,7 @@ def ping(obj) =begin # gw_c.rb -require 'drb/unix' +require_relative 'unix' require 'foo' foo = Foo.new('c', nil) diff --git a/lib/drb/ssl.rb b/lib/drb/ssl.rb index e2bc247b1731a3..adc85dbc9c168a 100644 --- a/lib/drb/ssl.rb +++ b/lib/drb/ssl.rb @@ -1,7 +1,7 @@ # frozen_string_literal: false require 'socket' require 'openssl' -require 'drb/drb' +require_relative 'drb' require 'singleton' module DRb diff --git a/lib/drb/timeridconv.rb b/lib/drb/timeridconv.rb index 9ac7e1e69c9093..3ead98a7f24527 100644 --- a/lib/drb/timeridconv.rb +++ b/lib/drb/timeridconv.rb @@ -1,5 +1,5 @@ # frozen_string_literal: false -require 'drb/drb' +require_relative 'drb' require 'monitor' module DRb diff --git a/lib/drb/unix.rb b/lib/drb/unix.rb index 7dcf2daaf83c9a..89957c9e7bcc33 100644 --- a/lib/drb/unix.rb +++ b/lib/drb/unix.rb @@ -1,6 +1,6 @@ # frozen_string_literal: false require 'socket' -require 'drb/drb' +require_relative 'drb' require 'tmpdir' raise(LoadError, "UNIXServer is required") unless defined?(UNIXServer) diff --git a/lib/irb/cmd/load.rb b/lib/irb/cmd/load.rb index f800b741eb5504..1bd3d3275a8617 100644 --- a/lib/irb/cmd/load.rb +++ b/lib/irb/cmd/load.rb @@ -11,7 +11,7 @@ # require "irb/cmd/nop.rb" -require "irb/ext/loader" +require_relative "../ext/loader" # :stopdoc: module IRB diff --git a/lib/irb/context.rb b/lib/irb/context.rb index b82aaea6a60181..606d744e1efbd1 100644 --- a/lib/irb/context.rb +++ b/lib/irb/context.rb @@ -9,8 +9,8 @@ # # # -require "irb/workspace" -require "irb/inspector" +require_relative "workspace" +require_relative "inspector" require "irb/input-method" require "irb/output-method" diff --git a/lib/irb/ext/use-loader.rb b/lib/irb/ext/use-loader.rb index 571dd25d17aed7..cc7170667175d8 100644 --- a/lib/irb/ext/use-loader.rb +++ b/lib/irb/ext/use-loader.rb @@ -10,8 +10,8 @@ # # -require "irb/cmd/load" -require "irb/ext/loader" +require_relative "../cmd/load" +require_relative "loader" class Object alias __original__load__IRB_use_loader__ load diff --git a/lib/irb/init.rb b/lib/irb/init.rb index a971b75ac3e166..2066d8cb64581f 100644 --- a/lib/irb/init.rb +++ b/lib/irb/init.rb @@ -197,7 +197,7 @@ def IRB.parse_opts(argv: ::ARGV) print IRB.version, "\n" exit 0 when "-h", "--help" - require "irb/help" + require_relative "help" IRB.print_usage exit 0 when "--" diff --git a/lib/irb/input-method.rb b/lib/irb/input-method.rb index f7b1aac3bf3c27..7db602947b1af9 100644 --- a/lib/irb/input-method.rb +++ b/lib/irb/input-method.rb @@ -9,7 +9,7 @@ # # # -require 'irb/src_encoding' +require_relative 'src_encoding' require 'irb/magic-file' module IRB diff --git a/lib/irb/ruby-lex.rb b/lib/irb/ruby-lex.rb index fb7e08099fd6d4..659b15f4024cce 100644 --- a/lib/irb/ruby-lex.rb +++ b/lib/irb/ruby-lex.rb @@ -11,7 +11,7 @@ # require "e2mmap" -require "irb/slex" +require_relative "slex" require "irb/ruby-token" # :stopdoc: diff --git a/lib/irb/slex.rb b/lib/irb/slex.rb index 039b214a8d815c..e584b312bdb92d 100644 --- a/lib/irb/slex.rb +++ b/lib/irb/slex.rb @@ -11,7 +11,7 @@ # require "e2mmap" -require "irb/notifier" +require_relative "notifier" # :stopdoc: module IRB diff --git a/lib/irb/xmp.rb b/lib/irb/xmp.rb index 3234cff7f3f030..60cf3b4e4dfe40 100644 --- a/lib/irb/xmp.rb +++ b/lib/irb/xmp.rb @@ -11,7 +11,7 @@ # require "irb" -require "irb/frame" +require_relative "frame" # An example printer for irb. # diff --git a/lib/net/ftp.rb b/lib/net/ftp.rb index 9902f9dc657a08..e68d825dcf53f2 100644 --- a/lib/net/ftp.rb +++ b/lib/net/ftp.rb @@ -17,7 +17,7 @@ require "socket" require "monitor" -require "net/protocol" +require_relative "protocol" require "time" begin require "openssl" diff --git a/lib/net/http/status.rb b/lib/net/http/status.rb index cd4dcb095e1d20..b3995f763f1d34 100644 --- a/lib/net/http/status.rb +++ b/lib/net/http/status.rb @@ -1,7 +1,7 @@ #!/usr/bin/env ruby # frozen_string_literal: true -require 'net/http' +require_relative '../http' if $0 == __FILE__ require 'open-uri' diff --git a/lib/net/https.rb b/lib/net/https.rb index 58cb6ddf192621..922638e1370e63 100644 --- a/lib/net/https.rb +++ b/lib/net/https.rb @@ -4,7 +4,7 @@ = net/https -- SSL/TLS enhancement for Net::HTTP. This file has been merged with net/http. There is no longer any need to - require 'net/https' to use HTTPS. + require_relative 'https' to use HTTPS. See Net::HTTP for details on how to make HTTPS connections. @@ -19,5 +19,5 @@ =end -require 'net/http' +require_relative 'http' require 'openssl' diff --git a/lib/net/imap.rb b/lib/net/imap.rb index 4debec8d5426de..fa9b19071a9712 100644 --- a/lib/net/imap.rb +++ b/lib/net/imap.rb @@ -18,7 +18,7 @@ require "monitor" require "digest/md5" require "strscan" -require 'net/protocol' +require_relative 'protocol' begin require "openssl" rescue LoadError diff --git a/lib/net/pop.rb b/lib/net/pop.rb index 92a4fe7303b30e..a6374cd78c824e 100644 --- a/lib/net/pop.rb +++ b/lib/net/pop.rb @@ -21,7 +21,7 @@ # See Net::POP3 for documentation. # -require 'net/protocol' +require_relative 'protocol' require 'digest/md5' require 'timeout' diff --git a/lib/net/smtp.rb b/lib/net/smtp.rb index 1777a7fa7e9b7b..86b55d278b726a 100644 --- a/lib/net/smtp.rb +++ b/lib/net/smtp.rb @@ -17,7 +17,7 @@ # See Net::SMTP for documentation. # -require 'net/protocol' +require_relative 'protocol' require 'digest/md5' require 'timeout' begin diff --git a/lib/racc/parser.rb b/lib/racc/parser.rb index 0cdb42e49d1428..f284c02307fcf5 100644 --- a/lib/racc/parser.rb +++ b/lib/racc/parser.rb @@ -187,7 +187,7 @@ class Parser Racc_Runtime_Core_Version_R = '1.4.6' Racc_Runtime_Core_Revision_R = %w$originalRevision: 1.8 $[1] begin - require 'racc/cparse' + require_relative 'cparse' # Racc_Runtime_Core_Version_C = (defined in extension) Racc_Runtime_Core_Revision_C = Racc_Runtime_Core_Id_C.split[2] unless new.respond_to?(:_racc_do_parse_c, true) diff --git a/lib/rexml/attlistdecl.rb b/lib/rexml/attlistdecl.rb index dc1d2add0b8995..44a91d66d63158 100644 --- a/lib/rexml/attlistdecl.rb +++ b/lib/rexml/attlistdecl.rb @@ -1,7 +1,7 @@ # frozen_string_literal: false #vim:ts=2 sw=2 noexpandtab: -require 'rexml/child' -require 'rexml/source' +require_relative 'child' +require_relative 'source' module REXML # This class needs: diff --git a/lib/rexml/attribute.rb b/lib/rexml/attribute.rb index ca5984e178f2e5..4ae8b10062f676 100644 --- a/lib/rexml/attribute.rb +++ b/lib/rexml/attribute.rb @@ -1,6 +1,6 @@ # frozen_string_literal: false -require "rexml/namespace" -require 'rexml/text' +require_relative "namespace" +require_relative 'text' module REXML # Defines an Element Attribute; IE, a attribute=value pair, as in: diff --git a/lib/rexml/cdata.rb b/lib/rexml/cdata.rb index 2238446dc4e522..997f5a08dbcea1 100644 --- a/lib/rexml/cdata.rb +++ b/lib/rexml/cdata.rb @@ -1,5 +1,5 @@ # frozen_string_literal: false -require "rexml/text" +require_relative "text" module REXML class CData < Text diff --git a/lib/rexml/child.rb b/lib/rexml/child.rb index d23451e71ec843..cc6e9a471991b0 100644 --- a/lib/rexml/child.rb +++ b/lib/rexml/child.rb @@ -1,5 +1,5 @@ # frozen_string_literal: false -require "rexml/node" +require_relative "node" module REXML ## diff --git a/lib/rexml/comment.rb b/lib/rexml/comment.rb index 822fe0d5864348..52c58b46f6fa09 100644 --- a/lib/rexml/comment.rb +++ b/lib/rexml/comment.rb @@ -1,5 +1,5 @@ # frozen_string_literal: false -require "rexml/child" +require_relative "child" module REXML ## diff --git a/lib/rexml/doctype.rb b/lib/rexml/doctype.rb index 1eb1f5b4e18f8e..ca44454decffaf 100644 --- a/lib/rexml/doctype.rb +++ b/lib/rexml/doctype.rb @@ -1,10 +1,10 @@ # frozen_string_literal: false -require "rexml/parent" -require "rexml/parseexception" -require "rexml/namespace" -require 'rexml/entity' -require 'rexml/attlistdecl' -require 'rexml/xmltokens' +require_relative "parent" +require_relative "parseexception" +require_relative "namespace" +require_relative 'entity' +require_relative 'attlistdecl' +require_relative 'xmltokens' module REXML # Represents an XML DOCTYPE declaration; that is, the contents of -1 if transitive - require "rexml/formatters/transitive" + require_relative "formatters/transitive" REXML::Formatters::Transitive.new( indent, ie_hack ) else REXML::Formatters::Pretty.new( indent, ie_hack ) diff --git a/lib/rexml/dtd/attlistdecl.rb b/lib/rexml/dtd/attlistdecl.rb index 32847daadb2975..1326cb21e4c0f9 100644 --- a/lib/rexml/dtd/attlistdecl.rb +++ b/lib/rexml/dtd/attlistdecl.rb @@ -1,5 +1,5 @@ # frozen_string_literal: false -require "rexml/child" +require_relative "../child" module REXML module DTD class AttlistDecl < Child diff --git a/lib/rexml/dtd/dtd.rb b/lib/rexml/dtd/dtd.rb index 927d5d847b1a36..8b0f2d753afe21 100644 --- a/lib/rexml/dtd/dtd.rb +++ b/lib/rexml/dtd/dtd.rb @@ -1,10 +1,10 @@ # frozen_string_literal: false -require "rexml/dtd/elementdecl" -require "rexml/dtd/entitydecl" -require "rexml/comment" -require "rexml/dtd/notationdecl" -require "rexml/dtd/attlistdecl" -require "rexml/parent" +require_relative "elementdecl" +require_relative "entitydecl" +require_relative "../comment" +require_relative "notationdecl" +require_relative "attlistdecl" +require_relative "../parent" module REXML module DTD diff --git a/lib/rexml/dtd/elementdecl.rb b/lib/rexml/dtd/elementdecl.rb index 119fd41a8f6140..20ed0232441c2f 100644 --- a/lib/rexml/dtd/elementdecl.rb +++ b/lib/rexml/dtd/elementdecl.rb @@ -1,5 +1,5 @@ # frozen_string_literal: false -require "rexml/child" +require_relative "../child" module REXML module DTD class ElementDecl < Child diff --git a/lib/rexml/dtd/entitydecl.rb b/lib/rexml/dtd/entitydecl.rb index 45707e2f42d009..312df655ff26a8 100644 --- a/lib/rexml/dtd/entitydecl.rb +++ b/lib/rexml/dtd/entitydecl.rb @@ -1,5 +1,5 @@ # frozen_string_literal: false -require "rexml/child" +require_relative "../child" module REXML module DTD class EntityDecl < Child diff --git a/lib/rexml/dtd/notationdecl.rb b/lib/rexml/dtd/notationdecl.rb index cfdf0b9b74a10e..04a9b08aa7ddb8 100644 --- a/lib/rexml/dtd/notationdecl.rb +++ b/lib/rexml/dtd/notationdecl.rb @@ -1,5 +1,5 @@ # frozen_string_literal: false -require "rexml/child" +require_relative "../child" module REXML module DTD class NotationDecl < Child diff --git a/lib/rexml/element.rb b/lib/rexml/element.rb index 1ef22d29a2fbd3..7903d83453211b 100644 --- a/lib/rexml/element.rb +++ b/lib/rexml/element.rb @@ -1,10 +1,10 @@ # frozen_string_literal: false -require "rexml/parent" -require "rexml/namespace" -require "rexml/attribute" -require "rexml/cdata" -require "rexml/xpath" -require "rexml/parseexception" +require_relative "parent" +require_relative "namespace" +require_relative "attribute" +require_relative "cdata" +require_relative "xpath" +require_relative "parseexception" module REXML # An implementation note about namespaces: @@ -713,7 +713,7 @@ def write(output=$stdout, indent=-1, transitive=false, ie_hack=false) Kernel.warn("#{self.class.name}.write is deprecated. See REXML::Formatters", uplevel: 1) formatter = if indent > -1 if transitive - require "rexml/formatters/transitive" + require_relative "formatters/transitive" REXML::Formatters::Transitive.new( indent, ie_hack ) else REXML::Formatters::Pretty.new( indent, ie_hack ) diff --git a/lib/rexml/entity.rb b/lib/rexml/entity.rb index 97c7b6b42fa898..d6fd5edd0dee2f 100644 --- a/lib/rexml/entity.rb +++ b/lib/rexml/entity.rb @@ -1,7 +1,7 @@ # frozen_string_literal: false -require 'rexml/child' -require 'rexml/source' -require 'rexml/xmltokens' +require_relative 'child' +require_relative 'source' +require_relative 'xmltokens' module REXML class Entity < Child diff --git a/lib/rexml/formatters/pretty.rb b/lib/rexml/formatters/pretty.rb index a80274bdad529a..562ef9462e1797 100644 --- a/lib/rexml/formatters/pretty.rb +++ b/lib/rexml/formatters/pretty.rb @@ -1,5 +1,5 @@ # frozen_string_literal: false -require 'rexml/formatters/default' +require_relative 'default' module REXML module Formatters diff --git a/lib/rexml/formatters/transitive.rb b/lib/rexml/formatters/transitive.rb index 81e67f3274ef3a..5ff51e10f3720f 100644 --- a/lib/rexml/formatters/transitive.rb +++ b/lib/rexml/formatters/transitive.rb @@ -1,5 +1,5 @@ # frozen_string_literal: false -require 'rexml/formatters/pretty' +require_relative 'pretty' module REXML module Formatters diff --git a/lib/rexml/instruction.rb b/lib/rexml/instruction.rb index c4f65eefc14df2..2552f3e4425714 100644 --- a/lib/rexml/instruction.rb +++ b/lib/rexml/instruction.rb @@ -1,6 +1,6 @@ # frozen_string_literal: false -require "rexml/child" -require "rexml/source" +require_relative "child" +require_relative "source" module REXML # Represents an XML Instruction; IE, diff --git a/lib/rexml/light/node.rb b/lib/rexml/light/node.rb index d58119a3a44ebf..01177c64d2846a 100644 --- a/lib/rexml/light/node.rb +++ b/lib/rexml/light/node.rb @@ -1,5 +1,5 @@ # frozen_string_literal: false -require 'rexml/xmltokens' +require_relative '../xmltokens' # [ :element, parent, name, attributes, children* ] # a = Node.new diff --git a/lib/rexml/namespace.rb b/lib/rexml/namespace.rb index 90ba7cc635bc8e..4a7174eaebc24c 100644 --- a/lib/rexml/namespace.rb +++ b/lib/rexml/namespace.rb @@ -1,5 +1,5 @@ # frozen_string_literal: false -require 'rexml/xmltokens' +require_relative 'xmltokens' module REXML # Adds named attributes to an object. diff --git a/lib/rexml/node.rb b/lib/rexml/node.rb index 52337ade44ee8a..081caba6cb7c0c 100644 --- a/lib/rexml/node.rb +++ b/lib/rexml/node.rb @@ -1,7 +1,7 @@ # frozen_string_literal: false -require "rexml/parseexception" -require "rexml/formatters/pretty" -require "rexml/formatters/default" +require_relative "parseexception" +require_relative "formatters/pretty" +require_relative "formatters/default" module REXML # Represents a node in the tree. Nodes are never encountered except as diff --git a/lib/rexml/output.rb b/lib/rexml/output.rb index 96dfea570ed874..88a5fb378d9d12 100644 --- a/lib/rexml/output.rb +++ b/lib/rexml/output.rb @@ -1,5 +1,5 @@ # frozen_string_literal: false -require 'rexml/encoding' +require_relative 'encoding' module REXML class Output diff --git a/lib/rexml/parent.rb b/lib/rexml/parent.rb index 3bd0a962555032..6a53b37a123b65 100644 --- a/lib/rexml/parent.rb +++ b/lib/rexml/parent.rb @@ -1,5 +1,5 @@ # frozen_string_literal: false -require "rexml/child" +require_relative "child" module REXML # A parent has children, and has methods for accessing them. The Parent diff --git a/lib/rexml/parsers/baseparser.rb b/lib/rexml/parsers/baseparser.rb index 80eeb0fa79c1a6..4df1f57a05a840 100644 --- a/lib/rexml/parsers/baseparser.rb +++ b/lib/rexml/parsers/baseparser.rb @@ -1,7 +1,7 @@ # frozen_string_literal: false -require 'rexml/parseexception' -require 'rexml/undefinednamespaceexception' -require 'rexml/source' +require_relative '../parseexception' +require_relative '../undefinednamespaceexception' +require_relative '../source' require 'set' module REXML diff --git a/lib/rexml/parsers/lightparser.rb b/lib/rexml/parsers/lightparser.rb index f0601ae51b1372..bdc08276a9ac4d 100644 --- a/lib/rexml/parsers/lightparser.rb +++ b/lib/rexml/parsers/lightparser.rb @@ -1,7 +1,7 @@ # frozen_string_literal: false -require 'rexml/parsers/streamparser' -require 'rexml/parsers/baseparser' -require 'rexml/light/node' +require_relative 'streamparser' +require_relative 'baseparser' +require_relative '../light/node' module REXML module Parsers diff --git a/lib/rexml/parsers/pullparser.rb b/lib/rexml/parsers/pullparser.rb index 8c4921755333c3..f8b232a2cd35a5 100644 --- a/lib/rexml/parsers/pullparser.rb +++ b/lib/rexml/parsers/pullparser.rb @@ -1,9 +1,9 @@ # frozen_string_literal: false require 'forwardable' -require 'rexml/parseexception' -require 'rexml/parsers/baseparser' -require 'rexml/xmltokens' +require_relative '../parseexception' +require_relative 'baseparser' +require_relative '../xmltokens' module REXML module Parsers diff --git a/lib/rexml/parsers/sax2parser.rb b/lib/rexml/parsers/sax2parser.rb index 1386f69c83fe56..6a24ce2227a522 100644 --- a/lib/rexml/parsers/sax2parser.rb +++ b/lib/rexml/parsers/sax2parser.rb @@ -1,8 +1,8 @@ # frozen_string_literal: false -require 'rexml/parsers/baseparser' -require 'rexml/parseexception' -require 'rexml/namespace' -require 'rexml/text' +require_relative 'baseparser' +require_relative '../parseexception' +require_relative '../namespace' +require_relative '../text' module REXML module Parsers diff --git a/lib/rexml/parsers/streamparser.rb b/lib/rexml/parsers/streamparser.rb index f6a8bfa802cd67..9e0eb0b363c4eb 100644 --- a/lib/rexml/parsers/streamparser.rb +++ b/lib/rexml/parsers/streamparser.rb @@ -1,5 +1,5 @@ # frozen_string_literal: false -require "rexml/parsers/baseparser" +require_relative "baseparser" module REXML module Parsers diff --git a/lib/rexml/parsers/treeparser.rb b/lib/rexml/parsers/treeparser.rb index fc0993c72a5aee..bf9a42545b8084 100644 --- a/lib/rexml/parsers/treeparser.rb +++ b/lib/rexml/parsers/treeparser.rb @@ -1,6 +1,6 @@ # frozen_string_literal: false -require 'rexml/validation/validationexception' -require 'rexml/undefinednamespaceexception' +require_relative '../validation/validationexception' +require_relative '../undefinednamespaceexception' module REXML module Parsers diff --git a/lib/rexml/parsers/ultralightparser.rb b/lib/rexml/parsers/ultralightparser.rb index 6571d119bd6930..e0029f43da535d 100644 --- a/lib/rexml/parsers/ultralightparser.rb +++ b/lib/rexml/parsers/ultralightparser.rb @@ -1,6 +1,6 @@ # frozen_string_literal: false -require 'rexml/parsers/streamparser' -require 'rexml/parsers/baseparser' +require_relative 'streamparser' +require_relative 'baseparser' module REXML module Parsers diff --git a/lib/rexml/parsers/xpathparser.rb b/lib/rexml/parsers/xpathparser.rb index ac3c4d4e676117..d01d325e04d705 100644 --- a/lib/rexml/parsers/xpathparser.rb +++ b/lib/rexml/parsers/xpathparser.rb @@ -1,6 +1,6 @@ # frozen_string_literal: false -require 'rexml/namespace' -require 'rexml/xmltokens' +require_relative '../namespace' +require_relative '../xmltokens' module REXML module Parsers diff --git a/lib/rexml/quickpath.rb b/lib/rexml/quickpath.rb index 5d6c77ca38d772..a0466b25d9b635 100644 --- a/lib/rexml/quickpath.rb +++ b/lib/rexml/quickpath.rb @@ -1,6 +1,6 @@ # frozen_string_literal: false -require 'rexml/functions' -require 'rexml/xmltokens' +require_relative 'functions' +require_relative 'xmltokens' module REXML class QuickPath diff --git a/lib/rexml/source.rb b/lib/rexml/source.rb index af65cf4751a78d..8663e489a85ea5 100644 --- a/lib/rexml/source.rb +++ b/lib/rexml/source.rb @@ -1,6 +1,6 @@ # coding: US-ASCII # frozen_string_literal: false -require 'rexml/encoding' +require_relative 'encoding' module REXML # Generates Source-s. USE THIS CLASS. diff --git a/lib/rexml/text.rb b/lib/rexml/text.rb index 86269dea1e531c..208febf5ee78fc 100644 --- a/lib/rexml/text.rb +++ b/lib/rexml/text.rb @@ -1,10 +1,10 @@ # frozen_string_literal: false -require 'rexml/security' -require 'rexml/entity' -require 'rexml/doctype' -require 'rexml/child' -require 'rexml/doctype' -require 'rexml/parseexception' +require_relative 'security' +require_relative 'entity' +require_relative 'doctype' +require_relative 'child' +require_relative 'doctype' +require_relative 'parseexception' module REXML # Represents text nodes in an XML document diff --git a/lib/rexml/undefinednamespaceexception.rb b/lib/rexml/undefinednamespaceexception.rb index e522ed57eaa3ad..492a098183e3cc 100644 --- a/lib/rexml/undefinednamespaceexception.rb +++ b/lib/rexml/undefinednamespaceexception.rb @@ -1,5 +1,5 @@ # frozen_string_literal: false -require 'rexml/parseexception' +require_relative 'parseexception' module REXML class UndefinedNamespaceException < ParseException def initialize( prefix, source, parser ) diff --git a/lib/rexml/validation/relaxng.rb b/lib/rexml/validation/relaxng.rb index fb52438290d3f4..f29a2c05e5782f 100644 --- a/lib/rexml/validation/relaxng.rb +++ b/lib/rexml/validation/relaxng.rb @@ -1,6 +1,6 @@ # frozen_string_literal: false -require "rexml/validation/validation" -require "rexml/parsers/baseparser" +require_relative "validation" +require_relative "../parsers/baseparser" module REXML module Validation diff --git a/lib/rexml/validation/validation.rb b/lib/rexml/validation/validation.rb index f0c76f976ca928..0ad6ada4277777 100644 --- a/lib/rexml/validation/validation.rb +++ b/lib/rexml/validation/validation.rb @@ -1,5 +1,5 @@ # frozen_string_literal: false -require 'rexml/validation/validationexception' +require_relative 'validationexception' module REXML module Validation diff --git a/lib/rexml/xmldecl.rb b/lib/rexml/xmldecl.rb index a37e9f3ddc6420..d02204931cb33a 100644 --- a/lib/rexml/xmldecl.rb +++ b/lib/rexml/xmldecl.rb @@ -1,6 +1,6 @@ # frozen_string_literal: false -require 'rexml/encoding' -require 'rexml/source' +require_relative 'encoding' +require_relative 'source' module REXML # NEEDS DOCUMENTATION diff --git a/lib/rexml/xpath.rb b/lib/rexml/xpath.rb index 300d063fc5fe45..a0921bd8e10d8c 100644 --- a/lib/rexml/xpath.rb +++ b/lib/rexml/xpath.rb @@ -1,6 +1,6 @@ # frozen_string_literal: false -require 'rexml/functions' -require 'rexml/xpath_parser' +require_relative 'functions' +require_relative 'xpath_parser' module REXML # Wrapper class. Use this class to access the XPath functions. diff --git a/lib/rexml/xpath_parser.rb b/lib/rexml/xpath_parser.rb index 983db282c550f8..e30581d3d01c58 100644 --- a/lib/rexml/xpath_parser.rb +++ b/lib/rexml/xpath_parser.rb @@ -1,9 +1,9 @@ # frozen_string_literal: false -require 'rexml/namespace' -require 'rexml/xmltokens' -require 'rexml/attribute' -require 'rexml/syncenumerator' -require 'rexml/parsers/xpathparser' +require_relative 'namespace' +require_relative 'xmltokens' +require_relative 'attribute' +require_relative 'syncenumerator' +require_relative 'parsers/xpathparser' class Object # provides a unified +clone+ operation, for REXML::XPathParser diff --git a/lib/rinda/ring.rb b/lib/rinda/ring.rb index 34dc24512269c4..948cfaf20831a1 100644 --- a/lib/rinda/ring.rb +++ b/lib/rinda/ring.rb @@ -3,7 +3,7 @@ # Note: Rinda::Ring API is unstable. # require 'drb/drb' -require 'rinda/rinda' +require_relative 'rinda' require 'ipaddr' module Rinda diff --git a/lib/rinda/tuplespace.rb b/lib/rinda/tuplespace.rb index 47860bc8aed240..6a41a7ba75d503 100644 --- a/lib/rinda/tuplespace.rb +++ b/lib/rinda/tuplespace.rb @@ -1,7 +1,7 @@ # frozen_string_literal: false require 'monitor' require 'drb/drb' -require 'rinda/rinda' +require_relative 'rinda' require 'forwardable' module Rinda diff --git a/lib/rss/0.9.rb b/lib/rss/0.9.rb index d852a6a85e98ee..219ccefcdbc28b 100644 --- a/lib/rss/0.9.rb +++ b/lib/rss/0.9.rb @@ -1,5 +1,5 @@ # frozen_string_literal: false -require "rss/parser" +require_relative "parser" module RSS diff --git a/lib/rss/1.0.rb b/lib/rss/1.0.rb index fb63937c5e1505..c8f92fb54ef476 100644 --- a/lib/rss/1.0.rb +++ b/lib/rss/1.0.rb @@ -1,5 +1,5 @@ # frozen_string_literal: false -require "rss/parser" +require_relative "parser" module RSS diff --git a/lib/rss/atom.rb b/lib/rss/atom.rb index 38e927478c2b59..48c27330d0b8f2 100644 --- a/lib/rss/atom.rb +++ b/lib/rss/atom.rb @@ -1,5 +1,5 @@ # frozen_string_literal: false -require 'rss/parser' +require_relative 'parser' module RSS ## diff --git a/lib/rss/content.rb b/lib/rss/content.rb index d35311075a2cfa..78c18d103c3f6e 100644 --- a/lib/rss/content.rb +++ b/lib/rss/content.rb @@ -1,5 +1,5 @@ # frozen_string_literal: false -require "rss/rss" +require_relative "rss" module RSS # The prefix for the Content XML namespace. diff --git a/lib/rss/converter.rb b/lib/rss/converter.rb index b92e35a051d172..d372e067256c32 100644 --- a/lib/rss/converter.rb +++ b/lib/rss/converter.rb @@ -1,5 +1,5 @@ # frozen_string_literal: false -require "rss/utils" +require_relative "utils" module RSS diff --git a/lib/rss/dublincore.rb b/lib/rss/dublincore.rb index 8d1a5519472182..85b836d3bf3486 100644 --- a/lib/rss/dublincore.rb +++ b/lib/rss/dublincore.rb @@ -1,5 +1,5 @@ # frozen_string_literal: false -require "rss/rss" +require_relative "rss" module RSS # The prefix for the Dublin Core XML namespace. @@ -161,4 +161,4 @@ class DublinCore#{Utils.to_class_name(name)} < Element require 'rss/dublincore/1.0' require 'rss/dublincore/2.0' -require 'rss/dublincore/atom' +require_relative 'dublincore/atom' diff --git a/lib/rss/dublincore/atom.rb b/lib/rss/dublincore/atom.rb index 0b8b11e440b4e3..1cfcdec677c8b7 100644 --- a/lib/rss/dublincore/atom.rb +++ b/lib/rss/dublincore/atom.rb @@ -1,5 +1,5 @@ # frozen_string_literal: false -require "rss/atom" +require_relative "../atom" module RSS module Atom diff --git a/lib/rss/image.rb b/lib/rss/image.rb index 6b86ec0e5b60ca..837f7d18f4dd60 100644 --- a/lib/rss/image.rb +++ b/lib/rss/image.rb @@ -1,6 +1,6 @@ # frozen_string_literal: false require 'rss/1.0' -require 'rss/dublincore' +require_relative 'dublincore' module RSS diff --git a/lib/rss/maker.rb b/lib/rss/maker.rb index 33d285f6afb50d..d63ae59052a5c9 100644 --- a/lib/rss/maker.rb +++ b/lib/rss/maker.rb @@ -1,5 +1,5 @@ # frozen_string_literal: false -require "rss/rss" +require_relative "rss" module RSS ## @@ -67,13 +67,13 @@ def maker(version) require "rss/maker/1.0" require "rss/maker/2.0" -require "rss/maker/feed" -require "rss/maker/entry" -require "rss/maker/content" -require "rss/maker/dublincore" -require "rss/maker/slash" -require "rss/maker/syndication" -require "rss/maker/taxonomy" -require "rss/maker/trackback" -require "rss/maker/image" -require "rss/maker/itunes" +require_relative "maker/feed" +require_relative "maker/entry" +require_relative "maker/content" +require_relative "maker/dublincore" +require_relative "maker/slash" +require_relative "maker/syndication" +require_relative "maker/taxonomy" +require_relative "maker/trackback" +require_relative "maker/image" +require_relative "maker/itunes" diff --git a/lib/rss/maker/0.9.rb b/lib/rss/maker/0.9.rb index 622a4c30b4c3b5..b68730489b68bc 100644 --- a/lib/rss/maker/0.9.rb +++ b/lib/rss/maker/0.9.rb @@ -1,7 +1,7 @@ # frozen_string_literal: false require "rss/0.9" -require "rss/maker/base" +require_relative "base" module RSS module Maker diff --git a/lib/rss/maker/1.0.rb b/lib/rss/maker/1.0.rb index 3aee77e913b1d2..6921433b7b7992 100644 --- a/lib/rss/maker/1.0.rb +++ b/lib/rss/maker/1.0.rb @@ -1,7 +1,7 @@ # frozen_string_literal: false require "rss/1.0" -require "rss/maker/base" +require_relative "base" module RSS module Maker diff --git a/lib/rss/maker/atom.rb b/lib/rss/maker/atom.rb index e0cd7623c86ecb..cdd1d8753e2b7e 100644 --- a/lib/rss/maker/atom.rb +++ b/lib/rss/maker/atom.rb @@ -1,7 +1,7 @@ # frozen_string_literal: false -require "rss/atom" +require_relative "../atom" -require "rss/maker/base" +require_relative "base" module RSS module Maker diff --git a/lib/rss/maker/base.rb b/lib/rss/maker/base.rb index bc4ca841419fb8..17537b70062504 100644 --- a/lib/rss/maker/base.rb +++ b/lib/rss/maker/base.rb @@ -1,7 +1,7 @@ # frozen_string_literal: false require 'forwardable' -require 'rss/rss' +require_relative '../rss' module RSS module Maker diff --git a/lib/rss/maker/content.rb b/lib/rss/maker/content.rb index 3559a45ad02c75..42d73d1846c55a 100644 --- a/lib/rss/maker/content.rb +++ b/lib/rss/maker/content.rb @@ -1,5 +1,5 @@ # frozen_string_literal: false -require 'rss/content' +require_relative '../content' require 'rss/maker/1.0' require 'rss/maker/2.0' diff --git a/lib/rss/maker/dublincore.rb b/lib/rss/maker/dublincore.rb index 988209c045b53a..5e490ab540506e 100644 --- a/lib/rss/maker/dublincore.rb +++ b/lib/rss/maker/dublincore.rb @@ -1,5 +1,5 @@ # frozen_string_literal: false -require 'rss/dublincore' +require_relative '../dublincore' require 'rss/maker/1.0' module RSS diff --git a/lib/rss/maker/entry.rb b/lib/rss/maker/entry.rb index f806cbcaae85bb..ccdf9608ae6786 100644 --- a/lib/rss/maker/entry.rb +++ b/lib/rss/maker/entry.rb @@ -1,6 +1,6 @@ # frozen_string_literal: false -require "rss/maker/atom" -require "rss/maker/feed" +require_relative "atom" +require_relative "feed" module RSS module Maker diff --git a/lib/rss/maker/feed.rb b/lib/rss/maker/feed.rb index fdef7ad6430bfc..72ee704d6af61c 100644 --- a/lib/rss/maker/feed.rb +++ b/lib/rss/maker/feed.rb @@ -1,5 +1,5 @@ # frozen_string_literal: false -require "rss/maker/atom" +require_relative "atom" module RSS module Maker diff --git a/lib/rss/maker/image.rb b/lib/rss/maker/image.rb index 1957ba86891511..cde837c2b2f669 100644 --- a/lib/rss/maker/image.rb +++ b/lib/rss/maker/image.rb @@ -1,7 +1,7 @@ # frozen_string_literal: false -require 'rss/image' +require_relative '../image' require 'rss/maker/1.0' -require 'rss/maker/dublincore' +require_relative 'dublincore' module RSS module Maker diff --git a/lib/rss/maker/itunes.rb b/lib/rss/maker/itunes.rb index d964a4d9427b3d..a442725190c73c 100644 --- a/lib/rss/maker/itunes.rb +++ b/lib/rss/maker/itunes.rb @@ -1,5 +1,5 @@ # frozen_string_literal: false -require 'rss/itunes' +require_relative '../itunes' require 'rss/maker/2.0' module RSS diff --git a/lib/rss/maker/slash.rb b/lib/rss/maker/slash.rb index 3bd82d305702d9..898206f3ff8d00 100644 --- a/lib/rss/maker/slash.rb +++ b/lib/rss/maker/slash.rb @@ -1,5 +1,5 @@ # frozen_string_literal: false -require 'rss/slash' +require_relative '../slash' require 'rss/maker/1.0' module RSS diff --git a/lib/rss/maker/syndication.rb b/lib/rss/maker/syndication.rb index 840b70229ab06d..fde762045dc657 100644 --- a/lib/rss/maker/syndication.rb +++ b/lib/rss/maker/syndication.rb @@ -1,5 +1,5 @@ # frozen_string_literal: false -require 'rss/syndication' +require_relative '../syndication' require 'rss/maker/1.0' module RSS diff --git a/lib/rss/maker/taxonomy.rb b/lib/rss/maker/taxonomy.rb index 76a2d1600d488c..d71f7326347998 100644 --- a/lib/rss/maker/taxonomy.rb +++ b/lib/rss/maker/taxonomy.rb @@ -1,7 +1,7 @@ # frozen_string_literal: false -require 'rss/taxonomy' +require_relative '../taxonomy' require 'rss/maker/1.0' -require 'rss/maker/dublincore' +require_relative 'dublincore' module RSS module Maker diff --git a/lib/rss/maker/trackback.rb b/lib/rss/maker/trackback.rb index f97691c608eaf9..f69c9da128ea52 100644 --- a/lib/rss/maker/trackback.rb +++ b/lib/rss/maker/trackback.rb @@ -1,5 +1,5 @@ # frozen_string_literal: false -require 'rss/trackback' +require_relative '../trackback' require 'rss/maker/1.0' require 'rss/maker/2.0' diff --git a/lib/rss/parser.rb b/lib/rss/parser.rb index e271dc381c18fb..3a34d0adb47e69 100644 --- a/lib/rss/parser.rb +++ b/lib/rss/parser.rb @@ -2,8 +2,8 @@ require "forwardable" require "open-uri" -require "rss/rss" -require "rss/xml" +require_relative "rss" +require_relative "xml" module RSS diff --git a/lib/rss/rss.rb b/lib/rss/rss.rb index db87e11ad576f6..0eb08638d23e49 100644 --- a/lib/rss/rss.rb +++ b/lib/rss/rss.rb @@ -63,8 +63,8 @@ def w3cdtf require "English" -require "rss/utils" -require "rss/converter" +require_relative "utils" +require_relative "converter" require "rss/xml-stylesheet" module RSS diff --git a/lib/rss/taxonomy.rb b/lib/rss/taxonomy.rb index b7ea219e8cbbfb..50688ee6c1f0f3 100644 --- a/lib/rss/taxonomy.rb +++ b/lib/rss/taxonomy.rb @@ -1,6 +1,6 @@ # frozen_string_literal: false require "rss/1.0" -require "rss/dublincore" +require_relative "dublincore" module RSS # The prefix for the Taxonomy XML namespace. diff --git a/lib/rss/xml-stylesheet.rb b/lib/rss/xml-stylesheet.rb index be9cfaaf64bc4f..175c95fbcd7b10 100644 --- a/lib/rss/xml-stylesheet.rb +++ b/lib/rss/xml-stylesheet.rb @@ -1,5 +1,5 @@ # frozen_string_literal: false -require "rss/utils" +require_relative "utils" module RSS diff --git a/lib/rss/xml.rb b/lib/rss/xml.rb index cda8668044f8fe..b74630295fc700 100644 --- a/lib/rss/xml.rb +++ b/lib/rss/xml.rb @@ -1,5 +1,5 @@ # frozen_string_literal: false -require "rss/utils" +require_relative "utils" module RSS module XML diff --git a/lib/shell/builtin-command.rb b/lib/shell/builtin-command.rb index e419a68c33cbd5..a6a9d232ade3f7 100644 --- a/lib/shell/builtin-command.rb +++ b/lib/shell/builtin-command.rb @@ -10,7 +10,7 @@ # # -require "shell/filter" +require_relative "filter" class Shell class BuiltInCommand < Filter diff --git a/lib/shell/command-processor.rb b/lib/shell/command-processor.rb index b52cb0043f759e..a6b55f5a89a20b 100644 --- a/lib/shell/command-processor.rb +++ b/lib/shell/command-processor.rb @@ -12,8 +12,8 @@ require "e2mmap" -require "shell/error" -require "shell/filter" +require_relative "error" +require_relative "filter" require "shell/system-command" require "shell/builtin-command" diff --git a/lib/shell/system-command.rb b/lib/shell/system-command.rb index af22ed90d75593..767a9ee12cf6d9 100644 --- a/lib/shell/system-command.rb +++ b/lib/shell/system-command.rb @@ -10,7 +10,7 @@ # # -require "shell/filter" +require_relative "filter" class Shell class SystemCommand < Filter diff --git a/lib/uri/common.rb b/lib/uri/common.rb index ab4a8e382b146d..17d9ffc28c7206 100644 --- a/lib/uri/common.rb +++ b/lib/uri/common.rb @@ -10,8 +10,8 @@ # See URI for general documentation # -require "uri/rfc2396_parser" -require "uri/rfc3986_parser" +require_relative "rfc2396_parser" +require_relative "rfc3986_parser" module URI REGEXP = RFC2396_REGEXP diff --git a/lib/uri/file.rb b/lib/uri/file.rb index 6c959be50d8334..561ec703c46520 100644 --- a/lib/uri/file.rb +++ b/lib/uri/file.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -require 'uri/generic' +require_relative 'generic' module URI diff --git a/lib/uri/ftp.rb b/lib/uri/ftp.rb index bc9c9c3c65c99e..f57b4b7df9abc5 100644 --- a/lib/uri/ftp.rb +++ b/lib/uri/ftp.rb @@ -8,7 +8,7 @@ # See URI for general documentation # -require 'uri/generic' +require_relative 'generic' module URI diff --git a/lib/uri/generic.rb b/lib/uri/generic.rb index 0948cba66dec35..ea79e7950a5bde 100644 --- a/lib/uri/generic.rb +++ b/lib/uri/generic.rb @@ -9,7 +9,7 @@ # See URI for general documentation # -require 'uri/common' +require_relative 'common' autoload :IPSocket, 'socket' autoload :IPAddr, 'ipaddr' diff --git a/lib/uri/http.rb b/lib/uri/http.rb index 7d499f08d86d7a..2e2ebcc1d37340 100644 --- a/lib/uri/http.rb +++ b/lib/uri/http.rb @@ -8,7 +8,7 @@ # See URI for general documentation # -require 'uri/generic' +require_relative 'generic' module URI diff --git a/lib/uri/https.rb b/lib/uri/https.rb index 3c8c905cc3e171..4780ee0a4482d2 100644 --- a/lib/uri/https.rb +++ b/lib/uri/https.rb @@ -8,7 +8,7 @@ # See URI for general documentation # -require 'uri/http' +require_relative 'http' module URI diff --git a/lib/uri/ldap.rb b/lib/uri/ldap.rb index 6863fcfbc1f769..228c793cbd510b 100644 --- a/lib/uri/ldap.rb +++ b/lib/uri/ldap.rb @@ -12,7 +12,7 @@ # See URI for general documentation # -require 'uri/generic' +require_relative 'generic' module URI diff --git a/lib/uri/ldaps.rb b/lib/uri/ldaps.rb index d03f8efa2d8890..227e7fab354b3e 100644 --- a/lib/uri/ldaps.rb +++ b/lib/uri/ldaps.rb @@ -6,7 +6,7 @@ # See URI for general documentation # -require 'uri/ldap' +require_relative 'ldap' module URI diff --git a/lib/uri/mailto.rb b/lib/uri/mailto.rb index 4dd41bca3e4953..9c06871c7a9ef5 100644 --- a/lib/uri/mailto.rb +++ b/lib/uri/mailto.rb @@ -8,7 +8,7 @@ # See URI for general documentation # -require 'uri/generic' +require_relative 'generic' module URI diff --git a/lib/webrick/cgi.rb b/lib/webrick/cgi.rb index 33f1542731ca52..bb0ae2fc844214 100644 --- a/lib/webrick/cgi.rb +++ b/lib/webrick/cgi.rb @@ -8,9 +8,9 @@ # # $Id$ -require "webrick/httprequest" -require "webrick/httpresponse" -require "webrick/config" +require_relative "httprequest" +require_relative "httpresponse" +require_relative "config" require "stringio" module WEBrick diff --git a/lib/webrick/config.rb b/lib/webrick/config.rb index af4b561534fba0..9f2ab44f49d80c 100644 --- a/lib/webrick/config.rb +++ b/lib/webrick/config.rb @@ -9,11 +9,11 @@ # # $IPR: config.rb,v 1.52 2003/07/22 19:20:42 gotoyuzo Exp $ -require 'webrick/version' -require 'webrick/httpversion' -require 'webrick/httputils' -require 'webrick/utils' -require 'webrick/log' +require_relative 'version' +require_relative 'httpversion' +require_relative 'httputils' +require_relative 'utils' +require_relative 'log' module WEBrick module Config diff --git a/lib/webrick/cookie.rb b/lib/webrick/cookie.rb index 24bf92ec001a48..5fd3bfb22862ee 100644 --- a/lib/webrick/cookie.rb +++ b/lib/webrick/cookie.rb @@ -10,7 +10,7 @@ # $IPR: cookie.rb,v 1.16 2002/09/21 12:23:35 gotoyuzo Exp $ require 'time' -require 'webrick/httputils' +require_relative 'httputils' module WEBrick diff --git a/lib/webrick/httpauth.rb b/lib/webrick/httpauth.rb index bbb67765284801..f8bf09a6f1972c 100644 --- a/lib/webrick/httpauth.rb +++ b/lib/webrick/httpauth.rb @@ -9,11 +9,11 @@ # # $IPR: httpauth.rb,v 1.14 2003/07/22 19:20:42 gotoyuzo Exp $ -require 'webrick/httpauth/basicauth' -require 'webrick/httpauth/digestauth' -require 'webrick/httpauth/htpasswd' -require 'webrick/httpauth/htdigest' -require 'webrick/httpauth/htgroup' +require_relative 'httpauth/basicauth' +require_relative 'httpauth/digestauth' +require_relative 'httpauth/htpasswd' +require_relative 'httpauth/htdigest' +require_relative 'httpauth/htgroup' module WEBrick diff --git a/lib/webrick/httpauth/basicauth.rb b/lib/webrick/httpauth/basicauth.rb index 751885bc3e3fdc..7d0a9cfc8fd43d 100644 --- a/lib/webrick/httpauth/basicauth.rb +++ b/lib/webrick/httpauth/basicauth.rb @@ -8,9 +8,9 @@ # # $IPR: basicauth.rb,v 1.5 2003/02/20 07:15:47 gotoyuzo Exp $ -require 'webrick/config' -require 'webrick/httpstatus' -require 'webrick/httpauth/authenticator' +require_relative '../config' +require_relative '../httpstatus' +require_relative 'authenticator' module WEBrick module HTTPAuth diff --git a/lib/webrick/httpauth/digestauth.rb b/lib/webrick/httpauth/digestauth.rb index 94f849a02ef117..6416a40998f584 100644 --- a/lib/webrick/httpauth/digestauth.rb +++ b/lib/webrick/httpauth/digestauth.rb @@ -12,9 +12,9 @@ # # $IPR: digestauth.rb,v 1.5 2003/02/20 07:15:47 gotoyuzo Exp $ -require 'webrick/config' -require 'webrick/httpstatus' -require 'webrick/httpauth/authenticator' +require_relative '../config' +require_relative '../httpstatus' +require_relative 'authenticator' require 'digest/md5' require 'digest/sha1' diff --git a/lib/webrick/httpauth/htdigest.rb b/lib/webrick/httpauth/htdigest.rb index c35b38433bf8bf..93b18e2c750bd9 100644 --- a/lib/webrick/httpauth/htdigest.rb +++ b/lib/webrick/httpauth/htdigest.rb @@ -8,8 +8,8 @@ # # $IPR: htdigest.rb,v 1.4 2003/07/22 19:20:45 gotoyuzo Exp $ -require 'webrick/httpauth/userdb' -require 'webrick/httpauth/digestauth' +require_relative 'userdb' +require_relative 'digestauth' require 'tempfile' module WEBrick diff --git a/lib/webrick/httpauth/htpasswd.rb b/lib/webrick/httpauth/htpasswd.rb index cff18a8012d9de..abca30532e0429 100644 --- a/lib/webrick/httpauth/htpasswd.rb +++ b/lib/webrick/httpauth/htpasswd.rb @@ -8,8 +8,8 @@ # # $IPR: htpasswd.rb,v 1.4 2003/07/22 19:20:45 gotoyuzo Exp $ -require 'webrick/httpauth/userdb' -require 'webrick/httpauth/basicauth' +require_relative 'userdb' +require_relative 'basicauth' require 'tempfile' module WEBrick diff --git a/lib/webrick/httpproxy.rb b/lib/webrick/httpproxy.rb index d180ff483185f5..d05d59514c7291 100644 --- a/lib/webrick/httpproxy.rb +++ b/lib/webrick/httpproxy.rb @@ -10,7 +10,7 @@ # $IPR: httpproxy.rb,v 1.18 2003/03/08 18:58:10 gotoyuzo Exp $ # $kNotwork: straw.rb,v 1.3 2002/02/12 15:13:07 gotoken Exp $ -require "webrick/httpserver" +require_relative "httpserver" require "net/http" module WEBrick diff --git a/lib/webrick/httprequest.rb b/lib/webrick/httprequest.rb index ac60c3937fcdeb..e402099a3045e4 100644 --- a/lib/webrick/httprequest.rb +++ b/lib/webrick/httprequest.rb @@ -10,10 +10,10 @@ # $IPR: httprequest.rb,v 1.64 2003/07/13 17:18:22 gotoyuzo Exp $ require 'uri' -require 'webrick/httpversion' -require 'webrick/httpstatus' -require 'webrick/httputils' -require 'webrick/cookie' +require_relative 'httpversion' +require_relative 'httpstatus' +require_relative 'httputils' +require_relative 'cookie' module WEBrick diff --git a/lib/webrick/httpresponse.rb b/lib/webrick/httpresponse.rb index 255a27f6b962cb..bc1dacc8378fc7 100644 --- a/lib/webrick/httpresponse.rb +++ b/lib/webrick/httpresponse.rb @@ -11,10 +11,10 @@ require 'time' require 'uri' -require 'webrick/httpversion' -require 'webrick/htmlutils' -require 'webrick/httputils' -require 'webrick/httpstatus' +require_relative 'httpversion' +require_relative 'htmlutils' +require_relative 'httputils' +require_relative 'httpstatus' module WEBrick ## diff --git a/lib/webrick/https.rb b/lib/webrick/https.rb index 4826654d3a4d02..b0a49bc40bae05 100644 --- a/lib/webrick/https.rb +++ b/lib/webrick/https.rb @@ -9,8 +9,8 @@ # # $IPR: https.rb,v 1.15 2003/07/22 19:20:42 gotoyuzo Exp $ -require 'webrick/ssl' -require 'webrick/httpserver' +require_relative 'ssl' +require_relative 'httpserver' module WEBrick module Config diff --git a/lib/webrick/httpserver.rb b/lib/webrick/httpserver.rb index e46b3bd1ad8243..6945868ec827be 100644 --- a/lib/webrick/httpserver.rb +++ b/lib/webrick/httpserver.rb @@ -10,13 +10,13 @@ # $IPR: httpserver.rb,v 1.63 2002/10/01 17:16:32 gotoyuzo Exp $ require 'io/wait' -require 'webrick/server' -require 'webrick/httputils' -require 'webrick/httpstatus' -require 'webrick/httprequest' -require 'webrick/httpresponse' -require 'webrick/httpservlet' -require 'webrick/accesslog' +require_relative 'server' +require_relative 'httputils' +require_relative 'httpstatus' +require_relative 'httprequest' +require_relative 'httpresponse' +require_relative 'httpservlet' +require_relative 'accesslog' module WEBrick class HTTPServerError < ServerError; end diff --git a/lib/webrick/httpservlet.rb b/lib/webrick/httpservlet.rb index 1ee04ec86fd5fc..da49a1405b3af9 100644 --- a/lib/webrick/httpservlet.rb +++ b/lib/webrick/httpservlet.rb @@ -9,11 +9,11 @@ # # $IPR: httpservlet.rb,v 1.21 2003/02/23 12:24:46 gotoyuzo Exp $ -require 'webrick/httpservlet/abstract' -require 'webrick/httpservlet/filehandler' -require 'webrick/httpservlet/cgihandler' -require 'webrick/httpservlet/erbhandler' -require 'webrick/httpservlet/prochandler' +require_relative 'httpservlet/abstract' +require_relative 'httpservlet/filehandler' +require_relative 'httpservlet/cgihandler' +require_relative 'httpservlet/erbhandler' +require_relative 'httpservlet/prochandler' module WEBrick module HTTPServlet diff --git a/lib/webrick/httpservlet/abstract.rb b/lib/webrick/httpservlet/abstract.rb index fc4cd2275a8113..bccb091861d7fa 100644 --- a/lib/webrick/httpservlet/abstract.rb +++ b/lib/webrick/httpservlet/abstract.rb @@ -9,9 +9,9 @@ # # $IPR: abstract.rb,v 1.24 2003/07/11 11:16:46 gotoyuzo Exp $ -require 'webrick/htmlutils' -require 'webrick/httputils' -require 'webrick/httpstatus' +require_relative '../htmlutils' +require_relative '../httputils' +require_relative '../httpstatus' module WEBrick module HTTPServlet diff --git a/lib/webrick/httpservlet/cgihandler.rb b/lib/webrick/httpservlet/cgihandler.rb index b1fb471c54dbc8..981f649750e0f6 100644 --- a/lib/webrick/httpservlet/cgihandler.rb +++ b/lib/webrick/httpservlet/cgihandler.rb @@ -11,8 +11,8 @@ require 'rbconfig' require 'tempfile' -require 'webrick/config' -require 'webrick/httpservlet/abstract' +require_relative '../config' +require_relative 'abstract' module WEBrick module HTTPServlet diff --git a/lib/webrick/httpservlet/filehandler.rb b/lib/webrick/httpservlet/filehandler.rb index 0072e81ac64472..cb9c8b097692d6 100644 --- a/lib/webrick/httpservlet/filehandler.rb +++ b/lib/webrick/httpservlet/filehandler.rb @@ -11,9 +11,9 @@ require 'time' -require 'webrick/htmlutils' -require 'webrick/httputils' -require 'webrick/httpstatus' +require_relative '../htmlutils' +require_relative '../httputils' +require_relative '../httpstatus' module WEBrick module HTTPServlet diff --git a/lib/webrick/httpstatus.rb b/lib/webrick/httpstatus.rb index 0630219ada2d47..c811f21964990c 100644 --- a/lib/webrick/httpstatus.rb +++ b/lib/webrick/httpstatus.rb @@ -9,7 +9,7 @@ # # $IPR: httpstatus.rb,v 1.11 2003/03/24 20:18:55 gotoyuzo Exp $ -require 'webrick/accesslog' +require_relative 'accesslog' module WEBrick diff --git a/lib/webrick/server.rb b/lib/webrick/server.rb index 88e160d9814edf..4a6e74c4f91883 100644 --- a/lib/webrick/server.rb +++ b/lib/webrick/server.rb @@ -10,8 +10,8 @@ # $IPR: server.rb,v 1.62 2003/07/22 19:20:43 gotoyuzo Exp $ require 'socket' -require 'webrick/config' -require 'webrick/log' +require_relative 'config' +require_relative 'log' module WEBrick