flor 1.6.1 → 1.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 162cdcdf2bca8c6f41feb24643e32306cd65183d30a3a6562b8a1d51b151192e
-  data.tar.gz: 48c5664d39b6efc8783121806cfd7faa24f26714e00a1a5af9694ca9dd68d09e
+  metadata.gz: 047da4d33003f19f54b5d646fa488e59a63878f25e5a4b39006375ce9a9b22c4
+  data.tar.gz: e4d955a4984e3eb781ad10eaa657cc3b9432ef67495402f9286a98a479215685
 SHA512:
-  metadata.gz: 94825467c26f7cb714bd0744979023164655eed579d19b6662a2e7b75d8fa7dc170f21c4ff5ce6e3d12fcd53b90a86999fcd10389481edf362a0c7ab4d469481
-  data.tar.gz: 8c4f9c54c2284f6fd72ecfc1d6f9f83e7a436f446ae2eec06efd8978aaf34e609f1a8d06f3320b384a01fe64c702abaf8c20c87080830f745ee0dfb7d12f4ec5
+  metadata.gz: 7be8459b6ce6f98a957c37950682ed558526455e9f329ee952d16f148693b81bb95a98741f83302525d37f9d4f5170d451d393ebbbac686342f7c078d2e171ad
+  data.tar.gz: 81a86bafd33ee08eab5561c3693f030008ff1d65903d70f706376e0f6d917483354b1b7c4f8b20cf2d14a8257644488cd307ecd2a660100d12a9aa975cf55364

data/CHANGELOG.md

@@ -2,6 +2,19 @@
 # CHANGELOG.md
 
 
+## flor 1.6.3  released 2025-05-29
+
+* Stop Scheduler#notify swallowing errors, gh-43
+* Rework max_execution_count conf and use, gh-41
+* Introduce Flor.pp(o, opts={}) and Flor.pp_to_s
+* Set skip_transaction: true when reimporting ptrs
+
+
+## flor 1.6.2  released 2023-12-03
+
+* Prevent djan failing on negative indent for hash keys
+
+
 ## flor 1.6.1  released 2023-10-20
 
 * Use djan in Flor.msg_to_detail_s(executor, message)

data/CREDITS.md

@@ -3,6 +3,7 @@
 
 ## Contributors
 
+* pscholze - https://github.com/pscholze
 * Olle Jonsson - https://github.com/olleolleolle
 * Ryan Scott - https://github.com/Subtletree
 * Jeffrey Hicks - https://github.com/jrhicks

data/LICENSE.txt

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

@@ -6,8 +6,10 @@
 
 Flor is a "Ruby workflow engine", if that makes any sense.
 
+<!--
 * [floraison mailing list](https://groups.google.com/forum/#!forum/floraison)
 * [twitter.com/@flor_workflow](https://twitter.com/flor_workflow)
+-->
 
 
 ## use
@@ -36,7 +38,7 @@ Using flor in your Ruby project requires you to clearly separate business proces
 
 ## quickstart
 
-This quickstart sets up a flor unit tied to a SQLite database, resets the databse, binds two taskers and then launches a flow execution involving the two taskers. Finally, it prints out the resulting workitem as the execution has just terminated.
+This quickstart sets up a flor unit tied to a SQLite database, resets the database, binds two taskers and then launches a flow execution involving the two taskers. Finally, it prints out the resulting workitem as the execution has just terminated.
 
 ```ruby
 require 'flor/unit'
@@ -94,7 +96,7 @@ p r['payload']['log']
 
 This quickstart is at [doc/quickstart0/](doc/quickstart0/), it's a minimal, one-file Ruby quickstart.
 
-There is also [doc/quickstart1/](doc/quickstart1/), a more complex example, that shows a flor setup, where taskers and flows are layed out in a flor directory tree.
+There is also [doc/quickstart1/](doc/quickstart1/), a more complex example, that shows a flor setup, where taskers and flows are laid out in a flor directory tree.
 
 
 ## documentation
@@ -114,6 +116,8 @@ See [doc/](doc/).
 * [floraison/flack](https://github.com/floraison/flack) - a flor wrapping [Rack](https://github.com/rack/rack) app
 * [floraison/fugit](https://github.com/floraison/fugit) - a time library for flor and [rufus-scheduler](https://github.com/jmettraux/rufus-scheduler)
 * [floraison/raabro](https://github.com/floraison/raabro) - the PEG library flor uses for its parsing needs
+* [kiebor81/flor-language-service](https://github.com/kiebor81/flor-language-service) - a Visual Studio Code language service for the Flor language
+* [flor.vim](https://github.com/floraison/flor/blob/master/misc/flor.vim) - a Vim syntax file for flor
 
 
 ## blog posts and presentations
@@ -138,10 +142,13 @@ There are various other Ruby and Ruby on Rails projects about workflows and busi
 * [Petri Flow](https://github.com/hooopo/petri_flow) - "Petri Net Workflow Engine for Ruby" (Rails)
 * [Pallets](https://github.com/linkyndy/pallets) - "Simple and reliable workflow engine, written in Ruby"
 * [Gush](https://github.com/chaps-io/gush) - "Fast and distributed workflow runner using ActiveJob and Redis"
+* [Rukawa](https://github.com/joker1007/rukawa) - Hyper simple workflow engine powered by concurrent-ruby
+* [ChronoForge](https://github.com/radioactive-labs/chrono_forge) - durable workflow engine for Ruby on Rails that provides reliable state management, error recovery, and workflow orchestration through ActiveJob
+* [StepperMotor](https://github.com/stepper-motor/stepper_motor) - Effortless step workflows for Rails
 
 There is a [workflow engine](https://ruby.libhunt.com/categories/5786-workflow-engine) category on [Awesome Ruby](https://ruby.libhunt.com/).
 
-If you want your engine/library to be added in this list, don't hesitate to ask me on [Gitter](https://gitter.im/floraison/flor) or via a pull request.
+If you want your engine/library to be added in this list, don't hesitate to ask me on via an [issue](https://github.com/floraison/flor/issues) or a pull request.
 
 It's not limited to Ruby, but there is a wider list at [meirwah/awesome-workflow-engines](https://github.com/meirwah/awesome-workflow-engines).
 

data/flor.gemspec

@@ -40,7 +40,7 @@ A Ruby workflow engine (ruote next generation)
   #s.add_runtime_dependency 'rufus-lru', '~> 1.1'
   s.add_runtime_dependency 'munemo', '~> 1.0' # >= 1.0 and < 2
   s.add_runtime_dependency 'raabro', '~> 1.1' # >= 1.1 and < 2
-  s.add_runtime_dependency 'fugit', '~> 1.2' # >= 1.2 and < 2
+  s.add_runtime_dependency 'fugit', '~> 1.10', '>= 1.11.1' # >= 1.2 and < 2
   s.add_runtime_dependency 'dense', '~> 1.1' # >= 1.1 and < 2
 
   s.add_runtime_dependency 'sequel', '~> 5.0' # >= 5.0 and < 6

data/lib/flor/colours.rb

@@ -53,78 +53,78 @@ module Flor
   @colours = Colours.new
   @no_colours = NoColours.new
 
-  def self.no_colours
+  class << self
 
-    @no_colours
-  end
+    def no_colours
 
-  def self.colours(opts={})
+      @no_colours
+    end
 
-    #opts =
-    #  case opts
-    #  when Hash then opts
-    #  when Colours, NoColours then { color: opts }
-    #  else { out: opts }
-    #  end
+    def colours(opts={})
 
-    c = nil;
-      [ :color, :colour, :colors, :colours ].each do |k|
-        if opts.has_key?(k); c = opts[k]; break; end
-      end
+      #opts =
+      #  case opts
+      #  when Hash then opts
+      #  when Colours, NoColours then { color: opts }
+      #  else { out: opts }
+      #  end
 
-    return @colours if c == true
-    return @no_colours if c == false
+      c = nil;
+        [ :color, :colour, :colors, :colours ].each do |k|
+          if opts.has_key?(k); c = opts[k]; break; end
+        end
 
-    o = opts[:out] || $stdout
+      return @colours if c == true
+      return @no_colours if c == false
 
-    return @colours if (
-      (o.respond_to?(:log_colours?) ? o.log_colours? : o.tty?) ||
-      ($0[-6..-1] == '/rspec' &&
-        (ARGV.include?('--tty') || ARGV.include?('--color'))))
+      o = opts[:out] || $stdout
 
-    @no_colours
-  end
+      return @colours if (
+        (o.respond_to?(:log_colours?) ? o.log_colours? : o.tty?) ||
+        ($0[-6..-1] == '/rspec' &&
+          (ARGV.include?('--tty') || ARGV.include?('--color'))))
 
-  def self.decolour(s)
+      @no_colours
+    end
 
-    s.gsub(/\x1b\[\d+(;\d+)?m/, '')
-  end
+    def decolour(s)
 
-  def self.no_colour_length(s)
+      s.gsub(/\x1b\[\d+(;\d+)?m/, '')
+    end
 
-    decolour(s).length
-  end
+    def no_colour_length(s)
 
-  def self.truncate_string(s, maxlen, post='...')
+      decolour(s).length
+    end
 
-    ncl = no_colour_length(s)
-    r = StringIO.new
-    l = 0
+    def truncate_string(s, maxlen, post='...')
 
-    s.scan(/(\x1b\[\d+(?:;\d+)?m|[^\x1b]+)/) do |ss, _|
-      if ss[0, 1] == ""
-        r << ss
-      else
+      ncl = no_colour_length(s)
+      r = StringIO.new
+      l = 0
+
+      s.scan(/(\x1b\[\d+(?:;\d+)?m|[^\x1b]+)/) do |ss, _|
+        if ss[0, 1] == ""
+          r << ss
+        else
 #p({ r: r.string, l: l, ssl: ss.length, maxlen: maxlen, reml: maxlen - l })
-        ss = ss[0, maxlen - l]
-        r << ss
-        l += ss.length
-        break if l >= maxlen
+          ss = ss[0, maxlen - l]
+          r << ss
+          l += ss.length
+          break if l >= maxlen
+        end
       end
-    end
 
-    return r.string if l < maxlen
-
-    if post.is_a?(String)
-      r << post
-    elsif post.is_a?(Proc)
-      r << post.call(ncl, maxlen, s)
-    end
+      return r.string if l < maxlen
 
-    r.string
-  end
+      if post.is_a?(String)
+        r << post
+      elsif post.is_a?(Proc)
+        r << post.call(ncl, maxlen, s)
+      end
 
-  class << self
+      r.string
+    end
 
     alias decolor decolour
 

data/lib/flor/conf.rb

@@ -30,8 +30,8 @@ module Flor
     #   reload/resync with db after how much time? (defaults to 60 (seconds))
     #   minimizes communication with db in idle periods
     #
-    # * :sch_max_executors
-    #   How many executor thread at most? (defaults to 7, 1 is OK in certain
+    # * :sch_max_executors or :sch_max_executor_count
+    #   How many executor threads at most? (defaults to 7, 1 is OK in certain
     #   environments)
     #
     # * :exe_max_messages
@@ -101,7 +101,7 @@ module Flor
           c.merge!(interpret_env)
         end
 
-        c.merge!(over_conf)
+        c.merge!(Flor.to_string_keyed_hash(over_conf))
       end
 
       def get_class(conf, key)

data/lib/flor/core/executor.rb

@@ -156,7 +156,7 @@ module Flor
       end
         #
         # vars: variables
-        # vdomain: variable domain (used in conjuction with the loader)
+        # vdomain: variable domain (used in conjunction with the loader)
         # cnid: closure nid
         # dbg: used to debug messages (useful @node['dbg'] when 'receive')
 

data/lib/flor/core/procedure.rb

@@ -872,7 +872,7 @@ class Flor::Procedure < Flor::Node
   end
 
   # Called by the executor, in turns call cancel and cancel_when_ methods
-  # which may be overriden.
+  # which may be overridden.
   #
   def do_cancel
 
@@ -908,7 +908,7 @@ class Flor::Procedure < Flor::Node
   end
 
   # Called by the executor, in turns call kill and kill_when_ methods
-  # which may be overriden.
+  # which may be overridden.
   #
   def do_kill
 
@@ -941,7 +941,7 @@ class Flor::Procedure < Flor::Node
     [] # no effect
   end
 
-  # The core cancel work, is overriden by some procedure implementations.
+  # The core cancel work, is overridden by some procedure implementations.
   #
   def cancel
 

data/lib/flor/core/texecutor.rb

@@ -20,12 +20,12 @@ module Flor
         @archive = nil
       end
 
-      def notify(executor, msg)
+      def notify(executor, message)
 
-        return [] if msg['consumed']
+        return [] if message['consumed']
 
-        @logger.notify(executor, msg)
-        @journal << msg
+        @logger.notify(executor, message)
+        @journal << message
 
         []
       end

data/lib/flor/core.rb

@@ -2,80 +2,93 @@
 
 module Flor
 
-  def self.generate_exid(domain, unit)
+  class << self
 
-    @exid_counter ||= 0
-    @exid_mutex ||= Mutex.new
+    def generate_exid(domain, unit)
 
-    t = Time.now.utc
+      @exid_counter ||= 0
+      @exid_mutex ||= Mutex.new
 
-    sus =
-      @exid_mutex.synchronize do
+      t = Time.now.utc
 
-        sus = t.sec * 100000000 + t.usec * 100 + @exid_counter
+      sus =
+        @exid_mutex.synchronize do
 
-        @exid_counter = @exid_counter + 1
-        @exid_counter = 0 if @exid_counter > 99
+          sus = t.sec * 100000000 + t.usec * 100 + @exid_counter
 
-        Munemo.to_s(sus)
-      end
+          @exid_counter = @exid_counter + 1
+          @exid_counter = 0 if @exid_counter > 99
 
-    t = t.strftime('%Y%m%d.%H%M')
+          Munemo.to_s(sus)
+        end
 
-    "#{domain}-#{unit}-#{t}.#{sus}"
-  end
+      t = t.strftime('%Y%m%d.%H%M')
 
-  def self.make_launch_msg(exid, tree, opts)
+      "#{domain}-#{unit}-#{t}.#{sus}"
+    end
 
-    t =
-      tree.is_a?(String) ?
-      Flor.parse(tree, opts[:fname] || opts[:path], opts) :
-      tree
+    def make_launch_msg(exid, tree, opts)
 
-    unless t
+      t =
+        tree.is_a?(String) ?
+        Flor.parse(tree, opts[:fname] || opts[:path], opts) :
+        tree
 
-      #h = opts.merge(prune: false, rewrite: false, debug: 0)
-      #Raabro.pp(Flor.parse(tree, h[:fname], h))
-        # TODO re-parse and indicate what went wrong...
+      unless t
+
+        #h = opts.merge(prune: false, rewrite: false, debug: 0)
+        #Raabro.pp(Flor.parse(tree, h[:fname], h))
+          # TODO re-parse and indicate what went wrong...
+
+        fail ArgumentError.new(
+          "flow parsing failed: " + tree.inspect[0, 35] + '...')
+      end
+
+      pl = opts[:payload] || opts[:fields] || {}
+      vs = opts[:variables] || opts[:vars] || {}
 
       fail ArgumentError.new(
-        "flow parsing failed: " + tree.inspect[0, 35] + '...')
-    end
+        "given launch payload should be a Hash, but it's a #{pl.class}"
+      ) unless pl.is_a?(Hash)
+      fail ArgumentError.new(
+        "given launch variables should come in a Hash, but it's a #{vs.class}"
+      ) unless vs.is_a?(Hash)
 
-    pl = opts[:payload] || opts[:fields] || {}
-    vs = opts[:variables] || opts[:vars] || {}
+      msg = {
+        'point' => 'execute',
+        'exid' => exid,
+        'nid' => '0',
+        'tree' => t,
+        'payload' => pl,
+        'vars' => vs }
 
-    fail ArgumentError.new(
-      "given launch payload should be a Hash, but it's a #{pl.class}"
-    ) unless pl.is_a?(Hash)
-    fail ArgumentError.new(
-      "given launch variables should come in a Hash, but it's a #{vs.class}"
-    ) unless vs.is_a?(Hash)
+      msg['vdomain'] = opts[:vdomain] \
+        if opts.has_key?(:vdomain)
 
-    msg = {
-      'point' => 'execute',
-      'exid' => exid,
-      'nid' => '0',
-      'tree' => t,
-      'payload' => pl,
-      'vars' => vs }
+      msg
+    end
 
-    msg['vdomain'] = opts[:vdomain] \
-      if opts.has_key?(:vdomain)
+    def load_procedures(dir)
 
-    msg
-  end
+      dirpath =
+        if dir.match(/\A[.\/]/)
+          File.join(dir, '*.rb')
+        else
+          File.join(File.dirname(__FILE__), dir, '*.rb')
+        end
 
-  def self.load_procedures(dir)
+      Dir[dirpath].sort.each { |path| require(path) }
+    end
 
-    dirpath =
-      if dir.match(/\A[.\/]/)
-        File.join(dir, '*.rb')
-      else
-        File.join(File.dirname(__FILE__), dir, '*.rb')
-      end
+    def pp(o, opts={})
 
-    Dir[dirpath].sort.each { |path| require(path) }
+      puts Flor.to_djan(o, { indent: 2, width: true }.merge(opts))
+    end
+
+    def pp_to_s(o, opts={})
+
+      Flor.to_djan(o, { indent: 2, width: true }.merge(opts))
+    end
   end
 end
 

data/lib/flor/djan.rb

@@ -140,7 +140,7 @@ module Flor
             #
           kml, vml =
             x.inject([ 0, 0 ]) { |(kl, vl), (k, v)|
-              [ [ kl, len(k, opts) ].max, [ vl, len(v, opts) ].max ] }
+              [ [ kl, len(k.to_s, opts) ].max, [ vl, len(v, opts) ].max ] }
           kml += 1
             #
           if i && w && i + kml + 1 + vml < w

data/lib/flor/parser.rb

@@ -697,42 +697,45 @@ fail "don't know how to invert #{operation.inspect}" # FIXME
     alias rewrite_panode rewrite_flor
   end # module Parser
 
-  def self.unescape_u(cs)
+  class << self
 
-    s = ''; 4.times { s << cs.next }
+    def unescape_u(cs)
 
-    [ s.to_i(16) ].pack('U*')
-  end
+      s = ''; 4.times { s << cs.next }
+
+      [ s.to_i(16) ].pack('U*')
+    end
 
-  def self.unescape(s)
+    def unescape(s)
 
-    sio = StringIO.new
+      sio = StringIO.new
 
-    cs = s.each_char
+      cs = s.each_char
 
-    loop do
+      loop do
 
-      c = cs.next
+        c = cs.next
 
-      break unless c
+        break unless c
 
-      if c == '\\'
-        case cn = cs.next
-        when 'u' then sio.print(unescape_u(cs))
-        when '\\', '"', '\'' then sio.print(cn)
-        when 'b' then sio.print("\b")
-        when 'f' then sio.print("\f")
-        when 'n' then sio.print("\n")
-        when 'r' then sio.print("\r")
-        when 't' then sio.print("\t")
-        else sio.print("\\#{cn}")
+        if c == '\\'
+          case cn = cs.next
+          when 'u' then sio.print(unescape_u(cs))
+          when '\\', '"', '\'' then sio.print(cn)
+          when 'b' then sio.print("\b")
+          when 'f' then sio.print("\f")
+          when 'n' then sio.print("\n")
+          when 'r' then sio.print("\r")
+          when 't' then sio.print("\t")
+          else sio.print("\\#{cn}")
+          end
+        else
+          sio.print(c)
         end
-      else
-        sio.print(c)
       end
-    end
 
-    sio.string
+      sio.string
+    end
   end
 end
 

data/lib/flor/pcore/andor.rb

@@ -11,7 +11,7 @@ class Flor::Pro::Andor < Flor::Procedure
   # and
   #   false
   #   true
-  #     # => evalutes to false
+  #     # => evaluates to false
   # ```
   #
   # ```

data/lib/flor/pcore/apply.rb

@@ -13,7 +13,7 @@ class Flor::Pro::Apply < Flor::Procedure
   #   apply sum 1 2
   # ```
   #
-  # It is usually used implicitely, as in
+  # It is usually used implicitly, as in
   # ```
   # sequence
   #   define sum a b

data/lib/flor/pcore/case.rb

@@ -88,7 +88,7 @@ class Flor::Pro::Case < Flor::Procedure
   #
   # ### defaulting to f.ret
   #
-  # When nothing is explicitely provided for consideration by "case", the
+  # When nothing is explicitly provided for consideration by "case", the
   # incoming `f.ret` is used.
   #
   # ```

data/lib/flor/pcore/define.rb

@@ -103,7 +103,7 @@ class Flor::Pro::Define < Flor::Procedure
 
     return [ tre, sig ] unless wrapped?(sig)
 
-    # There is a parenthese around the parameters, let's unwrap that...
+    # There are parentheses around the parameters, let's unwrap that...
 
     hed = Flor.dup(tre[1][0, off])
     sig = Flor.dup(sig)

data/lib/flor/pcore/fail.rb

@@ -2,7 +2,7 @@
 
 class Flor::Pro::Fail < Flor::Procedure
   #
-  # Explicitely raises an error.
+  # Explicitly raises an error.
   #
   # ```
   # fail "not enough water in the tank"

data/lib/flor/pcore/if.rb

@@ -43,6 +43,27 @@ class Flor::Pro::If < Flor::Procedure
   #
   # Currently, if an "else if" is needed, it's better to use [cond](cond.md).
   #
+  # ## improving readability with else and then
+  #
+  # "then" and "else" can be aliased to "sequence" and be used within if to
+  # make the flow definition easier to read, and especially less confusing.
+  #
+  # ```
+  # # at the top of the workflow definition
+  # # alias "then" and "else" to "sequence"
+  #
+  # set then sequence
+  # set else sequence
+  #
+  # # ...
+  #
+  # if (f.age > 3)
+  #   then
+  #     set f.designation 'child'
+  #   else
+  #     set f.designation 'baby'
+  #     order_baby_food _
+  # ```
   #
   # ## see also
   #

data/lib/flor/pcore/iterator.rb

@@ -146,12 +146,11 @@ class Flor::Macro::Iterator < Flor::Macro
 
   def rewrite_iterator_tree(procedure_name)
 
-    atts = att_children
-
     l = tree[2]
 
     th = [ procedure_name, [], l, *tree[3] ]
-    atts.each { |ac| th[1] << Flor.dup(ac) }
+
+    att_children.each { |ac| th[1] << Flor.dup(ac) }
 
     if non_att_children.any?
 

data/lib/flor/pcore/match.rb

@@ -156,7 +156,7 @@ class Flor::Pro::Match < Flor::Pro::Case
   #
   # ## "bind"
   #
-  # "bind" binds explicitely a value and allows for a sub-pattern.
+  # "bind" binds explicitly a value and allows for a sub-pattern.
   # ```
   # match [ 1 4 ]
   #   [ 1 (bind y (or 2 3)) ]; "match y:$(y)"

data/lib/flor/pcore/reverse.rb

@@ -17,7 +17,7 @@ class Flor::Pro::Reverse < Flor::Procedure
   # reverse _     # sets f.ret to [ 4, 6, 5 ]
   # ```
   #
-  # Will fail if it finds nothing reversable.
+  # Will fail if it finds nothing reversible.
   #
   # # see also
   #

data/lib/flor/pcore/set.rb

@@ -49,7 +49,7 @@ class Flor::Pro::Set < Flor::Procedure
   #   set __2 g h
   #     [ 9 10 11 12 13 ]
   #       # ==> g: 11, h: 12
-  #       # `__` is not prefixed by a var name, so it justs discard
+  #       # `__` is not prefixed by a var name, so it just discards
   #       # what it captures
   #   set i j___
   #     [ 14 15 16 17 18 19 ]

data/lib/flor/pcore/until.rb

@@ -2,7 +2,7 @@
 
 class Flor::Pro::Until < Flor::Procedure
   #
-  # Loops until or while a condiation evalutates to true.
+  # Loops until or while a condiation evaluates to true.
   #
   # ```
   # set i 0

data/lib/flor/punit/c_iterator.rb

@@ -156,6 +156,7 @@ class Flor::Pro::ConcurrentIterator < Flor::Procedure
     is.each { |i| t1[i][1][0][0] = '_reff' }
 
     @node['tree'] = [ t[0], t1, *t[2..-1] ]
+Flor.pp @node['tree']
   end
 end
 

data/lib/flor/punit/signal.rb

@@ -2,7 +2,7 @@
 
 class Flor::Pro::Signal < Flor::Procedure
   #
-  # Used in conjuction with "on".
+  # Used in conjunction with "on".
   #
   # An external (or internal) agent may send a signal to an execution and the
   # execution may have a "on" handler for it.

data/lib/flor/punit/trap.rb

@@ -139,7 +139,7 @@ class Flor::Pro::Trap < Flor::Procedure
   #
   # The range limit determines what is the range, or scope of the trap.
   # By default the trap only care about nodes below its parent. In other words,
-  # the trap binds itself to its parent and observes the messages occuring
+  # the trap binds itself to its parent and observes the messages occurring
   # in the execution in the branch of nodes whose root is the parent.
   #
   # The possible values for `range:` are:

data/lib/flor/to_string.rb

@@ -5,58 +5,61 @@ module Flor
   # used in procedure, cancel, until, cursor specs
   # when "walking" and "stepping"
 
-  def self.to_s(o=nil, k=nil)
+  class << self
 
-    return 'Flor' if o == nil && k == nil
-      # should it emerge somewhere...
+    def to_s(o=nil, k=nil)
 
-    return o.collect { |e| Flor.to_s(e, k) }.join("\n") if o.is_a?(Array)
+      return 'Flor' if o == nil && k == nil
+        # should it emerge somewhere...
 
-    if o.is_a?(Hash)
+      return o.collect { |e| Flor.to_s(e, k) }.join("\n") if o.is_a?(Array)
 
-      return send("message_#{k}_to_s", o) if k && o['point'].is_a?(String)
-      return message_to_s(o) if o['point'].is_a?(String)
+      if o.is_a?(Hash)
 
-      return send("node_#{k}_to_s", o) if k && o.has_key?('parent')
-      return node_to_s(o) if o['parent'].is_a?(String)
+        return send("message_#{k}_to_s", o) if k && o['point'].is_a?(String)
+        return message_to_s(o) if o['point'].is_a?(String)
+
+        return send("node_#{k}_to_s", o) if k && o.has_key?('parent')
+        return node_to_s(o) if o['parent'].is_a?(String)
+      end
+
+      return [ o, k ].inspect if k
+      o.inspect
     end
 
-    return [ o, k ].inspect if k
-    o.inspect
-  end
+    def message_to_s(m)
 
-  def self.message_to_s(m)
+      s = StringIO.new
+      s << '(msg ' << m['nid'] << ' ' << m['point']
+      %w[ from flavour ].each { |k|
+        s << ' ' << k << ':' << m[k].to_s if m.has_key?(k) }
+      s << ')'
 
-    s = StringIO.new
-    s << '(msg ' << m['nid'] << ' ' << m['point']
-    %w[ from flavour ].each { |k|
-      s << ' ' << k << ':' << m[k].to_s if m.has_key?(k) }
-    s << ')'
+      s.string
+    end
 
-    s.string
-  end
+    def node_status_to_s(n)
 
-  def self.node_status_to_s(n)
+      stas = n['status'].reverse
 
-    stas = n['status'].reverse
+      s = StringIO.new
+      while sta = stas.shift
+        s << '(status ' << (sta['status'] || 'o') # o for open
+        s << ' pt:' << sta['point']
+        if f = sta['flavour']; s << ' fla:' << f; end
+        if f = sta['from']; s << ' fro:' << f; end
+        if m = sta['m']; s << ' m:' << m; end
+        s << ')'
+        s << "\n" if stas.any?
+      end
 
-    s = StringIO.new
-    while sta = stas.shift
-      s << '(status ' << (sta['status'] || 'o') # o for open
-      s << ' pt:' << sta['point']
-      if f = sta['flavour']; s << ' fla:' << f; end
-      if f = sta['from']; s << ' fro:' << f; end
-      if m = sta['m']; s << ' m:' << m; end
-      s << ')'
-      s << "\n" if stas.any?
+      s.string
     end
 
-    s.string
-  end
+    def node_to_s(n) # there is already a .node_to_s in log.rb
 
-  def self.node_to_s(n) # there is already a .node_to_s in log.rb
-
-    n.inspect
+      n.inspect
+    end
   end
 end
 

data/lib/flor/tools/env.rb

@@ -8,74 +8,77 @@ module Flor::Tools; end
 
 module Flor::Tools::Env
 
-  def self.make(path, envname=nil, opts={})
+  class << self
 
-    if envname.is_a?(Hash)
-      opts = envname
-      envname = nil
-    end
+    def make(path, envname=nil, opts={})
 
-    opts[:env] = envname || 'production'
-    opts[:sto_uri] ||= 'sqlite://tmp/dev.db'
-    opts[:gitkeep] = true unless opts.has_key?(:gitkeep)
+      if envname.is_a?(Hash)
+        opts = envname
+        envname = nil
+      end
 
-    mkdir(path, envname) if envname
+      opts[:env] = envname || 'production'
+      opts[:sto_uri] ||= 'sqlite://tmp/dev.db'
+      opts[:gitkeep] = true unless opts.has_key?(:gitkeep)
 
-    mk_etc(path, envname, opts)
-    mk_lib(path, envname, opts)
-    mk_usr(path, envname, opts)
-    mk_var(path, envname, opts)
-  end
+      mkdir(path, envname) if envname
+
+      mk_etc(path, envname, opts)
+      mk_lib(path, envname, opts)
+      mk_usr(path, envname, opts)
+      mk_var(path, envname, opts)
+    end
 
-  # protected, somehow
+    # protected, somehow
 
-  def self.mk_etc(*ps, opts)
+    def mk_etc(*ps, opts)
 
-    mkdir(*ps, 'etc')
-    mkdir(*ps, 'etc', 'variables')
-    touch(*ps, 'etc', 'variables', '.gitkeep') if opts[:gitkeep]
+      mkdir(*ps, 'etc')
+      mkdir(*ps, 'etc', 'variables')
+      touch(*ps, 'etc', 'variables', '.gitkeep') if opts[:gitkeep]
 
-    write(*ps, 'etc', 'conf.json') do
-      "env: #{opts[:env]}\n" +
-      "sto_uri: #{opts[:sto_uri].inspect}"
+      write(*ps, 'etc', 'conf.json') do
+        "env: #{opts[:env]}\n" +
+        "sto_uri: #{opts[:sto_uri].inspect}"
+      end
     end
-  end
 
-  def self.mk_lib(*ps, opts)
+    def mk_lib(*ps, opts)
 
-    mkdir(*ps, 'lib')
-    mkdir(*ps, 'lib', 'flows')
-    touch(*ps, 'lib', 'flows', '.gitkeep') if opts[:gitkeep]
-    mkdir(*ps, 'lib', 'taskers')
-    touch(*ps, 'lib', 'taskers', '.gitkeep') if opts[:gitkeep]
-  end
+      mkdir(*ps, 'lib')
+      mkdir(*ps, 'lib', 'flows')
+      touch(*ps, 'lib', 'flows', '.gitkeep') if opts[:gitkeep]
+      mkdir(*ps, 'lib', 'taskers')
+      touch(*ps, 'lib', 'taskers', '.gitkeep') if opts[:gitkeep]
+    end
 
-  def self.mk_usr(*ps, opts)
+    def mk_usr(*ps, opts)
 
-    mkdir(*ps, 'usr')
+      mkdir(*ps, 'usr')
 
-    if opts[:acme] == false
-      touch(*ps, 'usr', '.gitkeep') if opts[:gitkeep]
-    else
-      mkdir(*ps, 'usr', 'com.acme')
-      mk_etc(*ps, 'usr', 'com.acme', opts)
-      mk_lib(*ps, 'usr', 'com.acme', opts)
+      if opts[:acme] == false
+        touch(*ps, 'usr', '.gitkeep') if opts[:gitkeep]
+      else
+        mkdir(*ps, 'usr', 'com.acme')
+        mk_etc(*ps, 'usr', 'com.acme', opts)
+        mk_lib(*ps, 'usr', 'com.acme', opts)
+      end
     end
-  end
 
-  def self.mk_var(*ps, opts)
+    def mk_var(*ps, opts)
 
-    mkdir(*ps, 'var')
-    mkdir(*ps, 'var', 'log')
-    touch(*ps, 'var', 'log', '.gitkeep') if opts[:gitkeep]
-  end
+      mkdir(*ps, 'var')
+      mkdir(*ps, 'var', 'log')
+      touch(*ps, 'var', 'log', '.gitkeep') if opts[:gitkeep]
+    end
 
-  def self.mkdir(*ps); FileUtils.mkdir(File.join(*ps.compact)); end
-  def self.touch(*ps); FileUtils.touch(File.join(*ps.compact)); end
+    def mkdir(*ps); FileUtils.mkdir(File.join(*ps.compact)); end
+    def touch(*ps); FileUtils.touch(File.join(*ps.compact)); end
 
-  def self.write(*ps, &block)
+    def write(*ps, &block)
 
-    File.open(File.join(*ps.compact), 'wb') { |f| f.write(block.call) }
+      File.open(File.join(*ps.compact), 'wb') { |f| f.write(block.call) }
+    end
   end
 end
 

data/lib/flor/tools/shell.rb

@@ -208,18 +208,21 @@ module Flor::Tools
 
     ALIASES = {}
 
-    def self.make_alias(a, b)
+    class << self
 
-      define_method("hlp_#{a}") { "alias to #{b.inspect}" }
-      alias_method "man_#{a}", "man_#{b}" rescue nil
-      alias_method "cmd_#{a}", "cmd_#{b}"
+      def make_alias(a, b)
 
-      (ALIASES[b] ||= []) << a
-    end
+        define_method("hlp_#{a}") { "alias to #{b.inspect}" }
+        alias_method "man_#{a}", "man_#{b}" rescue nil
+        alias_method "cmd_#{a}", "cmd_#{b}"
+
+        (ALIASES[b] ||= []) << a
+      end
 
-    def self.is_alias?(c)
+      def is_alias?(c)
 
-      !! ALIASES.values.find { |a| a.include?(c) }
+        !! ALIASES.values.find { |a| a.include?(c) }
+      end
     end
 
     def args(line); line.split(/\s+/); end
@@ -642,7 +645,7 @@ module Flor::Tools
         puts Flor.to_d(
           { key: @unit.conf[key] }, colour: true, indent: 1, width: true)
       elsif key
-        # alreay done
+        # already done
       else
         page(Flor.to_d(@unit.conf, colour: true, indent: 1, width: true))
       end

data/lib/flor/unit/journal.rb

@@ -1,7 +1,15 @@
 # frozen_string_literal: true
 
+
 module Flor
 
+  # As seen in docs/hooks.md
+  #
+  # ```ruby
+  # flor.hooker.add('journal', Flor::Journal)
+  # ```
+  #
+  #
   # A Journal hook, receives only "consumed" messages and
   # keeps a copy of all of them.
   #

data/lib/flor/unit/scheduler.rb

@@ -46,19 +46,22 @@ module Flor
       @spooler =
         (Flor::Conf.get_class(@conf, 'spooler') || Flor::Spooler).new(self)
 
-      @heart_rate = @conf[:sch_heart_rate] || 0.3
-      @reload_after = @conf[:sch_reload_after] || 60
+      @heart_rate = @conf['sch_heart_rate'] || 0.3
+      @reload_after = @conf['sch_reload_after'] || 60
         #
       @wake_up = true
       @next_time = nil
       @reloaded_at = Time.now
 
-      @msg_max_res_time = @conf[:sch_msg_max_res_time] || 10 * 60
+      @msg_max_res_time = @conf['sch_msg_max_res_time'] || 10 * 60
 
       @idle_count = 0
 
-      @max_executors = @conf[:sch_max_executors] || 1
-        #
+      @max_executor_count =
+        @conf['sch_max_executor_count'] ||
+        @conf['sch_max_executors'] ||
+        7
+
       @executors = []
 
       c = @conf['constant']
@@ -367,20 +370,22 @@ module Flor
       @wake_up = true
     end
 
-    def notify(executor, o)
+    def notify(executor, message)
 
       if executor
-        @hooker.notify(executor, o)
+        @hooker.notify(executor, message)
       else
-        @hooker.wlist.notify(nil, o)
+        @hooker.wlist.notify(nil, message)
       end
 
-    rescue => err
-      puts '-sch' * 19
-      puts "+ error in #{self.class}#notify"
-      p err
-      puts err.backtrace
-      puts ('-sch' * 19) + ' .'
+      # NO, let it fail...
+      #
+    #rescue => err
+    #  puts '-sch' * 19
+    #  puts "+ error in #{self.class}#notify"
+    #  p err
+    #  puts err.backtrace
+    #  puts ('-sch' * 19) + ' .'
     end
 
     def trap(node, tra)
@@ -710,18 +715,20 @@ module Flor
       @storage.trigger_timers
     end
 
+    def free_executor_count
+
+      [ 0, @max_executor_count - @executors.count ].max
+    end
+
     def trigger_executions
 
       @executors.select! { |e| e.alive? }
         # drop done executors
 
-      free_executor_count = @max_executors - @executors.size
-
-      return if free_executor_count < 1
-
-      messages = @storage.load_messages(free_executor_count)
+      @storage.load_messages(free_executor_count).each do |exid, ms|
+        # remember that load_messages load count + 2 executions...
 
-      messages.each do |exid, ms|
+        break if free_executor_count < 1
 
         next unless @storage.reserve_all_messages(ms)
 

data/lib/flor/unit/storage.rb

@@ -821,7 +821,8 @@ module Flor
       @db[:flor_pointers]
         .import(
           POINTER_COLUMNS,
-          pointers)
+          pointers,
+          skip_transaction: true)
 
       callback(:pointers, :update, exid)
     end

data/lib/flor.rb

@@ -16,7 +16,7 @@ require 'dense'
 
 module Flor
 
-  VERSION = '1.6.1'
+  VERSION = '1.6.3'
 end
 
 require 'flor/colours'

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: flor
 version: !ruby/object:Gem::Version
-  version: 1.6.1
+  version: 1.6.3
 platform: ruby
 authors:
 - John Mettraux
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-10-20 00:00:00.000000000 Z
+date: 2025-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: munemo
@@ -44,14 +43,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.10'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.11.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.10'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.11.1
 - !ruby/object:Gem::Dependency
   name: dense
   requirement: !ruby/object:Gem::Requirement
@@ -290,7 +295,6 @@ metadata:
   mailing_list_uri: https://groups.google.com/forum/#!forum/floraison
   homepage_uri: https://github.com/floraison/flor
   source_code_uri: https://github.com/floraison/flor
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -305,8 +309,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.33
-signing_key:
+rubygems_version: 3.6.2
 specification_version: 4
 summary: A Ruby workflow engine
 test_files: []