parallel_tests 0.3.4 → 0.3.5

data/README.markdown

@@ -48,7 +48,7 @@ Example output
 
 Even process runtimes (for specs only atm)
 -----------------
-Add to your `spec/parallel_specs.opts` (or `spec/spec.opts`) :
+Add to your `spec/parallel_spec.opts` (or `spec/spec.opts`) :
     --format ParallelSpecs::SpecRuntimeLogger:tmp/parallel_profile.log
 It will log test runtime and partition the test-load accordingly.
 
@@ -109,7 +109,8 @@ inspired by [pivotal labs](http://pivotallabs.com/users/miked/blog/articles/849-
  - [Joakim Kolsjö](http://www.rubyblocks.se)
  - [Kevin Scaldeferri](http://kevin.scaldeferri.com/blog/)
  - [Kpumuk](http://kpumuk.info/)
- - [Maksim Horbu](http://github.com/mhorbul)
+ - [Maksim Horbul](http://github.com/mhorbul)
+ - [Pivotal Labs][http://pivotallabs.com]
  - [Rohan Deshpande](http://github.com/rdeshpande)
  - [Tchandy](http://thiagopradi.net/)
  - [Terence Lee](http://hone.heroku.com/)

data/VERSION

@@ -1 +1 @@
-0.3.4
+0.3.5

data/bin/parallel_test

@@ -13,6 +13,7 @@ Options are:
 BANNER
   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("-f", '--files path/to/test_file,path/to/other_test_file]', Array, "run these test files (comma-separated list w/o spaces)"){|files| options[:files] = files }
   opts.on("-r", '--root [PATH]', "execute test commands from this path"){|path| options[:root] = path }
   opts.on("-e", '--exec [COMMAND]', "execute this code parallel and with ENV['TEST_ENV_NUM']"){|path| options[:execute] = path }
   opts.on("-o", '--test-options [SOMETHING]', "execute test commands with those options"){|arg| options[:test_options] = arg }
@@ -44,7 +45,7 @@ else
   tests_folder = File.join(task, options[:path_prefix].to_s)
   tests_folder = File.join(options[:root], tests_folder) unless options[:root].to_s.empty?
 
-  groups = klass.tests_in_groups(tests_folder, num_processes)
+  groups = klass.tests_in_groups(options[:files] || tests_folder, num_processes)
   num_processes = groups.size
 
   #adjust processes to groups

data/lib/parallel_cucumber.rb

@@ -19,6 +19,10 @@ class ParallelCucumber < ParallelTests
 
   protected
 
+  def self.test_suffix
+    ".feature"
+  end
+
   def self.line_is_result?(line)
     line =~ /^\d+ (steps|scenarios)/
   end
@@ -26,8 +30,4 @@ class ParallelCucumber < ParallelTests
   def self.line_is_failure?(line)
     line =~ /^\d+ (steps|scenarios).*(\d{2,}|[1-9]) failed/
   end
-
-  def self.find_tests(root)
-    Dir["#{root}**/**/*.feature"]
-  end
 end

data/lib/parallel_specs.rb

@@ -21,7 +21,7 @@ class ParallelSpecs < ParallelTests
 
   protected
 
-  def self.find_tests(root)
-    Dir["#{root}**/**/*_spec.rb"]
+  def self.test_suffix
+    "_spec.rb"
   end
 end

data/lib/parallel_tests.rb

@@ -108,7 +108,15 @@ class ParallelTests
     end
   end
 
+  def self.test_suffix
+    "_test.rb"
+  end
+
   def self.find_tests(root)
-    Dir["#{root}**/**/*_test.rb"]
+    if root.is_a?(Array)
+      root
+    else
+      Dir["#{root}**/**/*#{self.test_suffix}"]
+    end
   end
 end

data/parallel_tests.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{parallel_tests}
-  s.version = "0.3.4"
+  s.version = "0.3.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael Grosser"]
-  s.date = %q{2010-03-27}
+  s.date = %q{2010-05-01}
   s.email = %q{grosser.michael@gmail.com}
   s.executables = ["parallel_test", "parallel_spec", "parallel_cucumber"]
   s.extra_rdoc_files = [

data/spec/integration_spec.rb

@@ -4,7 +4,7 @@ describe 'CLI' do
   end
 
   after do
-    `rm -rf #{folder}`
+#    `rm -rf #{folder}`
   end
 
   def folder
@@ -27,7 +27,7 @@ describe 'CLI' do
   end
 
   def run_specs(options={})
-    `cd #{folder} && #{executable} -t spec -n #{options[:processes]||2} 2>&1 && echo 'i ran!'`
+    `cd #{folder} && #{executable} -t spec -n #{options[:processes]||2} #{options[:add]} 2>&1 && echo 'i ran!'`
   end
 
   it "runs tests in parallel" do
@@ -81,4 +81,14 @@ describe 'CLI' do
     expected = ((Parallel.processor_count == 1 or ENV['RUN_CODE_RUN']) ? 10 : 5)
     (Time.now - t).should <= expected
   end
+
+  it "can run with given files" do
+    write "x1_spec.rb", "puts '111'"
+    write "x2_spec.rb", "puts '222'"
+    write "x3_spec.rb", "puts '333'"
+    result = run_specs(:add => '--files spec/x1_spec.rb,spec/x3_spec.rb')
+    result.should include('111')
+    result.should include('333')
+    result.should_not include('222')
+  end
 end

data/spec/spec_helper.rb

@@ -30,6 +30,12 @@ def test_tests_in_groups(klass, folder, suffix)
       `rm -f #{@log}`
     end
 
+    it "groups when given an array of files" do
+      list_of_files = Dir["#{test_root}/**/*#{suffix}"]
+      found = klass.find_tests_with_sizes(list_of_files)
+      found.should =~ list_of_files.map{ |file| [file, File.stat(file).size]}
+    end
+
     it "finds all tests" do
       found = klass.tests_in_groups(test_root, 1)
       all = [ Dir["#{test_root}/**/*#{suffix}"] ]

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 4
-  version: 0.3.4
+  - 5
+  version: 0.3.5
 platform: ruby
 authors: 
 - Michael Grosser
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-27 00:00:00 +01:00
+date: 2010-05-01 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency