flor 1.0.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7a1f76874a9957b7c15c59baf997e0e60ff4872b9109a7cd741692735a94565c
-  data.tar.gz: 7fd1552910609023dd8bce0de0d5b5fc1ebc5ae1674fc27f0d0cb932c4bab2a7
+  metadata.gz: e89a3c4accc6ee1eca033031352f4c6d20c9b42ffbcb44aebe3cca04b59bc128
+  data.tar.gz: 30914f85dfb1f76de1877cdb60e977eff73cb1ee31d9dfa7b893160799b4c162
 SHA512:
-  metadata.gz: cbca621e72efc0bdf1df26a4554590032f7a42d76ca19b361305f519071f1f026678c55c2980e74661ebcd5ac018d9e3e892376ee69a07c91ebb1d2d809cbb75
-  data.tar.gz: b2c7cbe0a13c12f0e9b935c3d675f583d93a4f78f921982e75eb9050c84d97914c63cf9280667b5be977280cda9de27a57972f3f0d72b097710a6b3b1e45d67b
+  metadata.gz: 91cbcbbebccc7209554f49645a43876bf7f2743a77eac4a64ab3daf7f5fbfb8f2e7d566f6ffc03c932222aa2daf82e5674fd52a653bddd8b390b27cbb4714e1c
+  data.tar.gz: 174730b60ab5366c9cae335644ace73722ff52dc34477754020817c630dfabe1f6710846e437bbb936cb76fb4922f04d1dc2ffd2fde64f4c80924bd3dd7a629f

data/CHANGELOG.md

@@ -2,7 +2,38 @@
 # CHANGELOG.md
 
 
-## flor 0.19.0  not yet released
+## flor 1.2.1  released 2021-03-22
+
+* If conf sto_db_logger is false, do not attach a logger to the db connection
+
+
+## flor 1.2.0  released 2021-03-15
+
+* Add #attd, #attl, #att_texts to Flor::Pointer
+
+
+## flor 1.1.1  released 2021-03-03
+
+* Use YAML to have more compact msg_to_detail_s
+
+
+## flor 1.1.0  released 2021-01-06
+
+* Introduce Tasker #set_payload and #set_vars
+* Introduce the ModuleGanger
+* Allow for domain/dot.json taskers
+* Introduce Flor::StagedBasicTasker
+* Fix service/executor issue in Caller
+
+
+## flor 1.0.1  released 2020-11-23
+
+* Accept sto_uri strings pointing to constant like 'DB'
+
+
+## flor 1.0.0  released 2020-11-22
+
+* Lots of incremental improvements
 
 
 ## flor 0.18.0  released 2019-05-05

data/LICENSE.txt

@@ -1,5 +1,5 @@
 
-Copyright (c) 2015-2020, John Mettraux, jmettraux+flor@gmail.com
+Copyright (c) 2015-2021, 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

data/README.md

@@ -1,7 +1,7 @@
 
 # flor
 
-[![Build Status](https://secure.travis-ci.org/floraison/flor.svg)](http://travis-ci.org/floraison/flor)
+[![tests](https://github.com/floraison/flor/workflows/test/badge.svg)](https://github.com/floraison/flor/actions)
 [![Gem Version](https://badge.fury.io/rb/flor.svg)](http://badge.fury.io/rb/flor)
 
 Flor is a "Ruby workflow engine", if that makes any sense.

data/lib/flor.rb

@@ -2,6 +2,7 @@
 
 require 'pp'
 require 'json'
+require 'yaml'
 require 'logger'
 require 'thread'
 require 'digest'
@@ -15,7 +16,7 @@ require 'dense'
 
 module Flor
 
-  VERSION = '1.0.0'
+  VERSION = '1.2.1'
 end
 
 require 'flor/colours'

data/lib/flor/core/texecutor.rb

@@ -254,7 +254,7 @@ module Flor
           o.each { |ee| ee['_path'] = path if ee.is_a?(Hash) }
         end
 
-        o
+        rework_conf(o)
       end
 
       def interpret_path(path, context=nil)
@@ -299,6 +299,31 @@ module Flor
 
         ps.last == 'etc' ? File.absolute_path(File.join(dir, '..')) : dir
       end
+
+      protected
+
+      # For now, only the return procedure has to be marshalled back
+      # to the "return" string, gh-36
+      #
+      def rework_conf(o)
+
+        case o
+        when Array
+          o.collect { |e|
+            rework_conf(e) }
+        when Hash
+          o.inject({}) { |h, (k, v)|
+            h[k] =
+              if Flor.is_proc_tree?(v) && v[1]['proc'] == 'return'
+                'return'
+              else
+                rework_conf(v)
+              end
+            h }
+        else
+          o
+        end
+      end
     end
   end
 end

data/lib/flor/flor.rb

@@ -3,12 +3,11 @@
 module Flor
 
   NAME_REX = '[a-zA-Z0-9_]+'
-  UNIT_NAME_REX = /\A#{NAME_REX}\z/
-  DOMAIN_NAME_REX = /\A#{NAME_REX}(\.#{NAME_REX})*\z/
-  FLOW_NAME_REX = /\A(#{NAME_REX}(?:\.#{NAME_REX})*)\.([a-zA-Z0-9_-]+)\z/
+  UNIT_NAME_REX = /\A#{NAME_REX}\z/.freeze
+  DOMAIN_NAME_REX = /\A#{NAME_REX}(\.#{NAME_REX})*\z/.freeze
+  FLOW_NAME_REX = /\A(#{NAME_REX}(?:\.#{NAME_REX})*)\.([a-zA-Z0-9_-]+)\z/.freeze
 
-  #DOMAIN_UNIT_REX = /\A(#{NAME_REX}(?:\.#{NAME_REX})*)-(#{NAME_REX})[-\z]/
-  DOMAIN_UNIT_REX = /\A(#{NAME_REX}(?:\.#{NAME_REX})*)-(#{NAME_REX})[-$]/
+  DOMAIN_UNIT_REX = /\A(#{NAME_REX}(?:\.#{NAME_REX})*)-(#{NAME_REX})[-$]/.freeze
 
   SPLAT_REGEX = /\A(.*)__(_|\d+)\z/.freeze
 
@@ -21,7 +20,7 @@ module Flor
     signal cancel
     terminated failed ceased
     idle
-  ]
+      ].freeze
 
   class << self
 
@@ -280,13 +279,19 @@ module Flor
     #
     # functions about time
 
+    # Used by the storage in its next_time endeavours
+    #
+    def tstam
+      Time.now.utc.strftime('%FT%T')
+    end
+
     def isostamp(show_date, show_time, show_usec, time)
 
       t = (time || Time.now).utc
       s = StringIO.new
 
-      s << t.strftime('%Y-%m-%d') if show_date
-      s << t.strftime('T%H:%M:%S') if show_time
+      s << t.strftime('%F') if show_date   # YYYY-mm-dd
+      s << t.strftime('T%T') if show_time  # THH:MM:SS
       s << sprintf('.%06d', t.usec) if show_time && show_usec
       s << 'Z' if show_time
 
@@ -324,6 +329,11 @@ module Flor
       isostamp(false, true, true, t)
     end
 
+    def monow
+
+      Process.clock_gettime(Process::CLOCK_MONOTONIC)
+    end
+
 #  def to_time(ts)
 #
 #    m = ts.match(/\A(\d{4})(\d{2})(\d{2})\.(\d{2})(\d{2})(\d{2})(\d+)([uU]?)\z/)
@@ -368,11 +378,18 @@ module Flor
       sub_domain?(dom, sub)
     end
 
+    def dot_join(*elts)
+
+      elts.collect(&:to_s).select { |e| e.length > 0 }.join('.')
+    end
+
     def sub_domain?(dom, sub)
 
-      dom == '' ||
-      sub == dom ||
-      sub[0, dom.length + 1] == dom + '.'
+      d = dom.is_a?(Array) ? dot_join(*dom) : dom.to_s
+
+      d == '' ||
+      sub == d ||
+      sub[0, d.length + 1] == d + '.'
     end
     alias subdomain? sub_domain?
 

data/lib/flor/id.rb

@@ -2,6 +2,9 @@
 
 module Flor
 
+  NID_REX = /\A[0-9]+(?:_[0-9]+)*(?:-[0-9]+)?\z/.freeze
+  START_NID_REX = /\A[0-9]+(?:_[0-9]+)*(?:-[0-9]+)?/.freeze
+
   class << self
 
     #
@@ -99,7 +102,7 @@ module Flor
 
     def is_nid?(s)
 
-      !! (s.is_a?(String) && s.match(/\A[0-9]+(?:_[0-9]+)*(?:-[0-9]+)?\z/))
+      !! (s.is_a?(String) && s.match(NID_REX))
     end
 
     def split_exid(s)

data/lib/flor/log.rb

@@ -324,6 +324,7 @@ module Flor
     def msg_to_detail_s(executor, m, opts={})
 
       return if m['_detail_msg_flag']
+        #
       m['_detail_msg_flag'] = true if opts[:flag]
 
       o = StringIO.new
@@ -333,18 +334,22 @@ module Flor
       n = executor.execution['nodes'][nid]
       node = n ? Flor::Node.new(executor, n, m) : nil
 
-      o.puts "#{_c.dg}<Flor.msg_to_detail_s>#{_c.rs}#{_c.yl}"
-      o.puts Flor.to_pretty_s(m)
-      o.puts "#{_c.dg}payload:#{_c.yl}"
-      o.puts Flor.to_pretty_s(m['payload'], 0)
-      o.puts "#{_c.dg}tree:"
+      o.puts "#{_c.rs}#{_c.dg}<Flor.msg_to_detail_s>"
+
+      o.puts "#{_c.dg}message:#{_c.yl}"
+      o.puts YAML.dump(m)
+
+      o.puts "#{_c.dg}tree:#{_c.yl}"
       o.puts(tree_to_s(node.lookup_tree(nid), nid, out: o)) if node
+
       o.puts "#{_c.dg}node:#{_c.yl}"
-      o.puts(Flor.to_pretty_s(n)) if n
-      o.puts "#{_c.dg}nodes:"
+      o.puts YAML.dump(n.merge('tree' => '(above)'))
+
+      o.puts "#{_c.dg}nodes:#{_c.yl}"
       o.puts nods_to_s(executor, m, opts)
       z = executor.execution['nodes'].size
       o.puts "#{_c.yl}#{z} node#{z == 1 ? '' : 's'}."
+
       o.puts "#{_c.dg}</Flor.msg_to_detail_s>#{_c.rs}"
 
       o.string

data/lib/flor/punit/c_iterator.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'flor/punit/m_ram'
+require 'flor/punit/m_receive_and_merge'
 
 
 # Parent class for "c-for-each" and "c-map"

data/lib/flor/punit/concurrence.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'flor/punit/m_ram'
+require 'flor/punit/m_receive_and_merge'
 
 
 class Flor::Pro::Concurrence < Flor::Procedure
@@ -387,10 +387,11 @@ class Flor::Pro::Concurrence < Flor::Procedure
 
   REWRITE_AS_ATTS = %w[
     on_receive on_merge
-    child_on_error children_on_error ]
-      #
-      # heads of the child nodes that should get rewritten as attributes
-      # of the concurrence ...
+    child_on_error children_on_error
+      ].freeze
+        #
+        # heads of the child nodes that should get rewritten as attributes
+        # of the concurrence ...
 
   def pre_execute_rewrite
 

data/lib/flor/punit/{m_ram.rb → m_receive_and_merge.rb}

@@ -179,15 +179,15 @@ module Flor::Pro::ReceiveAndMerge
   # * ignore
   # * stack
 
-  STACK_REX = /\Astack(?::([-_a-zA-Z0-9]+))?\z/
+  STACK_REX = /\Astack(?::([-_a-zA-Z0-9]+))?\z/.freeze
 
-  TRANSLATORS = { STACK_REX => 'k', /\Atail\z/ => 'a' }
+  TRANSLATORS = { STACK_REX => 'k', /\Atail\z/ => 'a' }.freeze
 
   MORDERS = {
-    'f' => :first, 'l' => :last, /[tnh]/ => :north, /[bsa]/ => :south }
+    'f' => :first, 'l' => :last, /[tnh]/ => :north, /[bsa]/ => :south }.freeze
   MMERGERS = {
     'd' => :deep, /[mp]/ => :mix, 'o' => :override, 'i' => :ignore,
-    'k' => :stack }
+    'k' => :stack }.freeze
 
   def default_merger
 

data/lib/flor/tools/firb.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+require 'irb'
+
+#require 'sequel'
+require 'flor'
+require 'flor/unit'
+
+
+p [ RUBY_VERSION, RUBY_PLATFORM ]
+
+puts
+
+ENV.each do |k, v|
+  next unless k.match?(/RUBY|GEM/)
+  puts "* #{k}: #{v}"
+end
+
+ARGV.each do |arg|
+  if arg.match(/:/)
+    DB = Sequel.connect(arg)
+    p DB
+  end
+end
+
+#MODELS = [ :executions, :timers, :traces, :traps, :pointers, :messages ]
+if defined?(DB)
+  Flor::Message.dataset = DB[:flor_messages]
+end
+
+ARGV.clear
+IRB.start
+

data/lib/flor/tools/shell.rb

@@ -15,11 +15,16 @@ module Flor::Tools
     def initialize(argv=nil)
 
       env = ENV['FLOR_ENV'] || 'shell'
-      @root = "envs/#{env}"
+
+      @root = File.directory?(env) ? env : "envs/#{env}"
 
       prepare_home
 
-      @unit = Flor::Unit.new("#{@root}/etc/conf.json")
+      over_conf = {}
+        #
+      c = ENV['FLOR_STO_URI']; over_conf['sto_uri'] = c if c
+
+      @unit = Flor::Unit.new("#{@root}/etc/conf.json", over_conf)
 
       @unit.conf['unit'] = 'cli'
       #unit.hooker.add('journal', Flor::Journal)
@@ -31,7 +36,11 @@ module Flor::Tools
       @mute = false
       @paging = true
 
-      @unit.start
+      if ENV['FLOR_NO_START']
+        @unit.check_migration_version
+      else
+        @unit.start
+      end
 
       @flow_path = File.join(@root, 'home/scratch.flo')
       @ra_flow_path = File.join(@root, 'home/ra_scratch.flo')

data/lib/flor/unit.rb

@@ -22,6 +22,7 @@ require 'flor/unit/loader'
 require 'flor/unit/hloader'
 require 'flor/unit/ganger'
 require 'flor/unit/spooler'
+require 'flor/unit/gangers'
 require 'flor/unit/taskers'
 
 Flor.load_procedures('punit')

data/lib/flor/unit/caller.rb

@@ -107,9 +107,11 @@ module Flor
       #
       # call
 
-      p = message['point']
-      ms = [ "on_#{p}", :on_message, :on, p ]
-      ms = ms + [ :on_cancel, :cancel ] if p == 'detask'
+      pt = message['point']
+
+      ms = [ "call_#{pt}", "on_#{pt}", :on_message, :on, pt ]
+      ms = ms + [ :on_cancel, :cancel ] if pt == 'detask'
+
       m = ms.find { |mm| o.respond_to?(mm) }
 
       fail(
@@ -121,7 +123,7 @@ module Flor
         case o.method(m).arity
         when 1 then o.send(m, message)
         when 2 then o.send(m, conf, message)
-        when 3 then o.send(m, executor, conf, message)
+        when 3 then o.send(m, service, conf, message)
         when -1 then o.send(m, {
           service: service, configuration: conf, message: message })
         else o.send(m)

data/lib/flor/unit/caller_jruby.rb

@@ -23,7 +23,7 @@ module Flor
         @exitstatus = exitstatus
       end
 
-      def pid; @process.pid; end
+      def pid; @process.pid; rescue; nil; end
     end
 
     def spawn(conf, data)
@@ -41,7 +41,7 @@ module Flor
       henv.each { |k, v| builder.environment.put(k, v) }
 
       process = builder.start
-      pid = process.pid
+      pid = process.respond_to?(:pid) ?  process.pid : nil
 
       o = process.outputStream.to_io
       i = process.inputStream.to_io
@@ -61,10 +61,12 @@ module Flor
 
     rescue => err
 
-      Process.detach(pid) \
-        if pid
-      (Process.kill(9, pid) rescue nil) \
-        unless Flor.no?(conf['on_error_kill'])
+      if pid
+        Process.detach(pid)
+        (Process.kill(9, pid) rescue nil) unless Flor.no?(conf['on_error_kill'])
+      else
+        process.destroy rescue nil
+      end
 
       raise err if err.is_a?(SpawnError)
       raise WrappedSpawnError.new(conf, { to: to, t0: t0, pid: pid }, err)
@@ -72,7 +74,6 @@ module Flor
     ensure
 
       [ i, o, f ].each { |x| x.close rescue nil }
-
     end
 
     module CmdParser include Raabro