Skip to content

Use require_relative instead of require #360

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 12, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/net-ldap.rb
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# -*- ruby encoding: utf-8 -*-
require 'net/ldap'
require_relative 'net/ldap'
4 changes: 2 additions & 2 deletions lib/net/ber.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# -*- ruby encoding: utf-8 -*-
require 'net/ldap/version'
require_relative 'ldap/version'

module Net # :nodoc:
##
Expand Down Expand Up @@ -349,4 +349,4 @@ def to_ber
Null = Net::BER::BerIdentifiedNull.new
end

require 'net/ber/core_ext'
require_relative 'ber/core_ext'
12 changes: 6 additions & 6 deletions lib/net/ber/core_ext.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# -*- ruby encoding: utf-8 -*-
require 'net/ber/ber_parser'
require_relative 'ber_parser'
# :stopdoc:
class IO
include Net::BER::BERParser
Expand All @@ -19,35 +19,35 @@ class OpenSSL::SSL::SSLSocket
module Net::BER::Extensions # :nodoc:
end

require 'net/ber/core_ext/string'
require_relative 'core_ext/string'
# :stopdoc:
class String
include Net::BER::BERParser
include Net::BER::Extensions::String
end

require 'net/ber/core_ext/array'
require_relative 'core_ext/array'
# :stopdoc:
class Array
include Net::BER::Extensions::Array
end
# :startdoc:

require 'net/ber/core_ext/integer'
require_relative 'core_ext/integer'
# :stopdoc:
class Integer
include Net::BER::Extensions::Integer
end
# :startdoc:

require 'net/ber/core_ext/true_class'
require_relative 'core_ext/true_class'
# :stopdoc:
class TrueClass
include Net::BER::Extensions::TrueClass
end
# :startdoc:

require 'net/ber/core_ext/false_class'
require_relative 'core_ext/false_class'
# :stopdoc:
class FalseClass
include Net::BER::Extensions::FalseClass
Expand Down
26 changes: 13 additions & 13 deletions lib/net/ldap.rb
Original file line number Diff line number Diff line change
Expand Up @@ -17,19 +17,19 @@ class LDAP
end
require 'socket'

require 'net/ber'
require 'net/ldap/pdu'
require 'net/ldap/filter'
require 'net/ldap/dataset'
require 'net/ldap/password'
require 'net/ldap/entry'
require 'net/ldap/instrumentation'
require 'net/ldap/connection'
require 'net/ldap/version'
require 'net/ldap/error'
require 'net/ldap/auth_adapter'
require 'net/ldap/auth_adapter/simple'
require 'net/ldap/auth_adapter/sasl'
require_relative 'ber'
require_relative 'ldap/pdu'
require_relative 'ldap/filter'
require_relative 'ldap/dataset'
require_relative 'ldap/password'
require_relative 'ldap/entry'
require_relative 'ldap/instrumentation'
require_relative 'ldap/connection'
require_relative 'ldap/version'
require_relative 'ldap/error'
require_relative 'ldap/auth_adapter'
require_relative 'ldap/auth_adapter/simple'
require_relative 'ldap/auth_adapter/sasl'

Net::LDAP::AuthAdapter.register([:simple, :anon, :anonymous], Net::LDAP::AuthAdapter::Simple)
Net::LDAP::AuthAdapter.register(:sasl, Net::LDAP::AuthAdapter::Sasl)
Expand Down
4 changes: 2 additions & 2 deletions lib/net/ldap/auth_adapter/gss_spnego.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
require 'net/ldap/auth_adapter'
require 'net/ldap/auth_adapter/sasl'
require_relative '../auth_adapter'
require_relative 'sasl'

module Net
class LDAP
Expand Down
2 changes: 1 addition & 1 deletion lib/net/ldap/auth_adapter/sasl.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require 'net/ldap/auth_adapter'
require_relative '../auth_adapter'

module Net
class LDAP
Expand Down
2 changes: 1 addition & 1 deletion lib/net/ldap/auth_adapter/simple.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require 'net/ldap/auth_adapter'
require_relative '../auth_adapter'

module Net
class LDAP
Expand Down
2 changes: 1 addition & 1 deletion lib/net/ldap/dataset.rb
Original file line number Diff line number Diff line change
Expand Up @@ -165,4 +165,4 @@ def read_ldif(io)
end
end

require 'net/ldap/entry' unless defined? Net::LDAP::Entry
require_relative 'entry' unless defined? Net::LDAP::Entry
2 changes: 1 addition & 1 deletion lib/net/ldap/entry.rb
Original file line number Diff line number Diff line change
Expand Up @@ -189,4 +189,4 @@ def setter?(sym)
private :setter?
end # class Entry

require 'net/ldap/dataset' unless defined? Net::LDAP::Dataset
require_relative 'dataset' unless defined? Net::LDAP::Dataset
2 changes: 1 addition & 1 deletion lib/net/snmp.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# -*- ruby encoding: utf-8 -*-
require 'net/ldap/version'
require_relative 'ldap/version'

# :stopdoc:
module Net
Expand Down
2 changes: 1 addition & 1 deletion net-ldap.gemspec
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# -*- encoding: utf-8 -*-
lib = File.expand_path('../lib', __FILE__)
$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
require 'net/ldap/version'
require_relative 'lib/net/ldap/version'

Gem::Specification.new do |s|
s.name = %q{net-ldap}
Expand Down
2 changes: 1 addition & 1 deletion test/test_dn.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
require_relative 'test_helper'
require 'net/ldap/dn'
require_relative '../lib/net/ldap/dn'

class TestDN < Test::Unit::TestCase
def test_escape
Expand Down
2 changes: 1 addition & 1 deletion test/test_helper.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Add 'lib' to load path.
require 'test/unit'
require 'net/ldap'
require_relative '../lib/net/ldap'
require 'flexmock/test_unit'

# Whether integration tests should be run.
Expand Down
2 changes: 1 addition & 1 deletion test/test_snmp.rb
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# $Id: testsnmp.rb 231 2006-12-21 15:09:29Z blackhedd $

require_relative 'test_helper'
require 'net/snmp'
require_relative '../lib/net/snmp'

class TestSnmp < Test::Unit::TestCase
def self.raw_string(s)
Expand Down