Rakefile in ci_reporter-1.6.9 vs Rakefile in ci_reporter-1.7.0

- old
+ new

@@ -1,12 +1,18 @@ +#-- +# Copyright (c) 2006-2012 Nick Sieger <nicksieger@gmail.com> +# See the file LICENSE.txt included with the distribution for +# software license details. +#++ + require 'bundler/setup' MANIFEST = FileList["History.txt", "Manifest.txt", "README.rdoc", "LICENSE.txt", "Rakefile", "*.rake", "lib/**/*.rb", "spec/**/*.rb", "tasks/**/*.rake"] begin - File.open("Manifest.txt", "w") {|f| MANIFEST.each {|n| f << "#{n}\n"} } + File.open("Manifest.txt", "w") {|f| MANIFEST.sort.each {|n| f << "#{n}\n"} } require 'hoe' Hoe.plugin :rubyforge require File.dirname(__FILE__) + '/lib/ci/reporter/version' hoe = Hoe.spec("ci_reporter") do |p| p.version = CI::Reporter::VERSION @@ -41,12 +47,12 @@ next unless Rake::Task.task_defined?(task) Rake::Task[task].prerequisites.clear Rake::Task[task].actions.clear end -# No RCov on JRuby at the moment -if RUBY_PLATFORM =~ /java/ +# RCov only on 1.8 +if defined?(RUBY_ENGINE) task :default => :spec else task :default => :rcov end @@ -59,10 +65,11 @@ @spec_bin = 'spec' Spec::Rake::SpecTask end RSpecTask.new do |t| + t.rspec_opts = "--color" end RSpecTask.new("spec:rcov") do |t| t.rcov_opts = ['--exclude gems/*'] t.rcov = true @@ -78,13 +85,10 @@ t.require_exact_threshold = false end rescue LoadError end -task "spec:rcov" do - rm_f "Manifest.txt" -end task :rcov => "spec:rcov" task :generate_output do rm_rf "acceptance/reports" ENV['CI_REPORTS'] = "acceptance/reports" @@ -95,10 +99,11 @@ opts = "-rubygems" end begin result_proc = proc {|ok,*| puts "Failures above are expected." unless ok } ruby "-Ilib #{opts} -rci/reporter/rake/test_unit_loader acceptance/test_unit_example_test.rb", &result_proc + ruby "-Ilib #{opts} -rci/reporter/rake/minitest_loader acceptance/minitest_example_test.rb", &result_proc ruby "-Ilib #{opts} -S #{@spec_bin} --require ci/reporter/rake/rspec_loader --format CI::Reporter::RSpec acceptance/rspec_example_spec.rb", &result_proc ruby "-Ilib #{opts} -rci/reporter/rake/cucumber_loader -S cucumber --format CI::Reporter::Cucumber acceptance/cucumber", &result_proc ensure ENV['RUBYOPT'] = opts if opts != "-rubygems" ENV.delete 'CI_REPORTS' @@ -106,9 +111,10 @@ end task :acceptance => :generate_output RSpecTask.new(:acceptance_spec) do |t| t.pattern = FileList['acceptance/verification_spec.rb'] + t.rspec_opts = "--color" end task :acceptance => :acceptance_spec task :default => :acceptance