🐛 Use modern require_relative for gem internal files

Author: pboling

.rubocop_gradual.lock

@@ -30,7 +30,7 @@ m = Module.new do
       if update_index && update_index.succ == i && a =~ Gem::Version::ANCHORED_VERSION_PATTERN
         bundler_version = a
       end
-      next unless a =~ /\A--bundler(?:[= ](#{Gem::Version::VERSION_PATTERN}))?\z/
+      next unless a =~ /\A--bundler(?:[= ](#{Gem::Version::VERSION_PATTERN}))?\z/o
       bundler_version = $1
       update_index = i
     end
@@ -56,7 +56,7 @@ m = Module.new do
   def lockfile_version
     return unless File.file?(lockfile)
     lockfile_contents = File.read(lockfile)
-    return unless lockfile_contents =~ /\n\nBUNDLED WITH\n\s{2,}(#{Gem::Version::VERSION_PATTERN})\n/
+    return unless lockfile_contents =~ /\n\nBUNDLED WITH\n\s{2,}(#{Gem::Version::VERSION_PATTERN})\n/o
     Regexp.last_match(1)
   end
 
@@ -83,15 +83,15 @@ m = Module.new do
 
   def activate_bundler
     gem_error = activation_error_handling do
-      gem "bundler", bundler_requirement
+      gem("bundler", bundler_requirement)
     end
     return if gem_error.nil?
     require_error = activation_error_handling do
       require "bundler/version"
     end
     return if require_error.nil? && Gem::Requirement.new(bundler_requirement).satisfied_by?(Gem::Version.new(Bundler::VERSION))
-    warn "Activating bundler (#{bundler_requirement}) failed:\n#{gem_error.message}\n\nTo install the version of bundler this project requires, run `gem install bundler -v '#{bundler_requirement}'`"
-    exit 42
+    warn("Activating bundler (#{bundler_requirement}) failed:\n#{gem_error.message}\n\nTo install the version of bundler this project requires, run `gem install bundler -v '#{bundler_requirement}'`")
+    exit(42)
   end
 
   def activation_error_handling

bin/bundle

@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+set -euo pipefail
+IFS=$'\n\t'
+set -vx
+
+bundle install
+
+# Do any other automated setup that you need to do here

bin/setup

@@ -18,9 +18,9 @@
 module OpenID
 end
 
-require "openid/version"
-require "openid/consumer"
-require "openid/server"
+require_relative "openid/version"
+require_relative "openid/consumer"
+require_relative "openid/server"
 
 OpenID::Version.class_eval do
   extend VersionGem::Basic

lib/openid.rb

@@ -1,7 +1,7 @@
-require "openid/kvform"
-require "openid/util"
-require "openid/cryptutil"
-require "openid/message"
+require_relative "kvform"
+require_relative "util"
+require_relative "cryptutil"
+require_relative "message"
 
 module OpenID
   def self.get_secret_size(assoc_type)

lib/openid/association.rb

@@ -1,13 +1,13 @@
-require "openid/consumer/idres"
-require "openid/consumer/checkid_request"
-require "openid/consumer/associationmanager"
-require "openid/consumer/responses"
-require "openid/consumer/session"
-require "openid/consumer/discovery_manager"
-require "openid/consumer/discovery"
-require "openid/message"
-require "openid/yadis/discovery"
-require "openid/store/nonce"
+require_relative "consumer/idres"
+require_relative "consumer/checkid_request"
+require_relative "consumer/associationmanager"
+require_relative "consumer/responses"
+require_relative "consumer/session"
+require_relative "consumer/discovery_manager"
+require_relative "consumer/discovery"
+require_relative "message"
+require_relative "yadis/discovery"
+require_relative "store/nonce"
 
 module OpenID
   # OpenID support for Relying Parties (aka Consumers).

lib/openid/consumer.rb

@@ -1,9 +1,9 @@
-require "openid/dh"
-require "openid/util"
-require "openid/kvpost"
-require "openid/cryptutil"
-require "openid/protocolerror"
-require "openid/association"
+require_relative "../dh"
+require_relative "../util"
+require_relative "../kvpost"
+require_relative "../cryptutil"
+require_relative "../protocolerror"
+require_relative "../association"
 
 module OpenID
   class Consumer
@@ -137,7 +137,7 @@ def negotiate_association
             assoc_type, session_type = supported_types
             begin
               request_association(assoc_type, session_type)
-            rescue ServerError => why
+            rescue ServerError
               Util.log("Server #{@server_url} refused its suggested " \
                 "association type: session_type=#{session_type}, " \
                 "assoc_type=#{assoc_type}")

lib/openid/consumer/associationmanager.rb

@@ -1,5 +1,5 @@
-require "openid/message"
-require "openid/util"
+require_relative "../message"
+require_relative "../util"
 
 module OpenID
   class Consumer

lib/openid/consumer/checkid_request.rb

@@ -1,17 +1,17 @@
 # Functions to discover OpenID endpoints from identifiers.
 
 require "uri"
-require "openid/util"
-require "openid/fetchers"
-require "openid/urinorm"
-require "openid/message"
-require "openid/yadis/discovery"
-require "openid/yadis/xrds"
-require "openid/yadis/xri"
-require "openid/yadis/services"
-require "openid/yadis/filters"
-require "openid/consumer/html_parse"
-require "openid/yadis/xrires"
+require_relative "../util"
+require_relative "../fetchers"
+require_relative "../urinorm"
+require_relative "../message"
+require_relative "../yadis/discovery"
+require_relative "../yadis/xrds"
+require_relative "../yadis/xri"
+require_relative "../yadis/services"
+require_relative "../yadis/filters"
+require_relative "../consumer/html_parse"
+require_relative "../yadis/xrires"
 
 module OpenID
   OPENID_1_0_NS = "http://openid.net/xmlns/1.0"

lib/openid/consumer/discovery.rb

@@ -1,4 +1,4 @@
-require "openid/yadis/htmltokenizer"
+require_relative "../yadis/htmltokenizer"
 
 module OpenID
   # Stuff to remove before we start looking for tags

lib/openid/consumer/html_parse.rb

@@ -1,8 +1,8 @@
-require "openid/message"
-require "openid/protocolerror"
-require "openid/kvpost"
-require "openid/consumer/discovery"
-require "openid/urinorm"
+require_relative "../message"
+require_relative "../protocolerror"
+require_relative "../kvpost"
+require_relative "../urinorm"
+require_relative "discovery"
 
 module OpenID
   class TypeURIMismatch < ProtocolError

lib/openid/consumer/idres.rb

@@ -1,4 +1,4 @@
-require "openid/util"
+# stdlib
 require "digest/sha1"
 require "digest/sha2"
 begin
@@ -10,11 +10,14 @@
     require "hmac-sha2"
   rescue LoadError
     # Nothing exists use included hmac files
-    require "hmac/sha1"
-    require "hmac/sha2"
+    require_relative "../hmac/sha1"
+    require_relative "../hmac/sha2"
   end
 end
 
+# This library
+require_relative "util"
+
 module OpenID
   # This module contains everything needed to perform low-level
   # cryptograph and data manipulation tasks.

lib/openid/cryptutil.rb

@@ -1,5 +1,5 @@
-require "openid/util"
-require "openid/cryptutil"
+require_relative "util"
+require_relative "cryptutil"
 
 module OpenID
   # Encapsulates a Diffie-Hellman key exchange.  This class is used

lib/openid/dh.rb

@@ -1,4 +1,4 @@
-require "openid/message"
+require_relative "message"
 
 module OpenID
   # An interface for OpenID extensions.

lib/openid/extension.rb

@@ -1,8 +1,8 @@
 # Implements the OpenID attribute exchange specification, version 1.0
 
-require "openid/extension"
-require "openid/trustroot"
-require "openid/message"
+require_relative "../extension"
+require_relative "../trustroot"
+require_relative "../message"
 
 module OpenID
   module AX

lib/openid/extensions/ax.rb

@@ -2,7 +2,7 @@
 # Extension 1.0
 # see: http://openid.net/specs/
 
-require "openid/extension"
+require_relative "../extension"
 
 module OpenID
   module OAuth

lib/openid/extensions/oauth.rb

@@ -2,7 +2,7 @@
 # Extension 1.0
 # see: http://openid.net/specs/
 
-require "openid/extension"
+require_relative "../extension"
 
 module OpenID
   module PAPE

lib/openid/extensions/pape.rb

@@ -1,6 +1,6 @@
-require "openid/extension"
-require "openid/util"
-require "openid/message"
+require_relative "../extension"
+require_relative "../util"
+require_relative "../message"
 
 module OpenID
   module SReg

lib/openid/extensions/sreg.rb

@@ -1,7 +1,7 @@
 # An implementation of the OpenID User Interface Extension 1.0 - DRAFT 0.5
 # see: http://svn.openid.net/repos/specifications/user_interface/1.0/trunk/openid-user-interface-extension-1_0.html
 
-require "openid/extension"
+require_relative "../extension"
 
 module OpenID
   module UI

lib/openid/extensions/ui.rb

@@ -1,6 +1,8 @@
+# External dependencies
 require "net/http"
-require "openid/util"
-require "openid/version"
+
+# This library
+require_relative "util"
 
 begin
   require "net/https"

lib/openid/fetchers.rb

@@ -1,5 +1,5 @@
-require "openid/message"
-require "openid/fetchers"
+require_relative "message"
+require_relative "fetchers"
 
 module OpenID
   # Exception that is raised when the server returns a 400 response

lib/openid/kvpost.rb

@@ -1,5 +1,5 @@
-require "openid/util"
-require "openid/kvform"
+require_relative "util"
+require_relative "kvform"
 
 module OpenID
   IDENTIFIER_SELECT = "http://specs.openid.net/auth/2.0/identifier_select"

lib/openid/message.rb

@@ -1,4 +1,4 @@
-require "openid/util"
+require_relative "util"
 
 module OpenID
   # An error in the OpenID protocol

lib/openid/protocolerror.rb

@@ -1,10 +1,10 @@
-require "openid/cryptutil"
-require "openid/util"
-require "openid/dh"
-require "openid/store/nonce"
-require "openid/trustroot"
-require "openid/association"
-require "openid/message"
+require_relative "cryptutil"
+require_relative "util"
+require_relative "dh"
+require_relative "store/nonce"
+require_relative "trustroot"
+require_relative "association"
+require_relative "message"
 
 require "time"
 

lib/openid/server.rb

@@ -1,10 +1,12 @@
+# stdlib
 require "fileutils"
 require "pathname"
 require "tempfile"
 
-require "openid/util"
-require "openid/store/interface"
-require "openid/association"
+# This library
+require_relative "../util"
+require_relative "../association"
+require_relative "interface"
 
 module OpenID
   module Store

lib/openid/store/filesystem.rb

@@ -1,4 +1,4 @@
-require "openid/util"
+require_relative "../util"
 
 module OpenID
   # Stores for Associations and nonces. Used by both the Consumer and

lib/openid/store/interface.rb

@@ -1,8 +1,11 @@
-require "openid/util"
-require "openid/store/interface"
-require "openid/store/nonce"
+# stdlib
 require "time"
 
+# This library
+require_relative "../util"
+require_relative "interface"
+require_relative "nonce"
+
 module OpenID
   module Store
     class Memcache < Interface

lib/openid/store/memcache.rb

@@ -1,4 +1,5 @@
-require "openid/store/interface"
+require_relative "interface"
+
 module OpenID
   module Store
     # An in-memory implementation of Store.  This class is mainly used

lib/openid/store/memory.rb

@@ -1,7 +1,10 @@
-require "openid/cryptutil"
+# stdlib
 require "date"
 require "time"
 
+# This library
+require_relative "../cryptutil"
+
 module OpenID
   module Nonce
     DEFAULT_SKEW = 60 * 60 * 5

lib/openid/store/nonce.rb

@@ -1,5 +1,8 @@
+# stdlib
 require "uri"
-require "openid/urinorm"
+
+# This library
+require_relative "urinorm"
 
 module OpenID
   class RealmVerificationRedirected < Exception

lib/openid/trustroot.rb

@@ -1,3 +1,4 @@
+# stdlib
 require "uri"
 
 module OpenID

lib/openid/urinorm.rb

@@ -1,4 +1,4 @@
-require "openid/yadis/accept"
+require_relative "accept"
 
 module OpenID
   module Yadis