Skip to content

Commit 5e4b124

Browse files
committed
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.
1 parent fa213f5 commit 5e4b124

11 files changed

+0
-5
lines changed

Rakefile

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,9 @@
11
# Rakefile for Puppet -*- ruby -*-
2-
RAKE_ROOT = File.dirname(__FILE__)
32

43
# We need access to the Puppet.version method
54
$LOAD_PATH.unshift(File.expand_path("lib"))
65
require 'puppet/version'
76

8-
$LOAD_PATH << File.join(RAKE_ROOT, 'tasks')
9-
107
begin
118
require 'rubygems'
129
require 'rubygems/package_task'
@@ -21,8 +18,6 @@ end
2118
require 'rake'
2219
require 'open3'
2320

24-
Dir['tasks/**/*.rake'].each { |t| load t }
25-
2621
if Rake.application.top_level_tasks.grep(/^(pl:|package:)/).any?
2722
begin
2823
require 'packaging'
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)