parallel 1.2.2 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e26f6721425c56c0c45ca69a2301136ffeeb520b
-  data.tar.gz: 68ecf7b9f6eac61c89546c500653c17260f4952c
+  metadata.gz: 4335cc7d93938d3aafdb07fee7a4aa32e7b586c7
+  data.tar.gz: 718327edc760a05b8d8502ed1afdb334a1fb1ef1
 SHA512:
-  metadata.gz: 17eab2e1bc6367300fc2cdd780e3378978bc0cb78a2ca9cdfdd16917658a697cf8a808587eb851a1a30e8829916bcff9a9b7d4230ea78e1f182b57d75a2c1716
-  data.tar.gz: d72aee9ea542f2032d04e1da09acaa50897f949ca9a178212d57a4a557b5cc42e7d27e776bf539e135840ec2d83947c91c732735fdc38760b33085f4c91bc792
+  metadata.gz: 1d4c4d72297c1e8e0da33d05e111d7eb32e58c0f7d759329abd1c5f9a90c17711bf23202f75ad647414194284747b8d493073a11cc024e4351633a743526f6aa
+  data.tar.gz: 2dc97cc4d85eb122faa0cdade2de92d5889a14eed7fe08527c4cc3562d5fc8c2ae7571842a3c44bfc69fdb726aab5e19a90102a164a7884de93ac0291558df46

data.tar.gz.sig

@@ -1,3 +1,2 @@
-�����,���C�H���d4�`�ߗ+Tf�@�<�`K%����>����]�l����_���Հ,���+�J�WUt�ĦY���X������Ǐ�,�����xNH�e����F�\�Nߞ�`�j�l���70��
-����j(4�f�O�Y6�SnM1�7�c�����#��W/��w6�����V���;���B��F|�'��޻�Žq�z� �3�^�'�ɳ02�ǩz
-�{�3sA�e�{�yah�V�I�?+�b
+]��� a��FmS%�Mϓh���u���M
�m���BE��#��&.X��S�ၓ3�8aa�J~�>�巣
�����=���n�D;{�EhMzsp�R��;���:�C�^Gώ����Y��&2��H4�
~����"e�݈���O��1�ɖPtR
+�!��$d�-�B��<�L�"�ȗ�Z{�c���ԃ�~�F/�'t"�brM�h��.9�k-5"o��	�a�|�kt\#9�xt�4�_е�����*�qI/�F

data/lib/parallel.rb

@@ -84,7 +84,7 @@ module Parallel
     end
 
     def each(array, options={}, &block)
-      map(array, options.merge(:preserve_results => false), &block)
+      map(array, options.merge(:preserve_results => !!options[:finish]), &block)
       array
     end
 
@@ -94,6 +94,7 @@ module Parallel
 
     def map(array, options = {}, &block)
       array = array.to_a # turn Range and other Enumerable-s into an Array
+      options[:mutex] ||= Mutex.new
 
       if RUBY_PLATFORM =~ /java/ and not options[:in_processes]
         method = :in_threads
@@ -124,14 +125,18 @@ module Parallel
     end
 
     def add_progress_bar!(array, options)
-      if (title = options[:progress]) && !options[:finish]
+      if title = options[:progress]
         require 'ruby-progressbar'
         progress = ProgressBar.create(
           :title => title,
           :total => array.size,
           :format => '%t |%E | %B | %a'
         )
-        options[:finish] = lambda { |item, i, result| progress.increment }
+        old_finish = options[:finish]
+        options[:finish] = lambda do |item, i, result|
+          old_finish.call(item, i, result) if old_finish
+          progress.increment
+        end
       end
     end
 
@@ -442,10 +447,10 @@ module Parallel
     def with_instrumentation(item, index, options)
       on_start = options[:start]
       on_finish = options[:finish]
-      on_start.call(item, index) if on_start
+      options[:mutex].synchronize { on_start.call(item, index) } if on_start
       result = yield
     ensure
-      on_finish.call(item, index, result) if on_finish
+      options[:mutex].synchronize { on_finish.call(item, index, result) } if on_finish
     end
   end
 end

data/lib/parallel/version.rb

@@ -1,3 +1,3 @@
 module Parallel
-  VERSION = Version = '1.2.2'
+  VERSION = Version = '1.2.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: parallel
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.3
 platform: ruby
 authors:
 - Michael Grosser
@@ -30,7 +30,7 @@ cert_chain:
   F5etKHZg0j3eHO31/i2HnswY04lqGImUu6aM5EnijFTB7PPW2KwKKM4+kKDYFdlw
   /0WV1Ng2/Y6qsHwmqGg2VlYj2h4=
   -----END CERTIFICATE-----
-date: 2014-08-12 00:00:00.000000000 Z
+date: 2014-08-17 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: michael@grosser.it