parallel_rspec 0.5.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: d64dc85017a3e37989dc7622f31efbf66dc2f5db
-  data.tar.gz: e7be200563e7b4c7bce5219fca0f51aaeee868fb
+SHA256:
+  metadata.gz: 789b0fec42e9fe3b485305a5da250915fab02f89678dba1171ec7fd2d7b0bcc5
+  data.tar.gz: 259d48bbffa5177861d88cf92daa4a9b942e4d40d21dff4d04ee3eb190a49dde
 SHA512:
-  metadata.gz: bda496ce03c066b1f0c72c7b880921d5f39b6d5863337673c8e47422395fccf3bef08bc418892ad052867d73a7575719cf94878ba8a5347540ef00bc0fd396ac
-  data.tar.gz: e842d8a1b930b4ab6f39aa6c86c4c581b480aa1ca53ab42c6fa33a7756107054ff10b61f68e3d820c8bef79e14252f2ce59c062327e2b8d79f6b8044f5bfd620
+  metadata.gz: b5da7ba542f13faacb9d89906b23255c02262e228b3cfa4c72377f0f0a1addfabfcb1c6970e6c15316e4a569f4ed15b28592ce11b0cbad522b7342c67f97ed13
+  data.tar.gz: 4a1eac0dfaa95d8ef167380ec9922072dee901e2e9087c0c9f00b121b34dde73cd148dada9c435bf51d98cb5f6547eaf31f5aa61e9b9effa8de148843f7ee122

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
 
@@ -53,17 +53,35 @@ You may like to make an alias:
 
 When you change WORKERS, don't forget to restart Spring and re-run the create and populate steps above if necessary.
 
-To set up a rake task which uses parallel_rspec, use, for example:
+By default, there's a task called `parallel_rspec` which will run all specs. To make a custom rake task which uses parallel_rspec with different options, inherit from ParallelRSpec::RakeTask, for example:
 
 ```ruby
+  require 'parallel_rspec'
+
   ParallelRSpec::RakeTask.new(:prspec) do |t|
     ENV['WORKERS'] = '4'
-    t.pattern = "**/spec/*_spec.rb"
+    t.pattern = "spec/**/*_spec.rb"
     t.rspec_opts = "--tag parallel"
     # etc...
   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.
@@ -72,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/railtie.rb

@@ -1,11 +1,14 @@
-require 'rails'
+begin
+  require 'rails'
 
-module ParallelRSpec
-  class Railtie < Rails::Railtie
-    railtie_name :parallel_rspec
+  module ParallelRSpec
+    class Railtie < Rails::Railtie
+      railtie_name :parallel_rspec
 
-    rake_tasks do
-      load "parallel_rspec/tasks.rake"
+      rake_tasks do
+        load "parallel_rspec/tasks.rake"
+      end
     end
   end
+rescue LoadError
 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

@@ -2,27 +2,41 @@ require 'parallel_rspec/workers.rb'
 
 db_namespace = namespace :db do
   namespace :parallel do
-    # desc "Creates the test database"
+    desc "Creates the test databases"
     task :create => [:load_config] do
       ParallelRSpec::Workers.new.run_test_workers do |worker|
-        ActiveRecord::Tasks::DatabaseTasks.create ActiveRecord::Base.configurations['test']
+        if ActiveRecord::Base.configurations.respond_to?(:configs_for)
+          ActiveRecord::Base.configurations.configs_for(env_name: 'test').each do |configuration|
+            ActiveRecord::Tasks::DatabaseTasks.create configuration
+          end
+        else
+          ActiveRecord::Tasks::DatabaseTasks.create ActiveRecord::Base.configurations['test']
+        end
       end
     end
 
-    # desc "Empty the test database"
+    desc "Empty the test databases"
     task :purge => %w(environment load_config) do
       ParallelRSpec::Workers.new.run_test_workers do |worker|
-        ActiveRecord::Tasks::DatabaseTasks.purge ActiveRecord::Base.configurations['test']
+        if ActiveRecord::Tasks::DatabaseTasks.respond_to?(:purge_current)
+          ActiveRecord::Tasks::DatabaseTasks.purge_current 'test'
+        else
+          ActiveRecord::Tasks::DatabaseTasks.purge ActiveRecord::Base.configurations['test']
+        end
       end
     end
 
-    # desc "Recreate the test database from an existent schema.rb file"
+    desc "Recreate the test databases from an existent schema.rb file"
     task :load_schema => %w(db:parallel:purge) do
       should_reconnect = ActiveRecord::Base.connection_pool.active_connection?
       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
@@ -31,25 +45,29 @@ db_namespace = namespace :db do
       end
     end
 
-    # desc "Recreate the test database from an existent structure.sql file"
+    desc "Recreate the test databases 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
 
-    # desc "Recreate the test database from the current schema"
+    desc "Recreate the test databases from the current schema"
     task :load do
-      db_namespace["db:parallel:purge"].invoke
+      db_namespace["parallel:purge"].invoke
       case ActiveRecord::Base.schema_format
-        when :ruby
-          db_namespace["parallel:load_schema"].invoke
-        when :sql
-          db_namespace["parallel:load_structure"].invoke
+      when :ruby
+        db_namespace["parallel:load_schema"].invoke
+      when :sql
+        db_namespace["parallel:load_structure"].invoke
       end
     end
 
-    # desc "Check for pending migrations and load the test schema"
+    desc "Check for pending migrations and load the test schema"
     task :prepare => %w(environment load_config) do
       unless ActiveRecord::Base.configurations.blank?
         db_namespace['parallel:load'].invoke
@@ -57,3 +75,7 @@ db_namespace = namespace :db do
     end
   end
 end
+
+ParallelRSpec::RakeTask.new(:parallel_rspec) do |t|
+  t.pattern = "spec/**/*_spec.rb"
+end

data/lib/parallel_rspec/version.rb

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

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: parallel_rspec
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 2.1.1
 platform: ruby
 authors:
 - Will Bryant, Powershop New Zealand Ltd
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2016-01-06 00:00:00.000000000 Z
+date: 2022-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '1.10'
-  type: :development
+        version: '10.0'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '10.0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
-  type: :development
+        version: '0'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 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.
@@ -58,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
@@ -71,7 +72,7 @@ homepage: https://github.com/willbryant/parallel_rspec
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -86,9 +87,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.2.5
-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.