rbbt-util 5.5.4 → 5.5.5

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MWIwMmM0MmY4N2RkZWY3MzFkZDNhMGNmNGU2NzBmMWQwMGU5MWNkMw==
+    N2QwOWU5NGVjMWZlZjQyMmIxNTk4NWFhOGQxNzMwZGNjOTlmNThmNA==
   data.tar.gz: !binary |-
-    MDUzODQ2Njc4NDJlYWI2MmNkNzE0YTM4M2I3OTkyZTdkMjA1Y2JjYw==
+    Y2YwMzc0ZDY0YjZlNGU1MjVhYmNkMzVkZjliYmY3N2MyNThiYjg4MQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NjAzMDQ1YTRkZmE5NjM3YzY4NTA5MDU5MDk1YWY4MGZlZGI5ZDVkNzI4NWNm
-    OTRjNDgwNGQ4MjBmNmE0OThjMWIzMTY2MzFhNDk5NWRhYTg1ODdmOWNhNTIy
-    ODJmNzkxMGVlZjkwZmQ0MDU2YzllNjIxZWI4ZDA4ZjBmNzZiMTQ=
+    MzZkZWNhN2Y0OWQ5Y2YxMGU3Y2U3NDRmYWFlYTkwYjJhOGFlMjZlMzRhYTlk
+    MmE2ZjAxOTVkYjk2NWY5MDg0ZWU1ZTE0MWU5YTMyN2NlNTNhNzc3Y2RjNjBi
+    YzI0NDQxODExM2RlZDU5MDliYzg0OTM1NjI4ZjI2ODhjOWI3Y2M=
   data.tar.gz: !binary |-
-    ZTI0ODM1MThjZmU4NzJiMzIyMmZjOTM4Y2Y3N2JiNTM0MDUwOWI1OTU4Mzlm
-    MjFkN2MzZTBjMTZjNGQ0NWY5N2UzZTk5YjBmMTFiODZiYjk3MDIyMTg3ZDYy
-    NDdlMjc0MWRlZjhhM2E1NTA0NWNkNjI5MjNmODM1MzViODkwY2E=
+    ZGEyZDk5YmNhM2E4OWYwZjNmNWU1Y2Y4OGEzNWY3YjYxMjdkMWZhYjZmNWIx
+    N2I0N2ExY2QzNTMwZTZhMTFmMGRlNDRhMjRlZTNkMjdiZGQxMmQ3NGNmNjA0
+    ZWY0YTI2ZTAyMDcyYzMxOWIyZjU5MTRhZTYwOGQyYmZmMzQwMGI=

data/etc/app.d/base.rb

@@ -14,7 +14,7 @@ use Rack::Session::Cookie, :key => 'rack.session',
 
 
 #{{{ DIRECTORIES
-local_var = Rbbt.var.find
+local_var = Rbbt.var.find(:current)
 set :cache_dir           , local_var.sinatra.cache.find
 set :file_dir            , local_var.sinatra.files.find
 set :permalink_dir       , local_var.sinatra.permalink.find

data/etc/app.d/entities.rb

@@ -18,7 +18,7 @@ Rbbt.etc.entities.read.split("\n").each do |name|
   end
 end if Rbbt.etc.entities.exists?
 
-$annotation_repo = Rbbt.var.find(:lib).sinatra.annotation_repo.find
+$annotation_repo = Rbbt.var.find.sinatra.annotation_repo.find
 Rbbt.etc.persit_properties.yaml.each do |name,list|
   next if name.empty?
   mod = Kernel.const_get name

data/lib/rbbt/annotations/util.rb

@@ -4,8 +4,13 @@ module Annotated
 
   def self.flatten(array)
     return array if array.nil?  or array.empty?
+    array.extend AnnotatedArray if Annotated === array
     return array.flatten if AnnotatedArray === array
-    return array if array.compact.collect{|e| e.info }.uniq.length > 1
+    begin
+      return array if array.compact.collect{|e| e.info }.uniq.length > 1
+    rescue
+      return array
+    end
     array.compact.first.annotate(array.flatten).tap{|a| a.extend AnnotatedArray }
   end
 

data/lib/rbbt/association/item.rb

@@ -37,8 +37,9 @@ module AssociationItem
   property :info => :array2single do
     fields = knowledge_base.index_fields(database)
     return [{}] * self.length if fields.nil? or fields.empty?
+
     value.collect{|v|
-      Hash[*v.zip(fields).flatten]
+      Hash[*fields.zip(v).flatten]
     }
   end
 end

data/lib/rbbt/knowledge_base.rb

@@ -226,15 +226,24 @@ class KnowledgeBase
   end
 
   #{{{ Query
+  
+  def setup(name, matches)
+    AssociationItem.setup matches, self, name, false
+  end
+
+  def all(name, options={})
+    repo = get_index name, options
+    setup name, repo.keys
+  end
 
   def children(name, entity)
     repo = get_index name
-    AssociationItem.setup repo.match(entity), self, name, false
+    setup(name, repo.match(entity))
   end
 
   def parents(name, entity)
     repo = get_index name
-    AssociationItem.setup repo.reverse.match(entity), self, name, true
+    setup(name, repo.reverse.match(entity))
   end
 
   def neighbours(name, entity)
@@ -256,7 +265,7 @@ class KnowledgeBase
       raise "Entities are not a Hash or an AnnotatedArray: #{Misc.fingerprint entities}"
     end
     repo = get_index name
-    AssociationItem.setup repo.subset_entities(entities), self, name, false
+    setup(name, repo.subset_entities(entities))
   end
 
   def translate(entities, type)

data/lib/rbbt/resource/path.rb

@@ -55,7 +55,7 @@ module Path
   end
 
   SEARCH_PATHS = {
-    :current => File.join(File.expand_path('.'), "{TOPLEVEL}", "{SUBPATH}"),
+    :current => File.join("{PWD}", "{TOPLEVEL}", "{SUBPATH}"),
     :user    => File.join(ENV['HOME'], ".{PKGDIR}", "{TOPLEVEL}", "{SUBPATH}"),
     :global  => File.join('/', "{TOPLEVEL}", "{PKGDIR}", "{SUBPATH}"),
     :local   => File.join('/usr/local', "{TOPLEVEL}", "{PKGDIR}", "{SUBPATH}"),
@@ -98,13 +98,19 @@ module Path
       raise "Did not recognize the 'where' tag: #{where}. Options: #{search_paths.keys}" unless search_paths.include? where
       libdir = where == :lib ? Path.caller_lib_dir(caller_lib) : ""
       libdir ||= ""
-      Path.setup search_paths[where].sub('{PKGDIR}', pkgdir).sub('{TOPLEVEL}', toplevel).sub('{SUBPATH}', subpath).sub('{LIBDIR}', libdir), @pkgdir, @resource
+      pwd = FileUtils.pwd
+      Path.setup search_paths[where].sub('{PKGDIR}', pkgdir).sub('{PWD}', pwd).sub('{TOPLEVEL}', toplevel).sub('{SUBPATH}', subpath).sub('{LIBDIR}', libdir), @pkgdir, @resource
     end
   end
 
   def find_all(caller_lib = nil, search_paths = nil)
     search_paths ||= SEARCH_PATHS
-    search_paths.keys.collect{|where| find(where, Path.caller_lib_dir, search_paths)}.select{|file| file.exists?}.uniq
+    search_paths = search_paths.dup
+
+    search_paths.keys.
+      collect{|where| find(where, Path.caller_lib_dir, search_paths)}.
+      compact.select{|file| file.exists?}.uniq
+
   end
 
   #{{{ Methods

data/lib/rbbt/workflow/step.rb

@@ -117,7 +117,7 @@ class Step
       Log.medium("Starting task #{task.name || ""} [#{Process.pid}]: #{ path }")
       set_info :status, :started
 
-      set_info :started, Time.now
+      set_info :started, (start_time = Time.now)
       
       set_info :inputs, Misc.remove_long_items(Misc.zip2hash(task.inputs, @inputs)) unless task.inputs.nil?
 
@@ -154,7 +154,8 @@ class Step
             end
 
       set_info :status, :done
-      set_info :done, Time.now
+      set_info :done, (done_time = Time.now)
+      set_info :time_elapsed, done_time - start_time
       Log.medium("Completed task #{task.name || ""} [#{Process.pid}]: #{ path }")
       res
     end

data/share/config.ru

@@ -3,9 +3,9 @@ require 'rbbt/resource'
 require 'rbbt'
 load Rbbt.etc['app.d/init.rb'].find
 
-class_name = File.basename(FileUtils.pwd)
+$class_name = class_name = File.basename(FileUtils.pwd)
 
-app = eval "class #{class_name} < Sinatra::Base; self end"
+$app = app = eval "class #{class_name} < Sinatra::Base; self end"
 
 app.class_eval do
   Log.info{"Loading: " << Rbbt.etc['app.d/base.rb'].find}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbbt-util
 version: !ruby/object:Gem::Version
-  version: 5.5.4
+  version: 5.5.5
 platform: ruby
 authors:
 - Miguel Vazquez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-23 00:00:00.000000000 Z
+date: 2013-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake