rbbt-util 5.5.50 → 5.5.51

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NGM4ZjliYTA2Y2UxYzNiZWY2NWM0N2Q5ZTI3MTFhNGU2ODI2Nzk3ZQ==
+    ZjQ0ZDU1ZWJkNWY0MDJhYzZhNTZiOGMxZTQ1ZGY1YTcxYTg2YmMxZg==
   data.tar.gz: !binary |-
-    NmI0MTM4MjRhYTM3NjJmMWRiN2NjOTg3NDNjYTYxYjhjN2IzNDRhOQ==
+    ZTlhYjJjZDE0MTEyMWYxNTM0ZTQ3NmJiYjIwM2UxM2NiNTM3ZGJkYQ==
 SHA512:
   metadata.gz: !binary |-
-    NTc0MThjZDQ5ZTMyMjM0MjM2ZTFhMDZiYTg5YzU5ZDJmZGE1Y2ExNTZmZWU0
-    M2RkOWI3NTJkNmU3NWVkYzFiZDRiY2M2YTExMTg4MmQ1M2U4N2Y3YWRmN2U4
-    NDFiMjFiNzRhMmJmNzgwOTEyYzM2MDk2YjkxNzIxMTY5YjA0YmY=
+    YTE4Njc0ODNiYjY5MjJjYjQ4YjIwZDBjZWUyMjdmMWVlZTA1OGQ2MTZlYjlm
+    NjgxODBjNzJjZTMxYzMwMjJhODJkYTk0ZWZiMDJiNmJjMDNlNjI1NmQxMWRh
+    NDUwOTQyYzFlYTc4MDIwOGM3MmQwMmEwYmY0M2YzNTdjYTcwZTY=
   data.tar.gz: !binary |-
-    M2UyM2MyMmZjODBhZjU4N2MzNzA1MTcyMWZlYTEzYTU3MmVmNWRlZGY5ZmU1
-    MWU1MTIyMzNiNTQyMzBiNDc4OGZjNmE3NDZhNjk3YTk3MTU2ODNmMjY1NmRj
-    NTliMWJiOTBiZDRjYmQwZTg1NWEyZDM3NmZlMzUzZTQ3NzIwNTI=
+    NmI3MWVjMDEyM2U3YjRkM2MyYTUyZjc5NDY4NThkMzI0YTEyNDg1ZjAwNzdi
+    NWVhYTE2OWRlMDAyN2FkMzU4NTA2MTJhNTMzZjg4ZDQ3NzU2OGZlMzcwOTYy
+    ODA5M2EwZjJlODAzOGQwMzRhMWRmMTYyOWU1NDM3MDMwMDFhYjI=

data/lib/rbbt/resource.rb

@@ -2,6 +2,7 @@ require 'rbbt/util/open'
 require 'rbbt/util/log'
 require 'rbbt/resource/path'
 require 'net/http'
+require 'set'
 
  
 module Resource
@@ -55,11 +56,14 @@ module Resource
     end
   end
 
+  attr_accessor :server_missing_resource_cache
   def get_from_server(path, final_path)
     url = File.join(remote_server, '/resource/', self.to_s, 'get_file')
     url << "?" << Misc.hash2GET_params(:file => path, :create => false)
 
     begin
+      @server_missing_resource_cache ||= Set.new
+      raise "Resource Not Found" if @server_missing_resource_cache.include? url
       Net::HTTP.get_response URI(url) do |response|
           case response
           when Net::HTTPSuccess, Net::HTTPOK
@@ -70,22 +74,23 @@ module Resource
               end
             end
 
-            when Net::HTTPRedirection, Net::HTTPFound
-              location = response['location']
-              Log.debug("Feching directory from: #{location}. Into: #{final_path}")
-              FileUtils.mkdir_p final_path unless File.exists? final_path
-              Misc.in_dir final_path do
-                CMD.cmd('tar xvfz -', :in => Open.open(location))
-              end
+          when Net::HTTPRedirection, Net::HTTPFound
+            location = response['location']
+            Log.debug("Feching directory from: #{location}. Into: #{final_path}")
+            FileUtils.mkdir_p final_path unless File.exists? final_path
+            Misc.in_dir final_path do
+              CMD.cmd('tar xvfz -', :in => Open.open(location))
+            end
+          when Net::HTTPInternalServerError
+            @server_missing_resource_cache << url
+            raise "Resource Not Found"
           else
-            exit
             raise "Response not understood: #{response.inspect}"
           end
       end
     rescue
       Log.warn "Could not retrieve (#{self.to_s}) #{ path } from #{ remote_server }"
       Log.error $!.message
-      Log.error $!.backtrace * "\n"
       FileUtils.rm_rf final_path if File.exists? final_path
       return false
     end

data/lib/rbbt/tsv/manipulate.rb

@@ -249,12 +249,19 @@ module TSV
           when :double
             new_key_field_name, new_field_names = through new_key_field, new_fields, uniq, zipped do |key, value|
               if data[key].nil?
-                #data[key] = value.collect{|v| v.dup}
-                data[key] = value.collect{|v| v.dup}
+                #data[key] = value.collect{|v| v.nil? ? nil : v.dup}
+                data[key] = value.dup
               else
-                current = data[key]
-                value.each_with_index do |v, i|
-                  current[i].concat v
+                if current = data[key] 
+                  value.each_with_index do |v, i|
+                    if _c = current[i]
+                      _c.concat v if v
+                    else
+                      current[i] = v || []
+                    end
+                  end
+                else
+                  current = v.collect{|e| [e] }
                 end
                 data[key] = current if data.respond_to? :tokyocabinet_class
               end

data/lib/rbbt/workflow/accessor.rb

@@ -28,13 +28,16 @@ class Step
   def info
     return {} if info_file.nil? or not Open.exists? info_file
     begin
-      Misc.insist(2, 0.5) do
-        Open.open(info_file) do |file|
-          INFO_SERIALIAZER.load(file) || {}
+      Misc.insist(2, 2) do
+        Misc.insist(2, 0.5) do
+          Open.open(info_file) do |file|
+            INFO_SERIALIAZER.load(file) || {}
+          end
         end
       end
     rescue Exception
       Log.debug{"Error loading info file: " + info_file}
+      Open.write(info_file, {:status => :error, :messages => ["Info file lost"]}.to_yaml)
       raise $!
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rbbt-util
 version: !ruby/object:Gem::Version
-  version: 5.5.50
+  version: 5.5.51
 platform: ruby
 authors:
 - Miguel Vazquez