Move Rake tasks to rakelib directory

This commit moves all Rake tasks not defined in the Rakefile to a new rakelib directory, where Rake will autodiscover and import those tasks. Additionally, I've removed old logic in the Rakefile that manually specified where to find and how to import those tasks.
QWolfp3 · Apr 25, 2024 · 5e4b124 · 5e4b124
1 parent fa213f5
commit 5e4b124
Show file tree

Hide file tree

Showing 11 changed files with 0 additions and 5 deletions.
diff --git a/Rakefile b/Rakefile
@@ -1,12 +1,9 @@
 # Rakefile for Puppet -*- ruby -*-
-RAKE_ROOT = File.dirname(__FILE__)
 
 # We need access to the Puppet.version method
 $LOAD_PATH.unshift(File.expand_path("lib"))
 require 'puppet/version'
 
-$LOAD_PATH << File.join(RAKE_ROOT, 'tasks')
-
 begin
   require 'rubygems'
   require 'rubygems/package_task'
@@ -21,8 +18,6 @@ end
 require 'rake'
 require 'open3'
 
-Dir['tasks/**/*.rake'].each { |t| load t }
-
 if Rake.application.top_level_tasks.grep(/^(pl:|package:)/).any?
   begin
     require 'packaging'

diff --git a/tasks/benchmark.rake → rakelib/benchmark.rake b/tasks/benchmark.rake → rakelib/benchmark.rake
diff --git a/tasks/cfpropertylist.rake → rakelib/cfpropertylist.rake b/tasks/cfpropertylist.rake → rakelib/cfpropertylist.rake
diff --git a/tasks/ci.rake → rakelib/ci.rake b/tasks/ci.rake → rakelib/ci.rake
diff --git a/tasks/generate_ast_model.rake → rakelib/generate_ast_model.rake b/tasks/generate_ast_model.rake → rakelib/generate_ast_model.rake
diff --git a/tasks/generate_cert_fixtures.rake → rakelib/generate_cert_fixtures.rake b/tasks/generate_cert_fixtures.rake → rakelib/generate_cert_fixtures.rake
diff --git a/tasks/manpages.rake → rakelib/manpages.rake b/tasks/manpages.rake → rakelib/manpages.rake
diff --git a/tasks/memwalk.rake → rakelib/memwalk.rake b/tasks/memwalk.rake → rakelib/memwalk.rake
diff --git a/tasks/parallel.rake → rakelib/parallel.rake b/tasks/parallel.rake → rakelib/parallel.rake
diff --git a/tasks/parser.rake → rakelib/parser.rake b/tasks/parser.rake → rakelib/parser.rake
diff --git a/tasks/yard.rake → rakelib/yard.rake b/tasks/yard.rake → rakelib/yard.rake