rbbt-util 5.13.29 → 5.13.30

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 17adbad9eb7b34f9e8e73dd6d07100524d087d2a
-  data.tar.gz: eff0d8f0b268e2ce676f1f0fee5fb74b39edb180
+  metadata.gz: 547e2309e238341b65561d216fc6324b85a13165
+  data.tar.gz: b7865ac59ad7bed3894c9fbb24ae3bd8da15f38d
 SHA512:
-  metadata.gz: 01362bc1fce56034de6132d1ba60b3e1eab70d943e65b71195fd6be85397bdb947077b7dedc4cdfcb795b889bdae3f160462ed8d8e2d37d37b332905aca3c34e
-  data.tar.gz: 66c449d2b05aadc792bf9a8b401ec8dd57dee7408ac1144d281edf651b1f71db4d10e8e52c57d735d935dd10a1fb61c984101c7acc2a10430843386ce4595414
+  metadata.gz: 98235141db97b051c8c5f6f4c3125937f2ba427407f960de9abc212662578e553024062289feb7f90bd65e763f6084fc4eb33b39b4d52bc743bdca8dd5a0e3ef
+  data.tar.gz: 5cfd97fbd116dbd802c99d477da00ce7b852531e41e7c5f59ea8c84cbf0d07e2bb67a0dd57c5efc1a0a1b938b8400f664567b767a9215a7f7f3093944591ef7f

data/lib/rbbt/tsv.rb

@@ -34,7 +34,7 @@ module TSV
 
     IndiferentHash.setup(options)
     ENTRIES.each do |entry|
-      hash.send("#{ entry }=", options[entry]) if options.include? entry
+      hash.send("#{ entry }=", options[entry.to_s]) if options.include? entry.to_s
       hash.send("#{ entry }=", options[entry.to_sym]) if options.include? entry.to_sym
     end
 
@@ -84,6 +84,7 @@ module TSV
       end
     end
 
+
     data.unnamed = unnamed unless unnamed.nil?
 
     data.entity_options = entity_options
@@ -92,7 +93,13 @@ module TSV
       data.identifiers = Path.setup(data.identifiers, source.pkgdir, source.resource)
     end
 
-    data
+    if data.respond_to? :persistence_path
+      data
+    else
+      h = data.dup
+      data.clear
+      data.annotate h
+    end
   end
 
   def self.parse_header(stream, options = {})

data/lib/rbbt/tsv/accessor.rb

@@ -82,27 +82,41 @@ module TSV
     res
   end
 
-  def self.extended(data)
-    if not data.respond_to? :write
-      class << data
-        attr_accessor :writable
+  def close
+    begin
+      super
+    rescue Exception
+      self
+    end
+  end
 
-        def close
-        end
+  def read(force = false)
+    begin
+      super
+    rescue Exception
+      @writable = false
+      self
+    end
+  end
 
-        def read(force = false)
-          @writable = false
-          self
-        end
+  def write(force = false)
+    begin
+      super
+    rescue Exception
+      @writable = true
+      self
+    end
+  end
 
-        def write(force = false)
-          @writable = true
-          self
-        end
+  def write?
+    @writable
+  end
+
+  def self._extended(data)
+    if not data.respond_to? :write
+      class << data
+        attr_accessor :writable
 
-        def write?
-          @writable
-        end
       end
     end
   end
@@ -114,6 +128,16 @@ module TSV
   ENTRY_KEYS = Set.new
   NIL_VALUE = "NIL_VALUE"
 
+  def load_entry_value(value)
+    return value unless respond_to? :persistence_path
+    (value.nil? or value == SERIALIZED_NIL) ? nil : TSV_SERIALIZER.load(value)
+  end
+
+  def dump_entry_value(value)
+    return value unless respond_to? :persistence_path
+    (value.nil? or value == SERIALIZED_NIL) ? SERIALIZED_NIL : TSV_SERIALIZER.dump(value)
+  end
+
   def self.entry(*entries)
     entries = entries.collect{|entry| entry.to_s}
     ENTRIES.concat entries
@@ -125,7 +149,7 @@ module TSV
       TSV.send(:define_method, entry) do
         return instance_variable_get(var_name) if instance_variables.include? var_name
         svalue = self.send(:[], key, :entry_key)
-        value = (svalue.nil? or svalue == SERIALIZED_NIL) ? nil : TSV_SERIALIZER.load(svalue)
+        value = load_entry_value(svalue)
         instance_variable_set(var_name, value)
         value
       end
@@ -133,7 +157,7 @@ module TSV
       TSV.send(:define_method, entry + "=") do |value|
         instance_variable_set(var_name, value)
         value = value.to_s if Path === value
-        self.send(:[]=, key, (value.nil? ? SERIALIZED_NIL : TSV_SERIALIZER.dump(value)), :entry_key)
+        self.send(:[]=, key, dump_entry_value(value), :entry_key)
         value
       end
 
@@ -153,7 +177,7 @@ module TSV
 
   def serializer=(serializer)
     @serializer = serializer
-    self.send(:[]=, KEY_PREFIX + 'serializer', (serializer.nil? ? SERIALIZED_NIL : TSV_SERIALIZER.dump(serializer)), :entry_key)
+    self.send(:[]=, KEY_PREFIX + 'serializer', dump_entry_value(serializer), :entry_key)
     @serializar_module = serializer.nil? ? TSV::CleanSerializer : SERIALIZER_ALIAS[serializer.to_sym]
   end
 
@@ -408,7 +432,8 @@ module TSV
 
 
   def fields
-    @fields ||= TSV_SERIALIZER.load(self.send(:[], "__tsv_hash_fields", :entry_key) || SERIALIZED_NIL)
+    #@fields ||= TSV_SERIALIZER.load(self.send(:[], "__tsv_hash_fields", :entry_key) || SERIALIZED_NIL)
+    @fields ||= load_entry_value(self.send(:[], "__tsv_hash_fields", :entry_key))
     if true or @fields.nil? or @unnamed
       @fields
     else
@@ -417,15 +442,15 @@ module TSV
   end
 
   def namespace=(value)
-    self.send(:[]=, "__tsv_hash_namespace", value.nil? ? SERIALIZED_NIL : TSV::TSV_SERIALIZER.dump(value), true)
+    #self.send(:[]=, "__tsv_hash_namespace", value.nil? ? SERIALIZED_NIL : TSV::TSV_SERIALIZER.dump(value), true)
+    self.send(:[]=, "__tsv_hash_namespace", dump_entry_value(value), true)
     @namespace = value
     @entity_options = nil
   end
 
   def fields=(value)
     clean = true
-    value_ym = value.nil? ? SERIALIZED_NIL : TSV::TSV_SERIALIZER.dump(value)
-    self.send(:[]=, "__tsv_hash_fields", value_ym, clean)
+    self.send(:[]=, "__tsv_hash_fields", dump_entry_value(value), clean)
     @fields = value
     @named_fields = nil
   end

data/lib/rbbt/workflow/accessor.rb

@@ -423,7 +423,7 @@ module Workflow
   end
 
   def rec_inputs(taskname)
-    [taskname].concat(rec_dependencies(taskname)).inject([]){|acc, tn| acc.concat((Array === tn ? tn.first.tasks[tn.last] : tasks[tn.to_sym]).inputs) }
+    [taskname].concat(rec_dependencies(taskname)).inject([]){|acc, tn| acc.concat((Array === tn ? tn.first.tasks[tn.last] : tasks[tn.to_sym]).inputs) }.uniq
   end
 
   def rec_input_defaults(taskname)

data/share/rbbt_commands/workflow/info

@@ -62,7 +62,7 @@ if inputs and inputs.any?
     when TrueClass, FalseClass
       puts "  " << Misc.format_definition_list_item(input, value.to_s, 80, 20, :blue)
     else
-      text = value.split("\n")[0..5].compact * "\n\n"
+      text = value.to_s.split("\n")[0..5].compact * "\n\n"
       puts "  " << Misc.format_definition_list_item(input, text, 80, 20, :blue)
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbbt-util
 version: !ruby/object:Gem::Version
-  version: 5.13.29
+  version: 5.13.30
 platform: ruby
 authors:
 - Miguel Vazquez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-31 00:00:00.000000000 Z
+date: 2014-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake