turnip-parallel_tests 0.0.1 → 0.0.2

data/.gitignore

@@ -15,3 +15,4 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+vendor

data/.travis.yml

@@ -0,0 +1,5 @@
+language: ruby
+rvm:
+  - 1.9.3
+  - 2.0.0
+script: bundle exec rspec

data/README.md

@@ -2,6 +2,11 @@
 
 Helper [parallel_tests](https://github.com/grosser/parallel_tests) for [turnip](https://github.com/jnicklas/turnip).
 
+[![Build Status](https://travis-ci.org/gongo/turnip-parallel_tests.png?branch=master)](https://travis-ci.org/gongo/turnip-parallel_tests)
+[![Coverage Status](https://coveralls.io/repos/gongo/turnip-parallel_tests/badge.png)](https://coveralls.io/r/gongo/turnip-parallel_tests)
+
+
+
 ## Motivation
 
 I wanted to run a turnip project using `parallel_rspec`.
@@ -29,6 +34,33 @@ Add `--type turnip` (or `-t turnip`) to the commands:
 
     $ parallel_rspec -n 3 --type turnip spec
 
+## About grouping of tests.
+
+Group tests by:
+
+* `.feature`: number of steps.
+* `_spec.rb`: file size.
+
+eg:
+
+```sh
+$ ls spec
+features/battle1.feature # 12 steps.
+features/battle2.feature #  8 steps.
+features/battle3.feature #  4 steps.
+features/battle4.feature #  6 steps.
+```
+
+When 3 cpus:
+
+```sh
+$ parallel_rspec -n 3 --type turnip spec
+```
+
+* thread1: `battle1.feature`
+* thread2: `battle2.feature`
+* thread3: `battle3.feature` , `battle4.feature`
+
 ## License
 
 see `LICENSE.txt`

data/lib/parallel_tests/turnip/runner.rb

@@ -1,4 +1,5 @@
 require 'parallel_tests/rspec/runner'
+require 'parallel_tests/grouper'
 
 module ParallelTests
   module Turnip
@@ -10,19 +11,43 @@ module ParallelTests
           'turnip'
         end
 
-        def test_suffix_regexp
-          '(\.feature|_spec\.rb)'
+        #
+        # @note
+        #   Conditions of the grouping:
+        #     feature: number of turnip steps.
+        #        spec: filesize.
+        #
+        # @param   [Array]    tests       Selected files and folders at commandline.
+        # @param   [Integer]  num_groups  Number of processes to use.
+        # @param   [Hash]     options
+        #
+        # @return  [Array]    Test filenames that are grouped.
+        #
+        def tests_in_groups(tests, num_groups, options={})
+          features, specs = find_features_and_specs(tests, options)
+
+          ftests = ::ParallelTests::Grouper.by_steps(features, num_groups, options)
+          stests = ::ParallelTests::Grouper.in_even_groups_by_size(with_runtime_info(specs), num_groups, options)
+          ftests.zip(stests).map { |t| t.flatten }
         end
 
-        def find_tests(tests, options = {})
-          (tests || []).map do |file_or_folder|
+        #
+        # @param   [Array]  tests     see +tests_in_groups+
+        # @param   [Hash]   options   see +tests_in_groups+
+        #
+        # @return  [Array]  two array of feature and spec filename
+        #
+        def find_features_and_specs(tests, options = {})
+          files = (tests || []).map do |file_or_folder|
             if File.directory?(file_or_folder)
               files = files_in_folder(file_or_folder, options)
-              files.grep(/#{test_suffix_regexp}$/).grep(options[:pattern]||//)
+              files.grep(/(\.feature|_spec\.rb)$/).grep(options[:pattern]||//)
             else
               file_or_folder
             end
           end.flatten.uniq
+
+          files.partition { |file| file =~ /\.feature$/ }
         end
       end
     end

data/lib/turnip/parallel_tests/version.rb

@@ -1,5 +1,5 @@
 module Turnip
   module ParallelTests
-    VERSION = "0.0.1"
+    VERSION = "0.0.2"
   end
 end

data/spec/data/big_size_spec.rb

@@ -0,0 +1,30 @@
+# 30 lines
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#
+#

data/spec/data/features/README.md

@@ -0,0 +1 @@
+Feature files in this directory is using [this project](https://github.com/gongo/turnip_formatter/tree/master/example/spec/features).

data/spec/data/features/battle.feature

@@ -0,0 +1,36 @@
+Feature: Battle a monster
+
+  Scenario: normal monster
+    Given there is a monster
+     When I attack it
+     Then it should die
+      And Fanfare
+
+  Scenario: strong monster
+
+    This scenario will error
+    So, fanfare is not...oh...
+
+    Given there is a strong monster
+     When I attack it
+     Then it should die
+      And Fanfare
+
+  Scenario: spell magic
+
+    This scenario will error because he can't cast spell
+
+    Given there is a strong monster
+     When I cast a spell 'fireball'
+      And I attack it
+     Then it should die
+      And Fanfare
+
+  @magician
+  Scenario: spell magic 
+
+    Given there is a strong monster
+     When I cast a spell 'fireball'
+      And I attack it
+     Then it should die
+      And Fanfare

data/spec/data/features/battle2.feature

@@ -0,0 +1,26 @@
+Feature: Battle a monster with weapon
+
+  Background:
+    Given I equip a weapon
+
+  Scenario: normal monster
+    Given there is a monster
+     When I attack it
+     Then it should die
+      And Fanfare
+
+  Scenario: strong monster
+    Given there is a strong monster
+     When I attack it
+     Then it should die
+      And Fanfare
+ 
+  Scenario: boss monster
+
+    This scenario will error
+    So, fanfare is not...oh...
+
+    Given there is a boss monster
+     When I attack it
+     Then it should die
+      And Fanfare

data/spec/data/features/battle3.feature

@@ -0,0 +1,26 @@
+@escape
+Feature: Battle monsters
+
+  Scenario: Escape
+    Given there are monsters:
+      | gargoyle   |
+      | Cockatrice |
+     When I escape
+     Then I was able to escape
+
+  Scenario: Inescapable
+    Given there are monsters:
+      | gargoyle   |
+      | Cockatrice |
+      | basilisk   |
+     When I escape
+     Then I could not escape
+
+  @master_of_escape
+  Scenario: Escape because he is master
+    Given there are monsters:
+      | gargoyle   |
+      | Cockatrice |
+      | basilisk   |
+     When I escape
+     Then I was able to escape

data/spec/data/features/small_size_spec.rb

@@ -0,0 +1,5 @@
+# 5 lines
+#
+#
+#
+#

data/spec/data/features/songs.feature

@@ -0,0 +1,26 @@
+# Based on turnip/examples
+
+Feature: Battle a monster
+  Scenario: normal monster
+    Given there is a monster
+     When I attack it
+     Then it should die
+      And Fanfare
+
+  Scenario Outline: a simple outline
+      Given there is a monster with <hp> hitpoints
+      When I attack the monster and do <damage> points damage
+      Then the monster should be <state>
+
+      Examples:
+        | hp | damage | state |
+        | 10 |     13 | alive |
+        | 12 |      8 | dead  |
+        |  3 |     10 | alive |
+        |  8 |      5 | dead  |
+
+  Scenario: strong monster
+    Given there is a strong monster
+     When I attack it
+     Then it should die
+      And Fanfare

data/spec/parallel_tests/turnip/runner_spec.rb

@@ -0,0 +1,191 @@
+require 'spec_helper.rb'
+require 'parallel_tests/turnip/runner'
+
+describe ParallelTests::Turnip::Runner do
+  let(:runner) do
+    ParallelTests::Turnip::Runner
+  end
+
+  let(:helper) do
+    Turnip::ParallelTests::Spec
+  end
+
+  let(:options) do
+    {}
+  end
+
+  let(:find_features_and_specs) do
+    features, specs = runner.find_features_and_specs(tests, options)
+    [helper.format_filename(features), helper.format_filename(specs)]
+  end
+
+  let(:tests_in_groups) do
+    runner.tests_in_groups(tests, cpus, options).map do |group|
+      helper.format_filename(group)
+    end
+  end
+
+  context 'selected directories' do
+    let(:tests) do
+      [helper.test_file_directory, helper.test_file_directory + '/features']
+    end
+
+    describe '.find_features_and_specs' do
+      it 'get all feature and spec files' do
+        actual_features, actual_specs = find_features_and_specs
+
+        expect_features = [
+          'features/battle.feature', 'features/battle2.feature',
+          'features/battle3.feature', 'features/songs.feature'
+        ]
+        expect_specs = ['big_size_spec.rb', 'features/small_size_spec.rb']
+
+        actual_features.should =~ expect_features
+        actual_specs.should =~ expect_specs
+      end
+    end
+
+    context '1 processor' do
+      let(:cpus) do
+        1
+      end
+
+      it 'get a test group' do
+        tests_in_groups.size.should eq 1
+      end
+    end
+
+    context '3 processors' do
+      let(:cpus) do
+        3
+      end
+
+      it 'get test groups' do
+        expect_group1 = ['features/songs.feature', 'big_size_spec.rb']
+        expect_group2 = ['features/battle.feature', 'features/small_size_spec.rb']
+        expect_group3 = ['features/battle2.feature', 'features/battle3.feature']
+
+        groups = tests_in_groups
+        groups.size.should eq 3
+        groups[0].should =~ expect_group1
+        groups[1].should =~ expect_group2
+        groups[2].should =~ expect_group3
+      end
+    end
+  end
+
+  context 'selected directory and pattern option' do
+    let(:tests) do
+      [helper.test_file_directory]
+    end
+
+    let(:options) do
+      { :pattern => /songs/ }
+    end
+
+    describe '.find_features_and_specs' do
+      it 'get specify pattern file' do
+        actual_features, actual_specs = find_features_and_specs
+
+        expect_features = [ 'features/songs.feature' ]
+
+        actual_features.should =~ expect_features
+        actual_specs.should be_empty
+      end
+    end
+
+    context '1 processor' do
+      let(:cpus) do
+        1
+      end
+
+      it 'get a test group' do
+        tests_in_groups.size.should eq 1
+        tests_in_groups[0].size.should eq 1
+      end
+    end
+
+    context '3 processors' do
+      let(:cpus) do
+        3
+      end
+
+      it 'get test groups' do
+        expect_group1 = ['features/songs.feature']
+
+        groups = tests_in_groups
+        groups.size.should eq 3
+        groups[0].should =~ expect_group1
+        groups[1].should be_empty
+        groups[2].should be_empty
+      end
+    end
+  end
+
+  context 'selected files' do
+    let(:tests) do
+      [
+        helper.test_file_directory + '/features/battle.feature',
+        helper.test_file_directory + '/features/battle2.feature',
+        helper.test_file_directory + '/features/battle3.feature',
+        helper.test_file_directory + '/features/battle2.feature', # duplication
+        helper.test_file_directory + '/features/battle2.feature', # duplication
+        helper.test_file_directory + '/features/battle.feature',  # duplication
+      ]
+    end
+
+    let(:options) do
+      { :pattern => /songs/ }
+    end
+
+    describe '.find_features_and_specs' do
+      it 'get selected files' do
+        actual_features, actual_specs = find_features_and_specs
+
+        expect_features = [
+          'features/battle.feature',
+          'features/battle2.feature',
+          'features/battle3.feature',
+        ]
+
+        actual_features.should =~ expect_features
+        actual_specs.should be_empty
+      end
+    end
+
+    context '1 processor' do
+      let(:cpus) do
+        1
+      end
+
+      it 'get a test group' do
+        expect_group = [
+          'features/battle.feature',
+          'features/battle2.feature',
+          'features/battle3.feature',
+        ]
+
+        tests_in_groups.size.should eq 1
+        tests_in_groups[0].should =~ expect_group
+      end
+    end
+
+    context '3 processors' do
+      let(:cpus) do
+        3
+      end
+
+      it 'get test groups' do
+        expect_group1 = ['features/battle.feature']
+        expect_group2 = ['features/battle2.feature']
+        expect_group3 = ['features/battle3.feature']
+
+        groups = tests_in_groups
+        groups.size.should eq 3
+        groups[0].should =~ expect_group1
+        groups[1].should =~ expect_group2
+        groups[2].should =~ expect_group3
+      end
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,18 @@
+require 'coveralls'
+Coveralls.wear!
+
+module Turnip::ParallelTests
+  module Spec
+    extend self
+
+    def test_file_directory
+      File.dirname(__FILE__) + '/data'
+    end
+
+    def format_filename(filenames)
+      filenames.map do |filename|
+        filename.sub(test_file_directory + '/', '')
+      end
+    end
+  end
+end

data/turnip-parallel_tests.gemspec

@@ -18,7 +18,10 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency 'parallel_tests'
+  spec.add_dependency 'parallel_tests', '~> 0.16'
+  spec.add_dependency 'gherkin'
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
+  spec.add_development_dependency "rspec"
+  spec.add_development_dependency "coveralls"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: turnip-parallel_tests
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,10 +9,26 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-23 00:00:00.000000000 Z
+date: 2013-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parallel_tests
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.16'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.16'
+- !ruby/object:Gem::Dependency
+  name: gherkin
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -59,6 +75,38 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: coveralls
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Helper ParallelTests for Turnip
 email:
 - gonngo@gmail.com
@@ -67,6 +115,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -74,6 +123,15 @@ files:
 - lib/parallel_tests/turnip/runner.rb
 - lib/turnip/parallel_tests.rb
 - lib/turnip/parallel_tests/version.rb
+- spec/data/big_size_spec.rb
+- spec/data/features/README.md
+- spec/data/features/battle.feature
+- spec/data/features/battle2.feature
+- spec/data/features/battle3.feature
+- spec/data/features/small_size_spec.rb
+- spec/data/features/songs.feature
+- spec/parallel_tests/turnip/runner_spec.rb
+- spec/spec_helper.rb
 - turnip-parallel_tests.gemspec
 homepage: https://github.com/gongo/turnip-parallel_tests
 licenses:
@@ -88,16 +146,31 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 2410521719137719469
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 2410521719137719469
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Helper ParallelTests for Turnip
-test_files: []
+test_files:
+- spec/data/big_size_spec.rb
+- spec/data/features/README.md
+- spec/data/features/battle.feature
+- spec/data/features/battle2.feature
+- spec/data/features/battle3.feature
+- spec/data/features/small_size_spec.rb
+- spec/data/features/songs.feature
+- spec/parallel_tests/turnip/runner_spec.rb
+- spec/spec_helper.rb