diff options
| author | James Turnbull <james@lovedthanlost.net> | 2010-04-15 13:18:22 +1000 |
|---|---|---|
| committer | James Turnbull <james@lovedthanlost.net> | 2010-04-16 14:58:33 +1000 |
| commit | cf7e6967632ba3f1d3b7ae21ccaf5daed9cec6e7 (patch) | |
| tree | 9a62c3e4c9eefef9f2398915434a218ea1dc6fe4 | |
| parent | b93924e1f4ae55565d96701f55ec49ff16379ef0 (diff) | |
| download | puppet-cf7e6967632ba3f1d3b7ae21ccaf5daed9cec6e7.tar.gz puppet-cf7e6967632ba3f1d3b7ae21ccaf5daed9cec6e7.tar.xz puppet-cf7e6967632ba3f1d3b7ae21ccaf5daed9cec6e7.zip | |
Updated Rake tasks to no longer load puppet.rb
| -rw-r--r-- | Rakefile | 6 | ||||
| -rw-r--r-- | tasks/rake/gem.rake | 6 |
2 files changed, 7 insertions, 5 deletions
@@ -1,13 +1,15 @@ # Rakefile for Puppet -*- ruby -*- -$: << File.expand_path('lib') $LOAD_PATH << File.join(File.dirname(__FILE__), 'tasks') -require 'puppet.rb' require 'rake' require 'rake/packagetask' require 'rake/gempackagetask' +module Puppet + PUPPETVERSION = File.read('lib/puppet.rb')[/PUPPETVERSION *= *'(.*)'/,1] or fail "Couldn't find PUPPETVERSION" +end + Dir['tasks/**/*.rake'].each { |t| load t } FILES = FileList[ diff --git a/tasks/rake/gem.rake b/tasks/rake/gem.rake index ba9d8ab4d..d654886ae 100644 --- a/tasks/rake/gem.rake +++ b/tasks/rake/gem.rake @@ -30,9 +30,9 @@ spec = Gem::Specification.new do |spec| spec.add_dependency('facter', '>= 1.5.1') spec.summary = 'Puppet, an automated configuration management tool' spec.description = 'Puppet, an automated configuration management tool' - spec.author = 'Reductive Labs' - spec.email = 'puppet@reductivelabs.com' - spec.homepage = 'http://reductivelabs.com' + spec.author = 'Puppet Labs' + spec.email = 'puppet@puppetlabs.com' + spec.homepage = 'http://puppetlabs.com' spec.rubyforge_project = 'puppet' spec.has_rdoc = true spec.rdoc_options << |