Switched to using require_relative to improve load-times (closes #93).

postmodern · Jan 25, 2024 · 5687622 · 5687622
1 parent 929bcfa
commit 5687622
Show file tree

Hide file tree

Showing 17 changed files with 39 additions and 42 deletions.
diff --git a/lib/nmap.rb b/lib/nmap.rb
@@ -1,3 +1,3 @@
-require 'nmap/program'
-require 'nmap/xml'
-require 'nmap/version'
+require_relative 'nmap/program'
+require_relative 'nmap/xml'
+require_relative 'nmap/version'
diff --git a/lib/nmap/xml.rb b/lib/nmap/xml.rb
@@ -1,10 +1,10 @@
-require 'nmap/xml/scanner'
-require 'nmap/xml/scan_task'
-require 'nmap/xml/scan'
-require 'nmap/xml/host'
-require 'nmap/xml/run_stat'
-require 'nmap/xml/prescript'
-require 'nmap/xml/postscript'
+require_relative 'xml/scanner'
+require_relative 'xml/scan_task'
+require_relative 'xml/scan'
+require_relative 'xml/host'
+require_relative 'xml/run_stat'
+require_relative 'xml/prescript'
+require_relative 'xml/postscript'
 
 require 'nokogiri'
 

diff --git a/lib/nmap/xml/cpe.rb b/lib/nmap/xml/cpe.rb
@@ -1,4 +1,4 @@
-require 'nmap/xml/cpe/url'
+require_relative 'cpe/url'
 
 module Nmap
   class XML

diff --git a/lib/nmap/xml/host.rb b/lib/nmap/xml/host.rb
@@ -1,14 +1,14 @@
-require 'nmap/xml/status'
-require 'nmap/xml/address'
-require 'nmap/xml/hostname'
-require 'nmap/xml/os'
-require 'nmap/xml/port'
-require 'nmap/xml/ip_id_sequence'
-require 'nmap/xml/tcp_sequence'
-require 'nmap/xml/tcp_ts_sequence'
-require 'nmap/xml/uptime'
-require 'nmap/xml/traceroute'
-require 'nmap/xml/host_script'
+require_relative 'status'
+require_relative 'address'
+require_relative 'hostname'
+require_relative 'os'
+require_relative 'port'
+require_relative 'ip_id_sequence'
+require_relative 'tcp_sequence'
+require_relative 'tcp_ts_sequence'
+require_relative 'uptime'
+require_relative 'traceroute'
+require_relative 'host_script'
 
 require 'nokogiri'
 require 'time'
@@ -258,7 +258,7 @@ def os
       # @yield [uptime]
       #   If a block is given, it will be passed the resulting object
       #
-      # @yieldparam [Uptime] 
+      # @yieldparam [Uptime]
       #   Uptime value.
       #
       # @return [Uptime]

diff --git a/lib/nmap/xml/host_script.rb b/lib/nmap/xml/host_script.rb
@@ -1,4 +1,4 @@
-require 'nmap/xml/scripts'
+require_relative 'scripts'
 
 module Nmap
   class XML

diff --git a/lib/nmap/xml/ip_id_sequence.rb b/lib/nmap/xml/ip_id_sequence.rb
@@ -1,4 +1,4 @@
-require 'nmap/xml/sequence'
+require_relative 'sequence'
 
 module Nmap
   class XML

diff --git a/lib/nmap/xml/os.rb b/lib/nmap/xml/os.rb
@@ -1,5 +1,5 @@
-require 'nmap/xml/os_class'
-require 'nmap/xml/os_match'
+require_relative 'os_class'
+require_relative 'os_match'
 
 module Nmap
   class XML

diff --git a/lib/nmap/xml/os_class.rb b/lib/nmap/xml/os_class.rb
@@ -1,4 +1,4 @@
-require 'nmap/xml/cpe'
+require_relative 'cpe'
 
 module Nmap
   class XML

diff --git a/lib/nmap/xml/port.rb b/lib/nmap/xml/port.rb
@@ -1,5 +1,5 @@
-require 'nmap/xml/service'
-require 'nmap/xml/scripts'
+require_relative 'service'
+require_relative 'scripts'
 
 module Nmap
   class XML

diff --git a/lib/nmap/xml/postscript.rb b/lib/nmap/xml/postscript.rb
@@ -1,4 +1,4 @@
-require 'nmap/xml/scripts'
+require_relative 'scripts'
 
 module Nmap
   class XML

diff --git a/lib/nmap/xml/prescript.rb b/lib/nmap/xml/prescript.rb
@@ -1,4 +1,4 @@
-require 'nmap/xml/scripts'
+require_relative 'scripts'
 
 module Nmap
   class XML

diff --git a/lib/nmap/xml/scripts.rb b/lib/nmap/xml/scripts.rb
@@ -1,4 +1,4 @@
-require 'nmap/xml/script'
+require_relative 'script'
 
 module Nmap
   class XML

diff --git a/lib/nmap/xml/service.rb b/lib/nmap/xml/service.rb
@@ -1,4 +1,4 @@
-require 'nmap/xml/cpe'
+require_relative 'cpe'
 
 module Nmap
   class XML

diff --git a/lib/nmap/xml/tcp_sequence.rb b/lib/nmap/xml/tcp_sequence.rb
@@ -1,4 +1,4 @@
-require 'nmap/xml/sequence'
+require_relative 'sequence'
 
 module Nmap
   class XML
@@ -14,7 +14,7 @@ class TcpSequence < Sequence
       #   The difficulty index from nmap
       #
       # @since 0.5.0
-      #   
+      #
       def index
         @index ||= if (index_string = @node['index'])
                      index_string.to_i

diff --git a/lib/nmap/xml/tcp_ts_sequence.rb b/lib/nmap/xml/tcp_ts_sequence.rb
@@ -1,4 +1,4 @@
-require 'nmap/xml/sequence'
+require_relative 'sequence'
 
 module Nmap
   class XML

diff --git a/lib/nmap/xml/traceroute.rb b/lib/nmap/xml/traceroute.rb
@@ -1,4 +1,4 @@
-require 'nmap/xml/hop'
+require_relative 'hop'
 
 module Nmap
   class XML

diff --git a/ruby-nmap.gemspec b/ruby-nmap.gemspec
@@ -7,10 +7,7 @@ Gem::Specification.new do |gem|
 
   gem.name    = gemspec.fetch('name')
   gem.version = gemspec.fetch('version') do
-                  lib_dir = File.join(File.dirname(__FILE__),'lib')
-                  $LOAD_PATH << lib_dir unless $LOAD_PATH.include?(lib_dir)
-
-                  require 'nmap/version'
+                  require_relative 'lib/nmap/version'
                   Nmap::VERSION
                 end