flor 0.9.5 → 0.10.0

data/lib/flor/unit.rb

@@ -1,26 +1,3 @@
-#--
-# Copyright (c) 2015-2017, John Mettraux, jmettraux+flor@gmail.com
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-#
-# Made in Japan.
-#++
 
 require 'sequel'
 require 'sequel/extensions/migration'

data/lib/flor/unit/executor.rb

@@ -1,27 +1,3 @@
-#--
-# Copyright (c) 2015-2017, John Mettraux, jmettraux+flor@gmail.com
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-#
-# Made in Japan.
-#++
-
 
 module Flor
 
@@ -30,15 +6,21 @@ module Flor
     attr_reader :exid
     attr_reader :consumed
 
-    def initialize(unit, exid)
+    def initialize(unit, messages)
+
+      @exid = messages.first[:exid]
 
       super(
         unit,
-        unit.storage.fetch_traps(exid),
-        unit.storage.load_execution(exid))
-
-      @exid = exid
-      @messages = unit.storage.fetch_messages(exid)
+        unit.storage.fetch_traps(@exid),
+        unit.storage.load_execution(@exid))
+
+      @messages =
+        messages.collect { |m|
+          Flor::Storage
+            .from_blob(m[:content])
+            .tap { |mm| mm['mid'] = m[:id].to_i }
+        }
       @consumed = []
 
       @alive = true
@@ -110,7 +92,11 @@ module Flor
       @unit.storage.put_execution(@execution)
       @unit.storage.put_messages(@messages)
 
-      @unit.logger.log_run_end(self, t0)
+      du = Time.now - t0
+      t0 = Flor.tstamp(t0)
+
+      @unit.logger.log_run_end(self, t0, du)
+      @unit.hooker.notify(self, make_end_message(t0, du))
 
       @consumed.clear
 
@@ -199,6 +185,24 @@ module Flor
 
       io.string
     end
+
+    def make_end_message(start, duration)
+
+      m = {}
+      m['point'] = 'end'
+      m['exid'] = @exid
+      m['start'] = start
+      m['duration'] = "#{duration}s"
+      m['consumed'] = @consumed.size
+      m['counters'] = Flor.dup(@execution['counters'])
+      m['nodes'] = @execution['nodes'].size
+      m['size'] = @execution['size']
+      m['archive_size'] = @unit.archive[@exid].size if @unit.archive
+      m['er'] = @execution['counters']['runs'] # "emitting run"
+      m['pr'] = m['er'] # "processing run"
+
+      m
+    end
   end
 end
 

data/lib/flor/unit/ganger.rb

@@ -1,26 +1,3 @@
-#--
-# Copyright (c) 2015-2017, John Mettraux, jmettraux+flor@gmail.com
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-#
-# Made in Japan.
-#++
 
 module Flor
 
@@ -28,6 +5,8 @@ module Flor
 
     # NB: tasker configuration entries start with "gan_"
 
+    #RESERVED_NAMES = %w[ tag ]
+
     attr_reader :unit
 
     def initialize(unit)
@@ -40,9 +19,12 @@ module Flor
 
     def has_tasker?(exid, name)
 
-      domain = exid.split('-', 2).first
+      #return false if RESERVED_NAMES.include?(name)
+
+      d = Flor.domain(exid)
 
-      !! @unit.loader.tasker(domain, name)
+      #!! @unit.loader.tasker(d, name)
+      !! (@unit.loader.tasker(d, 'tasker') || @unit.loader.tasker(d, name))
     end
 
     def task(executor, message)
@@ -82,16 +64,9 @@ module Flor
       fail NotImplementedError
     end
 
-    def reply(message)
-
-      @unit.queue({
-        'point' => 'return',
-        'exid' => message['exid'],
-        'nid' => message['nid'],
-        'payload' => message['payload'],
-        'tasker' => message['tasker'] })
+    def return(message)
 
-      nil
+      @unit.return(message)
     end
 
     protected

data/lib/flor/unit/hooker.rb

@@ -1,26 +1,3 @@
-#--
-# Copyright (c) 2015-2017, John Mettraux, jmettraux+flor@gmail.com
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-#
-# Made in Japan.
-#++
 
 module Flor
 
@@ -50,6 +27,11 @@ module Flor
       h ? h[2] || h[3] : nil
     end
 
+    def wlist
+
+      @wlist ||= self['wlist']
+    end
+
     def add(*args, &block)
 
       name = nil
@@ -113,7 +95,6 @@ module Flor
 
     def match?(executor, hook, opts, message)
 
-#p opts if hook.is_a?(Flor::Trap)
       opts = hook.opts if hook.respond_to?(:opts) && opts.empty?
 
       c = o(opts, :consumed, :c)
@@ -125,7 +106,6 @@ module Flor
         return false if hook.within_itself?(executor, message)
       end
 
-#p :xxx if hook.is_a?(Flor::Trap)
       ps = o(opts, :point, :p, [])
       return false if ps && ! ps.include?(message['point'])
 

data/lib/flor/unit/journal.rb

@@ -1,26 +1,3 @@
-#--
-# Copyright (c) 2015-2017, John Mettraux, jmettraux+flor@gmail.com
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-#
-# Made in Japan.
-#++
 
 module Flor
 

data/lib/flor/unit/loader.rb

@@ -1,26 +1,3 @@
-#--
-# Copyright (c) 2015-2017, John Mettraux, jmettraux+flor@gmail.com
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-#
-# Made in Japan.
-#++
 
 module Flor
 
@@ -43,10 +20,10 @@ module Flor
 
       Dir[File.join(root, '**/*.json')]
         .select { |f| f.index('/etc/variables/') }
-        .sort # just to be sure
-        .sort_by(&:length)
-        .select { |f| path_matches?(domain, f) }
-        .inject({}) { |vars, f| vars.merge!(interpret(f)) }
+        .collect { |pa| [ pa, expose_d(pa, {}) ] }
+        .select { |pa, d| is_subdomain?(domain, d) }
+        .sort_by { |pa, d| d.count('.') }
+        .inject({}) { |vars, (pa, d)| vars.merge!(interpret(pa)) }
     end
 
     #def procedures(path)
@@ -57,69 +34,58 @@ module Flor
 
     # If found, returns [ source_path, path ]
     #
-    def library(domain, name=nil)
+    def library(domain, name=nil, opts={})
 
+      domain, name, opts = [ domain, nil, name ] if name.is_a?(Hash)
       domain, name = split_dn(domain, name)
 
-      path =
-        (Dir[File.join(root, '**/*.{flo,flor}')])
-          .sort
-          .sort_by(&:length)
-          .select { |f| f.index('/lib/') }
-          .select { |f| path_name_matches?(domain, name, f) }
-          .first
+      path, d, n = (Dir[File.join(root, '**/*.{flo,flor}')])
+        .select { |f| f.index('/lib/') }
+        .collect { |pa| [ pa, *expose_dn(pa, opts) ] }
+        .select { |pa, d, n| n == name && is_subdomain?(domain, d) }
+        .sort_by { |pa, d, n| d.count('.') }
+        .last
 
       path ? [ Flor.relativize_path(path), File.read(path) ] : nil
     end
 
-#    class FlowEnv
-#
-#      attr_accessor :path, :domain, :flow_name, :source, :variables, :payload
-#      alias :flow :flow_name
-#
-#      def initialize(loader, path)
-#
-#        @path = path
-#
-#        es = path.split('.')
-#        @domain, @flow_name = [ es[0..-2].join('.'), es[-1] ]
-#
-#        @source = loader.library(@domain, @flow_name)
-#        @variables = loader.variables(@domain)
-#        #@payload = ... # TODO at some point, if necessary...
-#
-#        fail ArgumentError.new(
-#          "could not find flow at #{@path.inspect}"
-#        ) unless @source
-#      end
-#
-#      def to_a
-#
-#        [ path, domain, flow, source, variables, payload ]
-#      end
-#    end
-#
-#    def flow_environment(path)
-#
-#      FlowEnv.new(self, path)
-#    end
-
     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
-        .select { |f| path_name_matches?(domain, name, f) }
+      path, d, n = Dir[File.join(root, '**/*.json')]
+        .select { |pa| pa.index('/lib/taskers/') }
+        .collect { |pa| [ pa, *expose_dn(pa, {}) ] }
+        .select { |pa, d, n|
+          is_subdomain?(domain, [ d, n ].join('.')) ||
+          (n == name && is_subdomain?(domain, d)) }
+        .sort_by { |pa, d, n| d.count('.') }
         .last
 
-      path ? interpret(path) : nil
+      return nil unless path
+
+      conf = interpret(path)
+
+      return conf if n == name
+
+      con = conf[name]
+
+      return nil unless con
+
+      con.merge!('_path' => conf['_path'])
     end
 
     protected
 
+    # is da a subdomain of db?
+    #
+    def is_subdomain?(da, db)
+
+      da == db ||
+      db == '' ||
+      da[0, db.length + 1] == db + '.'
+    end
+
     def split_dn(domain, name)
 
       if name
@@ -130,41 +96,44 @@ module Flor
       end
     end
 
-    def root
-
-      if lp = @unit.conf['lod_path']
-        File.absolute_path(lp)
-      else
-        File.dirname(File.absolute_path(@unit.conf['_path'] + '/..'))
-      end
-    end
+    def expose_d(path, opts)
 
-    def path_matches?(domain, f)
+      pa = path[root.length..-1]
+      pa = pa[5..-1] if pa[0, 5] == '/usr/'
 
-      f = f[root.length..-1]
-      f = f[5..-1] if f[0, 5] == '/usr/'
+      libregex =
+        opts[:subflows] ?
+        /\/lib\/(subflows|flows|taskers)\// :
+        /\/lib\/(flows|taskers)\//
 
-      f = f
+      pa
         .sub(/\/etc\/variables\//, '/')
-        .sub(/\/lib\/(flows|taskers)\//, '/')
+        .sub(libregex, '/')
         .sub(/\/\z/, '')
         .sub(/\/(flo|flor|dot)\.json\z/, '')
         .sub(/\.(flo|flor|json)\z/, '')
         .sub(/\A\//, '')
         .gsub(/\//, '.')
-
-#p [ :pm, domain[0, f.length], f, '=>', domain[0, f.length] == f ]
-      domain[0, f.length] == f
     end
 
-    def path_name_matches?(domain, name, f)
+    def expose_dn(path, opts)
 
-      f = f.sub(/\/(flo|flor|dot)\.json\z/, '.json')
+      pa = expose_d(path, opts)
 
-#p [ domain, name, f ]
-      return false if File.basename(f).split('.').first != name
+      if ri = pa.rindex('.')
+        [ pa[0..ri - 1], pa[ri + 1..-1] ]
+      else
+        [ '', pa ]
+      end
+    end
 
-      path_matches?(domain, File.dirname(f) + '/')
+    def root
+
+      if lp = @unit.conf['lod_path']
+        File.absolute_path(lp)
+      else
+        File.dirname(File.absolute_path(@unit.conf['_path'] + '/..'))
+      end
     end
 
     def interpret(path)