parallel_rspec 0.4.1 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 773680cd7ac7cc86421fc4511597b488293aa9b0
-  data.tar.gz: 420dff9c171a05bf34e3013c8cb8c0aed377bf0e
+SHA256:
+  metadata.gz: 2d143dce3b81dac87bf01778c952ad87821de77b440e11fc5d24e270a932331e
+  data.tar.gz: f1ca46d4effc92cd59613f44dc4bf55015a3b8c70a025211dbd5a19421337730
 SHA512:
-  metadata.gz: 5b347907242eed08bc9edef8f2d59f221519d74d9f30ff6fa8fdb81edac1c7cdfc1df2b1c38566a20aa6a137618909a5a6c539d6f7c5d9ff6dcb92760c8815be
-  data.tar.gz: cbe1cf67c4deab173e1668dae741f555d8b930872a558f08d6d3d71925d06d0c4c38f2f1d5266f2d8cc8a0af8e02c05ba10f0768e39fa493cbf81e1a604f57df
+  metadata.gz: d72eae09b94e9d243f99ffd7c7d3ff8f97e2c77a6905cba37a738d66002ba298ff86990cb6069cbb323a9758b2bbd5b3c4ab09db8ee42a1dbd2d0a3b76243242
+  data.tar.gz: 486f0adb28955ae1f5f2c972ac26b0748d2691a9205b9c82a1c7b686a88c0a59deddfd9c85b5be92a98bd45ed9fe2ef616a80ea971143d86f0170bfdec97cc0b

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
 
@@ -34,7 +34,7 @@ By default, ParallelRSpec will use two workers.  If you would like to use more,
 
 ParallelRSpec runs each worker with its own copy of the test database to avoid locking and deadlocking problems.  To create these and populate them with your schema, run:
 
-    $ bundle exec db:parallel:create db:parallel:prepare
+    $ bundle exec rake db:parallel:create db:parallel:prepare
 
 ParallelRSpec will automatically make the database name for each worker based on the name you used for the `test` environment in `config/database.yml`.  For example, if your normal `test` database is `foo_test`, worker 1 will keep using `foo_test` but worker 2's database will be `foo_test2`.
 
@@ -53,11 +53,46 @@ 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.
 
+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.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.
 
 
+## Thanks
+
+* Charles Horn (@hornc)
+* Roger Nesbitt (@mogest)
+
+
 ## License
 
 The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).

data/lib/parallel_rspec/client.rb

@@ -26,6 +26,10 @@ module ParallelRSpec
       channel_to_server.write([:example_failed, serialize_example(example)])
     end
 
+    def example_finished(example)
+      channel_to_server.write([:example_finished, serialize_example(example)])
+    end
+
     def example_pending(example)
       channel_to_server.write([:example_pending, serialize_example(example)])
     end
@@ -40,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/rake_task.rb

@@ -0,0 +1,10 @@
+require 'rspec/core/rake_task'
+
+module ParallelRSpec
+  class RakeTask < RSpec::Core::RakeTask
+    def initialize(*args, &task_block)
+      super
+      self.rspec_path = File.expand_path('../../../exe/prspec', __FILE__)
+    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/server.rb

@@ -22,6 +22,10 @@ module ParallelRSpec
       reporter.example_failed(example)
     end
 
+    def example_finished(example, channel_to_client)
+      reporter.example_finished(example)
+    end
+
     def example_pending(example, channel_to_client)
       reporter.example_pending(example)
     end

data/lib/parallel_rspec/tasks.rake

@@ -2,27 +2,31 @@ 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']
       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']
       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 +35,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 +65,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.4.1"
+  VERSION = "2.1.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
 
@@ -56,8 +61,18 @@ module ParallelRSpec
 
     def establish_test_database_connection(worker)
       ENV['TEST_ENV_NUMBER'] = worker.to_s
-      ActiveRecord::Base.configurations['test']['database'] << worker.to_s unless worker == 1
-      ActiveRecord::Base.establish_connection(ActiveRecord::Base.configurations['test'])
+      if defined?(ActiveRecord)
+        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
 
     def verify_children(child_pids)

data/lib/parallel_rspec.rb

@@ -1,8 +1,20 @@
 require "parallel_rspec/version"
+require "parallel_rspec/config"
 require "parallel_rspec/channel"
 require "parallel_rspec/workers"
 require "parallel_rspec/example"
 require "parallel_rspec/server"
 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.4.1
+  version: 2.1.0
 platform: ruby
 authors:
 - Will Bryant, Powershop New Zealand Ltd
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2015-09-27 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,8 +58,10 @@ 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
 - lib/parallel_rspec/runner.rb
 - lib/parallel_rspec/server.rb
 - lib/parallel_rspec/tasks.rake
@@ -70,7 +72,7 @@ homepage: https://github.com/willbryant/parallel_rspec
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -85,9 +87,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.2.2
-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.