Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Make sure bundler gets loaded before ci_reporter loader

  • Loading branch information...
commit 131ed236086f160ffe233242b0c0fb7996e7ba76 1 parent 64d64da
Nick Sieger nicksieger authored
Showing with 30 additions and 10 deletions.
  1. +9 −5 Gemfile
  2. +8 −2 Gemfile.lock
  3. +13 −3 Rakefile
14 Gemfile
View
@@ -1,8 +1,12 @@
source :rubygems
gem 'builder'
-gem 'hoe'
-gem 'cucumber'
-gem 'rspec', '> 2.0.0'
-gem 'test-unit', '> 2.0.0'
-gem 'rcov'
+group :development do
+ gem 'hoe'
+ gem 'rubyforge'
+ gem 'cucumber'
+ gem 'rspec', '> 2.0.0'
+ gem 'test-unit', '> 2.0.0'
+ gem 'rcov'
+ gem 'rdoc'
+end
10 Gemfile.lock
View
@@ -15,11 +15,13 @@ GEM
json (>= 1.4.6)
hoe (2.12.4)
rake (~> 0.8)
- json (1.5.1)
- json (1.5.1-java)
+ json (1.6.3)
+ json (1.6.3-java)
+ json_pure (1.6.1)
rake (0.9.2.2)
rcov (0.9.9)
rcov (0.9.9-java)
+ rdoc (3.9.2)
rspec (2.6.0)
rspec-core (~> 2.6.0)
rspec-expectations (~> 2.6.0)
@@ -28,6 +30,8 @@ GEM
rspec-expectations (2.6.0)
diff-lcs (~> 1.1.2)
rspec-mocks (2.6.0)
+ rubyforge (2.0.4)
+ json_pure (>= 1.1.7)
term-ansicolor (1.0.5)
test-unit (2.3.0)
@@ -40,5 +44,7 @@ DEPENDENCIES
cucumber
hoe
rcov
+ rdoc
rspec (> 2.0.0)
+ rubyforge
test-unit (> 2.0.0)
16 Rakefile
View
@@ -1,3 +1,5 @@
+require 'bundler/setup'
+
MANIFEST = FileList["History.txt", "Manifest.txt", "README.rdoc", "LICENSE.txt", "Rakefile",
"*.rake", "lib/**/*.rb", "spec/**/*.rb", "tasks/**/*.rake"]
@@ -86,11 +88,19 @@ task :rcov => "spec:rcov"
task :generate_output do
rm_rf "acceptance/reports"
ENV['CI_REPORTS'] = "acceptance/reports"
+ if ENV['RUBYOPT']
+ opts = ENV['RUBYOPT']
+ ENV['RUBYOPT'] = nil
+ else
+ opts = "-rubygems"
+ end
begin
- `ruby -Ilib -rubygems -rci/reporter/rake/test_unit_loader acceptance/test_unit_example_test.rb` rescue puts "Warning: #{$!}"
- `ruby -Ilib -rubygems -S #{@spec_bin} --require ci/reporter/rake/rspec_loader --format CI::Reporter::RSpec acceptance/rspec_example_spec.rb` rescue puts "Warning: #{$!}"
- `ruby -Ilib -rubygems -rci/reporter/rake/cucumber_loader -S cucumber --format CI::Reporter::Cucumber acceptance/cucumber` rescue puts "Warning: #{$!}"
+ 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} -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'
end
end
Please sign in to comment.
Something went wrong with that request. Please try again.