move tasks to bin

Author: grosser

Rakefile

@@ -1,3 +1,19 @@
 task :default => :spec
 require 'spec/rake/spectask'
-Spec::Rake::SpecTask.new {|t| t.spec_opts = ['--color']}
+Spec::Rake::SpecTask.new {|t| t.spec_opts = ['--color']}
+
+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 = "[email protected]"
+    gem.homepage = "http://github.com/grosser/#{project_name}"
+    gem.authors = ["Michael Grosser"]
+  end
+
+  Jeweler::GemcutterTasks.new
+rescue LoadError
+  puts "Jeweler, or one of its dependencies, is not available. Install it with: sudo gem install jeweler"
+end

bin/parallel_test

@@ -0,0 +1,60 @@
+#!/usr/bin/env ruby
+require 'rubygems'
+require 'active_support' # TODO remove this later...
+
+options = {}
+OptionParser.new do |opts|
+  opts.banner = <<BANNER
+Run tests in parallel, giving each process ENV['TEST_ENV_NUMBER'] ('', '2', '3', ...)
+
+Options are:
+BANNER
+  opts.on("-t", "--type [TYPE]", "which type of tests to run? test, spec or features"){|type| options[:type] = type }
+  opts.on("-n [PROCESSES]", Integer, "How many processes to use, default: available CPUs"){|n| options[:count] = n }
+  opts.on("-p", '--path [PATH]', "run tests inside this path only"){|path| options[:path_prefix] = path }
+  opts.on("-r", '--root [PATH]', "execute test commands from this path"){|path| options[:root] = path }
+  opts.on('-v', '--version', 'Show Version'){ puts ParallelTests::VERSION; exit}
+  opts.on("-h", "--help", "Show this.") { puts opts; exit }
+end.parse!
+
+lib, name, task = {
+  'test' => ["tests", "test", "test"],
+  'spec' => ["specs", "spec", "spec"],
+  'features' => ["cucumber", "feature", "features"]
+}[options[:type]||'test']
+
+require File.join(File.dirname(__FILE__), '..', 'lib', "parallel_#{lib}")
+klass = eval("Parallel#{lib.capitalize}")
+
+start = Time.now
+
+num_processes = options[:count] || Parallel.processor_count
+tests_folder = File.join(task, options[:path_prefix].to_s)
+tests_folder = File.join(options[:root], tests_folder) if options[:root]
+
+groups = klass.tests_in_groups(tests_folder, num_processes)
+
+#adjust processes to groups
+abort "no #{name}s found!" if groups.size == 0
+
+num_tests = groups.sum{|g| g.size }
+puts "#{groups.size} processes for #{num_tests} #{name}s, ~ #{num_tests / groups.size} #{name}s per process"
+
+output = Parallel.map(groups) do |group|
+  klass.run_tests(group, groups.index(group))
+end
+
+#parse and print results
+results = klass.find_results(output*"")
+puts ""
+puts "Results:"
+results.each{|r| puts r}
+
+#report total time taken
+puts ""
+puts "Took #{Time.now - start} seconds"
+
+#exit with correct status code
+# - rake parallel:test && echo 123 ==> 123 should not show up when test failed
+# - rake parallel:test db:reset ==> works when tests succeed
+abort "#{name.capitalize}s Failed" if klass.failed?(results)

lib/parallel_tests.rb

@@ -2,7 +2,7 @@
 
 class ParallelTests
   # parallel:spec[2,controller] <-> parallel:spec[controller]
-  def self.parse_test_args(args)
+  def self.parse_rake_args (args)
     num_processes = Parallel.processor_count
     options = ""
     if args[:count].to_s =~ /^\d*$/ # number or empty

spec/parallel_tests_spec.rb

@@ -3,25 +3,25 @@
 describe ParallelTests do
   test_tests_in_groups(ParallelTests, 'test', '_test.rb')
 
-  describe :parse_test_args do
+  describe :parse_rake_args do
     it "should return the count" do
       args = {:count => 2}
-      ParallelTests.parse_test_args(args).should == [2, '', ""]
+      ParallelTests.parse_rake_args(args).should == [2, '', ""]
     end
 
     it "should default to the prefix" do
       args = {:count => "models"}
-      ParallelTests.parse_test_args(args).should == [2, "models", ""]
+      ParallelTests.parse_rake_args(args).should == [2, "models", ""]
     end
 
     it "should return the count and prefix" do
       args = {:count => 2, :path_prefix => "models"}
-      ParallelTests.parse_test_args(args).should == [2, "models", ""]
+      ParallelTests.parse_rake_args(args).should == [2, "models", ""]
     end
 
     it "should return the count, prefix, and options" do
       args = {:count => 2, :path_prefix => "plain", :options => "-p default" }
-      ParallelTests.parse_test_args(args).should == [2, "plain", "-p default"]
+      ParallelTests.parse_rake_args(args).should == [2, "plain", "-p default"]
     end
   end
 

tasks/parallel_specs.rake

@@ -20,53 +20,16 @@ namespace :parallel do
     end
   end
 
-  [
-    ["tests", "test", "test"],
-    ["specs", "spec", "spec"],
-    ["cucumber", "feature", "features"]
-  ].each do |lib, name, task|
-    desc "run #{name}s in parallel with parallel:#{task}[num_cpus]"
-    task task, :count, :path_prefix, :options do |t,args|
-      require File.join(File.dirname(__FILE__), '..', 'lib', "parallel_#{lib}")
-      klass = eval("Parallel#{lib.capitalize}")
-
-      start = Time.now
-
-      num_processes, prefix, options = ParallelTests.parse_test_args(args)
-      tests_folder = File.join(RAILS_ROOT, task, prefix)
-      groups = klass.tests_in_groups(tests_folder, num_processes)
-
-      #adjust processes to groups
-      num_processes = [groups.size, num_processes].min
-      abort "no #{name}s found!" if num_processes == 0
-
-      num_tests = groups.sum { |g| g.size }
-      
-      puts "#{num_processes} processes for #{num_tests} #{name}s, ~ #{num_tests / num_processes} #{name}s per process"
-
-      output = Parallel.in_processes(num_processes) do |process_number|
-        klass.run_tests(groups[process_number], process_number, options)
-      end
-
-      #parse and print results
-      results = klass.find_results(output*"")
-      puts ""
-      puts "Results:"
-      results.each{|r| puts r}
-
-      #report total time taken
-      puts ""
-      puts "Took #{Time.now - start} seconds"
-
-      #exit with correct status code
-      # - rake parallel:test && echo 123 ==> 123 should not show up when test failed
-      # - rake parallel:test db:reset ==> works when tests succeed
-      abort "#{name.capitalize}s Failed" if klass.failed?(results)
+  ['test', 'spec', 'features'].each do |type|
+    desc "run #{type} in parallel with parallel:#{type}[num_cpus]"
+    task type, :count, :path_prefix, :options do |t,args|
+      require File.join(File.dirname(__FILE__), '..', 'lib', "parallel_tests")
+      count, prefix, options = ParallelTests.parse_rake_args(args)
+      sh "#{File.join(File.dirname(__FILE__), '..', 'bin', 'parallel_test')} --type #{type} -n #{count} -p #{prefix} -r #{RAILS_ROOT} -o #{options} -e"
     end
   end
 end
 
-
 #backwards compatability
 #spec:parallel:prepare
 #spec:parallel