Switched to using require_relative for loading local files (closes #25

).
ronin-rb · Aug 4, 2024 · f7d1f28 · f7d1f28
1 parent cb5c6f6
commit f7d1f28
Show file tree

Hide file tree

Showing 12 changed files with 26 additions and 26 deletions.
diff --git a/lib/ronin/code/asm.rb b/lib/ronin/code/asm.rb
@@ -18,9 +18,9 @@
 # along with ronin-code-asm.  If not, see <https://www.gnu.org/licenses/>.
 #
 
-require 'ronin/code/asm/program'
-require 'ronin/code/asm/shellcode'
-require 'ronin/code/asm/version'
+require_relative 'asm/program'
+require_relative 'asm/shellcode'
+require_relative 'asm/version'
 
 module Ronin
   module Code

diff --git a/lib/ronin/code/asm/archs.rb b/lib/ronin/code/asm/archs.rb
@@ -18,5 +18,5 @@
 # along with ronin-code-asm.  If not, see <https://www.gnu.org/licenses/>.
 #
 
-require 'ronin/code/asm/archs/x86'
-require 'ronin/code/asm/archs/amd64'
+require_relative 'archs/x86'
+require_relative 'archs/amd64'
diff --git a/lib/ronin/code/asm/archs/amd64.rb b/lib/ronin/code/asm/archs/amd64.rb
@@ -18,7 +18,7 @@
 # along with ronin-code-asm.  If not, see <https://www.gnu.org/licenses/>.
 #
 
-require 'ronin/code/asm/archs/x86'
+require_relative 'x86'
 
 module Ronin
   module Code

diff --git a/lib/ronin/code/asm/archs/x86.rb b/lib/ronin/code/asm/archs/x86.rb
@@ -18,7 +18,7 @@
 # along with ronin-code-asm.  If not, see <https://www.gnu.org/licenses/>.
 #
 
-require 'ronin/code/asm/register'
+require_relative '../register'
 
 module Ronin
   module Code
@@ -133,7 +133,7 @@ def register_clear(name)
 
           #
           # Generates the instruction to set a register.
-          # 
+          #
           # @param [Symbol] name
           #   The name of the register.
           #
@@ -146,7 +146,7 @@ def register_set(name,value)
 
           #
           # Generates the instruction to save a register.
-          # 
+          #
           # @param [Symbol] name
           #   The name of the register.
           #
@@ -156,7 +156,7 @@ def register_save(name)
 
           #
           # Generates the instruction to restore a register.
-          # 
+          #
           # @param [Symbol] name
           #   The name of the register.
           #

diff --git a/lib/ronin/code/asm/instruction.rb b/lib/ronin/code/asm/instruction.rb
@@ -18,7 +18,7 @@
 # along with ronin-code-asm.  If not, see <https://www.gnu.org/licenses/>.
 #
 
-require 'ronin/code/asm/immediate_operand'
+require_relative 'immediate_operand'
 
 module Ronin
   module Code

diff --git a/lib/ronin/code/asm/memory_operand.rb b/lib/ronin/code/asm/memory_operand.rb
@@ -18,7 +18,7 @@
 # along with ronin-code-asm.  If not, see <https://www.gnu.org/licenses/>.
 #
 
-require 'ronin/code/asm/register'
+require_relative 'register'
 
 module Ronin
   module Code

diff --git a/lib/ronin/code/asm/os.rb b/lib/ronin/code/asm/os.rb
@@ -18,9 +18,9 @@
 # along with ronin-code-asm.  If not, see <https://www.gnu.org/licenses/>.
 #
 
-require 'ronin/code/asm/os/os'
-require 'ronin/code/asm/os/freebsd'
-require 'ronin/code/asm/os/linux'
+require_relative 'os/os'
+require_relative 'os/freebsd'
+require_relative 'os/linux'
 
 module Ronin
   module Code

diff --git a/lib/ronin/code/asm/os/freebsd.rb b/lib/ronin/code/asm/os/freebsd.rb
@@ -18,7 +18,7 @@
 # along with ronin-code-asm.  If not, see <https://www.gnu.org/licenses/>.
 #
 
-require 'ronin/code/asm/config'
+require_relative '../config'
 
 module Ronin
   module Code

diff --git a/lib/ronin/code/asm/os/linux.rb b/lib/ronin/code/asm/os/linux.rb
@@ -18,7 +18,7 @@
 # along with ronin-code-asm.  If not, see <https://www.gnu.org/licenses/>.
 #
 
-require 'ronin/code/asm/config'
+require_relative '../config'
 
 module Ronin
   module Code

diff --git a/lib/ronin/code/asm/os/os.rb b/lib/ronin/code/asm/os/os.rb
@@ -18,7 +18,7 @@
 # along with ronin-code-asm.  If not, see <https://www.gnu.org/licenses/>.
 #
 
-require 'ronin/code/asm/config'
+require_relative '../config'
 
 require 'yaml'
 

diff --git a/lib/ronin/code/asm/program.rb b/lib/ronin/code/asm/program.rb
@@ -18,12 +18,12 @@
 # along with ronin-code-asm.  If not, see <https://www.gnu.org/licenses/>.
 #
 
-require 'ronin/code/asm/archs'
-require 'ronin/code/asm/os'
-require 'ronin/code/asm/register'
-require 'ronin/code/asm/instruction'
-require 'ronin/code/asm/immediate_operand'
-require 'ronin/code/asm/syntax'
+require_relative 'archs'
+require_relative 'os'
+require_relative 'register'
+require_relative 'instruction'
+require_relative 'immediate_operand'
+require_relative 'syntax'
 
 require 'tempfile'
 require 'yasm/program'
@@ -198,7 +198,7 @@ def instruction(name,*operands)
         #
         # Creates an operand of size 1 (byte).
         #
-        # @param [MemoryOperand, Integer] op 
+        # @param [MemoryOperand, Integer] op
         #   The value of the operand.
         #
         # @return [MemoryOperand, ImmediateOperand]

diff --git a/lib/ronin/code/asm/register.rb b/lib/ronin/code/asm/register.rb
@@ -18,7 +18,7 @@
 # along with ronin-code-asm.  If not, see <https://www.gnu.org/licenses/>.
 #
 
-require 'ronin/code/asm/memory_operand'
+require_relative 'memory_operand'
 
 module Ronin
   module Code