[#3392] Better Rakefile, remove puppetmasterd spec

- Minor improvements to Rakefile spec task
- Remove puppetmasterd spec, to be run as part of the testing matrix

1 files changed, 6 insertions, 18 deletions

diff --git a/Rakefile b/Rakefile
index 791d744e0..193ba77d3 100644
--- a/Rakefile
+++ b/Rakefile
@@ -7,6 +7,8 @@ require './lib/puppet.rb'
 require 'rake'
 require 'rake/packagetask'
 require 'rake/gempackagetask'
+require 'spec'
+require 'spec/rake/spectask'
 
 Dir['tasks/**/*.rake'].each { |t| load t }
 
@@ -38,24 +40,10 @@ end
 desc "Create the tarball and the gem - use when releasing"
 task :puppetpackages => [:create_gem, :package]
 
-desc "Run the specs under spec/"
-task :spec do
-    require 'spec'
-    require 'spec/rake/spectask'
-    begin
-#        require 'rcov'
-    rescue LoadError
-    end
-
-    Spec::Rake::SpecTask.new do |t|
-        t.spec_opts = ['--format','s', '--loadby','mtime']
-        t.spec_files = FileList['spec/**/*.rb']
-        t.fail_on_error = false
-        if defined?(Rcov)
-            t.rcov = true
-            t.rcov_opts = ['--exclude', 'spec/*,test/*,results/*,/usr/lib/*,/usr/local/lib/*']
-        end
-     end
+Spec::Rake::SpecTask.new do |t|
+    t.spec_opts = ['--format','s', '--loadby','mtime']
+    t.pattern ='spec/{unit,integation}/**/*.rb'
+    t.fail_on_error = false
 end
 
 desc "Run the unit tests"