rbbt-util 5.21.17 → 5.21.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 413428bcdd737fc43c4e24d56d8b0bc80aa6390a
-  data.tar.gz: 218f729af4be7d065bb62089ede6ba77fed025a3
+  metadata.gz: c722ae1fd02431a1b5cbe726b12d8cd2af4e8871
+  data.tar.gz: ea254aa679c034bf5294f9f80f7d430d95c6058b
 SHA512:
-  metadata.gz: f0b943de06c4327ca32de22f359c672ed1a6ed5e10af80b5cdb67196f41f5303190178a258f9e02f1e9be9a9ef75285f6d5a71ec3bc334a3948ec159cc97c3de
-  data.tar.gz: 55202883e3c01e7d3b6dc641f8a487c242803817a9c665eb6b1880ecb7754382af29e75fd1711b45880ee60d42b79db4ae6099348a3073bb946097e1f06884c3
+  metadata.gz: 1c76e07f15de03b2e49b5d21c04cdb358026a957b80ab1973ac4cd389b646fec1140806eb92598a9f6a66e0ada631ef6e41e58e376104ea5954e44b8c4479854
+  data.tar.gz: 8d7a4dec88f3f42f513e9ea1a009d4911f1e98548696e213c878da217fafd8bed1f56b297f472803fc2e13b70ab5cdff5618ced5ad0a6b6c19055015d62d7166

data/lib/rbbt/workflow/step/run.rb

@@ -363,13 +363,17 @@ class Step
     stream = @result if IO === @result
     @saved_stream = nil
     if stream and stream.respond_to? :abort and not stream.aborted?
+      doretry = true
       begin
         Log.medium "Aborting job stream #{stream.inspect} -- #{Log.color :blue, path}"
         stream.abort 
       rescue Aborted, Interrupt
         Log.medium "Aborting job stream #{stream.inspect} ABORTED RETRY -- #{Log.color :blue, path}"
         Log.exception $!
-        retry
+        if doretry
+          doretry = false
+          retry
+        end
       end
     end
   end
@@ -389,6 +393,7 @@ class Step
     return if @aborted
     @aborted = true
     Log.medium{"#{Log.color :red, "Aborting"} #{Log.color :blue, path}"}
+    doretry = true
     begin
       return if done?
       stop_dependencies
@@ -396,10 +401,16 @@ class Step
       abort_pid if running?
     rescue Aborted, Interrupt
       Log.medium{"#{Log.color :red, "Aborting ABORTED RETRY"} #{Log.color :blue, path}"}
-      retry
+      if doretry
+        doretry = false
+        retry
+      end
     rescue Exception
       Log.exception $!
-      retry
+      if doretry
+        doretry = false
+        retry
+      end
     ensure
       _clean_finished
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbbt-util
 version: !ruby/object:Gem::Version
-  version: 5.21.17
+  version: 5.21.19
 platform: ruby
 authors:
 - Miguel Vazquez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-08 00:00:00.000000000 Z
+date: 2016-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -486,82 +486,82 @@ signing_key:
 specification_version: 4
 summary: Utilities for the Ruby Bioinformatics Toolkit (rbbt)
 test_files:
-- test/test_helper.rb
+- test/rbbt/test_workflow.rb
 - test/rbbt/resource/test_path.rb
-- test/rbbt/association/test_item.rb
-- test/rbbt/association/test_database.rb
-- test/rbbt/association/test_open.rb
-- test/rbbt/association/test_index.rb
-- test/rbbt/association/test_util.rb
-- test/rbbt/util/test_concurrency.rb
-- test/rbbt/util/test_log.rb
-- test/rbbt/util/test_chain_methods.rb
-- test/rbbt/util/test_simpleopt.rb
-- test/rbbt/util/simpleopt/test_parse.rb
-- test/rbbt/util/simpleopt/test_get.rb
-- test/rbbt/util/simpleopt/test_setup.rb
 - test/rbbt/util/test_cmd.rb
-- test/rbbt/util/test_semaphore.rb
-- test/rbbt/util/concurrency/test_threads.rb
-- test/rbbt/util/concurrency/processes/test_socket.rb
-- test/rbbt/util/concurrency/test_processes.rb
-- test/rbbt/util/test_tmpfile.rb
-- test/rbbt/util/test_open.rb
-- test/rbbt/util/test_filecache.rb
-- test/rbbt/util/R/test_eval.rb
-- test/rbbt/util/R/test_model.rb
+- test/rbbt/util/simpleopt/test_setup.rb
+- test/rbbt/util/simpleopt/test_get.rb
+- test/rbbt/util/simpleopt/test_parse.rb
+- test/rbbt/util/test_chain_methods.rb
 - test/rbbt/util/test_simpleDSL.rb
-- test/rbbt/util/log/test_progress.rb
-- test/rbbt/util/test_colorize.rb
-- test/rbbt/util/test_R.rb
+- test/rbbt/util/test_log.rb
+- test/rbbt/util/test_open.rb
 - test/rbbt/util/misc/test_lock.rb
-- test/rbbt/util/misc/test_pipes.rb
+- test/rbbt/util/misc/test_multipart_payload.rb
 - test/rbbt/util/misc/test_bgzf.rb
+- test/rbbt/util/misc/test_pipes.rb
 - test/rbbt/util/misc/test_omics.rb
-- test/rbbt/util/misc/test_multipart_payload.rb
+- test/rbbt/util/test_concurrency.rb
+- test/rbbt/util/test_R.rb
+- test/rbbt/util/log/test_progress.rb
+- test/rbbt/util/test_colorize.rb
+- test/rbbt/util/test_simpleopt.rb
 - test/rbbt/util/test_excel2tsv.rb
+- test/rbbt/util/test_filecache.rb
+- test/rbbt/util/concurrency/test_processes.rb
+- test/rbbt/util/concurrency/test_threads.rb
+- test/rbbt/util/concurrency/processes/test_socket.rb
+- test/rbbt/util/test_semaphore.rb
 - test/rbbt/util/test_misc.rb
+- test/rbbt/util/test_tmpfile.rb
+- test/rbbt/util/R/test_model.rb
+- test/rbbt/util/R/test_eval.rb
+- test/rbbt/test_packed_index.rb
+- test/rbbt/entity/test_identifiers.rb
+- test/rbbt/test_association.rb
+- test/rbbt/knowledge_base/test_traverse.rb
+- test/rbbt/knowledge_base/test_registry.rb
+- test/rbbt/knowledge_base/test_entity.rb
+- test/rbbt/knowledge_base/test_enrichment.rb
+- test/rbbt/knowledge_base/test_syndicate.rb
+- test/rbbt/knowledge_base/test_query.rb
+- test/rbbt/test_resource.rb
 - test/rbbt/test_entity.rb
+- test/rbbt/test_knowledge_base.rb
+- test/rbbt/annotations/test_util.rb
+- test/rbbt/association/test_index.rb
+- test/rbbt/association/test_item.rb
+- test/rbbt/association/test_open.rb
+- test/rbbt/association/test_util.rb
+- test/rbbt/association/test_database.rb
+- test/rbbt/test_tsv.rb
 - test/rbbt/workflow/step/test_dependencies.rb
-- test/rbbt/workflow/test_doc.rb
-- test/rbbt/workflow/test_step.rb
 - test/rbbt/workflow/test_task.rb
-- test/rbbt/test_association.rb
-- test/rbbt/test_knowledge_base.rb
-- test/rbbt/tsv/parallel/test_traverse.rb
-- test/rbbt/tsv/parallel/test_through.rb
+- test/rbbt/workflow/test_step.rb
+- test/rbbt/workflow/test_doc.rb
+- test/rbbt/test_monitor.rb
+- test/rbbt/test_persist.rb
+- test/rbbt/test_annotations.rb
+- test/rbbt/persist/test_tsv.rb
+- test/rbbt/persist/tsv/test_lmdb.rb
+- test/rbbt/persist/tsv/test_kyotocabinet.rb
+- test/rbbt/persist/tsv/test_sharder.rb
+- test/rbbt/persist/tsv/test_cdb.rb
+- test/rbbt/persist/tsv/test_tokyocabinet.rb
+- test/rbbt/persist/tsv/test_leveldb.rb
+- test/rbbt/tsv/test_field_index.rb
 - test/rbbt/tsv/test_parallel.rb
-- test/rbbt/tsv/test_accessor.rb
+- test/rbbt/tsv/test_index.rb
+- test/rbbt/tsv/test_matrix.rb
 - test/rbbt/tsv/test_change_id.rb
+- test/rbbt/tsv/test_parser.rb
 - test/rbbt/tsv/test_stream.rb
+- test/rbbt/tsv/test_util.rb
+- test/rbbt/tsv/test_accessor.rb
 - test/rbbt/tsv/test_filter.rb
-- test/rbbt/tsv/test_matrix.rb
 - test/rbbt/tsv/test_attach.rb
 - test/rbbt/tsv/test_manipulate.rb
-- test/rbbt/tsv/test_field_index.rb
-- test/rbbt/tsv/test_index.rb
-- test/rbbt/tsv/test_util.rb
-- test/rbbt/tsv/test_parser.rb
-- test/rbbt/test_packed_index.rb
-- test/rbbt/test_persist.rb
+- test/rbbt/tsv/parallel/test_through.rb
+- test/rbbt/tsv/parallel/test_traverse.rb
 - test/rbbt/test_fix_width_table.rb
-- test/rbbt/knowledge_base/test_traverse.rb
-- test/rbbt/knowledge_base/test_entity.rb
-- test/rbbt/knowledge_base/test_query.rb
-- test/rbbt/knowledge_base/test_enrichment.rb
-- test/rbbt/knowledge_base/test_syndicate.rb
-- test/rbbt/knowledge_base/test_registry.rb
-- test/rbbt/entity/test_identifiers.rb
-- test/rbbt/test_monitor.rb
-- test/rbbt/test_workflow.rb
-- test/rbbt/test_annotations.rb
-- test/rbbt/annotations/test_util.rb
-- test/rbbt/test_resource.rb
-- test/rbbt/persist/tsv/test_tokyocabinet.rb
-- test/rbbt/persist/tsv/test_kyotocabinet.rb
-- test/rbbt/persist/tsv/test_lmdb.rb
-- test/rbbt/persist/tsv/test_leveldb.rb
-- test/rbbt/persist/tsv/test_cdb.rb
-- test/rbbt/persist/tsv/test_sharder.rb
-- test/rbbt/persist/test_tsv.rb
-- test/rbbt/test_tsv.rb
+- test/test_helper.rb