rbbt-util 5.5.29 → 5.5.30

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OTMxYzQzNDY1OTYzOGVkMDNmNzYzNWRkMDYwMGE0NmZkMDllZWQzNg==
+    YWQ4ODA4M2FhZTRlOTI5ZGNkMjVkY2U0MWQyM2NjNjUzOWY3MWFjZA==
   data.tar.gz: !binary |-
-    MWM0NzE2MGU1OTM1NGJiZTVhMDgzMDU2ZjFjOTkzYmFiMTkwNDViYg==
+    ZjczOTU0MDlmOTUzMzNiMjE5YWQ3ZjllZDk0ZDhjNjVhNjk4YTJkNQ==
 SHA512:
   metadata.gz: !binary |-
-    NWU0YzI4NWRjOGNiZjVhZTMwMTBhODFlMjQyZWYyNWFkZWU4MjIyZmFlNjFk
-    MWZkMTM1YWVmNDE0MjBjY2FmYTNkMTRjNjIxYjczNTk0ZTVjYzU4MTcxNzE4
-    ZDQwZDk0ZDAwNGM4MDA1MWNiY2E4YzJlODNmMjVkMGQxNDA0ZjA=
+    ZGExZmViNjhiZGUwMGVkN2JmNjIwNzk0OTVjOGMyNWI1ODFhZjg0MzhhZmMw
+    MmMyM2FlYzMyOWQyYzExNmI1MTQwZTAyY2ExNTIxZTlmMDEyMDhkMWQwM2U5
+    Y2YxZTAzZTQxZmZmOWI1OTljODI3ZTE1MzZlZDcyMjBkZmY3Zjc=
   data.tar.gz: !binary |-
-    Zjc5NzE1YmVkNTU4NTNkNDNjZDEwODk1ZGQyNWQxOGZjNThhZTY4NjcxNzY5
-    YTRjMjM5OTllODhiYmRkMTlmMjI4NWMwY2Q1MjM3YmFjMzMwYTdiODBjMTQz
-    NTM3YmY3M2U2M2YzOTY2ZTU3ZjE4MDRmMjE4Y2M5MWEwYTNkYjc=
+    YjAxMGJkMDdkZmYxOWZlMTk3NzNiMmFmNTg1MDNlZTljZmNkZWVkNTAwMDgy
+    NDljZGFkYTA5MTY5MWUzYjFiNWUwM2UwMDVkZjM1NTZmY2FkMjhhZmM2MTlk
+    YzA3NTIxMmIyMWVjYjVmYjU1MDRmZDFlNjQ1Mzk5MmQ5OTI1MTY=

data/etc/app.d/base.rb

@@ -1,7 +1,13 @@
 #{{{ MODULES AND HELPERS
+register Sinatra::RbbtRESTWorkflow
+if Rbbt.etc.workflows.find.exists?
+ Rbbt.etc.workflows.find.read.split("\n").each do |workflow|
+  Workflow.require_workflow workflow
+  add_workflow Kernel.const_get(workflow), true
+ end
+end
 register Sinatra::RbbtRESTMain
 register Sinatra::RbbtRESTEntity
-register Sinatra::RbbtRESTWorkflow
 register Sinatra::RbbtRESTFileServer # Remove to prevent serving files
 register Sinatra::RbbtRESTKnowledgeBase
 helpers Sinatra::RbbtMiscHelpers
@@ -24,11 +30,5 @@ set :favourite_maps_dir  , local_var.sinatra.favourite_maps
 
 #{{{ WORKFLOWS
 
-if Rbbt.etc.workflows.find.exists?
- Rbbt.etc.workflows.find.read.split("\n").each do |workflow|
-  Workflow.require_workflow workflow
-  add_workflow Kernel.const_get(workflow), true
- end
-end
 
 

data/etc/app.d/entities.rb

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

data/lib/rbbt/resource.rb

@@ -92,7 +92,7 @@ module Resource
       rake_dir, content = rake_for(path)
       rake_dir = Path.setup(rake_dir.dup, self.pkgdir, self)
     else
-      raise "Resource #{ path } does not seem to be claimed: #{ self }"
+      raise "Resource is missing and does not seem to be claimed: #{ self } -- #{ path } "
     end
 
     final_path = path.respond_to?(:find) ? (force ? path.find(:user) : path.find) : path

data/lib/rbbt/resource/util.rb

@@ -46,14 +46,6 @@ module Resource
         end
       end
 
-      begin
-        if not File.exists? File.join(opt_dir,'.post_install')
-          #Open.write(File.join(opt_dir,'.post_install'),"#!/bin/bash\n")
-        end
-      rescue Exception
-        Log.warn("Could not create default .post_install in #{ software_dir }")
-      end
-
       Open.read(File.join opt_dir, '.ld-paths').split(/\n/).each do |line|
         Misc.env_add('LD_LIBRARY_PATH',line.chomp)
         Misc.env_add('LD_RUN_PATH',line.chomp)
@@ -75,13 +67,18 @@ module Resource
         Misc.env_add('CLASSPATH', "#{File.expand_path(file)}")
       end
 
-      begin
-        File.chmod 0777, File.join(opt_dir, '.post_install')
-      rescue
-        Log.warn("Could not change permisions of .post_install in #{ software_dir }")
+      if File.exists?(File.join(opt_dir, '.post_install')) and File.directory?(File.join(opt_dir, '.post_install'))
+        Dir.glob(File.join(opt_dir, '.post_install','*')).each do |file|
+          begin
+            begin
+              File.chmod file
+              CMD.cmd(file) 
+            rescue
+              Log.warn("Could not execute #{ file }")
+            end
+          end
+        end
       end
-
-      CMD.cmd(File.join(opt_dir, '.post_install')) if File.exists? File.join(opt_dir, '.post_install')
     end
   end
 

data/share/config.ru

@@ -7,6 +7,12 @@ $class_name = class_name = File.basename(FileUtils.pwd)
 
 $app = app = eval "class #{class_name} < Sinatra::Base; self end"
 
+$LOAD_PATH.unshift('lib')
+
+#{{{ POST
+Log.info{"Loading: " << Rbbt.etc['app.d/pre.rb'].find if Rbbt.etc['app.d/pre.rb'].exists?}
+load Rbbt.etc['app.d/pre.rb'].find if Rbbt.etc['app.d/pre.rb'].exists?
+
 app.class_eval do
   Log.info{"Loading: " << Rbbt.etc['app.d/base.rb'].find}
   eval Rbbt.etc['app.d/base.rb'].read, nil, 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.29
+  version: 5.5.30
 platform: ruby
 authors:
 - Miguel Vazquez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-08 00:00:00.000000000 Z
+date: 2013-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake