Rakefile in facter-1.6.14 vs Rakefile in facter-1.6.15.rc1
- old
+ new
@@ -4,20 +4,20 @@
$LOAD_PATH.unshift(File.expand_path("lib"))
require 'facter/version'
$LOAD_PATH << File.join(File.dirname(__FILE__), 'tasks')
-require 'rubygems'
-require 'rspec'
-require 'rspec/core/rake_task'
-require 'rake'
-
begin
+ require 'rubygems'
+ require 'rspec'
+ require 'rspec/core/rake_task'
require 'rcov'
rescue LoadError
end
+require 'rake'
+
Dir['tasks/**/*.rake'].each { |t| load t }
Dir['ext/packaging/tasks/**/*'].sort.each { |t| load t }
build_defs_file = 'ext/build_defaults.yaml'
if File.exist?(build_defs_file)
@@ -53,19 +53,21 @@
task :default do
sh %{rake -T}
end
-desc "Run all specs"
-RSpec::Core::RakeTask.new do |t|
- t.pattern ='spec/{unit,integration}/**/*_spec.rb'
- t.fail_on_error = true
-end
+if defined?(RSpec::Core::RakeTask)
+ desc "Run all specs"
+ RSpec::Core::RakeTask.new do |t|
+ t.pattern ='spec/{unit,integration}/**/*_spec.rb'
+ t.fail_on_error = true
+ end
-RSpec::Core::RakeTask.new('spec:rcov') do |t|
- t.pattern ='spec/{unit,integration}/**/*_spec.rb'
- t.fail_on_error = true
- if defined?(Rcov)
- t.rcov = true
- t.rcov_opts = ['--exclude', 'spec/*,test/*,results/*,/usr/lib/*,/usr/local/lib/*,gems/*']
+ RSpec::Core::RakeTask.new('spec:rcov') do |t|
+ t.pattern ='spec/{unit,integration}/**/*_spec.rb'
+ t.fail_on_error = true
+ if defined?(Rcov)
+ t.rcov = true
+ t.rcov_opts = ['--exclude', 'spec/*,test/*,results/*,/usr/lib/*,/usr/local/lib/*,gems/*']
+ end
end
end