ztk 3.2.4 → 3.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d760f1f213971dc97e6eeef8759269b2f73572e3
-  data.tar.gz: a50b3d2e09579bb30f39a1bcb1c9af5d2a433248
+  metadata.gz: ed4dc92acd6566d623035a51532d94c6b4eb2586
+  data.tar.gz: c157a15976ed4ead4f2049fad070b4fae96be54c
 SHA512:
-  metadata.gz: 571f41f9f17350346888a4eb77e7434374599557bb11a0c18d359c16f14942712fbc21f03d9af4d75c0735a2802010aa0040af8558a7c0a2eb8631b4e4141dc7
-  data.tar.gz: 80c28ff3598abeb9a3374afc3d9b29fb7a34f729d3f6f7e7ed2a985769bb08510daa2db5316e658d63d85082ca482baa2e7618e710903f7cc3ff97ae0438b7c5
+  metadata.gz: 700c4e7864a361db22527bc3bbe0f81584e3459a2be1d609a060cf21d63d3016d9afa68d6b71536be90fe7abf6da906a8c9364e255355c1ce2031cd774ecfa7b
+  data.tar.gz: 8571f6db42d6447788111a01362d3d578acaa5e8b7eef867e666020a2788d9b255c304341c21b9f31444cc7087df9cf5a76074e7245c642a3ad939076c98081d

data/lib/ztk/parallel.rb

@@ -143,27 +143,27 @@ module ZTK
           parent_writer.close
           parent_reader.close
 
-          ::Timeout.timeout(config.child_timeout, ZTK::Parallel::Timeout) do
-            config.after_fork and config.after_fork.call(Process.pid)
+          config.after_fork and config.after_fork.call(Process.pid)
 
-            data = nil
-            begin
+          data = nil
+          begin
+            ::Timeout.timeout(config.child_timeout, ZTK::Parallel::Timeout) do
               data = block.call
-            rescue Exception => e
-              config.ui.logger.fatal { e.message }
-              e.backtrace.each do |line|
-                config.ui.logger << "#{line}\n"
-              end
-              data = ExceptionWrapper.new(e)
             end
+          rescue Exception => e
+            config.ui.logger.fatal { e.message }
+            e.backtrace.each do |line|
+              config.ui.logger << "#{line}\n"
+            end
+            data = ExceptionWrapper.new(e)
+          end
 
-            if !data.nil?
-              config.ui.logger.debug { "write(#{data.inspect})" }
-              begin
-                child_writer.write(Base64.encode64(Marshal.dump(data)))
-              rescue Exception => e
-                config.ui.logger.warn { "Exception while writing data to child_writer! - #{e.inspect}" }
-              end
+          if !data.nil?
+            config.ui.logger.debug { "write(#{data.inspect})" }
+            begin
+              child_writer.write(Base64.encode64(Marshal.dump(data)))
+            rescue Exception => e
+              config.ui.logger.warn { "Exception while writing data to child_writer! - #{e.inspect}" }
             end
           end
 
@@ -267,7 +267,7 @@ module ZTK
     def process_data(data)
       return data if !(ZTK::Parallel::ExceptionWrapper === data)
 
-      if ((config.raise_exceptions == true) || (ZTK::Parallel::Break === data.exception))
+      if ((config.raise_exceptions == true) || (ZTK::Parallel::Break === data.exception) || (ZTK::Parallel::Timeout === data.exception))
         config.ui.logger.fatal { "exception(#{data.exception.inspect})" }
         signal_all
         raise data.exception

data/lib/ztk/version.rb

@@ -1,6 +1,6 @@
 module ZTK
 
   # ZTK Version String
-  VERSION = "3.2.4"
+  VERSION = "3.2.5"
 
 end

data/spec/ztk/parallel_spec.rb

@@ -110,6 +110,18 @@ describe ZTK::Parallel do
         end.to raise_error ZTK::Parallel::Break
       end
 
+      it "should raise ZTK::Parallel::Timeout if execution is longer than the limit set" do
+        subject = ZTK::Parallel.new(:raise_exceptions => false, :child_timeout => 3)
+
+        expect do
+          subject.process do
+            sleep 10
+          end
+
+          subject.waitall
+        end.to raise_error ZTK::Parallel::Timeout
+      end
+
     end
 
     describe "#wait" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ztk
 version: !ruby/object:Gem::Version
-  version: 3.2.4
+  version: 3.2.5
 platform: ruby
 authors:
 - Zachary Patten
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-07 00:00:00.000000000 Z
+date: 2017-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport