diff --git a/Gemfile b/Gemfile index 9b90a14..c16218b 100644 --- a/Gemfile +++ b/Gemfile @@ -12,5 +12,3 @@ gem 'guard-coffeescript' gem 'growl' gem 'rake', '0.8.7' gem 'mocha', '0.9.12' -gem 'hydra', :git => 'git://github.com/johnbintz/hydra.git' -gem 'facter' diff --git a/Rakefile b/Rakefile index ace6ed3..1f09f12 100644 --- a/Rakefile +++ b/Rakefile @@ -3,28 +3,6 @@ include Rake::DSL if defined?(Rake::DSL) require 'bundler' Bundler::GemHelper.install_tasks -begin - require 'hydra' - require 'hydra/tasks' - require 'facter' - - Hydra::TestTask.new('hydra:spec') do |t| - t.add_files 'spec/**/*_spec.rb' - end -rescue LoadError - warn "$! - hydra not loaded" -end - -HYDRA_LOG = 'hydra-runner.log' - -task 'hydra:before' do - rm HYDRA_LOG if File.file?(HYDRA_LOG) -end - -task('hydra:spec').enhance(%w{hydra:before}) do - puts File.read(HYDRA_LOG) if File.file?(HYDRA_LOG) -end - require 'rspec/core/rake_task' RSpec::Core::RakeTask.new(:spec) @@ -38,23 +16,9 @@ Jasmine::Headless::Task.new namespace :spec do desc "Run on three Rubies" task :platforms do - current = %x{rvm-prompt v} - - fail = false - %w{1.8.7 1.9.2 ree}.each do |version| - puts "Switching to #{version}" - Bundler.with_clean_env do - system %{bash -c 'source ~/.rvm/scripts/rvm ; rvm #{version} ; bundle install ; bundle exec rake hydra:spec'} - end - if $?.exitstatus != 0 - fail = true - break - end - end - - system %{rvm #{current}} - - exit (fail ? 1 : 0) + system %{rvm 1.8.7,1.9.2,ree ruby bundle} + system %{rvm 1.8.7,1.9.2,ree ruby bundle exec rake spec} + raise StandardError.new if $?.exitstatus != 0 end end diff --git a/config/hydra.yml b/config/hydra.yml deleted file mode 100644 index 44bfd23..0000000 --- a/config/hydra.yml +++ /dev/null @@ -1,5 +0,0 @@ -<% Facter.loadfacts %> -workers: - - type: local - runners: <%= Facter.sp_number_processors %> -