flor 0.9.1.1 → 0.9.2

data/CHANGELOG.md

@@ -2,6 +2,12 @@
 # flor CHANGELOG.md
 
 
+## flor 0.9.2  released 2017-02-03
+
+- Allow for domain taskers (retasking)
+- Pass flow path (if any) in launch message
+
+
 ## flor 0.9.1.1  released 2017-01-31
 
 - Fix Gemfile.lock not updated...

data/flor.gemspec

@@ -31,8 +31,12 @@ A Ruby workflow engine (ruote next generation)
   #s.add_runtime_dependency 'rufus-lru', '>= 1.1.0'
   s.add_runtime_dependency 'fugit', '>= 0.9.5'
 
-  s.add_development_dependency 'rspec', '3.4.0'
   s.add_development_dependency 'sequel', '~> 4'
+    #
+    # flor in transient mode doesn't need a storage,
+    # so Sequel is not a runtime dependency
+
+  s.add_development_dependency 'rspec', '3.4.0'
 
   s.require_path = 'lib'
 end

data/lib/flor.rb

@@ -34,7 +34,7 @@ require 'raabro'
 
 module Flor
 
-  VERSION = '0.9.1.1'
+  VERSION = '0.9.2'
 end
 
 require 'flor/colours'

data/lib/flor/core.rb

@@ -55,10 +55,13 @@ module Flor
       tree
 
     unless t
-      #h = opts.merge(prune: false, rewrite: false)
-      #p Flor::Lang.parse(tree, h[:fname], h)
+
+      #h = opts.merge(prune: false, rewrite: false, debug: 0)
+      #Raabro.pp(Flor::Lang.parse(tree, h[:fname], h))
         # TODO re-parse and indicate what went wrong...
-      fail ArgumentError.new('flor parse failure')
+
+      fail ArgumentError.new(
+        "flor parse failure: " + tree.inspect[0, 35] + '...')
     end
 
     pl = opts[:payload] || opts[:fields] || {}

data/lib/flor/core/node.rb

@@ -323,15 +323,16 @@ class Flor::Node
       return [ '_proc', { 'proc' => key }, -1 ]
     end
 
-    if mod != 'd' && @executor.unit.tasker.has_tasker?(@executor.exid, key)
-      return [ '_task', { 'task' => key }, -1 ]
-    end
-
     l = @executor.unit.loader
     vdomain = @node['vdomain']
       #
     if l && vdomain != false
-      return l.variables(vdomain || domain)[key]
+      v = l.variables(vdomain || domain).fetch(key) { :no }
+      return v unless v == :no
+    end
+
+    if mod != 'd' && @executor.unit.tasker.has_tasker?(@executor.exid, key)
+      return [ '_task', { 'task' => key }, -1 ]
     end
 
     nil

data/lib/flor/flor.rb

@@ -379,6 +379,15 @@ module Flor
     s.length < l ? s : s[0, l] + '...'
   end
 
+  def self.relativize_path(path, from=Dir.getwd)
+
+    path = File.absolute_path(path)
+
+    path = path[from.length + 1..-1] if path[0, from.length] == from
+
+    path
+  end
+
   #
   # functions about time
 

data/lib/flor/unit/loader.rb

@@ -55,6 +55,8 @@ module Flor
     #  # TODO work with Flor.load_procedures
     #end
 
+    # If found, returns [ source_path, path ]
+    #
     def library(domain, name=nil)
 
       domain, name = split_dn(domain, name)
@@ -67,7 +69,7 @@ module Flor
           .select { |f| path_name_matches?(domain, name, f) }
           .first
 
-      path ? File.read(path) : nil
+      path ? [ Flor.relativize_path(path), File.read(path) ] : nil
     end
 
 #    class FlowEnv
@@ -105,11 +107,11 @@ module Flor
     def tasker(domain, name=nil)
 
       domain, name = split_dn(domain, name)
+#p [ domain, name ]
 
       path = Dir[File.join(root, '**/*.json')]
         .select { |f| f.index('/lib/taskers/') }
         .sort # just to be sure
-        .sort_by(&:length)
         .select { |f| path_name_matches?(domain, name, f) }
         .last
 
@@ -159,6 +161,7 @@ module Flor
 
       f = f.sub(/\/(flo|flor|dot)\.json\z/, '.json')
 
+#p [ domain, name, f ]
       return false if File.basename(f).split('.').first != name
 
       path_matches?(domain, File.dirname(f) + '/')

data/lib/flor/unit/scheduler.rb

@@ -207,10 +207,14 @@ module Flor
 
       if flow_name
 
-        source = @loader.library(source_or_path)
+        source_path, source = @loader.library(source_or_path)
+
+        opts[:fname] = source_path
 
         # TODO variables
+        #        loaded as needed, via the loader
         # TODO payload
+        #        yes, still has to be done
       end
 
       fail ArgumentError.new(

data/lib/flor/unit/tasker.rb

@@ -49,10 +49,8 @@ module Flor
       tname = message['tasker']
 
       tconf =
-        @unit.loader.tasker(domain, 'tasker') ||
+        ( ! message['routed'] && @unit.loader.tasker(domain, 'tasker')) ||
         @unit.loader.tasker(domain, tname)
-          #
-          # FIXME tasker tasker tasker lookup loop?
 
       fail ArgumentError.new(
         "tasker #{tname.inspect} not found"
@@ -88,6 +86,8 @@ module Flor
         'nid' => message['nid'],
         'payload' => message['payload'],
         'tasker' => message['tasker'] })
+
+      nil
     end
 
     protected

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flor
 version: !ruby/object:Gem::Version
-  version: 0.9.1.1
+  version: 0.9.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-31 00:00:00.000000000 Z
+date: 2017-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: munemo
@@ -60,37 +60,37 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.9.5
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: sequel
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 3.4.0
+        version: '4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 3.4.0
+        version: '4'
 - !ruby/object:Gem::Dependency
-  name: sequel
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: '4'
+        version: 3.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: '4'
+        version: 3.4.0
 description: A Ruby workflow engine (ruote next generation)
 email:
 - jmettraux+flor@gmail.com