parallel 1.17.0 → 1.20.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a6b2d803fd3a136456287d19f88a5986742beed7246f587491992661235e43c2
-  data.tar.gz: f3ed40c9c16f0a80e524f55c2f50d570d5da69c2f43ddc62023c323ddb968101
+  metadata.gz: 1f41f840e7e5128ebbb8d4ea2955b5bc555925ac049184ae1d4323885a3980b9
+  data.tar.gz: f9463997e0b890857d1909e6df6c8632b08eb028fc4015541631ca275d1fabfb
 SHA512:
-  metadata.gz: b5534907c40e98488528ed8c9bc08ae1eab61b5b8ec1ce9d1b02b40687d08a6f19f3721e962273674994654dbe7a55b8df05ff905342e0fb28ff810a6036d958
-  data.tar.gz: d0b9f65e4a85636f8b464605b9b53de89ff529139801a5f8a8c7259783bce45eb1791c43218ba9ec3950e04e00a14f40b38c6079b52375d1c50f34a8db16c109
+  metadata.gz: '0581d59c3d38af4fefdd761264899f9661a3c28e8a4d3c9683f7e93c2295313e53d518263a6b4d04fcbb9a57eb55dfe3854e8c27f9f4e378641823eea2aada72'
+  data.tar.gz: f77d00250586ada81bddfc2dd47e4895a526215549cee3728f31a927dd617a3a4d2bca7e72d9c7ff3c481e3a4488933c490153d0ef7dec97dc6a5cdd6bc513ed

data/lib/parallel.rb

@@ -3,15 +3,21 @@ require 'parallel/version'
 require 'parallel/processor_count'
 
 module Parallel
-  extend Parallel::ProcessorCount
+  extend ProcessorCount
+
+  Stop = Object.new.freeze
 
   class DeadWorker < StandardError
   end
 
   class Break < StandardError
+    attr_reader :value
+    def initialize(value = nil)
+      @value = value
+    end
   end
 
-  class Kill < StandardError
+  class Kill < Break
   end
 
   class UndumpableException < StandardError
@@ -22,8 +28,6 @@ module Parallel
     end
   end
 
-  Stop = Object.new.freeze
-
   class ExceptionWrapper
     attr_reader :exception
     def initialize(exception)
@@ -102,7 +106,7 @@ module Parallel
         item, index = @mutex.synchronize do
           return if @stopped
           item = @lambda.call
-          @stopped = (item == Parallel::Stop)
+          @stopped = (item == Stop)
           return if @stopped
           [item, @index += 1]
         end
@@ -201,14 +205,15 @@ module Parallel
 
   class << self
     def in_threads(options={:count => 2})
+      threads = []
+      count, _ = extract_count_from_options(options)
+
       Thread.handle_interrupt(Exception => :never) do
         begin
-          threads = []
-          count, _ = extract_count_from_options(options)
-          count.times do |i|
-            threads << Thread.new { yield(i) }
-          end
           Thread.handle_interrupt(Exception => :immediate) do
+            count.times do |i|
+              threads << Thread.new { yield(i) }
+            end
             threads.map(&:value)
           end
         ensure
@@ -229,12 +234,12 @@ module Parallel
 
     def any?(*args, &block)
       raise "You must provide a block when calling #any?" if block.nil?
-      !each(*args) { |*a| raise Parallel::Kill if block.call(*a) }
+      !each(*args) { |*a| raise Kill if block.call(*a) }
     end
 
     def all?(*args, &block)
       raise "You must provide a block when calling #all?" if block.nil?
-      !!each(*args) { |*a| raise Parallel::Kill unless block.call(*a) }
+      !!each(*args) { |*a| raise Kill unless block.call(*a) }
     end
 
     def each_with_index(array, options={}, &block)
@@ -269,16 +274,18 @@ module Parallel
       options[:return_results] = (options[:preserve_results] != false || !!options[:finish])
       add_progress_bar!(job_factory, options)
 
-      results = if size == 0
-        work_direct(job_factory, options, &block)
-      elsif method == :in_threads
-        work_in_threads(job_factory, options.merge(:count => size), &block)
-      else
-        work_in_processes(job_factory, options.merge(:count => size), &block)
-      end
-      if results
-        options[:return_results] ? results : source
-      end
+      result =
+        if size == 0
+          work_direct(job_factory, options, &block)
+        elsif method == :in_threads
+          work_in_threads(job_factory, options.merge(:count => size), &block)
+        else
+          work_in_processes(job_factory, options.merge(:count => size), &block)
+        end
+
+      return result.value if result.is_a?(Break)
+      raise result if result.is_a?(Exception)
+      options[:return_results] ? result : source
     end
 
     def map_with_index(array, options={}, &block)
@@ -339,7 +346,7 @@ module Parallel
       rescue
         exception = $!
       end
-      handle_exception(exception, results)
+      exception || results
     ensure
       self.worker_number = nil
     end
@@ -366,7 +373,7 @@ module Parallel
         end
       end
 
-      handle_exception(exception, results)
+      exception || results
     end
 
     def work_in_processes(job_factory, options, &blk)
@@ -400,7 +407,7 @@ module Parallel
                 results_mutex.synchronize { results[index] = result } # arrays are not threads safe on jRuby
               rescue StandardError => e
                 exception = e
-                if Parallel::Kill === exception
+                if Kill === exception
                   (workers - [worker]).each do |w|
                     w.thread.kill if w.thread
                     UserInterruptHandler.kill(w.pid)
@@ -413,8 +420,7 @@ module Parallel
           end
         end
       end
-
-      handle_exception(exception, results)
+      exception || results
     end
 
     def replace_worker(job_factory, workers, i, options, blk)
@@ -469,7 +475,10 @@ module Parallel
         item, index = job_factory.unpack(data)
         result = begin
           call_with_index(item, index, options, &block)
-        rescue
+        # https://github.com/rspec/rspec-support/blob/673133cdd13b17077b3d88ece8d7380821f8d7dc/lib/rspec/support.rb#L132-L140
+        rescue NoMemoryError, SignalException, Interrupt, SystemExit
+          raise $!
+        rescue Exception
           ExceptionWrapper.new($!)
         end
         begin
@@ -480,12 +489,6 @@ module Parallel
       end
     end
 
-    def handle_exception(exception, results)
-      return nil if [Parallel::Break, Parallel::Kill].include? exception.class
-      raise exception if exception
-      results
-    end
-
     # options is either a Integer or a Hash with :count
     def extract_count_from_options(options)
       if options.is_a?(Hash)

data/lib/parallel/processor_count.rb

@@ -1,16 +1,14 @@
 require 'etc'
 
 module Parallel
+  # TODO: inline this method into parallel.rb and kill physical_processor_count in next major release
   module ProcessorCount
-    # Number of processors seen by the OS and used for process scheduling. It's just wrapper for Etc.nprocessors
+    # Number of processors seen by the OS, used for process scheduling
     def processor_count
-      @processor_count ||= begin
-        Etc.nprocessors
-      end
+      @processor_count ||= Integer(ENV['PARALLEL_PROCESSOR_COUNT'] || Etc.nprocessors)
     end
 
     # Number of physical processor cores on the current system.
-    #
     def physical_processor_count
       @physical_processor_count ||= begin
         ppc = case RbConfig::CONFIG["target_os"]

data/lib/parallel/version.rb

@@ -1,3 +1,3 @@
 module Parallel
-  VERSION = Version = '1.17.0'
+  VERSION = Version = '1.20.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: parallel
 version: !ruby/object:Gem::Version
-  version: 1.17.0
+  version: 1.20.0
 platform: ruby
 authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-01 00:00:00.000000000 Z
+date: 2020-11-07 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: michael@grosser.it
@@ -23,7 +23,11 @@ files:
 homepage: https://github.com/grosser/parallel
 licenses:
 - MIT
-metadata: {}
+metadata:
+  bug_tracker_uri: https://github.com/grosser/parallel/issues
+  documentation_uri: https://github.com/grosser/parallel/blob/v1.20.0/Readme.md
+  source_code_uri: https://github.com/grosser/parallel/tree/v1.20.0
+  wiki_uri: https://github.com/grosser/parallel/wiki
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -32,15 +36,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.2'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.1.3
 signing_key: 
 specification_version: 4
 summary: Run any kind of code in parallel processes