Merge pull request #9331 from mhashizume/PA-6294/main/rake-gem

Simplify Rakefile
puppetlabs · May 21, 2024 · 290ebdb · 290ebdb
2 parents b0d63e5 + 366e8c6
commit 290ebdb
Show file tree

Hide file tree

Showing 11 changed files with 4 additions and 22 deletions.
diff --git a/Rakefile b/Rakefile
@@ -1,27 +1,9 @@
-# Rakefile for Puppet -*- ruby -*-
-RAKE_ROOT = File.dirname(__FILE__)
+# frozen_string_literal: true
 
-# 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'
-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'
-
-Dir['tasks/**/*.rake'].each { |t| load t }
+require 'rake'
+require 'rubygems'
+require 'rubygems/package_task'
 
 if Rake.application.top_level_tasks.grep(/^(pl:|package:)/).any?
   begin

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