parallel_tests 0.6.20 → 0.7.0.alpha

data/spec/parallel_tests/{runtime_logger_spec.rb → test/runtime_logger_spec.rb}

@@ -1,17 +1,18 @@
 require 'spec_helper'
 
-describe ParallelTests::RuntimeLogger do
-
+describe ParallelTests::Test::RuntimeLogger do
   describe :writing do
+    let(:log) { ParallelTests::Test::Runner.runtime_log }
+
     it "overwrites the runtime_log file on first log invocation" do
       class FakeTest
       end
       test = FakeTest.new
       time = Time.now
-      File.open(ParallelTests.runtime_log, 'w'){ |f| f.puts("FooBar") }
-      ParallelTests::RuntimeLogger.send(:class_variable_set,:@@has_started, false)
-      ParallelTests::RuntimeLogger.log(test, time, Time.at(time.to_f+2.00))
-      result = File.read(ParallelTests.runtime_log)
+      File.open(log, 'w'){ |f| f.puts("FooBar") }
+      ParallelTests::Test::RuntimeLogger.send(:class_variable_set,:@@has_started, false)
+      ParallelTests::Test::RuntimeLogger.log(test, time, Time.at(time.to_f+2.00))
+      result = File.read(log)
       result.should_not include('FooBar')
       result.should include('test/fake_test.rb:2.00')
     end
@@ -25,25 +26,28 @@ describe ParallelTests::RuntimeLogger do
       other_test = OtherFakeTest.new
 
       time = Time.now
-      File.open(ParallelTests.runtime_log, 'w'){ |f| f.puts("FooBar") }
-      ParallelTests::RuntimeLogger.send(:class_variable_set,:@@has_started, false)
-      ParallelTests::RuntimeLogger.log(test, time, Time.at(time.to_f+2.00))
-      ParallelTests::RuntimeLogger.log(other_test, time, Time.at(time.to_f+2.00))
-      result = File.read(ParallelTests.runtime_log)
+      File.open(log, 'w'){ |f| f.puts("FooBar") }
+      ParallelTests::Test::RuntimeLogger.send(:class_variable_set,:@@has_started, false)
+      ParallelTests::Test::RuntimeLogger.log(test, time, Time.at(time.to_f+2.00))
+      ParallelTests::Test::RuntimeLogger.log(other_test, time, Time.at(time.to_f+2.00))
+      result = File.read(log)
       result.should_not include('FooBar')
       result.should include('test/fake_test.rb:2.00')
       result.should include('test/other_fake_test.rb:2.00')
     end
-
   end
 
   describe :formatting do
+    def call(*args)
+      ParallelTests::Test::RuntimeLogger.message(*args)
+    end
+
     it "formats results for simple test names" do
       class FakeTest
       end
       test = FakeTest.new
       time = Time.now
-      ParallelTests::RuntimeLogger.message(test, time, Time.at(time.to_f+2.00)).should == 'test/fake_test.rb:2.00'
+      call(test, time, Time.at(time.to_f+2.00)).should == 'test/fake_test.rb:2.00'
     end
 
     it "formats results for complex test names" do
@@ -53,7 +57,7 @@ describe ParallelTests::RuntimeLogger do
       end
       test = AVeryComplex::FakeTest.new
       time = Time.now
-      ParallelTests::RuntimeLogger.message(test, time, Time.at(time.to_f+2.00)).should == 'test/a_very_complex/fake_test.rb:2.00'
+      call(test, time, Time.at(time.to_f+2.00)).should == 'test/a_very_complex/fake_test.rb:2.00'
     end
 
     it "guesses subdirectory structure for rails test classes" do
@@ -67,8 +71,7 @@ describe ParallelTests::RuntimeLogger do
       end
       test = FakeControllerTest.new
       time = Time.now
-      ParallelTests::RuntimeLogger.message(test, time, Time.at(time.to_f+2.00)).should == 'test/functional/fake_controller_test.rb:2.00'
+      call(test, time, Time.at(time.to_f+2.00)).should == 'test/functional/fake_controller_test.rb:2.00'
     end
   end
-
 end

data/spec/parallel_tests_spec.rb

@@ -1,8 +1,6 @@
-require 'spec_helper'
+require "spec_helper"
 
 describe ParallelTests do
-  test_tests_in_groups(ParallelTests, 'test', '_test.rb')
-
   describe :parse_rake_args do
     it "should return the count" do
       args = {:count => 2}
@@ -58,90 +56,6 @@ describe ParallelTests do
     end
   end
 
-  describe :run_tests do
-    it "uses TEST_ENV_NUMBER=blank when called for process 0" do
-      ParallelTests.should_receive(:open).with{|x,y|x=~/TEST_ENV_NUMBER= /}.and_return mocked_process
-      ParallelTests.run_tests(['xxx'],0,{})
-    end
-
-    it "uses TEST_ENV_NUMBER=2 when called for process 1" do
-      ParallelTests.should_receive(:open).with{|x,y| x=~/TEST_ENV_NUMBER=2/}.and_return mocked_process
-      ParallelTests.run_tests(['xxx'],1,{})
-    end
-
-    it "uses options" do
-      ParallelTests.should_receive(:open).with{|x,y| x=~ %r{ruby -Itest .* -- -v}}.and_return mocked_process
-      ParallelTests.run_tests(['xxx'],1,:test_options => '-v')
-    end
-
-    it "returns the output" do
-      io = open('spec/spec_helper.rb')
-      $stdout.stub!(:print)
-      ParallelTests.should_receive(:open).and_return io
-      ParallelTests.run_tests(['xxx'],1,{})[:stdout].should =~ /\$LOAD_PATH << File/
-    end
-  end
-
-  describe :test_in_groups do
-    it "does not sort when passed false do_sort option" do
-      ParallelTests.should_not_receive(:smallest_first)
-      ParallelTests.tests_in_groups [], 1, :no_sort => true
-    end
-
-    it "does sort when not passed do_sort option" do
-      ParallelTests.stub!(:tests_with_runtime).and_return([])
-      ParallelTests::Grouper.should_receive(:largest_first).and_return([])
-      ParallelTests.tests_in_groups [], 1
-    end
-
-    it "groups by single_process pattern and then via size" do
-      ParallelTests.should_receive(:with_runtime_info).and_return([['aaa',5],['aaa2',5],['bbb',2],['ccc',1],['ddd',1]])
-      result = ParallelTests.tests_in_groups [], 3, :single_process => [/^a.a/]
-      result.should == [["aaa", "aaa2"], ["bbb"], ["ccc", "ddd"]]
-    end
-  end
-
-  describe :find_results do
-    it "finds multiple results in test output" do
-      output = <<EOF
-Loaded suite /opt/ruby-enterprise/lib/ruby/gems/1.8/gems/rake-0.8.4/lib/rake/rake_test_loader
-Started
-..............
-Finished in 0.145069 seconds.
-
-10 tests, 20 assertions, 0 failures, 0 errors
-Loaded suite /opt/ruby-enterprise/lib/ruby/gems/1.8/gems/rake-0.8.4/lib/rake/rake_test_loader
-Started
-..............
-Finished in 0.145069 seconds.
-
-14 tests, 20 assertions, 0 failures, 0 errors
-
-EOF
-
-      ParallelTests.find_results(output).should == ['10 tests, 20 assertions, 0 failures, 0 errors','14 tests, 20 assertions, 0 failures, 0 errors']
-    end
-
-    it "is robust against scrambled output" do
-      output = <<EOF
-Loaded suite /opt/ruby-enterprise/lib/ruby/gems/1.8/gems/rake-0.8.4/lib/rake/rake_test_loader
-Started
-..............
-Finished in 0.145069 seconds.
-
-10 tests, 20 assertions, 0 failures, 0 errors
-Loaded suite /opt/ruby-enterprise/lib/ruby/gems/1.8/gems/rake-0.8.4/lib/rake/rake_test_loader
-Started
-..............
-Finished in 0.145069 seconds.
-
-14 te.dsts, 20 assertions, 0 failures, 0 errors
-EOF
-
-      ParallelTests.find_results(output).should == ['10 tests, 20 assertions, 0 failures, 0 errors','14 tedsts, 20 assertions, 0 failures, 0 errors']
-    end
-  end
-
   describe :bundler_enabled? do
     before do
       Object.stub!(:const_defined?).with(:Bundler).and_return false
@@ -175,77 +89,7 @@ EOF
     end
   end
 
-  describe :find_tests do
-    it "returns if root is an array" do
-      ParallelTests.send(:find_tests, [1]).should == [1]
-    end
-
-    it "finds all test files" do
-      begin
-        root = "/tmp/test-find_tests-#{rand(999)}"
-        `mkdir #{root}`
-        `mkdir #{root}/a`
-        `mkdir #{root}/b`
-        `touch #{root}/x_test.rb`
-        `touch #{root}/a/x_test.rb`
-        `touch #{root}/a/test.rb`
-        `touch #{root}/b/y_test.rb`
-        `touch #{root}/b/test.rb`
-        `ln -s #{root}/b #{root}/c`
-        `ln -s #{root}/b #{root}/a/`
-        ParallelTests.send(:find_tests, root).sort.should == [
-          "#{root}/a/b/y_test.rb",
-          "#{root}/a/x_test.rb",
-          "#{root}/b/y_test.rb",
-          "#{root}/c/y_test.rb",
-          "#{root}/x_test.rb"
-        ]
-      ensure
-        `rm -rf #{root}`
-      end
-    end
-
-    it "finds files by pattern" do
-      begin
-        root = "/tmp/test-find_tests-#{rand(999)}"
-        `mkdir #{root}`
-        `mkdir #{root}/a`
-        `touch #{root}/a/x_test.rb`
-        `touch #{root}/a/y_test.rb`
-        `touch #{root}/a/z_test.rb`
-        ParallelTests.send(:find_tests, root, :pattern => '^a/(y|z)_test').sort.should == [
-          "#{root}/a/y_test.rb",
-          "#{root}/a/z_test.rb",
-        ]
-      ensure
-        `rm -rf #{root}`
-      end
-    end
-  end
-
-  describe :summarize_results do
-    it "adds results" do
-      ParallelTests.summarize_results(['1 foo 3 bar','2 foo 5 bar']).should == '8 bars, 3 foos'
-    end
-
-    it "adds results with braces" do
-      ParallelTests.summarize_results(['1 foo(s) 3 bar(s)','2 foo 5 bar']).should == '8 bars, 3 foos'
-    end
-
-    it "adds same results with plurals" do
-      ParallelTests.summarize_results(['1 foo 3 bar','2 foos 5 bar']).should == '8 bars, 3 foos'
-    end
-
-    it "adds non-similar results" do
-      ParallelTests.summarize_results(['1 xxx 2 yyy','1 xxx 2 zzz']).should == '2 xxxs, 2 yyys, 2 zzzs'
-    end
-
-    it "does not pluralize 1" do
-      ParallelTests.summarize_results(['1 xxx 2 yyy']).should == '1 xxx, 2 yyys'
-    end
-  end
-
   it "has a version" do
-    ParallelTests::VERSION.should =~ /^\d+\.\d+\.\d+$/
+    ParallelTests::VERSION.should =~ /^\d+\.\d+\.\d+/
   end
 end

data/spec/spec_helper.rb

@@ -1,15 +1,17 @@
-# ---- requirements
 $LOAD_PATH << File.expand_path("../lib", File.dirname(__FILE__))
-require 'rubygems'
 
 FAKE_RAILS_ROOT = '/tmp/pspecs/fixtures'
 
 require 'tempfile'
-require 'parallel_specs'
-require 'parallel_specs/spec_runtime_logger'
-require 'parallel_specs/spec_summary_logger'
-require 'parallel_cucumber'
-require 'parallel_tests/runtime_logger'
+require 'parallel_tests'
+require 'parallel_tests/test/runner'
+require 'parallel_tests/test/runtime_logger'
+
+require 'parallel_tests/spec/runner'
+require 'parallel_tests/spec/runtime_logger'
+require 'parallel_tests/spec/summary_logger'
+
+require 'parallel_tests/cucumber/runner'
 
 OutputLogger = Struct.new(:output) do
   attr_reader :flock, :flush

metadata

@@ -1,19 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: parallel_tests
 version: !ruby/object:Gem::Version
-  version: 0.6.20
-  prerelease: 
+  version: 0.7.0.alpha
+  prerelease: 6
 platform: ruby
 authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-24 00:00:00.000000000 Z
+date: 2012-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parallel
-  requirement: &12086720 !ruby/object:Gem::Requirement
+  requirement: &16612760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,9 +21,9 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *12086720
+  version_requirements: *16612760
 description: 
-email: grosser.michael@gmail.com
+email: michael@grosser.it
 executables:
 - parallel_cucumber
 - parallel_spec
@@ -31,39 +31,43 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- .gitignore
 - Gemfile
 - Gemfile.lock
 - Rakefile
 - Readme.md
-- VERSION
 - bin/parallel_cucumber
 - bin/parallel_spec
 - bin/parallel_test
-- lib/parallel_cucumber.rb
-- lib/parallel_cucumber/runtime_logger.rb
-- lib/parallel_specs.rb
-- lib/parallel_specs/spec_failures_logger.rb
-- lib/parallel_specs/spec_logger_base.rb
-- lib/parallel_specs/spec_runtime_logger.rb
-- lib/parallel_specs/spec_summary_logger.rb
 - lib/parallel_tests.rb
+- lib/parallel_tests/cli.rb
+- lib/parallel_tests/cucumber/runner.rb
+- lib/parallel_tests/cucumber/runtime_logger.rb
 - lib/parallel_tests/grouper.rb
 - lib/parallel_tests/railtie.rb
-- lib/parallel_tests/runtime_logger.rb
+- lib/parallel_tests/spec/failures_logger.rb
+- lib/parallel_tests/spec/logger_base.rb
+- lib/parallel_tests/spec/runner.rb
+- lib/parallel_tests/spec/runtime_logger.rb
+- lib/parallel_tests/spec/summary_logger.rb
 - lib/parallel_tests/tasks.rb
-- lib/tasks/parallel_tests.rake
+- lib/parallel_tests/test/runner.rb
+- lib/parallel_tests/test/runtime_logger.rb
+- lib/parallel_tests/version.rb
 - parallel_tests.gemspec
 - spec/integration_spec.rb
-- spec/parallel_cucumber_spec.rb
-- spec/parallel_specs/spec_failure_logger_spec.rb
-- spec/parallel_specs/spec_runtime_logger_spec.rb
-- spec/parallel_specs/spec_summary_logger_spec.rb
-- spec/parallel_specs_spec.rb
-- spec/parallel_tests/runtime_logger_spec.rb
+- spec/parallel_tests/cucumber/runner_spec.rb
+- spec/parallel_tests/spec/failure_logger_spec.rb
+- spec/parallel_tests/spec/runner_spec.rb
+- spec/parallel_tests/spec/runtime_logger_spec.rb
+- spec/parallel_tests/spec/summary_logger_spec.rb
+- spec/parallel_tests/test/runner_spec.rb
+- spec/parallel_tests/test/runtime_logger_spec.rb
 - spec/parallel_tests_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/grosser/parallel_tests
-licenses: []
+licenses:
+- MIT
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -76,13 +80,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3131334744826676279
+      hash: -20791927037817869
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.15

data/VERSION

@@ -1 +0,0 @@
-0.6.20

data/lib/parallel_cucumber.rb

@@ -1,36 +0,0 @@
-require 'parallel_tests'
-
-class ParallelCucumber < ParallelTests
-  def self.run_tests(test_files, process_number, options)
-    color = ($stdout.tty? ? 'AUTOTEST=1 ; export AUTOTEST ;' : '')#display color when we are in a terminal
-    runtime_logging = " --format ParallelCucumber::RuntimeLogger --out #{runtime_log}"
-    cmd = "#{color} #{executable}"
-    cmd << runtime_logging if File.directory?(File.dirname(runtime_log))
-    cmd << " #{options[:test_options]} #{test_files*' '}"
-    execute_command(cmd, process_number, options)
-  end
-
-  def self.executable
-    if bundler_enabled?
-      "bundle exec cucumber"
-    elsif File.file?("script/cucumber")
-      "script/cucumber"
-    else
-      "cucumber"
-    end
-  end
-
-  def self.runtime_log
-    'tmp/parallel_runtime_cucumber.log'
-  end
-
-  protected
-
-  def self.test_suffix
-    ".feature"
-  end
-
-  def self.line_is_result?(line)
-    line =~ /^\d+ (steps|scenarios)/
-  end
-end

data/lib/parallel_cucumber/runtime_logger.rb

@@ -1,57 +0,0 @@
-class ParallelCucumber
-  class RuntimeLogger
-
-    def initialize(step_mother, path_or_io, options=nil)
-      @io = prepare_io(path_or_io)
-      @example_times = Hash.new(0)
-    end
-
-    def before_feature(_)
-      @start_at = Time.now.to_f
-    end
-
-    def after_feature(feature)
-      @example_times[feature.file] += Time.now.to_f - @start_at
-    end
-
-    def after_features(*args)
-      lock_output do
-        @io.puts @example_times.map { |file, time| "#{file}:#{time}" }
-      end
-    end
-
-    private
-
-    def prepare_io(path_or_io)
-      if path_or_io.respond_to?(:write)
-        path_or_io
-      else # its a path
-        File.open(path_or_io, 'w').close # clean out the file
-        file = File.open(path_or_io, 'a')
-
-        at_exit do
-          unless file.closed?
-            file.flush
-            file.close
-          end
-        end
-
-        file
-      end
-    end
-
-    # do not let multiple processes get in each others way
-    def lock_output
-      if File === @io
-        begin
-          @io.flock File::LOCK_EX
-          yield
-        ensure
-          @io.flock File::LOCK_UN
-        end
-      else
-        yield
-      end
-    end
-  end
-end