diff --git a/lib/rake.rb b/lib/rake.rb index 0f3d6a330..77cb0c73a 100644 --- a/lib/rake.rb +++ b/lib/rake.rb @@ -23,7 +23,7 @@ module Rake; end -require "rake/version" +require_relative "rake/version" require "rbconfig" require "fileutils" @@ -31,34 +31,34 @@ module Rake; end require "monitor" require "optparse" -require "rake/ext/string" +require_relative "rake/ext/string" -require "rake/win32" +require_relative "rake/win32" -require "rake/linked_list" -require "rake/cpu_counter" -require "rake/scope" -require "rake/task_argument_error" -require "rake/rule_recursion_overflow_error" -require "rake/rake_module" -require "rake/trace_output" -require "rake/pseudo_status" -require "rake/task_arguments" -require "rake/invocation_chain" -require "rake/task" -require "rake/file_task" -require "rake/file_creation_task" -require "rake/multi_task" -require "rake/dsl_definition" -require "rake/file_utils_ext" -require "rake/file_list" -require "rake/default_loader" -require "rake/early_time" -require "rake/late_time" -require "rake/name_space" -require "rake/task_manager" -require "rake/application" -require "rake/backtrace" +require_relative "rake/linked_list" +require_relative "rake/cpu_counter" +require_relative "rake/scope" +require_relative "rake/task_argument_error" +require_relative "rake/rule_recursion_overflow_error" +require_relative "rake/rake_module" +require_relative "rake/trace_output" +require_relative "rake/pseudo_status" +require_relative "rake/task_arguments" +require_relative "rake/invocation_chain" +require_relative "rake/task" +require_relative "rake/file_task" +require_relative "rake/file_creation_task" +require_relative "rake/multi_task" +require_relative "rake/dsl_definition" +require_relative "rake/file_utils_ext" +require_relative "rake/file_list" +require_relative "rake/default_loader" +require_relative "rake/early_time" +require_relative "rake/late_time" +require_relative "rake/name_space" +require_relative "rake/task_manager" +require_relative "rake/application" +require_relative "rake/backtrace" $trace = false diff --git a/lib/rake/application.rb b/lib/rake/application.rb index 2ea8c780c..33ca872dd 100644 --- a/lib/rake/application.rb +++ b/lib/rake/application.rb @@ -1,12 +1,12 @@ # frozen_string_literal: true require "optparse" -require "rake/task_manager" -require "rake/file_list" -require "rake/thread_pool" -require "rake/thread_history_display" -require "rake/trace_output" -require "rake/win32" +require_relative "task_manager" +require_relative "file_list" +require_relative "thread_pool" +require_relative "thread_history_display" +require_relative "trace_output" +require_relative "win32" module Rake diff --git a/lib/rake/clean.rb b/lib/rake/clean.rb index b52e832a9..c49adf933 100644 --- a/lib/rake/clean.rb +++ b/lib/rake/clean.rb @@ -12,7 +12,7 @@ # The intent of this task is to return a project to its # pristine, just unpacked state. -require "rake" +require_relative "../rake" # :stopdoc: diff --git a/lib/rake/dsl_definition.rb b/lib/rake/dsl_definition.rb index 6bd660cb6..37990687a 100644 --- a/lib/rake/dsl_definition.rb +++ b/lib/rake/dsl_definition.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true # Rake DSL functions. -require "rake/file_utils_ext" +require_relative "file_utils_ext" module Rake diff --git a/lib/rake/ext/string.rb b/lib/rake/ext/string.rb index c70236ae9..c82f53245 100644 --- a/lib/rake/ext/string.rb +++ b/lib/rake/ext/string.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true -require "rake/ext/core" +require_relative "core" class String diff --git a/lib/rake/file_creation_task.rb b/lib/rake/file_creation_task.rb index 5a4c68492..3df254cea 100644 --- a/lib/rake/file_creation_task.rb +++ b/lib/rake/file_creation_task.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -require "rake/file_task" -require "rake/early_time" +require_relative "file_task" +require_relative "early_time" module Rake diff --git a/lib/rake/file_list.rb b/lib/rake/file_list.rb index 22c339f24..76078d269 100644 --- a/lib/rake/file_list.rb +++ b/lib/rake/file_list.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true -require "rake/cloneable" -require "rake/file_utils_ext" -require "rake/ext/string" +require_relative "cloneable" +require_relative "file_utils_ext" +require_relative "ext/string" module Rake diff --git a/lib/rake/file_task.rb b/lib/rake/file_task.rb index c36b49699..8c398bcf0 100644 --- a/lib/rake/file_task.rb +++ b/lib/rake/file_task.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -require "rake/task" -require "rake/early_time" +require_relative "task" +require_relative "early_time" module Rake diff --git a/lib/rake/file_utils_ext.rb b/lib/rake/file_utils_ext.rb index e91ad595f..687d80584 100644 --- a/lib/rake/file_utils_ext.rb +++ b/lib/rake/file_utils_ext.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true -require "rake/file_utils" +require_relative "file_utils" module Rake # diff --git a/lib/rake/packagetask.rb b/lib/rake/packagetask.rb index 1b014d1ca..80a4acf02 100644 --- a/lib/rake/packagetask.rb +++ b/lib/rake/packagetask.rb @@ -2,8 +2,8 @@ # Define a package task library to aid in the definition of # redistributable package files. -require "rake" -require "rake/tasklib" +require_relative "../rake" +require_relative "tasklib" module Rake diff --git a/lib/rake/phony.rb b/lib/rake/phony.rb index 8caa5de17..8f62b7c8d 100644 --- a/lib/rake/phony.rb +++ b/lib/rake/phony.rb @@ -5,7 +5,7 @@ # # See FileTask#out_of_date? and Task#timestamp for more info. -require "rake" +require_relative "../rake" task :phony diff --git a/lib/rake/rake_test_loader.rb b/lib/rake/rake_test_loader.rb index 3ecee5d85..05d89fc45 100644 --- a/lib/rake/rake_test_loader.rb +++ b/lib/rake/rake_test_loader.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -require "rake/file_list" +require_relative "file_list" # Load the test files from the command line. argv = ARGV.select do |argument| diff --git a/lib/rake/task.rb b/lib/rake/task.rb index a8ed24ddf..e61ccb641 100644 --- a/lib/rake/task.rb +++ b/lib/rake/task.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true -require "rake/invocation_exception_mixin" +require_relative "invocation_exception_mixin" module Rake diff --git a/lib/rake/tasklib.rb b/lib/rake/tasklib.rb index 5354b4f94..597a2d650 100644 --- a/lib/rake/tasklib.rb +++ b/lib/rake/tasklib.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true -require "rake" +require_relative "../rake" module Rake diff --git a/lib/rake/testtask.rb b/lib/rake/testtask.rb index 56521d23d..7cf1ece5d 100644 --- a/lib/rake/testtask.rb +++ b/lib/rake/testtask.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -require "rake" -require "rake/tasklib" +require_relative "../rake" +require_relative "tasklib" module Rake diff --git a/lib/rake/thread_history_display.rb b/lib/rake/thread_history_display.rb index 412ea37be..50e2bc8a4 100644 --- a/lib/rake/thread_history_display.rb +++ b/lib/rake/thread_history_display.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true -require "rake/private_reader" +require_relative "private_reader" module Rake diff --git a/lib/rake/thread_pool.rb b/lib/rake/thread_pool.rb index 76aa3b74b..d791caa6e 100644 --- a/lib/rake/thread_pool.rb +++ b/lib/rake/thread_pool.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -require "rake/promise" +require_relative "promise" require "set" module Rake