parallel_rspec 1.2.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 19b61a06eaf02d7e86e49dbb7287884f351d3649accaa3d43fd7b59b11a70630
-  data.tar.gz: 54902af922e58c98d47ae265c1d471a4ac819ac2aac8f31925cf4154c7630317
+  metadata.gz: 83c17d292ba1b11cd79f83f1d8b795d0e7a606fe605ab998fb8e71d6876212fe
+  data.tar.gz: e6504610a0782653c34ac985fa355588f3fe75880c41cfda63c637b5520c155f
 SHA512:
-  metadata.gz: 6a54b4e9e0e0d8628bfb7fd33ad08a6f500dd7e1dd003bea96379dcfff623790b3ac3cb1f3fd76a53b127cbe62a75e5db4c8f3185994b23389e912da07e225f7
-  data.tar.gz: fe3e3185122faa62befdb5d233cb82d51d4740ecb84ad0aaff3538bb5075c2d525927cc125e5fc56fee9546105996d3ad4e3f014b587618cc01a0188a4bbd144
+  metadata.gz: 50a9c698147a7d65ff0452d3c83898dc46a54173683b9fa0886fc9b50aea9daae6205664063ccaee63a936cab567e2e26a3a6ff7fdf2dbcd2e2304c06da4e697
+  data.tar.gz: a16b420371af5586f1ff8f86d398cf46344c6b292430e853c82ac349f53f28d42882eff736f416168a4fdaabf6ffe62d971bdca61410ff81ae2b363a7bc04081

data/README.md

@@ -24,7 +24,7 @@ And then execute:
 
     $ bundle
 
-This version of ParallelRSpec has been tested with RSpec 3.3.
+This version of ParallelRSpec has been tested with RSpec 3.10.
 
 ## Usage
 
@@ -66,6 +66,22 @@ To set up a rake task which uses parallel_rspec, use, for example:
   end
 ```
 
+If you'd like code to run after parallel_rspec has created each worker, you can specify a block to run:
+
+```ruby
+  ParallelRSpec.configure do |config|
+    config.after_fork do |worker_number|
+      puts "I am worker #{worker_number}"
+    end
+  end
+```
+
+You might also want to detect whether your spec suite is running under ParallelRSpec or not:
+
+```ruby
+  do_something unless ParallelRSpec.running?
+```
+
 ## Contributing
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/willbryant/parallel_rspec.
@@ -74,6 +90,7 @@ Bug reports and pull requests are welcome on GitHub at https://github.com/willbr
 ## Thanks
 
 * Charles Horn (@hornc)
+* Roger Nesbitt (@mogest)
 
 
 ## License

data/lib/parallel_rspec/client.rb

@@ -44,6 +44,7 @@ module ParallelRSpec
         example.description,
         example.exception,
         example.location_rerun_argument,
+        ExampleGroup.new([]),
         example.metadata.slice(
           :absolute_file_path,
           :described_class,

data/lib/parallel_rspec/config.rb

@@ -0,0 +1,13 @@
+module ParallelRSpec
+  module Config
+    @after_fork = []
+
+    def self.after_fork(&block)
+      if block
+        @after_fork << block
+      else
+        @after_fork
+      end
+    end
+  end
+end

data/lib/parallel_rspec/example.rb

@@ -1,7 +1,9 @@
 module ParallelRSpec
+  ExampleGroup = Struct.new(:parent_groups)
+
   # only the good bits of RSpec's Example class, those needed by the reporters and formatters and
   # marshallable.
-  Example = Struct.new(:id, :description, :exception, :location_rerun_argument, :metadata) do
+  Example = Struct.new(:id, :description, :exception, :location_rerun_argument, :example_group, :metadata) do
     def self.delegate_to_metadata(key)
       define_method(key) { metadata[key] }
     end
@@ -13,4 +15,4 @@ module ParallelRSpec
     delegate_to_metadata :pending
     delegate_to_metadata :skip
   end
-end
+end

data/lib/parallel_rspec/runner.rb

@@ -16,6 +16,12 @@ end
 
 module ParallelRSpec
   class Runner < RSpec::Core::Runner
+    @@running = false
+
+    def self.running?
+      @@running
+    end
+
     # Runs the suite of specs and exits the process with an appropriate exit
     # code.
     def self.invoke
@@ -39,6 +45,7 @@ module ParallelRSpec
     #   or the configured failure exit code (1 by default) if specs
     #   failed.
     def self.run(args, err=$stderr, out=$stdout)
+      @@running = true
       RSpec::Core::Runner.trap_interrupt
       options = RSpec::Core::ConfigurationOptions.new(args)
       new(options).run(err, out)

data/lib/parallel_rspec/tasks.rake

@@ -22,7 +22,11 @@ db_namespace = namespace :db do
       begin
         ParallelRSpec::Workers.new.run_test_workers do |worker|
           ActiveRecord::Schema.verbose = false
-          ActiveRecord::Tasks::DatabaseTasks.load_schema_for ActiveRecord::Base.configurations['test'], :ruby, ENV['SCHEMA']
+          if ActiveRecord::Tasks::DatabaseTasks.respond_to?(:load_schema_current)
+            ActiveRecord::Tasks::DatabaseTasks.load_schema_current :ruby, ENV['SCHEMA'], 'test'
+          else
+            ActiveRecord::Tasks::DatabaseTasks.load_schema_for ActiveRecord::Base.configurations['test'], :ruby, ENV['SCHEMA']
+          end
         end
       ensure
         if should_reconnect
@@ -34,7 +38,11 @@ db_namespace = namespace :db do
     # desc "Recreate the test database from an existent structure.sql file"
     task :load_structure => %w(db:parallel:purge) do
       ParallelRSpec::Workers.new.run_test_workers do |worker|
-        ActiveRecord::Tasks::DatabaseTasks.load_schema_for ActiveRecord::Base.configurations['test'], :sql, ENV['SCHEMA']
+        if ActiveRecord::Tasks::DatabaseTasks.respond_to?(:load_schema_current)
+          ActiveRecord::Tasks::DatabaseTasks.load_schema_current :sql, ENV['SCHEMA'], 'test'
+        else
+          ActiveRecord::Tasks::DatabaseTasks.load_schema_for ActiveRecord::Base.configurations['test'], :sql, ENV['SCHEMA']
+        end
       end
     end
 

data/lib/parallel_rspec/version.rb

@@ -1,3 +1,3 @@
 module ParallelRSpec
-  VERSION = "1.2.0"
+  VERSION = "2.0.0"
 end

data/lib/parallel_rspec/workers.rb

@@ -30,6 +30,11 @@ module ParallelRSpec
         pid = fork do
           channel_to_client.close
           establish_test_database_connection(worker)
+
+          Config.after_fork.each do |proc|
+            proc.call(worker)
+          end
+
           yield worker, channel_to_server
         end
 
@@ -57,8 +62,16 @@ module ParallelRSpec
     def establish_test_database_connection(worker)
       ENV['TEST_ENV_NUMBER'] = worker.to_s
       if defined?(ActiveRecord)
-        ActiveRecord::Base.configurations['test']['database'] << worker.to_s unless worker == 1
-        ActiveRecord::Base.establish_connection(ActiveRecord::Base.configurations['test'])
+        if ActiveRecord::Base.configurations.respond_to?(:configs_for)
+          ActiveRecord::Base.configurations.configs_for(env_name: 'test').each do |configuration|
+            configuration.database << worker.to_s unless worker == 1
+            ActiveRecord::Base.establish_connection(configuration)
+          end
+        else
+          configuration = ActiveRecord::Base.configurations['test']
+          configuration.with_indifferent_access['database'] << worker.to_s unless worker == 1
+          ActiveRecord::Base.establish_connection(configuration)
+        end
       end
     end
 

data/lib/parallel_rspec.rb

@@ -1,4 +1,5 @@
 require "parallel_rspec/version"
+require "parallel_rspec/config"
 require "parallel_rspec/channel"
 require "parallel_rspec/workers"
 require "parallel_rspec/example"
@@ -7,3 +8,13 @@ require "parallel_rspec/client"
 require "parallel_rspec/rake_task"
 require "parallel_rspec/runner"
 require "parallel_rspec/railtie"
+
+module ParallelRSpec
+  def self.configure
+    yield Config
+  end
+
+  def self.running?
+    Runner.running?
+  end
+end

data/parallel_rspec.gemspec

@@ -19,7 +19,6 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "rake", "~> 10.0"
+  spec.add_dependency "rake", "> 10.0"
   spec.add_dependency "rspec"
-  spec.add_development_dependency "bundler", "~> 1.10"
 end

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: parallel_rspec
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Will Bryant, Powershop New Zealand Ltd
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-04-28 00:00:00.000000000 Z
+date: 2021-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
@@ -38,20 +38,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.10'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.10'
 description: This gem lets you run your RSpec examples in parallel across across your
   CPUs.  Each worker automatically gets its own database to avoid conflicts.  The
   optional spring-prspec gem adds support for running under Spring.
@@ -72,6 +58,7 @@ files:
 - lib/parallel_rspec.rb
 - lib/parallel_rspec/channel.rb
 - lib/parallel_rspec/client.rb
+- lib/parallel_rspec/config.rb
 - lib/parallel_rspec/example.rb
 - lib/parallel_rspec/railtie.rb
 - lib/parallel_rspec/rake_task.rb
@@ -85,7 +72,7 @@ homepage: https://github.com/willbryant/parallel_rspec
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -100,9 +87,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
-signing_key: 
+rubygems_version: 3.0.3
+signing_key:
 specification_version: 4
 summary: This gem lets you run your RSpec examples in parallel across across your
   CPUs.