summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Rakefile6
-rw-r--r--tasks/rake/gem.rake6
2 files changed, 7 insertions, 5 deletions
diff --git a/Rakefile b/Rakefile
index 6f2ff592a..416bafbc4 100644
--- a/Rakefile
+++ b/Rakefile
@@ -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 <<