rbbt-util 5.14.15 → 5.14.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b4562833949296544e288b767589677cdea4cd54
-  data.tar.gz: 50c2d8f06c365b3334ab046671031b4dadff448f
+  metadata.gz: 70d99fc7279b9731d3f52b47a88b98e754f50376
+  data.tar.gz: a44903e02e4cd08f4780b7a64526f14335fcd661
 SHA512:
-  metadata.gz: 247c31f35e49849089188684402ae360d88800e4d90cdbe897c36a7d666f00360c10e308a2a5626411f7d917595930efa4213c2af20050e7b8ab235fc4b5f349
-  data.tar.gz: 31d136e11cc112d958568a7607fc673876822f8c350ffd326c9b66b58ca55dc6e48659ee1f80ff660527188eb30ba63d0ddfa703c3cef285c865ae8fbf5ff824
+  metadata.gz: 8f6e582804b9c76c255ef1a7acc1ab8bf261e75a239c6b51f85de1e37baea9e0bd688da035e9999963a8d744e8f327039af4c0fe20e8b57e3f965097be418b7c
+  data.tar.gz: e655675f21100fcb903238b74c0e721743d9a78ae2bd7f17e1238ac1de9439b293b712760d781ba05aafd2da601f9b874e64da14848d373c023f0c817ab66025

data/bin/rbbt

@@ -206,7 +206,7 @@ rescue ParameterException
   puts
   exit -1
 rescue SystemExit
-  Log.exception $! unless $?.success?
+  Log.error "Command error" unless $?.success?
 rescue Exception
   Log.exception $!
 ensure

data/etc/app.d/entities.rb

@@ -1,14 +1,16 @@
+
+#{{{ Require files
 Rbbt.etc.requires.read.split("\n").each do |file|
   next if file.empty?
   Log.debug("requiring #{ file }")
   require file
 end if Rbbt.etc.requires.exists?
 
-
 Entity.entity_list_cache     = Rbbt.var.sinatra.find.entity_lists
 Entity.entity_map_cache      = Rbbt.var.sinatra.find.entity_maps
 Entity.entity_property_cache = Rbbt.var.sinatra.find.entity_properties
 
+#{{{ Prepare REST entities
 Rbbt.etc.entities.read.split("\n").each do |name|
   next if name.empty?
   mod = Kernel.const_get name
@@ -18,6 +20,7 @@ Rbbt.etc.entities.read.split("\n").each do |name|
   end
 end if Rbbt.etc.entities.exists?
 
+#{{{ Prepare REST entity property persist
 $annotation_repo = Rbbt.var.sinatra.annotation_repo.find
 (Rbbt.etc.persist_properties.yaml || {}).each do |name,list|
   next if name.empty?

data/lib/rbbt/association.rb

@@ -88,6 +88,7 @@ module Association
             if file.fields == field_headers
               file
             else
+              iii :reorder
               file.reorder(source, field_headers)
             end
           else
@@ -239,7 +240,7 @@ module Association
       tsv = load_tsv(file, options)
 
       tsv.annotate(data)
-      data.serializer = tsv.type if data.respond_to? :persistence_path
+      data.serializer = tsv.type 
 
       tsv.with_unnamed do
         tsv.each do |k,v|
@@ -330,4 +331,3 @@ module Association
     end
   end
 end
-

data/lib/rbbt/resource/path.rb

@@ -90,57 +90,61 @@ module Path
   end
 
   def find(where = nil, caller_lib = nil, paths = nil)
-    paths = (self.search_paths || SEARCH_PATHS).merge(paths || {})
-    where = paths[:default] if where == :default
-    return self if located?
-    if self.match(/(.*?)\/(.*)/)
-      toplevel, subpath = self.match(/(.*?)\/(.*)/).values_at 1, 2
-    else
-      toplevel, subpath = self, ""
-    end
-
-    path = nil
-    if where.nil?
-      STANDARD_SEARCH.each do |w| 
-        w = w.to_sym
-        next unless paths.include? w
-        path = find(w, caller_lib, paths)
-        return path if File.exists? path
-      end
-      (SEARCH_PATHS.keys - STANDARD_SEARCH).each do |w|
-        w = w.to_sym
-        next unless paths.include? w
-        path = find(w, caller_lib, paths)
-        return path if File.exists? path
-      end
-      if paths.include? :default
-        find((paths[:default] || :user), caller_lib, paths)
-      else
-        raise "Path '#{ path }' not found, and no default specified in search paths: #{paths.inspect}"
-      end
-    else
-      where = where.to_sym
-      raise "Did not recognize the 'where' tag: #{where}. Options: #{paths.keys}" unless paths.include? where
-
-      if where == :lib
-        libdir = Path.caller_lib_dir(caller_lib) || "NOLIBDIR"
-      else
-        libdir = "NOLIBDIR"
-      end
-      pwd = FileUtils.pwd
-      path = paths[where].
-        sub('{PKGDIR}', pkgdir).
-        sub('{PWD}', pwd).
-        sub('{TOPLEVEL}', toplevel).
-        sub('{SUBPATH}', subpath).
-        sub('{PATH}', self).
-        sub('{LIBDIR}', libdir) #, @pkgdir, @resource, @search_paths
-
-      path = path + '.gz' if File.exists? path + '.gz'
-      path = path + '.bgz' if File.exists? path + '.bgz'
-
-      self.annotate path
-    end
+    @path ||= {}
+    key = Misc.digest([where, caller_lib, paths].inspect)
+    @path[key] ||= begin
+                     paths = (self.search_paths || SEARCH_PATHS).merge(paths || {})
+                     where = paths[:default] if where == :default
+                     return self if located?
+                     if self.match(/(.*?)\/(.*)/)
+                       toplevel, subpath = self.match(/(.*?)\/(.*)/).values_at 1, 2
+                     else
+                       toplevel, subpath = self, ""
+                     end
+
+                     path = nil
+                     if where.nil?
+                       STANDARD_SEARCH.each do |w| 
+                         w = w.to_sym
+                         next unless paths.include? w
+                         path = find(w, caller_lib, paths)
+                         return path if File.exists? path
+                       end
+                       (SEARCH_PATHS.keys - STANDARD_SEARCH).each do |w|
+                         w = w.to_sym
+                         next unless paths.include? w
+                         path = find(w, caller_lib, paths)
+                         return path if File.exists? path
+                       end
+                       if paths.include? :default
+                         find((paths[:default] || :user), caller_lib, paths)
+                       else
+                         raise "Path '#{ path }' not found, and no default specified in search paths: #{paths.inspect}"
+                       end
+                     else
+                       where = where.to_sym
+                       raise "Did not recognize the 'where' tag: #{where}. Options: #{paths.keys}" unless paths.include? where
+
+                       if where == :lib
+                         libdir = Path.caller_lib_dir(caller_lib) || "NOLIBDIR"
+                       else
+                         libdir = "NOLIBDIR"
+                       end
+                       pwd = FileUtils.pwd
+                       path = paths[where].
+                         sub('{PKGDIR}', pkgdir).
+                         sub('{PWD}', pwd).
+                         sub('{TOPLEVEL}', toplevel).
+                         sub('{SUBPATH}', subpath).
+                         sub('{PATH}', self).
+                         sub('{LIBDIR}', libdir) #, @pkgdir, @resource, @search_paths
+
+                       path = path + '.gz' if File.exists? path + '.gz'
+                       path = path + '.bgz' if File.exists? path + '.bgz'
+
+                       self.annotate path
+                     end
+                   end
   end
 
   def find_all(caller_lib = nil, search_paths = nil)

data/lib/rbbt/resource/util.rb

@@ -101,7 +101,7 @@ module Resource
     task = Misc.path_relative_to rake_dir, path
     rakefile = rakefile.produce if rakefile.respond_to? :produce
 
-    rake_dir = rake_dir.find if rake_dir.respond_to? :find
+    rake_dir = rake_dir.find(:user) if rake_dir.respond_to? :find
 
     begin
       require 'rbbt/resource/rake'

data/lib/rbbt/tsv/accessor.rb

@@ -244,7 +244,7 @@ module TSV
         end
         self[key] == new
       else
-        self[key] = values.collect{|v| [v] }
+        self[key] = Array === values.first ? values.dup : values.collect{|v| [v] }
       end
     when :flat
       if self.include? key

data/lib/rbbt/tsv/parser.rb

@@ -143,7 +143,8 @@ module TSV
         raise $!
       end
 
-      keys = parts[key_position].split(@sep2, -1)
+      str = parts[key_position]
+      keys = str.split(@sep2, -1)
 
       if @take_all
         values = parts.collect{|e| e.split(@sep2, -1) }.flatten
@@ -545,7 +546,6 @@ module TSV
             stream.abort if stream.respond_to? :abort
             raise $!
           rescue Exception
-            Log.exception $!
             Log.error "Exception parsing #{Misc.fingerprint stream}: #{$!.message}"
             stream.abort $! if stream.respond_to? :abort
             raise $!

data/lib/rbbt/util/log.rb

@@ -226,6 +226,12 @@ module Log
     end
   end
 
+  def self.tsv(tsv)
+    STDERR.puts Log.color :magenta, "TSV log: " << Log.last_caller(caller)
+    iif tsv
+    ppp tsv.summary
+  end
+
   def self.stack(stack)
     LOG_MUTEX.synchronize do
 

data/lib/rbbt/util/misc/development.rb

@@ -272,9 +272,12 @@ module Misc
   end
 
   def self.bootstrap(elems, num = :current, file = nil, &block)
+    num = :current if num.nil?
     cpus = case num
            when :current
             4 
+           when String
+             num.to_i
            when Integer
              if num < 100
                num
@@ -283,6 +286,9 @@ module Misc
              end
            end
     file = caller.first + rand(1000000).to_s if file.nil?
-    RbbtSemaphore.fork_each_on_semaphore elems, cpus, file, &block
+    index = (0..elems.length-1).to_a.collect{|v| v.to_s }
+    RbbtSemaphore.fork_each_on_semaphore index, cpus, file do |i|
+      yield elems[i.to_i]
+    end
   end
 end

data/share/rbbt_commands/tsv/info

@@ -30,9 +30,7 @@ file = STDIN if file == '-'
 
 raise ParameterException, "Please specify the tsv file as argument" if file.nil?
 
-iii options
 options[:fields] = options[:fields].split(/[,\|]/) if options[:fields]
-iii options
 options[:header_hash] = options["header_hash"]
 options[:sep] = options["sep"]
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbbt-util
 version: !ruby/object:Gem::Version
-  version: 5.14.15
+  version: 5.14.16
 platform: ruby
 authors:
 - Miguel Vazquez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-13 00:00:00.000000000 Z
+date: 2014-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake