parallel-rspec 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 2820fc1f77e7c926911e9697230f45b46028d82d
-  data.tar.gz: 11ad9491f170694b49296ed590c189f964ca736f
+SHA256:
+  metadata.gz: 8b1cbb0a88df18c96b32c13c67195692a7618c0db805e900a3ae05e750701299
+  data.tar.gz: 930f387786a51fd24b6a3d4705a1afc424c84f9e4eb42527576cb2a4d81d60c3
 SHA512:
-  metadata.gz: cfaeda33e78559f68b2d013883daa58523b71bcc108db0d627385d7e3657152057bb6526fa9f860413c976e7a9d8a8f5ddf4ff036831aab289f7b3d7a19ae9d8
-  data.tar.gz: c9d96690ad7703cd798ea486f7ae18c4c6f3cd5d7d84b5844d2d0dd1c5008438380c5e22911331cb8693c264138d2d2735637fd2a79ceef2a7a3ba07c60b84d3
+  metadata.gz: cf874688c79e8a413254cc7c0718d57a5fbac581f67498916797bb447235c9c70767ac9931300fa4de5f95c1f4064cacbffdc03c180e67b9852b9e42458be634
+  data.tar.gz: 785b1509878689e253125edbe18245f6433180a7dda49b612a7f3ac75b941cc87d1db268a7dc582a81fb4b86a7f54ff5c2000c29dcabcddcf3517b2ff00bd1ad

data/CHANGELOG.md

@@ -0,0 +1,19 @@
+# Change Log
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](http://keepachangelog.com/) 
+and this project adheres to [Semantic Versioning](http://semver.org/).
+
+## [Unreleased]
+
+## [0.1.1] - 2019-02-19
+### Fixed
+- Handle exit code
+
+## 0.1.0 - 2016-12-31
+### Added
+- Basic implementation
+- README now contains "Getting Started / Usage" and "Controll concurrency"
+
+[Unreleased]: https://github.com/yuku/parallel-rspec/compare/v0.1.1...HEAD
+[0.1.1]: https://github.com/yuku/parallel-rspec/compare/v0.1.0...v0.1.1

data/LICENSE

@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2017 Yuku TAKAHASHI
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

data/bin/parallel-rspec

@@ -5,4 +5,5 @@ require "parallel-rspec"
 helper_path = ENV.fetch("RSPEC_PARALLEL_HELPER", "spec/parallel_spec_helper.rb")
 Kernel.load(helper_path) if File.readable?(helper_path)
 
-RSpec::Parallel::Runner.new(ARGV).start
+exit_code = RSpec::Parallel::Runner.new(ARGV).start
+Kernel.exit(exit_code)

data/lib/rspec/parallel/configuration.rb

@@ -38,7 +38,7 @@ module RSpec
 
       # @return [Integer]
       def log_level
-        @log_level ||= Logger::WARN
+        @log_level ||= Logger::INFO
       end
 
       attr_writer :concurrency, :logger, :log_level

data/lib/rspec/parallel/master.rb

@@ -19,6 +19,7 @@ module RSpec
         @args = args
         @path = "/tmp/parallel-rspec-#{$PID}.sock"
         @files_to_run = ::RSpec.configuration.files_to_run.uniq
+        @total = @files_to_run.size
         @server = ::UNIXServer.new(@path)
       end
 
@@ -29,15 +30,17 @@ module RSpec
 
       # @return [void]
       def run
+        count = 1
         until files_to_run.empty?
           rs, _ws, _es = IO.select([server])
           rs.each do |s|
             socket = s.accept
-            method, _data = socket.gets.strip.split("\t", 2)
+            method, data = socket.gets.strip.split(" ", 2)
             case method
             when Protocol::POP
               path = files_to_run.pop
-              RSpec::Parallel.configuration.logger.info("Deliver #{path}")
+              RSpec::Parallel.configuration.logger.info("[#{count} / #{total}] Deliver #{path} to worker[#{data}]")
+              count += 1
               socket.write(path)
             when Protocol::PING
               socket.write("ok")
@@ -71,6 +74,9 @@ module RSpec
       # @return [UNIXServer]
       attr_reader :server
 
+      # @return [Integer]
+      attr_reader :total
+
       # @return [void]
       def remove_socket_file
         FileUtils.rm(path, force: true)

data/lib/rspec/parallel/runner.rb

@@ -20,13 +20,15 @@ module RSpec
         @master = Master.new(args)
       end
 
-      # @return [void]
+      # @return [Integer] exit status code
       def start
+        waiters = []
         RSpec::Parallel.configuration.concurrency.times do
-          spawn_worker
+          waiters << spawn_worker
         end
         master.run
-        Process.waitall
+        statuses = waiters.map {|waiter| waiter.value }
+        statuses.all? {|status| status.success? } ? 0 : 1
       ensure
         pids.each.with_index do |pid, index|
           puts "----> output from worker[#{index}]"
@@ -49,7 +51,7 @@ module RSpec
         pid = Kernel.fork do
           master.close
 
-          File.open(output_file_path($PID), "w") do |file|
+          exit_code = File.open(output_file_path($PID), "w") do |file|
             # Redirect stdout and stderr to temp file
             STDOUT.reopen(file)
             STDERR.reopen(STDOUT)
@@ -61,7 +63,7 @@ module RSpec
             worker.run
           end
 
-          Kernel.exit! # avoid running any `at_exit` functions.
+          Kernel.exit!(exit_code == 0) # avoid running any `at_exit` functions.
         end
         pids << pid
         Process.detach(pid)

data/lib/rspec/parallel/version.rb

@@ -1,5 +1,5 @@
 module RSpec
   module Parallel
-    VERSION = "0.1.0".freeze
+    VERSION = "0.1.1".freeze
   end
 end

data/lib/rspec/parallel/worker.rb

@@ -9,10 +9,10 @@ module RSpec
       # @param master [RSpec::Parallel::Master]
       # @param number [Integer]
       def initialize(master, number)
-        RSpec::Parallel.configuration.logger.info("Initialize Iterator")
-        @iterator = Iterator.new(master.socket_builder)
+        RSpec::Parallel.configuration.logger.debug("Initialize Iterator")
+        @iterator = Iterator.new(self, master.socket_builder)
         @number = number
-        RSpec::Parallel.configuration.logger.info("Initialize SpecRunner")
+        RSpec::Parallel.configuration.logger.debug("Initialize SpecRunner")
         @spec_runner = SpecRunner.new(master.args)
       end
 
@@ -29,8 +29,10 @@ module RSpec
       class Iterator
         include Enumerable
 
+        # @param worker [RSpec::Parallel::Worker]
         # @param socket_builder [RSpec::Parallel::SocketBuilder]
-        def initialize(socket_builder)
+        def initialize(worker, socket_builder)
+          @worker = worker
           @socket_builder = socket_builder
         end
 
@@ -39,11 +41,11 @@ module RSpec
           loop do
             socket = connect_to_distributor
             if socket.nil?
-              RSpec::Parallel.configuration.logger.info("Sleep a little to wait master process")
+              RSpec::Parallel.configuration.logger.debug("Sleep a little to wait master process")
               sleep 0.5
               next
             end
-            RSpec::Parallel.configuration.logger.info("Send PING request")
+            RSpec::Parallel.configuration.logger.debug("Send PING request")
             socket.puts(Protocol::PING)
             # TODO: handle socket error and check pong message
             IO.select([socket])
@@ -58,8 +60,8 @@ module RSpec
           loop do
             socket = connect_to_distributor
             break if socket.nil?
-            RSpec::Parallel.configuration.logger.info("Send POP request")
-            socket.puts(Protocol::POP)
+            RSpec::Parallel.configuration.logger.debug("Send POP request")
+            socket.puts("#{Protocol::POP} #{worker.number}") # TODO: Rescue `Broken pipe (Errno::EPIPE)` error
             _, _, es = IO.select([socket], nil, [socket])
             unless es.empty?
               RSpec::Parallel.configuration.logger.error("Socket error occurs")
@@ -68,7 +70,7 @@ module RSpec
             path = socket.read(65_536)
             socket.close
             RSpec.world.example_groups.clear
-            RSpec::Parallel.configuration.logger.info("Load #{path}")
+            RSpec::Parallel.configuration.logger.debug("Load #{path}")
             Kernel.load path
             RSpec.world.example_groups.each do |example_group|
               yield example_group
@@ -81,6 +83,9 @@ module RSpec
         # @return [RSpec::Parallel::SocketBuilder]
         attr_reader :socket_builder
 
+        # @return [RSpec::Parallel::Worker]
+        attr_reader :worker
+
         # @return [BasicSocket, nil]
         def connect_to_distributor
           socket_builder.run
@@ -102,9 +107,13 @@ module RSpec
           @configuration.filter_manager = RSpec::Core::FilterManager.new
 
           success = @configuration.reporter.report(0) do |reporter|
+            # In genaral, ExampleGroup is configured by evaluating `describe`
+            # before `with_suite_hooks`
+            RSpec::Core::ExampleGroup.ensure_example_groups_are_configured
+
             @configuration.with_suite_hooks do
               example_groups.map do |g|
-                RSpec::Parallel.configuration.logger.info("Run #{g.inspect}")
+                RSpec::Parallel.configuration.logger.debug("Run #{g.inspect}")
                 g.run(reporter)
               end.all?
             end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: parallel-rspec
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Yuku Takahashi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-31 00:00:00.000000000 Z
+date: 2019-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-core
@@ -121,7 +121,9 @@ files:
 - ".rubocop.yml"
 - ".simplecov"
 - ".yardopts"
+- CHANGELOG.md
 - Gemfile
+- LICENSE
 - README.md
 - Rakefile
 - bin/parallel-rspec
@@ -158,8 +160,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: Parallel spec runner for RSpec 3