#56 Prefer require_relative instead of require

rogerluan · Dec 27, 2023 · c45af9b · c45af9b
2 parents 66a189e + f66da8f
commit c45af9b
Show file tree

Hide file tree

Showing 11 changed files with 18 additions and 18 deletions.
diff --git a/lib/arkana/config_parser.rb b/lib/arkana/config_parser.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require "yaml"
+require "yaml" unless defined?(YAML)
 require_relative "models/config"
 require_relative "helpers/ui"
 

diff --git a/lib/arkana/encoder.rb b/lib/arkana/encoder.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require "arkana/helpers/string"
+require_relative "helpers/string"
 
 # The encoder is responsible for finding the env vars for given keys, encoding them, and creating Secrets based on the generated data.
 module Encoder

diff --git a/lib/arkana/kotlin_code_generator.rb b/lib/arkana/kotlin_code_generator.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require "erb"
-require "fileutils"
+require "erb" unless defined?(Erb)
+require "fileutils" unless defined?(FileUtils)
 require_relative "helpers/string"
 
 # Responsible for generating Kotlin source and test files.

diff --git a/lib/arkana/models/template_arguments.rb b/lib/arkana/models/template_arguments.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require "arkana/models/secret"
+require_relative "secret"
 
 # A class that defines template arguments in a language-agnostic form.
 class TemplateArguments

diff --git a/lib/arkana/salt_generator.rb b/lib/arkana/salt_generator.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require "securerandom"
+require "securerandom" unless defined?(SecureRandom)
 require_relative "models/salt"
 
 # Responsible for generating the salt.

diff --git a/lib/arkana/swift_code_generator.rb b/lib/arkana/swift_code_generator.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require "erb"
-require "fileutils"
+require "erb" unless defined?(Erb)
+require "fileutils" unless defined?(FileUtils)
 require_relative "helpers/string"
 
 # Responsible for generating Swift source and test files.

diff --git a/lib/arkana/templates/kotlin/arkana.kt.erb b/lib/arkana/templates/kotlin/arkana.kt.erb
@@ -1,5 +1,5 @@
-<% require "arkana/helpers/string" %>
-<% require "arkana/helpers/kotlin_template_helper" %>
+<% require_relative "lib/arkana/helpers/string" %>
+<% require_relative "lib/arkana/helpers/kotlin_template_helper" %>
 <% # TODO: Sort these import statements alphabetically %>
 // DO NOT MODIFY
 // Automatically generated by Arkana (https://github.com/rogerluan/arkana)

diff --git a/lib/arkana/templates/kotlin/arkana_protocol.kt.erb b/lib/arkana/templates/kotlin/arkana_protocol.kt.erb
@@ -1,5 +1,5 @@
-<% require "arkana/helpers/string" %>
-<% require "arkana/helpers/kotlin_template_helper" %>
+<% require_relative "lib/arkana/helpers/string" %>
+<% require_relative "lib/arkana/helpers/kotlin_template_helper" %>
 // DO NOT MODIFY
 // Automatically generated by Arkana (https://github.com/rogerluan/arkana)
 package <%= @kotlin_package_name %>

diff --git a/lib/arkana/templates/kotlin/arkana_tests.kt.erb b/lib/arkana/templates/kotlin/arkana_tests.kt.erb
@@ -1,5 +1,5 @@
-<% require "arkana/helpers/string" %>
-<% require "arkana/helpers/kotlin_template_helper" %>
+<% require_relative "lib/arkana/helpers/string" %>
+<% require_relative "lib/arkana/helpers/kotlin_template_helper" %>
 // DO NOT MODIFY
 // Automatically generated by Arkana (https://github.com/rogerluan/arkana)
 package <%= @kotlin_package_name %>

diff --git a/lib/arkana/templates/swift/arkana.swift.erb b/lib/arkana/templates/swift/arkana.swift.erb
@@ -1,5 +1,5 @@
-<% require "arkana/helpers/string" %>
-<% require "arkana/helpers/swift_template_helper" %>
+<% require_relative "lib/arkana/helpers/string" %>
+<% require_relative "lib/arkana/helpers/swift_template_helper" %>
 <% # TODO: Sort these import statements alphabetically %>
 // DO NOT MODIFY
 // Automatically generated by Arkana (https://github.com/rogerluan/arkana)

diff --git a/lib/arkana/templates/swift/arkana_protocol.swift.erb b/lib/arkana/templates/swift/arkana_protocol.swift.erb
@@ -1,5 +1,5 @@
-<% require "arkana/helpers/string" %>
-<% require "arkana/helpers/swift_template_helper" %>
+<% require_relative "lib/arkana/helpers/string" %>
+<% require_relative "lib/arkana/helpers/swift_template_helper" %>
 // DO NOT MODIFY
 // Automatically generated by Arkana (https://github.com/rogerluan/arkana)