flor 0.18.0 → 1.2.0

data/lib/flor/punit/c_map.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 
 require 'flor/punit/c_iterator'
 

data/lib/flor/punit/cancel.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 
 class Flor::Pro::Cancel < Flor::Procedure
   #

data/lib/flor/punit/concurrence.rb

@@ -1,5 +1,6 @@
+# frozen_string_literal: true
 
-require 'flor/punit/m_ram'
+require 'flor/punit/m_receive_and_merge'
 
 
 class Flor::Pro::Concurrence < Flor::Procedure
@@ -386,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/cron.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 
 require 'flor/punit/schedule'
 

data/lib/flor/punit/do_trap.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 
 class Flor::Pro::DoTrap < Flor::Macro
   #

data/lib/flor/punit/every.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 
 require 'flor/punit/schedule'
 

data/lib/flor/punit/graft.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 
 class Flor::Pro::Graft < Flor::Procedure
   #

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 
 # Module extracted out of "concurrence", deals with receivers and mergers.
 #
@@ -178,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/punit/on_timeout.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 
 class Flor::Pro::OnTimeout < Flor::Procedure
   #

data/lib/flor/punit/part.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 
 class Flor::Pro::Part < Flor::Procedure
 

data/lib/flor/punit/schedule.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 
 class Flor::Pro::Schedule < Flor::Procedure
   #

data/lib/flor/punit/signal.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 
 class Flor::Pro::Signal < Flor::Procedure
   #

data/lib/flor/punit/sleep.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 
 class Flor::Pro::Sleep < Flor::Procedure
   #

data/lib/flor/punit/task.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 
 class Flor::Pro::Task < Flor::Procedure
   #

data/lib/flor/punit/trace.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 
 class Flor::Pro::Trace < Flor::Procedure
 

data/lib/flor/punit/trap.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 
 # Would it be worth the pain implementing bind:?
 
@@ -168,6 +169,12 @@ class Flor::Pro::Trap < Flor::Procedure
   # (org.acme.accounting, org.acme.engineering, org.acme.whatever.x.y.z, ...)
   #
   #
+  # ## the bnid: directive
+  #
+  # "bound nid" by default is the nid of the parent expression to the "trap".
+  # With `bnid:`, one can bind a trap to another expression.
+  #
+  #
   # ## the count: limit
   #
   # ```
@@ -244,6 +251,8 @@ class Flor::Pro::Trap < Flor::Procedure
     points = points.uniq if points
     names = names.uniq if names
 
+    bnid = att('bnid', 'bind') || parent || '0'
+
     msg =
       if fun
         apply(fun, [], tree[2], anid: false).first
@@ -253,7 +262,7 @@ class Flor::Pro::Trap < Flor::Procedure
 
     tra = {}
     tra['nid'] = nid
-    tra['bnid'] = parent || '0'
+    tra['bnid'] = bnid
     tra['points'] = points
     tra['tags'] = tags
     tra['heaps'] = heaps

data/lib/flor/to_string.rb

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

data/lib/flor/tools/env.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 
 require 'fileutils'
 

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 
 require 'io/console'
 require 'terminal-table'
@@ -14,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)
@@ -30,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/tools/shell_out.rb

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

data/lib/flor/tt.rb

@@ -0,0 +1,98 @@
+# frozen_string_literal: true
+
+require 'io/console'
+require 'terminal-table'
+
+module Flor
+
+  class << self
+
+    def to_tt(o, opts={})
+
+      h = o.is_a?(Hash) ? o : nil
+
+      if h && h['status'].is_a?(Array) && h['nid'].is_a?(String)
+        node_tt(h, opts)
+      elsif h && h['point'].is_a?(String) && h['sm'].is_a?(Integer)
+        message_tt(h, opts)
+      elsif h
+        djan_tt(h, opts)
+      else
+        pp_tt(o, opts)
+      end
+    end
+
+    def tt(o, opts={})
+
+      puts(to_tt(o, opts))
+    end
+
+    protected
+
+    #def columns; `tput cols`.to_i rescue 80; end
+    def columns; IO.console.winsize[1] rescue 80; end
+
+    def make_tt_table(opts, &block)
+
+      c = Flor.colours(opts)
+
+      table = Terminal::Table.new
+      table.style.border_x = opts[:border_x] || c.dg('-')
+      table.style.border_i = opts[:border_i] || c.dg('.')
+      table.style.border_y = opts[:border_y] || c.dg('|')
+
+      block.call(table) if block
+
+      table
+    end
+
+    def message_tt(m, opts)
+
+      cols = columns.to_f
+      w = (cols * 0.49).to_i
+
+      west =
+        "** message **\n\n" +
+        Flor.to_d(m.select { |k, _| k != 'cause' }, width: w)
+      east =
+        "cause:\n\n" +
+        Flor.to_d(m['cause'], width: w)
+
+      make_tt_table(opts) { |t| t.add_row([ west, east ]) }.to_s
+    end
+
+    def node_tt(n, opts)
+
+      cols = columns.to_f
+      w = (cols * 0.49).to_i
+
+      west =
+        "** node **\n\n" +
+        Flor.to_d(n.select { |k, _| k != 'status' && k != 'tree' }, width: w)
+      east =
+        "status:\n\n" +
+        Flor.to_d(n['status'], width: w)
+
+      make_tt_table(opts) { |t| t.add_row([ west, east ]) }.to_s
+    end
+
+    def pp_tt(o, opts)
+
+      make_tt_table(opts) { |t| t.add_row([ pp_s(o, opts) ]) }.to_s
+    end
+
+    def djan_tt(o, opts)
+
+      make_tt_table(opts) { |t| t.add_row([ Flor.to_d(o) ]) }.to_s
+    end
+
+    def pp_s(o, opts)
+
+      s = StringIO.new
+      PP.pp(o, s)
+
+      s.string
+    end
+  end
+end
+

data/lib/flor/unit.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 
 require 'sequel'
 require 'sequel/extensions/migration'
@@ -5,6 +6,7 @@ require 'sequel/extensions/migration'
 require 'fugit'
 
 require 'flor'
+require 'flor/unit/dump'
 require 'flor/unit/hook'
 require 'flor/unit/hooker'
 require 'flor/unit/caller'
@@ -20,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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 
 module Flor
 
@@ -41,16 +42,44 @@ module Flor
       root == '.' ? path : File.join(root, path)
     end
 
-    def ruby_call(service, conf, message)
+    def do_require(conf, path)
+
+      fail ArgumentError.new('".." not allowed in paths') \
+        if path =~ /\.\./
+
+      begin
+        require(path)
+        return
+      rescue LoadError => le
+      end
 
       root = File.dirname(conf['_path'] || '.')
 
-      Flor.h_fetch_a(conf, 'require').each { |pa|
-        fail ArgumentError.new('".." not allowed in paths') if pa =~ /\.\./
-        require(fjoin(root, pa)) }
-      Flor.h_fetch_a(conf, 'load').each { |pa|
-        fail ArgumentError.new('".." not allowed in paths') if pa =~ /\.\./
-        load(fjoin(root, pa)) }
+      require(fjoin(root, path))
+    end
+
+    def do_load(conf, path)
+
+      fail ArgumentError.new('".." not allowed in paths') \
+        if path =~ /\.\./
+
+      path += '.rb' unless path.match(/\.rb\z/)
+
+      begin
+        load(path)
+        return
+      rescue LoadError
+      end
+
+      root = File.dirname(conf['_path'] || '.')
+
+      load(fjoin(root, path))
+    end
+
+    def ruby_call(service, conf, message)
+
+      Flor.h_fetch_a(conf, 'require').each { |pa| do_require(conf, pa) }
+      Flor.h_fetch_a(conf, 'load').each { |pa| do_load(conf, pa) }
 
       #
       # initialize
@@ -78,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(
@@ -92,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)
@@ -112,10 +143,8 @@ module Flor
       h['v'] = message['vars']
       h['tag'] = (message['tags'] || []).first
 
-      cmd = h['cmd']
-
       m = encode(conf, message)
-      out, _ = spawn(cmd, m)
+      out, _ = spawn(conf, m)
       r = decode(conf, out)
 
       to_messages(r)
@@ -143,7 +172,32 @@ module Flor
         .load(data)
     end
 
-    def spawn(cmd, data)
+    def timeout(t, &block)
+
+      #Timeout.timeout(t, &block)
+        # avoid using Ruby Timeout :-( It was 2008, is that still relevant?
+
+      t0 = Time.now
+      th = Thread.new { Thread.current[:return] = block.call }
+      while (Time.now - t0 < t) do
+        break if th.key?(:return)
+        sleep 0.014
+      end
+
+      fail TimeoutError.new('execution expired') unless th.key?(:return)
+
+      th[:return]
+    end
+
+    def spawn(conf, data)
+
+      t0 = Time.now
+
+      cmd = conf['cmd']
+
+      to = Fugit.parse(conf['timeout'] || '14s')
+      to = to.is_a?(Fugit::Duration) ? to.to_sec : 14
+      to = 0 if to < 0 # no timeout
 
       i, o = IO.pipe # _ / stdout
       f, e = IO.pipe # _ / stderr
@@ -154,12 +208,24 @@ module Flor
       w.close
       o.close
       e.close
-      _, status = Process.wait2(pid)
 
-      fail SpawnError.new(status, i.read, f.read) if status.exitstatus != 0
+      _, status = timeout(to) { Process.wait2(pid) }
+
+      fail SpawnNonZeroExitError.new(conf, { to: to, t0: t0 }, status, i, f) \
+        if status.exitstatus != 0
 
       [ i.read, status ]
 
+    rescue => err
+
+      Process.detach(pid) \
+        if pid
+      (Process.kill(9, pid) rescue nil) \
+        unless Flor.no?(conf['on_error_kill'])
+
+      raise err if err.is_a?(SpawnError)
+      raise WrappedSpawnError.new(conf, { to: to, t0: t0, pid: pid }, err)
+
     ensure
 
       [ i, o, f, e, r, w ].each { |x| x.close rescue nil }
@@ -167,17 +233,84 @@ module Flor
 
     class SpawnError < StandardError
 
+      attr_accessor :conf, :ctx
+
+      def initialize(conf, ctx, msg)
+
+        @conf = conf
+        @ctx = ctx
+
+        super(msg)
+      end
+
+      def details
+
+        ha = Flor.yes?(@conf['on_error_hide_all'])
+        hcd = Flor.yes?(@conf['on_error_hide_cmd'])
+        hcf = Flor.yes?(@conf['on_error_hide_conf'])
+
+        cd = (ha || hcd) ? '(hidden)' : @conf['cmd']
+        cf = (ha || hcf) ? '(hidden)' : @conf.dup
+        cf['cmd'] = '(hidden)' if hcd && cf.is_a?(Hash)
+
+        d = {
+          cmd: cd, conf: cf,
+          timeout: ctx[:to],
+          pid: ctx[:pid],
+          start: Flor.tstamp(ctx[:t0]),
+          duration: Fugit.parse(Time.now - ctx[:t0]).to_plain_s,
+          cause: cause }
+
+        add_details(d) \
+          if respond_to?(:add_details)
+
+        d
+      end
+    end
+
+    class TimeoutError < StandardError; end
+
+    class WrappedSpawnError < SpawnError
+
+      attr_reader :cause
+
+      def initialize(conf, ctx, err)
+
+        @cause = err
+
+        super(conf, ctx, "wrapped: #{err.class.name}: #{err.message}")
+
+        set_backtrace(err.backtrace)
+      end
+
+      def add_details(details)
+
+        details[:cause] = { kla: @cause.class.name, msg: @cause.message }
+      end
+    end
+
+    class SpawnNonZeroExitError < SpawnError
+
       attr_reader :status, :out, :err
 
-      def initialize(status, out, err)
+      def initialize(conf, ctx, status, stdout, stderr)
+
+        @status = s = status
+        @stdout = stdout.read
+        @stderr = stderr.read
 
-        @status = status
-        @out = out
-        @err = err
+        ctx[:pid] ||= status.pid
 
-        msg = err.strip.split("\n").last
+        msg = @stderr.strip.split("\n").last
 
-        super("(code: #{status.exitstatus}, pid: #{status.pid}) #{msg}")
+        super(conf, ctx, "(code: #{s.exitstatus}, pid: #{s.pid}) #{msg}")
+      end
+
+      def add_details(details)
+
+        details[:status] = status.to_s
+        details[:stdout] = @stdout
+        details[:stderr] = @stderr
       end
     end
 
@@ -189,6 +322,8 @@ module Flor
       else []
       end
     end
+
+    require 'flor/unit/caller_jruby' if RUBY_PLATFORM.match(/java/)
   end
 end