flor 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 62c06708e2abc35f1b43c2cf9ecaf73d5f89633433c60af3864450d91ccabf47
-  data.tar.gz: 33d4531561c77d0f43cd97a51775d1079a41885650df73583c26050846177087
+  metadata.gz: 553a980e772a1ce1d8990fc8d0744163b6615c5e9a4fe391d48ab73ac2219b2a
+  data.tar.gz: 7b922c56e568ac51cbb9cc3dbcb02c930984f94785ddd3b8ea76804ccff848de
 SHA512:
-  metadata.gz: b27557dcfbf250d1b0af9c4220a140b66e84aceb0506d947a51a1440fabf385f21b2ce125c08178bf68d5c13b87ee3d9967fdf0a46d5ef3b473991b3329139c4
-  data.tar.gz: 48fdc31b116360526afa4fe6b40e0b550c04bc451085aac55005f28add44bb30802029218f73fd898965b54f2a88acb95eb9420e73ca83d494b9fed1fdf64cf7
+  metadata.gz: fc920c9d3f305e3e31f174ebbb5d8e7f935742a9b5bcd5a75b80646d5803746315e91e4937156a01f3fcc512c477b8770e6a665a86bd61a81120f0e305027652
+  data.tar.gz: 4dd48c11b6f59d2efc4aec15060d0c7db07541b1af4037dc8402b6ef701f43b88928aaaf3306e6ae0e1237a79f5fb360c992cf58648e26edb398f7adf843970e

data/CHANGELOG.md

@@ -2,6 +2,11 @@
 # CHANGELOG.md
 
 
+## 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

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.1.0'
+  VERSION = '1.1.1'
 end
 
 require 'flor/colours'

data/lib/flor/flor.rb

@@ -329,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/)

data/lib/flor/log.rb

@@ -334,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/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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flor
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - John Mettraux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-06 00:00:00.000000000 Z
+date: 2021-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: munemo
@@ -237,7 +237,7 @@ files:
 - lib/flor/punit/do_trap.rb
 - lib/flor/punit/every.rb
 - lib/flor/punit/graft.rb
-- lib/flor/punit/m_ram.rb
+- lib/flor/punit/m_receive_and_merge.rb
 - lib/flor/punit/on_timeout.rb
 - lib/flor/punit/part.rb
 - lib/flor/punit/schedule.rb