flor 0.18.0 → 1.0.0

data/lib/flor/unit/loader.rb

@@ -1,7 +1,30 @@
+# frozen_string_literal: true
 
 module Flor
 
-  class Loader
+  class CoreLoader
+
+    def shutdown
+    end
+
+    # Called to interpret require: confs from hooks and friends
+    #
+    def require(conf)
+
+      re = conf['require']
+
+      return unless re
+
+      ::Kernel.require(
+        if path = conf['_path']
+          File.join(File.dirname(path), re)
+        else
+          re
+        end)
+    end
+  end
+
+  class Loader < CoreLoader
 
     # NB: tasker configuration entries start with "loa_"
 
@@ -12,10 +35,8 @@ module Flor
       @cache = {}
       @mutex = Mutex.new
 
-      @root = File.absolute_path(@unit.conf['lod_path'] || @unit.conf['root'])
-    end
-
-    def shutdown
+      @root = File.absolute_path(
+        @unit.conf['lod_path'] || @unit.conf['root'] || '.')
     end
 
     def variables(domain)
@@ -98,8 +119,8 @@ module Flor
         .select { |pa, d| Flor.sub_domain?(d, domain) }
         .sort_by { |pa, d| d.count('.') }
         .collect { |pa, d|
-          eval(pa, {}).each_with_index { |h, i|
-            h['_path'] = pa + ":#{i}" } }
+          eval(pa, {})
+            .each_with_index { |h, i| h['_path'] = pa + ":#{i}" } }
         .flatten(1)
     end
 
@@ -109,8 +130,82 @@ module Flor
         .collect { |h| Flor::Hook.new(@unit, exid, h) }
     end
 
+    def domains(start=nil)
+
+      start ||= ''
+
+      Dir[File.join(@root, '**/*.{json,flo,flor,rb}')]
+        .collect { |pa| pa[@root.length..-1] }
+        .sort
+        .collect { |pa|
+          pa = pa[4..-1] if pa.match(/^\/usr\//)
+          case pa
+          when /\.flor?$/ then extract_flow_domain(pa)
+          when /\/lib\/hooks\// then extract_hook_domain(pa)
+          when /\/lib\/taskers\// then extract_tasker_domain(pa)
+          when /\/etc\/variables\// then extract_variable_domain(pa)
+          else nil
+          end }
+        .compact
+        .select { |pa| pa.length > 1 }
+        .collect { |pa|
+          pa = pa[1..-1] if pa[0, 1] == '/'
+          pa = pa[0..-2] if pa.match(/\/$/)
+          pa.gsub('/', '.') }
+        .sort
+        .uniq
+        .select { |dm| Flor.sub_domain?(start, dm) }
+    end
+
+    def definitions(start=nil)
+
+      start ||= ''
+
+      Dir[File.join(@root, '**/*.{flo,flor}')]
+        .collect { |pa| pa[@root.length..-1] }
+        .collect { |pa| pa.gsub(/\A\/usr\//, '/') }
+        .collect { |pa| pa.gsub(/\/lib\/(sub)?flows\//, '/') }
+        .collect { |pa| pa.gsub(/\.flor?\z/, '') }
+        .collect { |pa| pa.gsub(/\//, '.') }
+        .collect { |pa| pa.gsub(/\A\./, '') }
+        .sort
+        .select { |pa| Flor.sub_domain?(start, pa) }
+    end
+
     protected
 
+    def extract_flow_domain(pa)
+#o = pa
+      pa
+        .gsub(/\/lib\/(sub)?flows\//, '/')
+        .split('/')[0..-2].join('/')
+#.tap { |x| p 'flow:' + o + ':' + x }
+    end
+    def extract_hook_domain(pa)
+#o = pa
+      pa
+        .gsub(/\/lib\/hooks\//, '/')
+        .gsub(/\/(dot|hooks)\.(json|rb)$/, '/')
+        .gsub(/\.(json|rb)$/, '')
+#.tap { |x| p 'hook:' + o + ':' + x }
+    end
+    def extract_tasker_domain(pa)
+#o = pa
+      pa
+        .gsub(/\/lib\/taskers\//, '/')
+        .gsub(/\/[^\/]+\/(dot|flor|tasker)\.(json|rb)$/, '/')
+        .gsub(/\.(json|rb)$/, '')
+#.tap { |x| p 'tasker: ' + o + ': ' + x }
+    end
+    def extract_variable_domain(pa)
+#o = pa
+      pa
+        .gsub(/\/etc\/variables\//, '/')
+        .gsub(/\/(dot|flor)\.(json|rb)$/, '/')
+        .gsub(/\.(json|rb)$/, '')
+#.tap { |x| p 'variable: ' + o + ': ' + x }
+    end
+
     def split_dn(domain, name)
 
       if name

data/lib/flor/unit/logger.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 
 module Flor
 
@@ -62,17 +63,24 @@ module Flor
       n = Time.now.utc
       stp = Flor.tstamp(n)
 
+      dbi =
+        case @unit.storage.db.to_s
+        when /SQLite/ then @unit.storage.db.uri
+        else ''
+        end
+      dbi = ' ' + dbi if dbi.length > 0
+
       txt = elts.collect(&:to_s).join(' ')
       err = elts.find { |e| e.is_a?(Exception) }
 
-      line = "#{stp} #{@uni} #{lvl} #{txt}"
+      head = "#{stp} #{@uni}#{dbi} #{lvl} "
 
       if err
-        dig = lvl[0, 1] + Digest::MD5.hexdigest(line)[0, 4]
-        @out.puts("#{stp} #{@uni} #{lvl} #{dig} #{txt}")
+        dig = lvl[0, 1] + Digest::MD5.hexdigest(head + txt)[0, 4]
+        @out.puts(head + dig + ' ' + txt)
         err.backtrace.each { |lin| @out.puts("  #{dig} #{@uni} #{lin}") }
       else
-        @out.puts(line)
+        @out.puts(head + txt)
       end
     end
 
@@ -113,7 +121,18 @@ module Flor
         #
       msg = summarize_blob(msg)
 
-      @out.puts "#{_c.blg}sto#{_c.rs} t#{Thread.current.object_id} #{level.upcase} #{msg}"
+      msg = "#{_c.dg}#{msg}"
+      msg = msg.gsub(/\b(INSERT|UPDATE)\b/) { |m| "#{_c.rs}#{m}#{_c.dg}" }
+
+      tim = Time.now.utc.strftime('%T.%L') # HH:MM:SS.123
+      dbi = @unit.storage.db.object_id.to_s(16)
+      tid = Thread.current.object_id.to_s(16)
+      lvl = level.upcase
+
+      @out.puts(
+        "#{_c.blg}sto#{_c.rs} " +
+        "#{tim} #{_c.dg}db#{dbi} th#{tid} " +
+        "#{_c.rs}#{lvl}#{_c.rs} #{msg}#{_c.rs}")
     end
 
     def size_to_s(s)

data/lib/flor/unit/models.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 
 module Flor
 
@@ -92,6 +93,12 @@ module Flor
       end
     end
 
+    alias to_dump_h to_h
+      #
+      # Downsteam, #to_h answers are more complete, more standalone
+      # whereas, #to_dump_h answers are more compact (see florist).
+      # For now, they're just the same, it specializes downstream.
+
     class << self
 
       def from_h(h)
@@ -135,7 +142,7 @@ module Flor
 
       @models[key] ||=
         parent_module.const_set(
-          "#{c}#{@db.object_id.to_s.gsub('-', 'M')}",
+          "#{c}#{self.object_id.to_s.gsub('-', 'M')}",
           Class.new(parent_module.const_get(c)) do
             self.dataset = s.db["#{table_prefix}#{key}".to_sym]
             self.unit = s.unit

data/lib/flor/unit/models/execution.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 
 module Flor
 
@@ -98,6 +99,56 @@ module Flor
       h
     end
 
+    def lookup_nodes(query, opts={})
+
+      @node_index ||= nodes
+        .sort_by { |k, _| k }
+        .inject({}) { |h, (k, v)|
+          #
+          # nid => [ node ]
+          #
+          h[k] = [ v ]
+          #
+          # code => [ node0, node1, ... ]
+          #
+          t =
+            (lookup_tree(v['parent'])[1][Flor.child_id(v['nid'])] rescue nil) ||
+            lookup_tree(v['nid'])
+          s = Flor.tree_to_flor(t, chop: true)
+          (h[s] ||= []) << v
+          #
+          # tag => [ node0, node1, ... ]
+          #
+          ts = v['tags']
+          ts.each { |t| (h[t] ||= []) << v } if ts
+          #
+          h }
+
+      @node_index
+        .select { |k, v|
+          case query
+          when Regexp then k.match(query)
+          else k == query
+          end }
+        .values
+        .flatten(1)
+    end
+
+    def lookup_node(query, opts={})
+
+      lookup_nodes(query, opts).first
+    end
+
+    def lookup_nids(query, opts={})
+
+      lookup_nodes(query, opts).collect { |n| n['nid'] }
+    end
+
+    def lookup_nid(query, opts={})
+
+      lookup_node(query, opts)['nid']
+    end
+
     class << self
 
       def by_status(s)

data/lib/flor/unit/models/message.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 
 module Flor
 

data/lib/flor/unit/models/pointer.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 
 module Flor
 

data/lib/flor/unit/models/timer.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 
 module Flor
 

data/lib/flor/unit/models/trace.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 
 module Flor
 

data/lib/flor/unit/models/trap.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 
 module Flor
 
@@ -124,7 +125,7 @@ module Flor
         'exid' => self.exid,
         'nid' => self.nid,
         'type' => 'trap',
-        'trap' => to_hash,
+        'trap' => to_trap_h,
         'trap_id' => self.id,
         'message' => msg,
         'sm' => message['m'] }
@@ -133,7 +134,7 @@ module Flor
             #'dbg' => xx }
     end
 
-    def to_hash
+    def to_trap_h
 
       values
         .inject({}) { |h, (k, v)| h[k.to_s] = v if k != :content; h }

data/lib/flor/unit/scheduler.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 
 module Flor
 
@@ -9,6 +10,7 @@ module Flor
     attr_reader :logger
 
     attr_reader :thread_status
+    attr_reader :last_queued_message_id
 
     attr_reader :archive
 
@@ -222,7 +224,8 @@ module Flor
 
     def queue(message, opts={})
 
-      @storage.put_message(message)
+      @last_queued_message_id =
+        @storage.put_message(message)
 
       if opts[:wait]
         wait(message['exid'], opts)
@@ -356,9 +359,13 @@ module Flor
       ) unless nid
 
       fail ArgumentError.new(
-        "cannot add iteration to missing node #{nid.inspect}"
+        "cannot add iteration to node #{nid.inspect} not present in tree"
       ) unless exe.lookup_tree(nid)
 
+      fail ArgumentError.new(
+        "cannot add iteration to node #{nid.inspect} not present in execution"
+      ) unless exe.nodes.has_key?(nid)
+
       queue(msg, opts)
     end
     alias add_iteration add_iterations
@@ -434,16 +441,14 @@ module Flor
     #
     # unit.dump() { |h| ... }  # modify the has right before it's turned to JSON
     #
+    # unit.dump(hash: true)  # returns the hash (instead of JSONing it)
+    #
     def dump(io=nil, opts=nil, &block)
 
       io, opts = nil, io if io.is_a?(Hash)
       opts ||= {}
 
-      o = lambda { |k| v = opts[k] || opts["#{k}s".to_sym]; v ? Array(v) : nil }
-        #
-      exis = o[:exid]
-      doms = o[:domain]
-      sdms = o[:strict_domain] || o[:sdomain]
+      exis, doms, sdms = extract_dump_and_load_filters(opts)
         #
       filter = lambda { |q|
         q = q.where(
@@ -458,25 +463,25 @@ module Flor
           domain: sdms) if sdms
         q }
 
-      exs, tms, tps, pts =
+      hash =
         storage.db.transaction {
-          [ filter[executions].collect(&:to_h),
-            filter[timers].collect(&:to_h),
-            filter[traps].collect(&:to_h),
-            filter[pointers].collect(&:to_h) ] }
 
-      o = io ? io : StringIO.new
+          h = {
+            timestamp: Flor.tstamp,
+            executions: filter[executions].collect(&:to_h),
+            timers: filter[timers].collect(&:to_h),
+            traps: filter[traps].collect(&:to_h),
+            pointers: filter[pointers].collect(&:to_h) }
+
+          block.call(h) if block
 
-      h = {
-        timestamp: Flor.tstamp,
-        executions: exs,
-        timers: tms,
-        traps: tps,
-        pointers: pts }
+          h }
 
-      block.call(h) if block
+      return hash if opts[:hash] || opts[:h]
+
+      o = io ? io : StringIO.new
 
-      JSON.dump(h, o)
+      JSON.dump(hash, o)
 
       io ? io : o.string
     end
@@ -507,12 +512,7 @@ module Flor
       mks = DUMP_KEYS - h.keys
       fail Flor::FlorError.new("missing keys #{mks.inspect}") if mks.any?
 
-      o = lambda { |k| v = opts[k] || opts["#{k}s".to_sym]; v ? Array(v) : nil }
-        #
-      exis = o[:exid]
-      doms = o[:domain]
-      sdms = o[:strict_domain] || o[:sdomain]
-        #
+      exis, doms, sdms = extract_dump_and_load_filters(opts)
       doms = doms.collect { |d| /\A#{d}(\.#{Flor::NAME_REX})*\z/ } if doms
 
       counts = { executions: 0, timers: 0, traps: 0, pointers: 0, total: 0 }
@@ -541,7 +541,7 @@ module Flor
           cla.import(cols, rows) if rows.any?
         end
 
-        block.call(h) if block
+        block.call(h, counts) if block
       end
 
       counts
@@ -549,6 +549,13 @@ module Flor
 
     protected
 
+    def extract_dump_and_load_filters(opts)
+
+      o = lambda { |k| v = opts[k] || opts["#{k}s".to_sym]; v ? Array(v) : nil }
+
+      [ o[:exid], o[:domain], o[:strict_domain] || o[:sdomain] ]
+    end
+
     def tick
 
       t0 = Time.now