From 5e4b124dcce1fc4d5b4d9ab3241c20269619b68f Mon Sep 17 00:00:00 2001
From: Michael Hashizume <michael.hashizume@puppet.com>
Date: Mon, 22 Apr 2024 10:53:16 -0700
Subject: [PATCH 1/4] 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.
---
 Rakefile                                       | 5 -----
 {tasks => rakelib}/benchmark.rake              | 0
 {tasks => rakelib}/cfpropertylist.rake         | 0
 {tasks => rakelib}/ci.rake                     | 0
 {tasks => rakelib}/generate_ast_model.rake     | 0
 {tasks => rakelib}/generate_cert_fixtures.rake | 0
 {tasks => rakelib}/manpages.rake               | 0
 {tasks => rakelib}/memwalk.rake                | 0
 {tasks => rakelib}/parallel.rake               | 0
 {tasks => rakelib}/parser.rake                 | 0
 {tasks => rakelib}/yard.rake                   | 0
 11 files changed, 5 deletions(-)
 rename {tasks => rakelib}/benchmark.rake (100%)
 rename {tasks => rakelib}/cfpropertylist.rake (100%)
 rename {tasks => rakelib}/ci.rake (100%)
 rename {tasks => rakelib}/generate_ast_model.rake (100%)
 rename {tasks => rakelib}/generate_cert_fixtures.rake (100%)
 rename {tasks => rakelib}/manpages.rake (100%)
 rename {tasks => rakelib}/memwalk.rake (100%)
 rename {tasks => rakelib}/parallel.rake (100%)
 rename {tasks => rakelib}/parser.rake (100%)
 rename {tasks => rakelib}/yard.rake (100%)

diff --git a/Rakefile b/Rakefile
index 806e1c04dfb..c52df7c80dd 100644
--- 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 b/rakelib/benchmark.rake
similarity index 100%
rename from tasks/benchmark.rake
rename to rakelib/benchmark.rake
diff --git a/tasks/cfpropertylist.rake b/rakelib/cfpropertylist.rake
similarity index 100%
rename from tasks/cfpropertylist.rake
rename to rakelib/cfpropertylist.rake
diff --git a/tasks/ci.rake b/rakelib/ci.rake
similarity index 100%
rename from tasks/ci.rake
rename to rakelib/ci.rake
diff --git a/tasks/generate_ast_model.rake b/rakelib/generate_ast_model.rake
similarity index 100%
rename from tasks/generate_ast_model.rake
rename to rakelib/generate_ast_model.rake
diff --git a/tasks/generate_cert_fixtures.rake b/rakelib/generate_cert_fixtures.rake
similarity index 100%
rename from tasks/generate_cert_fixtures.rake
rename to rakelib/generate_cert_fixtures.rake
diff --git a/tasks/manpages.rake b/rakelib/manpages.rake
similarity index 100%
rename from tasks/manpages.rake
rename to rakelib/manpages.rake
diff --git a/tasks/memwalk.rake b/rakelib/memwalk.rake
similarity index 100%
rename from tasks/memwalk.rake
rename to rakelib/memwalk.rake
diff --git a/tasks/parallel.rake b/rakelib/parallel.rake
similarity index 100%
rename from tasks/parallel.rake
rename to rakelib/parallel.rake
diff --git a/tasks/parser.rake b/rakelib/parser.rake
similarity index 100%
rename from tasks/parser.rake
rename to rakelib/parser.rake
diff --git a/tasks/yard.rake b/rakelib/yard.rake
similarity index 100%
rename from tasks/yard.rake
rename to rakelib/yard.rake

From ec5b80291fde511762e089adbd246c6be969d2ce Mon Sep 17 00:00:00 2001
From: Michael Hashizume <michael.hashizume@puppet.com>
Date: Mon, 22 Apr 2024 10:54:59 -0700
Subject: [PATCH 2/4] Remove logic for older versions of Rake

---
 Rakefile | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/Rakefile b/Rakefile
index c52df7c80dd..617ad977345 100644
--- a/Rakefile
+++ b/Rakefile
@@ -4,19 +4,10 @@
 $LOAD_PATH.unshift(File.expand_path("lib"))
 require 'puppet/version'
 
-begin
-  require 'rubygems'
-  require 'rubygems/package_task'
-rescue LoadError
-  # Users of older versions of Rake (0.8.7 for example) will not necessarily
-  # have rubygems installed, or the newer rubygems package_task for that
-  # matter.
-  require 'rake/packagetask'
-  require 'rake/gempackagetask'
-end
-
-require 'rake'
 require 'open3'
+require 'rake'
+require 'rubygems'
+require 'rubygems/package_task'
 
 if Rake.application.top_level_tasks.grep(/^(pl:|package:)/).any?
   begin

From d4496cdb439b2197a2e2eb997205963fee71aaf8 Mon Sep 17 00:00:00 2001
From: Michael Hashizume <michael.hashizume@puppet.com>
Date: Mon, 22 Apr 2024 11:49:41 -0700
Subject: [PATCH 3/4] Add frozen string literal comment

---
 Rakefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Rakefile b/Rakefile
index 617ad977345..4ee68e14457 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,4 +1,4 @@
-# Rakefile for Puppet -*- ruby -*-
+# frozen_string_literal: true
 
 # We need access to the Puppet.version method
 $LOAD_PATH.unshift(File.expand_path("lib"))

From 366e8c6e13a762ca42cab7d907b0dda68751ac27 Mon Sep 17 00:00:00 2001
From: Michael Hashizume <michael.hashizume@puppet.com>
Date: Thu, 25 Apr 2024 10:14:17 -0700
Subject: [PATCH 4/4] Remove loading Puppet version

Previous versions of the Rakefile relied on Puppet#version as part of a
packaging task. That packaging task was removed from the Rakefile in
2012 in b1648b2, so we no longer need to load the Puppet library and
require puppet/version.
---
 Rakefile | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/Rakefile b/Rakefile
index 4ee68e14457..46b311f977d 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,9 +1,5 @@
 # frozen_string_literal: true
 
-# We need access to the Puppet.version method
-$LOAD_PATH.unshift(File.expand_path("lib"))
-require 'puppet/version'
-
 require 'open3'
 require 'rake'
 require 'rubygems'