rbbt-util 5.14.23 → 5.14.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a0c675bc2b0d013d5b99b303140dc40e1801de71
-  data.tar.gz: 959d1aa1394cdf4c7089536061db389accffda4c
+  metadata.gz: dfd34ace1726633f7431a3929e2c035a192ee874
+  data.tar.gz: b2d9f37f496e89c256ce74b5e4b2d543f473dd1d
 SHA512:
-  metadata.gz: 1cf549ff51e45c8d71d4f5ae579b291f907c87f5b16a33c738f6873b8588cf2095246d39108ce66b3ddb7f17d3d4c97c555ddfa2391b1a2a13dfea202ab30316
-  data.tar.gz: f34c95d23afa3ec14524e2698a519086302b72b247b4a9db7ceef896e950f4c9301dddcde750fcd24e3d1aec19d30d43565fcfd3c5646623a4362d9154d395ff
+  metadata.gz: b59fcb177f41b692077052ce358c40bedcbb47fd205ab4d6aea4abe498f4eea895e823159aefbc73e28ab652099b73bf15d11a91e0169b8122887ce93caba070
+  data.tar.gz: cdad69d36ef4306145ff97f8785dd5716ff2fd19a17d48c0dd18f30f7ce7d9b456fe71bff37741d17ce0289d452adab61986e802c51e797c6de520899404312e

data/etc/app.d/base.rb

@@ -1,13 +1,5 @@
 #{{{ MODULES AND HELPERS
 
-register Sinatra::RbbtRESTWorkflow
-
-Rbbt.etc.workflows.find.read.split("\n").each do |workflow|
-  next if workflow.empty?
-  Workflow.require_workflow workflow
-  add_workflow Kernel.const_get(workflow), true
-end if Rbbt.etc.workflows.find.exists?
-
 register Sinatra::RbbtRESTMain
 register Sinatra::RbbtRESTEntity
 register Sinatra::RbbtRESTFileServer # Remove to prevent serving files
@@ -21,7 +13,6 @@ use Rack::Session::Cookie, :key => 'rack.session',
   :expire_after => 2592000,
   :secret => "#{self.to_s} secret!!"
 
-
 #{{{ DIRECTORIES
 global_var = Rbbt.var.sinatra
 local_var = Rbbt.var.sinatra.app[$class_name]
@@ -35,9 +26,3 @@ set :favourites_dir      , local_var.favourites
 set :favourite_lists_dir , local_var.favourite_lists
 set :favourite_maps_dir  , local_var.favourite_maps
 
-#set :finder, nil
-
-#{{{ WORKFLOWS
-
-
-

data/etc/app.d/foundation.rb

@@ -0,0 +1,5 @@
+require 'zurb-foundation'
+
+#RbbtRESTHelpers.add_sass_load_path "#{Gem.loaded_specs['zurb-foundation'].full_gem_path}/scss/" 
+#RbbtRESTHelpers.javascript_resources << Path.setup("#{Gem.loaded_specs['zurb-foundation'].full_gem_path}/js/foundation")
+#RbbtRESTHelpers.javascript_resources << Path.setup("#{Gem.loaded_specs['zurb-foundation'].full_gem_path}/js/vendor")

data/etc/app.d/grid_system.rb

@@ -0,0 +1 @@
+require 'zen-grids'

data/etc/app.d/init.rb

@@ -1,5 +1,3 @@
-require 'zurb-foundation'
-require 'modular-scale'
 
 require 'rbbt'
 require 'rbbt/rest/main'

data/etc/app.d/resources.rb

@@ -1,9 +1,13 @@
-EntityRESTHelpers.entity_resources.unshift Rbbt.www.views.find
-RbbtRESTHelpers.template_resources.unshift Rbbt.www.views.find
-RbbtRESTHelpers.add_sass_load_path "#{Gem.loaded_specs['compass'].full_gem_path}/frameworks/compass/stylesheets"
-RbbtRESTHelpers.add_sass_load_path "#{Gem.loaded_specs['zurb-foundation'].full_gem_path}/scss/" 
-RbbtRESTHelpers.add_sass_load_path "#{Gem.loaded_specs['modular-scale'].full_gem_path}/stylesheets/" 
-RbbtRESTHelpers.javascript_resources << Path.setup("#{Gem.loaded_specs['zurb-foundation'].full_gem_path}/js/foundation")
-RbbtRESTHelpers.javascript_resources << Path.setup("#{Gem.loaded_specs['zurb-foundation'].full_gem_path}/js/vendor")
 
+EntityRESTHelpers.entity_resources.unshift Rbbt.www.views.find if Rbbt.www.views.exists?
+RbbtRESTHelpers.template_resources.unshift Rbbt.www.views.find if Rbbt.www.views.exists?
+
+#load Rbbt.etc['app.d']['foundation.rb'].find if Rbbt.etc['app.d']['foundation.rb'].exists?
+load Rbbt.etc['app.d']['grid_system.rb'].find if Rbbt.etc['app.d']['grid_system.rb'].exists?
+
+Compass::Frameworks::ALL.each do |importer|
+  next unless importer.respond_to? :path
+  path = importer.stylesheets_directory
+  RbbtRESTHelpers.add_sass_load_path path
+end
 

data/etc/app.d/workflows.rb

@@ -0,0 +1,7 @@
+register Sinatra::RbbtRESTWorkflow
+
+Rbbt.etc.workflows.find.read.split("\n").each do |workflow|
+  next if workflow.empty?
+  Workflow.require_workflow workflow
+  add_workflow Kernel.const_get(workflow), true
+end if Rbbt.etc.workflows.find.exists?

data/lib/rbbt/knowledge_base.rb

@@ -192,7 +192,7 @@ class KnowledgeBase
           file, registered_options = registry[name]
 
           options = Misc.add_defaults options, :persist_file => persist_file, :namespace => namespace, :format => format
-          options = Misc.add_defaults options, registered_options
+          options = Misc.add_defaults options, registered_options if registered_options and registered_options.any?
 
           persist_options = Misc.pull_keys options, :persist
 

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

@@ -26,7 +26,18 @@ module Misc
   def self.sd(list)
     return nil if list.length < 3
     mean = mean(list)
-    Math.sqrt(list.compact.inject(0.0){|acc,e| d = e - mean; acc += d * d}) / (list.compact.length - 1)
+    list = list.compact
+    list_length = list.length
+
+    total_square_distance = 0
+    list.each do |value|
+      distance = value - mean
+      total_square_distance += distance * distance
+    end
+
+    variance = total_square_distance / (list_length - 1)
+    Math.sqrt(variance)
+    #Math.sqrt(list.compact.inject(0.0){|acc,e| d = e - mean; acc += d * d; acc}) / (list.compact.length - 1)
   end
 
   def self.counts(array)

data/lib/rbbt/workflow/accessor.rb

@@ -461,6 +461,12 @@ module Workflow
     [taskname].concat(rec_dependencies(taskname)).inject([]){|acc, tn| acc.concat(task_from_dep(tn).inputs) }.uniq
   end
 
+  def rec_inputs(taskname)
+    task = task_from_dep(taskname)
+    dep_inputs = task.dep_inputs rec_dependencies(taskname), self
+    task.inputs + dep_inputs.values.flatten
+  end
+
   def rec_input_defaults(taskname)
     [taskname].concat(rec_dependencies(taskname)).inject(IndiferentHash.setup({})){|acc, tn|
       new = (Array === tn ? tn.first.tasks[tn[1].to_sym] : tasks[tn.to_sym]).input_defaults

data/lib/rbbt/workflow/task.rb

@@ -70,4 +70,26 @@ module Task
       exec_in *args
     end
   end
+
+  def self.dep_inputs(deps, workflow = nil)
+    seen = []
+    task_inputs = {}
+    deps.each do |dep|
+      wf, task = (Array === dep ? [dep.first, dep.first.tasks[dep[1].to_sym]] : [workflow, workflow.tasks[dep.to_sym]])
+      maps = (Array === dep and Hash === dep.last) ? dep.last.keys : []
+      next if seen.include? [wf, task.name]
+      seen << [wf, task.name]
+      new_inputs = task.inputs - maps
+      next unless new_inputs.any?
+      task_inputs[task] = new_inputs
+    end
+    task_inputs
+  end
+
+  def dep_inputs(deps, workflow = nil)
+    task_inputs = Task.dep_inputs deps, workflow
+    task_inputs.each do |task, inputs|
+      inputs.replace (inputs - self.inputs)
+    end
+  end
 end

data/lib/rbbt/workflow/usage.rb

@@ -28,13 +28,8 @@ module Task
       puts Log.color(:magenta, "Inputs from dependencies:")
       puts
       seen = []
-      deps.each do |dep|
-        task = Array === dep ? dep.first.tasks[dep[1].to_sym] : workflow.tasks[dep.to_sym]
-        maps = (Array === dep and Hash === dep.last) ? dep.last.keys : []
-        next if seen.include? task.name
-        seen << task.name
-        new_inputs = (task.inputs - self.inputs - maps)
-        next unless new_inputs.any?
+      task_inputs = dep_inputs deps, workflow
+      task_inputs.each do |task,new_inputs|
         puts "  #{Log.color :yellow, task.name.to_s}:"
         puts
         puts SOPT.input_doc(new_inputs, task.input_types, task.input_descriptions, task.input_defaults, true)

data/share/config.ru

@@ -3,14 +3,18 @@ require 'rbbt/resource'
 $LOAD_PATH.unshift('lib') unless $LOAD_PATH.include?('lib')
 
 def load_file(file)
-  if file.exists?
+  if Array === file
+    file.each{|f| load_file f }
+  elsif file.exists?
     Log.info("Loading: " << file)
     load file
   end
 end
 
 def app_eval(app, file)
-  if file.exists?
+  if Array === file
+    file.each{|f| app_eval app, f }
+  elsif file.exists?
     app.class_eval do
       Log.info("Loading: " << file)
       eval file.read, nil, file
@@ -27,6 +31,9 @@ $app = app = eval "class #{class_name} < Sinatra::Base; self end"
 #{{{ PRE
 load_file Rbbt.etc['app.d/pre.rb'].find 
 
+#{{{ WORKFLOWS
+app_eval app, Rbbt.etc['app.d/workflows.rb'].find_all
+
 #{{{ BASE
 app_eval app, Rbbt.etc['app.d/base.rb'].find
 
@@ -37,16 +44,16 @@ load_file Rbbt.etc['app.d/resources.rb'].find
 load_file Rbbt.etc['app.d/entities.rb'].find
 
 #{{{ ROUTES
-app_eval app, Rbbt.etc['app.d/routes.rb'].find
+app_eval app, Rbbt.etc['app.d/routes.rb'].find_all
 
 #{{{ FINDER
 app_eval app, Rbbt.etc['app.d/finder.rb'].find
 
 #{{{ POST
-load_file Rbbt.etc['app.d/post.rb'].find 
+load_file Rbbt.etc['app.d/post.rb'].find_all
 
 #{{{ PRELOAD
-load_file Rbbt.etc['app.d/preload.rb'].find 
+load_file Rbbt.etc['app.d/preload.rb'].find_all
 
 #{{{ RUN
 $title = class_name

data/share/rbbt_commands/app/start

@@ -18,7 +18,7 @@ Misc.in_dir(app_dir) do
   ENV["RBBT_FINDER"] = "true" if options.include?(:finder)
   ENV["RACK_ENV"] = options[:environment] if options.include?(:environment)
 
-  config_ru_file = File.exists?('config.ru') ? 'config.ru' : Rbbt.share['config.ru'].find
+  config_ru_file = File.exists?('./config.ru') ? './config.ru' : Rbbt.share['config.ru'].find
 
   if server == 'unicorn'
     `unicorn -c #{ Rbbt.share['unicorn.rb'].find } '#{config_ru_file}' -p #{options[:port] || "2887"}`

data/share/rbbt_commands/workflow/server

@@ -17,50 +17,22 @@ options = SOPT.get "-e--environment*:-p--port*:-s--server*:-b--bind*:-e--environ
 
 workflow = ARGV.first
 
-YAML::ENGINE.yamler = 'syck' if defined? YAML::ENGINE and YAML::ENGINE.respond_to? :yamler
-
 wf = Workflow.require_workflow workflow
 
-class WorkflowRest < Sinatra::Base
-  self
-end.get '/' do
-  redirect to(File.join('/', wf.to_s))
-end
-
-ENV["RACK_ENV"] = options[:environment] if options.include?(:environment)
+$title = wf.to_s
 
-class WorkflowRest < Sinatra::Base
-   
-  #{{{ MODULES AND HELPERS
-  register Sinatra::RbbtRESTMain
-  register Sinatra::RbbtRESTWorkflow
-  register Sinatra::RbbtRESTEntity
-  register Sinatra::RbbtRESTKnowledgeBase
-  helpers Sinatra::RbbtMiscHelpers
+load Rbbt.etc['app.d/init.rb'].find
 
-  #{{{ DIRECTORIES
-  local_var = Rbbt.var.find(:user)
-  set :cache_dir           , local_var.sinatra.cache.find
-  set :file_dir            , local_var.sinatra.files.find
-  set :favourites_dir      , local_var.sinatra.favourites.find
-  set :favourite_lists_dir , local_var.sinatra.favourite_lists
+app = class WorkflowRest < Sinatra::Base; self end
 
-  #{{{ SESSIONS
-  use Rack::Session::Cookie, :key => 'rack.session',
-    :path => '/',
-    :expire_after => 2592000,
-    :secret => "Workflow #{Workflow.workflows.inspect} secret!!"
-
-  #{{{ FOUNDATION RESOURCES
-  add_sass_load_path "#{Gem.loaded_specs['compass'].full_gem_path}/frameworks/compass/stylesheets"
-  add_sass_load_path "#{Gem.loaded_specs['zurb-foundation'].full_gem_path}/scss/" 
-  add_sass_load_path "#{Gem.loaded_specs['modular-scale'].full_gem_path}/stylesheets/" 
-  RbbtRESTHelpers.javascript_resources << Path.setup("#{Gem.loaded_specs['zurb-foundation'].full_gem_path}/js/foundation")
-  RbbtRESTHelpers.javascript_resources << Path.setup("#{Gem.loaded_specs['zurb-foundation'].full_gem_path}/js/vendor")
-
-  $title = "Workflow Scout"
-  use Rack::Deflater
+app.register Sinatra::RbbtRESTWorkflow
+app.get '/' do
+  redirect to(File.join('/', wf.to_s))
 end
+app.instance_eval Rbbt.etc['app.d/base.rb'].read
+app.use Rack::Deflater
+
+load Rbbt.etc['app.d/resources.rb'].find
 
 WorkflowRest.add_workflow wf, true
 

data/test/rbbt/util/test_misc.rb

@@ -382,10 +382,6 @@ eum fugiat quo voluptas nulla pariatur?"
     assert_equal [[:a,1,"A"], [:b,2,"B"]], current
   end
 
-  def __test_sd
-    assert_equal Math.sqrt(2), Misc.sd([1,3])
-  end
-
   def test_divide
     assert_equal 2, Misc.divide(%w(1 2 3 4 5 6 7 8 9),2).length
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbbt-util
 version: !ruby/object:Gem::Version
-  version: 5.14.23
+  version: 5.14.24
 platform: ruby
 authors:
 - Miguel Vazquez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-02 00:00:00.000000000 Z
+date: 2014-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -131,8 +131,11 @@ files:
 - etc/app.d/base.rb
 - etc/app.d/entities.rb
 - etc/app.d/finder.rb
+- etc/app.d/foundation.rb
+- etc/app.d/grid_system.rb
 - etc/app.d/init.rb
 - etc/app.d/resources.rb
+- etc/app.d/workflows.rb
 - lib/rbbt-util.rb
 - lib/rbbt.rb
 - lib/rbbt/annotations.rb