diff options
author | James Turnbull <james@lovedthanlost.net> | 2010-04-15 13:18:22 +1000 |
---|---|---|
committer | test branch <puppet-dev@googlegroups.com> | 2010-02-17 06:50:53 -0800 |
commit | 6f8a1e9bbb48157621edb05a77a5fae96b047705 (patch) | |
tree | 183970ec14df3c69b27d220aac27cad802fdd2f9 | |
parent | 83a8c68f89bd47585a9acdf7ef8a95a079fc82f9 (diff) | |
download | puppet-6f8a1e9bbb48157621edb05a77a5fae96b047705.tar.gz puppet-6f8a1e9bbb48157621edb05a77a5fae96b047705.tar.xz puppet-6f8a1e9bbb48157621edb05a77a5fae96b047705.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,15 +1,17 @@ # 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' require 'spec' require 'spec/rake/spectask' +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 << |