parallel_tests 0.4.5 → 0.4.6

data/Rakefile

@@ -4,14 +4,13 @@ Spec::Rake::SpecTask.new {|t| t.spec_opts = ['--color --backtrace']}
 
 begin
   require 'jeweler'
-  project_name = 'parallel_tests'
   Jeweler::Tasks.new do |gem|
-    gem.name = project_name
-    gem.summary = "Run tests / specs / features in parallel"
-    gem.email = "grosser.michael@gmail.com"
-    gem.homepage = "http://github.com/grosser/#{project_name}"
-    gem.authors = ["Michael Grosser"]
-    gem.add_dependency ['parallel']
+    gem.name     = "parallel_tests"
+    gem.summary  = "Run tests / specs / features in parallel"
+    gem.email    = "grosser.michael@gmail.com"
+    gem.homepage = "http://github.com/grosser/#{gem.name}"
+    gem.authors  = "Michael Grosser"
+    gem.add_dependency "parallel"
   end
 
   Jeweler::GemcutterTasks.new

data/{README.markdown → Readme.md}

@@ -3,17 +3,36 @@ Speedup Test::Unit + RSpec + Cucumber by running parallel on multiple CPUs.
 Setup for Rails
 ===============
 
+## Install
+### Rails 3
+As gem
+    sudo gem install parallel_tests
+    # add to Gemfile
+    gem "parallel_tests"
+
+OR as plugin
     sudo gem install parallel
-    script/plugin install git://github.com/grosser/parallel_tests.git
+    rails plugin install git://github.com/grosser/parallel_tests.git
+
+### Rails 2
+
+As gem
+    sudo gem install parallel_tests
+    # add to config/environment.rb
+    config.gem "parallel_tests"
 
+OR as plugin
+
+    sudo gem install parallel
+    ./script/plugin install git://github.com/grosser/parallel_tests.git
+
+## Setup
 ### 1: Add to `config/database.yml`
     test:
       database: xxx_test<%= ENV['TEST_ENV_NUMBER'] %>
 
 ### 2: Create additional database(s)
-    script/db_console
-    create database xxx_test2;
-    ...
+    rake parallel:create
 
 ### 3: Copy development schema (repeat after migrations)
     rake parallel:prepare
@@ -95,14 +114,13 @@ TIPS
  - [RSpec] if `script/spec` is missing parallel:spec uses just `spec` (which solves some issues with double-loaded environment.rb)
  - [RSpec] 'script/spec_server' or [spork](http://github.com/timcharper/spork/tree/master) do not work in parallel
  - [RSpec] `./script/generate rspec` if you are running rspec from gems (this plugin uses script/spec which may fail if rspec files are outdated)
- - [Bundler] if you have a `.bundle/environment.rb` then `bundle exec xxx` will be used to run tests 
+ - [Bundler] if you have a `Gemfile` then `bundle exec` will be used to run tests 
  - with zsh this would be `rake "parallel:prepare[3]"`
 
 TODO
 ====
- - build parallel:bootstrap [idea/basics](http://github.com/garnierjm/parallel_specs/commit/dd8005a2639923dc5adc6400551c4dd4de82bf9a)
  - make jRuby compatible [basics](http://yehudakatz.com/2009/07/01/new-rails-isolation-testing/)
- - make windows compatible (does anyone care ?)
+ - make windows compatible
 
 Authors
 ====
@@ -122,6 +140,7 @@ inspired by [pivotal labs](http://pivotallabs.com/users/miked/blog/articles/849-
  - [Tchandy](http://thiagopradi.net/)
  - [Terence Lee](http://hone.heroku.com/)
  - [Will Bryant](http://willbryant.net/)
+ - [Fred Wu](http://fredwu.me)
 
 [Michael Grosser](http://pragmatig.wordpress.com)  
 grosser.michael@gmail.com  

data/VERSION

@@ -1 +1 @@
-0.4.5
+0.4.6

data/bin/parallel_test

@@ -37,7 +37,7 @@ num_processes = num_processes * (options[:multiply] || 1)
 if options[:execute]
   results = Parallel.map(0...num_processes, :in_processes => num_processes) do |i|
     ParallelTests.execute_command(options[:execute], i)
-  end
+  end.flatten
   abort if results.any?{|r| r[:exit_status] != 0 }
 else
   lib, name, task = {

data/lib/parallel_tests.rb

@@ -1,5 +1,6 @@
 require 'parallel'
 require 'parallel_tests/grouper'
+require 'parallel_tests/railtie'
 
 class ParallelTests
   VERSION = File.read( File.join(File.dirname(__FILE__),'..','VERSION') ).strip

data/lib/parallel_tests/railtie.rb

@@ -0,0 +1,10 @@
+# add rake tasks if we are inside Rails
+if defined?(Rails::Railtie)
+  class ParallelTests
+    class Railtie < ::Rails::Railtie
+      rake_tasks do
+        load File.expand_path("../../tasks/parallel_tests.rake", __FILE__)
+      end
+    end
+  end
+end

data/lib/tasks/parallel_tests.rake

@@ -36,7 +36,7 @@ namespace :parallel do
       require "parallel_tests"
       count, prefix, options = ParallelTests.parse_rake_args(args)
       executable = File.join(File.dirname(__FILE__), '..', '..', 'bin', 'parallel_test')
-      command = "#{executable} --type #{type} -n #{count} -p '#{prefix}' -r '#{RAILS_ROOT}' -o '#{options}'"
+      command = "#{executable} --type #{type} -n #{count} -p '#{prefix}' -r '#{Rails.root}' -o '#{options}'"
       abort unless system(command) # allow to chain tasks e.g. rake parallel:spec parallel:features
     end
   end

data/parallel_tests.gemspec

@@ -5,20 +5,17 @@
 
 Gem::Specification.new do |s|
   s.name = %q{parallel_tests}
-  s.version = "0.4.5"
+  s.version = "0.4.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael Grosser"]
-  s.date = %q{2010-08-17}
+  s.date = %q{2010-09-24}
   s.email = %q{grosser.michael@gmail.com}
   s.executables = ["parallel_spec", "parallel_cucumber", "parallel_test"]
-  s.extra_rdoc_files = [
-    "README.markdown"
-  ]
   s.files = [
     ".gitignore",
-     "README.markdown",
      "Rakefile",
+     "Readme.md",
      "VERSION",
      "bin/parallel_cucumber",
      "bin/parallel_spec",
@@ -28,6 +25,7 @@ Gem::Specification.new do |s|
      "lib/parallel_specs/spec_runtime_logger.rb",
      "lib/parallel_tests.rb",
      "lib/parallel_tests/grouper.rb",
+     "lib/parallel_tests/railtie.rb",
      "lib/tasks/parallel_tests.rake",
      "parallel_tests.gemspec",
      "spec/integration_spec.rb",

data/spec/integration_spec.rb

@@ -106,6 +106,6 @@ describe 'CLI' do
     write "x1_spec.rb", ""
     write "x2_spec.rb", ""
     result = run_specs(:add => "--test-options ' --version'", :processes => 2)
-    result.should =~ /\d+\.\d+\.\d+\..*\d+\.\d+\.\d+\./m # prints version twice
+    result.should =~ /rspec \d+\.\d+\.\d+.*rspec \d+\.\d+\.\d+/m # prints version twice
   end
 end

data/spec/spec_helper.rb

@@ -18,6 +18,8 @@ end
 # Uses /tmp/parallel_tests/application as the cwd so we can create and remove
 # files as we want to. After execution it changes cwd back to the original one.
 def use_temporary_directory_for
+  require 'fileutils'
+
   dir = File.join("/tmp", "parallel_tests")
   new_dir = File.join(dir, "application")
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 4
-  - 5
-  version: 0.4.5
+  - 6
+  version: 0.4.6
 platform: ruby
 authors: 
 - Michael Grosser
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-17 00:00:00 +02:00
+date: 2010-09-24 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -37,12 +37,12 @@ executables:
 - parallel_test
 extensions: []
 
-extra_rdoc_files: 
-- README.markdown
+extra_rdoc_files: []
+
 files: 
 - .gitignore
-- README.markdown
 - Rakefile
+- Readme.md
 - VERSION
 - bin/parallel_cucumber
 - bin/parallel_spec
@@ -52,6 +52,7 @@ files:
 - lib/parallel_specs/spec_runtime_logger.rb
 - lib/parallel_tests.rb
 - lib/parallel_tests/grouper.rb
+- lib/parallel_tests/railtie.rb
 - lib/tasks/parallel_tests.rake
 - parallel_tests.gemspec
 - spec/integration_spec.rb