parallel_tests 2.14.3 → 2.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 802a9d4fb83cd7fb9d5bce515e16a15271cfc428
-  data.tar.gz: a83ad7e7884ac668453980354288eb67a54dbe39
+  metadata.gz: 1c475b70366d96f840ad6857d86c8ff9cfbf6bc5
+  data.tar.gz: df7751a1d3d61172c1ef0a2ac4d7950f6232f910
 SHA512:
-  metadata.gz: fd07e77eaa82c01c1787bcf83c23a0176cee5c9c70dcc0b28a4b27df00efdbde013b70f11a122062f8b1d7cd047397b371115b9c894948933795f3ec23d41c2c
-  data.tar.gz: d5de114478e45b2a962e377fa8d382b261905391f7cb5acfed6737157237f922e93afbae474d42d173ec4e44ef464cdbcdbbe4ab2c284523080507e536d9442d
+  metadata.gz: 79ffeb8fa61bb454ca5b7bef04fe66a2b8a071a376fff36f65f0fb84e23c0d1e8b3517ce8e51eacd8e88cbf34916a8495f118c6dc56b63efdcf183f7abd5bfcd
+  data.tar.gz: 6c5a8844af6c3f9e1b0ed2dac1426593bca85139ff16dc0aa0624c923b6a765011e861c20aa66a212e6f161e772171531360a7e4843109dcc81d798cfef0e21b

data/Readme.md

@@ -362,7 +362,7 @@ inspired by [pivotal labs](https://blog.pivotal.io/labs/labs/parallelize-your-rs
  - [Doc Ritezel](https://github.com/ohrite)
  - [Alexandre Wilhelm](https://github.com/dogild)
  - [Jerry](https://github.com/boblington)
-
+ - [Aleksei Gusev](https://github.com/hron)
 
 [Michael Grosser](http://grosser.it)<br/>
 michael@grosser.it<br/>

data/lib/parallel_tests/cucumber/scenario_line_logger.rb

@@ -11,12 +11,17 @@ module ParallelTests
           @tag_expression = tag_expression
         end
 
-        def visit_feature_element(uri, feature_element, feature_tags)
+        def visit_feature_element(uri, feature_element, feature_tags, line_numbers: [])
           scenario_tags = feature_element[:tags].map {|tag| ::Cucumber::Core::Ast::Tag.new(tag[:location], tag[:name])}
           scenario_tags = feature_tags + scenario_tags
           if feature_element[:examples].nil? # :Scenario
+            test_line = feature_element[:location][:line]
+
             # We don't accept the feature_element if the current tags are not valid
             return unless @tag_expression.evaluate(scenario_tags)
+            # or if it is not at the correct location
+            return if line_numbers.any? && !line_numbers.include?(test_line)
+
             @scenarios << [uri, feature_element[:location][:line]].join(":")
           else # :ScenarioOutline
             feature_element[:examples].each do |example|
@@ -24,7 +29,12 @@ module ParallelTests
               example_tags = scenario_tags + example_tags
               next unless @tag_expression.evaluate(example_tags)
               rows = example[:tableBody].select { |body| body[:type] == :TableRow }
-              rows.each { |row| @scenarios << [uri, row[:location][:line]].join(':') }
+              rows.each do |row|
+                test_line = row[:location][:line]
+                next if line_numbers.any? && !line_numbers.include?(test_line)
+
+                @scenarios << [uri, test_line].join(':')
+              end
             end
           end
         end

data/lib/parallel_tests/cucumber/scenarios.rb

@@ -27,8 +27,11 @@ module ParallelTests
           # Create the ScenarioLineLogger which will filter the scenario we want
           scenario_line_logger = ParallelTests::Cucumber::Formatters::ScenarioLineLogger.new(tag_expression)
 
-          # here we loop on the files map, each file will containe one or more scenario
+          # here we loop on the files map, each file will contain one or more scenario
           features ||= files.map do |path|
+            # Gather up any line numbers attached to the file path
+            path, *test_lines = path.split(/:(?=\d+)/)
+            test_lines.map!(&:to_i)
 
             # We encode the file and get the content of it
             source = ::Cucumber::Runtime::NormalisedEncodingFile.read(path)
@@ -40,7 +43,7 @@ module ParallelTests
             scanner = ::Gherkin::TokenScanner.new(document.body)
 
             begin
-              # We make an attempt to parse the gherkin document, this could be failed if the document is not well formated
+              # We make an attempt to parse the gherkin document, this could be failed if the document is not well formatted
               result = parser.parse(scanner)
               feature_tags = result[:feature][:tags].map { |tag| ::Cucumber::Core::Ast::Tag.new(tag[:location], tag[:name]) }
 
@@ -50,7 +53,7 @@ module ParallelTests
                 next unless /Scenario/.match(feature_element[:type])
 
                 # It's a scenario, we add it to the scenario_line_logger
-                scenario_line_logger.visit_feature_element(document.uri, feature_element, feature_tags)
+                scenario_line_logger.visit_feature_element(document.uri, feature_element, feature_tags, line_numbers: test_lines)
               end
 
             rescue StandardError => e

data/lib/parallel_tests/tasks.rb

@@ -79,23 +79,23 @@ module ParallelTests
 end
 
 namespace :parallel do
-  desc "setup test databases via db:setup --> parallel:setup[num_cpus]"
+  desc "Setup test databases via db:setup --> parallel:setup[num_cpus]"
   task :setup, :count do |_,args|
     command = "rake db:setup RAILS_ENV=#{ParallelTests::Tasks.rails_env}"
     ParallelTests::Tasks.run_in_parallel(ParallelTests::Tasks.suppress_schema_load_output(command), args)
   end
 
-  desc "create test databases via db:create --> parallel:create[num_cpus]"
+  desc "Create test databases via db:create --> parallel:create[num_cpus]"
   task :create, :count do |_,args|
     ParallelTests::Tasks.run_in_parallel("rake db:create RAILS_ENV=#{ParallelTests::Tasks.rails_env}", args)
   end
 
-  desc "drop test databases via db:drop --> parallel:drop[num_cpus]"
+  desc "Drop test databases via db:drop --> parallel:drop[num_cpus]"
   task :drop, :count do |_,args|
     ParallelTests::Tasks.run_in_parallel("rake db:drop RAILS_ENV=#{ParallelTests::Tasks.rails_env} DISABLE_DATABASE_ENVIRONMENT_CHECK=1", args)
   end
 
-  desc "update test databases by dumping and loading --> parallel:prepare[num_cpus]"
+  desc "Update test databases by dumping and loading --> parallel:prepare[num_cpus]"
   task(:prepare, [:count]) do |_,args|
     ParallelTests::Tasks.check_for_pending_migrations
     if defined?(ActiveRecord) && ActiveRecord::Base.schema_format == :ruby
@@ -111,36 +111,36 @@ namespace :parallel do
   end
 
   # when dumping/resetting takes too long
-  desc "update test databases via db:migrate --> parallel:migrate[num_cpus]"
+  desc "Update test databases via db:migrate --> parallel:migrate[num_cpus]"
   task :migrate, :count do |_,args|
     ParallelTests::Tasks.run_in_parallel("rake db:migrate RAILS_ENV=#{ParallelTests::Tasks.rails_env}", args)
   end
 
   # just load the schema (good for integration server <-> no development db)
-  desc "load dumped schema for test databases via db:schema:load --> parallel:load_schema[num_cpus]"
+  desc "Load dumped schema for test databases via db:schema:load --> parallel:load_schema[num_cpus]"
   task :load_schema, :count do |_,args|
     command = "rake #{ParallelTests::Tasks.purge_before_load} db:schema:load RAILS_ENV=#{ParallelTests::Tasks.rails_env} DISABLE_DATABASE_ENVIRONMENT_CHECK=1"
     ParallelTests::Tasks.run_in_parallel(ParallelTests::Tasks.suppress_schema_load_output(command), args)
   end
 
   # load the structure from the structure.sql file
-  desc "load structure for test databases via db:structure:load --> parallel:load_structure[num_cpus]"
+  desc "Load structure for test databases via db:structure:load --> parallel:load_structure[num_cpus]"
   task :load_structure, :count do |_,args|
     ParallelTests::Tasks.run_in_parallel("rake #{ParallelTests::Tasks.purge_before_load} db:structure:load RAILS_ENV=#{ParallelTests::Tasks.rails_env} DISABLE_DATABASE_ENVIRONMENT_CHECK=1", args)
   end
 
-  desc "load the seed data from db/seeds.rb via db:seed --> parallel:seed[num_cpus]"
+  desc "Load the seed data from db/seeds.rb via db:seed --> parallel:seed[num_cpus]"
   task :seed, :count do |_,args|
     ParallelTests::Tasks.run_in_parallel("rake db:seed RAILS_ENV=#{ParallelTests::Tasks.rails_env}", args)
   end
 
-  desc "launch given rake command in parallel"
+  desc "Launch given rake command in parallel"
   task :rake, :command, :count do |_, args|
     ParallelTests::Tasks.run_in_parallel("RAILS_ENV=#{ParallelTests::Tasks.rails_env} rake #{args.command}", args)
   end
 
   ['test', 'spec', 'features', 'features-spinach'].each do |type|
-    desc "run #{type} in parallel with parallel:#{type}[num_cpus]"
+    desc "Run #{type} in parallel with parallel:#{type}[num_cpus]"
     task type, [:count, :pattern, :options] do |t, args|
       ParallelTests::Tasks.check_for_pending_migrations
 

data/lib/parallel_tests/version.rb

@@ -1,3 +1,3 @@
 module ParallelTests
-  VERSION = Version = '2.14.3'
+  VERSION = Version = '2.15.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: parallel_tests
 version: !ruby/object:Gem::Version
-  version: 2.14.3
+  version: 2.15.0
 platform: ruby
 authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-20 00:00:00.000000000 Z
+date: 2017-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parallel