From b8b9ac90ed708a2b849328208b01760450e9adf1 Mon Sep 17 00:00:00 2001 From: Kevin McCormack Date: Thu, 2 Jul 2020 17:27:27 -0400 Subject: [PATCH 1/2] Use require_relative instead of require This enables testing things out by opening an IRB console and running require '/path/to/local/ruby-net-ldap/lib/net-ldap' --- lib/net-ldap.rb | 2 +- lib/net/ber.rb | 4 ++-- lib/net/ber/core_ext.rb | 12 ++++++------ lib/net/ldap.rb | 26 ++++++++++++------------- lib/net/ldap/auth_adapter/gss_spnego.rb | 4 ++-- lib/net/ldap/auth_adapter/sasl.rb | 2 +- lib/net/ldap/auth_adapter/simple.rb | 2 +- lib/net/ldap/dataset.rb | 2 +- lib/net/ldap/entry.rb | 2 +- lib/net/snmp.rb | 2 +- 10 files changed, 29 insertions(+), 29 deletions(-) diff --git a/lib/net-ldap.rb b/lib/net-ldap.rb index 879851eb..717878ca 100644 --- a/lib/net-ldap.rb +++ b/lib/net-ldap.rb @@ -1,2 +1,2 @@ # -*- ruby encoding: utf-8 -*- -require 'net/ldap' +require_relative 'net/ldap' diff --git a/lib/net/ber.rb b/lib/net/ber.rb index eb6f04b3..34696cc3 100644 --- a/lib/net/ber.rb +++ b/lib/net/ber.rb @@ -1,5 +1,5 @@ # -*- ruby encoding: utf-8 -*- -require 'net/ldap/version' +require_relative 'ldap/version' module Net # :nodoc: ## @@ -349,4 +349,4 @@ def to_ber Null = Net::BER::BerIdentifiedNull.new end -require 'net/ber/core_ext' +require_relative 'ber/core_ext' diff --git a/lib/net/ber/core_ext.rb b/lib/net/ber/core_ext.rb index b1939844..37e0993b 100644 --- a/lib/net/ber/core_ext.rb +++ b/lib/net/ber/core_ext.rb @@ -1,5 +1,5 @@ # -*- ruby encoding: utf-8 -*- -require 'net/ber/ber_parser' +require_relative 'ber_parser' # :stopdoc: class IO include Net::BER::BERParser @@ -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 diff --git a/lib/net/ldap.rb b/lib/net/ldap.rb index 9c13a97d..107cd930 100644 --- a/lib/net/ldap.rb +++ b/lib/net/ldap.rb @@ -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) diff --git a/lib/net/ldap/auth_adapter/gss_spnego.rb b/lib/net/ldap/auth_adapter/gss_spnego.rb index 9f773454..4a451ffb 100644 --- a/lib/net/ldap/auth_adapter/gss_spnego.rb +++ b/lib/net/ldap/auth_adapter/gss_spnego.rb @@ -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 diff --git a/lib/net/ldap/auth_adapter/sasl.rb b/lib/net/ldap/auth_adapter/sasl.rb index 139e8593..4489bda4 100644 --- a/lib/net/ldap/auth_adapter/sasl.rb +++ b/lib/net/ldap/auth_adapter/sasl.rb @@ -1,4 +1,4 @@ -require 'net/ldap/auth_adapter' +require_relative '../auth_adapter' module Net class LDAP diff --git a/lib/net/ldap/auth_adapter/simple.rb b/lib/net/ldap/auth_adapter/simple.rb index d01b57ae..d8e61c7b 100644 --- a/lib/net/ldap/auth_adapter/simple.rb +++ b/lib/net/ldap/auth_adapter/simple.rb @@ -1,4 +1,4 @@ -require 'net/ldap/auth_adapter' +require_relative '../auth_adapter' module Net class LDAP diff --git a/lib/net/ldap/dataset.rb b/lib/net/ldap/dataset.rb index 9027ed28..64a1ebf6 100644 --- a/lib/net/ldap/dataset.rb +++ b/lib/net/ldap/dataset.rb @@ -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 diff --git a/lib/net/ldap/entry.rb b/lib/net/ldap/entry.rb index 10965c7c..eb9d7922 100644 --- a/lib/net/ldap/entry.rb +++ b/lib/net/ldap/entry.rb @@ -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 diff --git a/lib/net/snmp.rb b/lib/net/snmp.rb index 258e8060..f89fe267 100644 --- a/lib/net/snmp.rb +++ b/lib/net/snmp.rb @@ -1,5 +1,5 @@ # -*- ruby encoding: utf-8 -*- -require 'net/ldap/version' +require_relative 'ldap/version' # :stopdoc: module Net From 1a13b871ed077f418ab3e048376d34067e2340fc Mon Sep 17 00:00:00 2001 From: Kevin McCormack Date: Thu, 2 Jul 2020 17:49:02 -0400 Subject: [PATCH 2/2] Update more requires to relative --- net-ldap.gemspec | 2 +- test/test_dn.rb | 2 +- test/test_helper.rb | 2 +- test/test_snmp.rb | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/net-ldap.gemspec b/net-ldap.gemspec index d6f1388b..101a39a8 100644 --- a/net-ldap.gemspec +++ b/net-ldap.gemspec @@ -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} diff --git a/test/test_dn.rb b/test/test_dn.rb index 5fff6ae8..a7b269b0 100644 --- a/test/test_dn.rb +++ b/test/test_dn.rb @@ -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 diff --git a/test/test_helper.rb b/test/test_helper.rb index d2c2c155..4a7600bd 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -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. diff --git a/test/test_snmp.rb b/test/test_snmp.rb index 6a809a80..80ec2c4e 100644 --- a/test/test_snmp.rb +++ b/test/test_snmp.rb @@ -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) pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy