parallel_split_test 0.2.0 → 0.2.1

data/.gitignore

@@ -0,0 +1 @@
+spec/tmp*

data/.rspec

@@ -0,0 +1,2 @@
+--color
+--backtrace

data/.travis.yml

@@ -1,5 +1,4 @@
-script: "bundle exec rake"
 rvm:
   - ree
-  - 1.9.2
   - 1.9.3
+  - 2.0.0

data/Gemfile

@@ -1,6 +1,5 @@
-source :rubygems
+source "https://rubygems.org"
 gemspec
 
-group :development do
-  gem 'rake'
-end
+gem "rake"
+gem "bump"

data/Gemfile.lock

@@ -1,28 +1,30 @@
 PATH
   remote: .
   specs:
-    parallel_split_test (0.2.0)
+    parallel_split_test (0.2.1)
       parallel (>= 0.5.13)
       rspec (>= 2)
 
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
-    diff-lcs (1.1.3)
-    parallel (0.5.13)
-    rake (0.9.2)
-    rspec (2.8.0)
-      rspec-core (~> 2.8.0)
-      rspec-expectations (~> 2.8.0)
-      rspec-mocks (~> 2.8.0)
-    rspec-core (2.8.0)
-    rspec-expectations (2.8.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.8.0)
+    bump (0.4.1)
+    diff-lcs (1.2.3)
+    parallel (0.6.4)
+    rake (10.0.4)
+    rspec (2.13.0)
+      rspec-core (~> 2.13.0)
+      rspec-expectations (~> 2.13.0)
+      rspec-mocks (~> 2.13.0)
+    rspec-core (2.13.1)
+    rspec-expectations (2.13.0)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.13.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  bump
   parallel_split_test!
   rake

data/Rakefile

@@ -1,18 +1,11 @@
+require 'bundler/setup'
 require 'bundler/gem_tasks'
+require 'bump/tasks'
 
 task :default do
   sh "rspec spec/"
 end
 
-rule /^version:bump:.*/ do |t|
-  file = 'lib/parallel_split_test/version.rb'
-  sh "git status | grep 'nothing to commit'" # ensure we are not dirty
-  index = ['major', 'minor','patch'].index(t.name.split(':').last)
-  version_file = File.read(file)
-  old_version, *version_parts = version_file.match(/(\d+)\.(\d+)\.(\d+)/).to_a
-  version_parts[index] = version_parts[index].to_i + 1
-  new_version = version_parts * '.'
-  File.open(file,'w'){|f| f.write(version_file.sub(old_version, new_version)) }
-
-  sh "bundle && git add #{file} Gemfile.lock && git commit -m 'bump version to #{new_version}'"
+task :selftest do
+  sh "./bin/parallel_split_test spec/"
 end

data/Readme.md

@@ -2,10 +2,7 @@ Split a big test file into multiple chunks and run them in parallel
 
 Install
 =======
-    sudo gem install parallel_split_test
-Or
-
-    rails plugin install git://github.com/grosser/parallel_split_test.git
+    gem install parallel_split_test
 
 Usage
 =====
@@ -56,6 +53,12 @@ Output
     Took 10.06 seconds with 2 processes
 
 
+Options
+=======
+<!-- last section of ./bin/parallel_split_test -h -->
+
+    -o, --test-options STRING        Run tests with these options
+
 TIPS
 ====
  - set number of processes to use with `PARALLEL_SPLIT_TEST_PROCESSES` environment variable

data/bin/parallel_split_test

@@ -2,6 +2,7 @@
 require "optparse"
 $LOAD_PATH << File.join(File.dirname(__FILE__), '..', 'lib')
 
+options = {}
 parser = OptionParser.new do |opts|
   opts.banner = <<BANNER
 Split a big test file into multiple chunks and run them in parallel, giving ENV['TEST_ENV_NUMBER'] ('', '2', '3', ...)
@@ -13,6 +14,7 @@ Options are:
 BANNER
   opts.on("-v", "--version", "Show Version"){ require 'parallel_split_test/version'; puts ParallelSplitTest::VERSION; exit}
   opts.on("-h", "--help", "Show this.") { puts opts; exit }
+  opts.on("-o", "--test-options STRING", "Run tests with these options") { |test_options| options[:test_options] = test_options }
 end
 
 parser.parse!
@@ -23,4 +25,4 @@ if ARGV.empty?
 end
 
 require 'parallel_split_test/runner'
-exit ParallelSplitTest::Runner.run(ARGV)
+exit ParallelSplitTest::Runner.run(ARGV, options)

data/lib/parallel_split_test.rb

@@ -3,22 +3,22 @@ require 'parallel'
 module ParallelSplitTest
   class << self
     attr_accessor :example_counter, :processes, :process_number
-  end
 
-  def self.run_example?
-    self.example_counter += 1
-    (example_counter - 1) % processes == process_number
-  end
+    def run_example?
+      self.example_counter += 1
+      (example_counter - 1) % processes == process_number
+    end
 
-  def self.choose_number_of_processes
-    self.processes = best_number_of_processes
-  end
+    def choose_number_of_processes
+      self.processes = best_number_of_processes
+    end
 
-  def self.best_number_of_processes
-    [
-      ENV['PARALLEL_SPLIT_TEST_PROCESSES'],
-      Parallel.physical_processor_count,
-      Parallel.processor_count
-    ].map(&:to_i).find{|number| number > 0 }
+    def best_number_of_processes
+      [
+        ENV['PARALLEL_SPLIT_TEST_PROCESSES'],
+        Parallel.physical_processor_count,
+        Parallel.processor_count
+      ].map(&:to_i).find{|number| number > 0 }
+    end
   end
 end

data/lib/parallel_split_test/command_line.rb

@@ -57,4 +57,4 @@ module ParallelSplitTest
       @world.announce_filters
     end
   end
-end
+end

data/lib/parallel_split_test/output_recorder.rb

@@ -7,11 +7,11 @@ module ParallelSplitTest
       @out = out
     end
 
-    %w[puts write print putc].each do |method|
+    %w[puts write print putc flush].each do |method|
       class_eval <<-RUBY, __FILE__, __LINE__
         def #{method}(*args)
-          @recorded.puts(*args)
-          @out.puts(*args)
+          @recorded.#{method}(*args)
+          @out.#{method}(*args)
         end
       RUBY
     end
@@ -21,4 +21,4 @@ module ParallelSplitTest
       @recorded.read
     end
   end
-end
+end

data/lib/parallel_split_test/runner.rb

@@ -1,10 +1,16 @@
 require 'parallel_split_test/command_line'
+require 'shellwords'
 
 # a cleaned up version of the RSpec runner, e.g. no drb support
 module ParallelSplitTest
   class Runner < RSpec::Core::Runner
-    def self.run(args, err=$stderr, out=$stdout)
+    def self.run(args, options={})
+      err = $stderr
+      out = $stdout
       trap_interrupt
+
+      args += Shellwords.shellwords(options[:test_options]) if options[:test_options] # TODO smarter parsing ...
+
       options = RSpec::Core::ConfigurationOptions.new(args)
       options.parse_options
 
@@ -18,6 +24,8 @@ module ParallelSplitTest
       RSpec.reset
     end
 
+    private
+
     def self.report_execution_time(out)
       start = Time.now.to_f
       result = yield
@@ -26,4 +34,4 @@ module ParallelSplitTest
       result
     end
   end
-end
+end

data/lib/parallel_split_test/version.rb

@@ -1,3 +1,3 @@
 module ParallelSplitTest
-  VERSION = '0.2.0'
+  VERSION = '0.2.1'
 end

data/spec/parallel_split_test_spec.rb

@@ -44,7 +44,7 @@ describe ParallelSplitTest do
     end
 
     def parallel_split_test(x, options={})
-      run "PARALLEL_SPLIT_TEST_PROCESSES=2 ../../bin/parallel_split_test #{x}", options
+      run "PARALLEL_SPLIT_TEST_PROCESSES=#{options[:process_count] || 2} ../../bin/parallel_split_test #{x}", options
     end
 
     def time
@@ -55,13 +55,11 @@ describe ParallelSplitTest do
 
     let(:root) { File.expand_path('../../', __FILE__) }
 
-    before do
-      run "rm -rf spec/tmp ; mkdir spec/tmp"
-      Dir.chdir "spec/tmp"
-    end
-
-    after do
-      Dir.chdir root
+    around do |example|
+      dir = "spec/tmp#{ENV['TEST_ENV_NUMBER']}"
+      run "rm -rf #{dir} ; mkdir #{dir}"
+      Dir.chdir(dir, &example)
+      run "rm -rf #{dir}"
     end
 
     describe "printing version" do
@@ -108,32 +106,49 @@ describe ParallelSplitTest do
         result.scan(/it-ran-.-in-.?-/).sort.should == ["it-ran-a-in--", "it-ran-b-in-2-"]
       end
 
+      it "runs in different processes for many examples/processes" do
+        write "xxx_spec.rb", <<-RUBY
+        describe "X" do
+          #{(0...3).to_a.map{|i| "it{ puts 'it-ran-"+ i.to_s+"-in-'+ENV['TEST_ENV_NUMBER'].to_s + '-' }" }.join("\n")}
+          describe "Y" do
+            #{(3...6).to_a.map{|i| "it{ puts 'it-ran-"+ i.to_s+"-in-'+ENV['TEST_ENV_NUMBER'].to_s + '-' }" }.join("\n")}
+            describe "Y" do
+              #{(6...9).to_a.map{|i| "it{ puts 'it-ran-"+ i.to_s+"-in-'+ENV['TEST_ENV_NUMBER'].to_s + '-' }" }.join("\n")}
+            end
+          end
+        end
+        RUBY
+        result = parallel_split_test "xxx_spec.rb", :process_count => 3
+        result.scan('3 examples, 0 failures').size.should == 6
+        result.scan(/it-ran-.-in-.?-/).size.should == 9
+      end
+
       it "runs faster" do
         write "xxx_spec.rb", <<-RUBY
         describe "X" do
-          it { sleep 1  }
+          it { sleep 1.5  }
         end
 
         describe "Y" do
-          it { sleep 1  }
+          it { sleep 1.5  }
         end
         RUBY
 
-        time{ parallel_split_test "xxx_spec.rb" }.should < 2
+        time{ parallel_split_test "xxx_spec.rb" }.should < 3
       end
 
       it "splits based on examples" do
         write "xxx_spec.rb", <<-RUBY
         describe "X" do
           describe "Y" do
-            it { sleep 1  }
-            it { sleep 1  }
+            it { sleep 1.5  }
+            it { sleep 1.5  }
           end
         end
         RUBY
 
         result = nil
-        time{ result = parallel_split_test "xxx_spec.rb" }.should < 2
+        time{ result = parallel_split_test "xxx_spec.rb" }.should < 3
         result.scan('1 example, 0 failures').size.should == 4
       end
 
@@ -207,6 +222,18 @@ describe ParallelSplitTest do
         result = parallel_split_test "xxx_spec.rb"
         result.should include("1 example, 0 failures\n1 example, 0 failures")
       end
+
+      it "can use --test-options" do
+        write "xxx_spec.rb", <<-RUBY
+          describe "xxx" do
+            it "yyy" do
+            end
+          end
+        RUBY
+
+        result = parallel_split_test "xxx_spec.rb --test-options '--format html'"
+        result.should include "</body>"
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: parallel_split_test
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-04 00:00:00.000000000 Z
+date: 2013-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &81205430 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: '2'
   type: :runtime
   prerelease: false
-  version_requirements: *81205430
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: parallel
-  requirement: &81205180 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +37,12 @@ dependencies:
         version: 0.5.13
   type: :runtime
   prerelease: false
-  version_requirements: *81205180
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.5.13
 description: 
 email: michael@grosser.it
 executables:
@@ -40,6 +50,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- .gitignore
+- .rspec
 - .travis.yml
 - Gemfile
 - Gemfile.lock
@@ -71,7 +83,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 131892335
+      hash: 4510026555026143828
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -80,10 +92,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 131892335
+      hash: 4510026555026143828
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Split a big test file into multiple chunks and run them in parallel