flor 1.6.0 → 1.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b28e7de7c950544c32279d8a63917911ae9d12be4154a1bcc0539c8ae343b6d6
-  data.tar.gz: 1838e6d66710983c5adce4dc19b799bed0a34bf5427ee8156c516749d740e703
+  metadata.gz: 3016e8a2b0cf63ad1ccb0aa5a057bee3c4c99b6fd8889e5f4d5c9b8d84319295
+  data.tar.gz: 9bf212da214adefa0f413277d74f13cfc8b8c3585962378d4279f45324cff2d7
 SHA512:
-  metadata.gz: f75fd74bd118784e7cf3285bff5f55d4e97c67f4666332712dc9b878c267690247468372ec3970d6cff570f90f235b31ae182279aec87f77d442d7cfa1c6536a
-  data.tar.gz: 8c4b251c6bd1cc514580aae6430dcc70489ca046940e8a9e23104260f48be0a5049ac70310bcecfa3fdb62d00a8e603c644e177ab1db080e38bea04c1c538fa7
+  metadata.gz: f17775b3282df1f8dfe02660422c14fad2c30815d80a1d242010d44715fad171543bd239371c43a3dcbdb2f9781eba2f3853a3dab0aa441e7cb0422cbdf1f06a
+  data.tar.gz: 74d3fec7573d8a1c7b80a5cd5c100516a71b2903f51635d7b22a4b644e3865528eea7e38a1c75d0ec4df1e45b88e8b404edae47f54c3697c886e06d502ae388f

data/CHANGELOG.md

@@ -2,6 +2,17 @@
 # CHANGELOG.md
 
 
+## flor 1.6.2  released 2012-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)
+* Accept --djan to flotojson.rb
+
+
 ## flor 1.6.0  released 2023-01-13
 
 * Add #fei to Message, Pointer, Timer, Trace and Trap models

data/README.md

@@ -6,7 +6,6 @@
 
 Flor is a "Ruby workflow engine", if that makes any sense.
 
-* [![Join the chat at https://gitter.im/floraison/flor](https://badges.gitter.im/floraison/flor.svg)](https://gitter.im/floraison/flor?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 * [floraison mailing list](https://groups.google.com/forum/#!forum/floraison)
 * [twitter.com/@flor_workflow](https://twitter.com/flor_workflow)
 

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/log.rb

@@ -337,13 +337,18 @@ module Flor
       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 YAML.dump(m)
+      o.puts(Flor.to_djan(m, indent: 2, width: true))
 
       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 n ? YAML.dump(n.merge('tree' => '(above)')) : 'nil'
+      #o.puts n ? YAML.dump(n.merge('tree' => '(above)')) : 'nil'
+      o.puts(
+        n ?
+        Flor.to_djan(n.merge('tree' => '(above)'), indent: 2, width: true) :
+        'nil')
 
       o.puts "#{_c.dg}nodes:#{_c.yl}"
       o.puts nods_to_s(executor, m, opts)

data/lib/flor/pcore/cursor.rb

@@ -62,6 +62,10 @@ class Flor::Pro::Cursor < Flor::Procedure
   #
   # ## cursor and start: / initial: attribute
   #
+  # Sometimes, it is necessary to enter a cursor not at its first child, but
+  # its second or third. Once such a cursor is entered and a `continue` is
+  # met it will "rewind" to the first child (not the "start" child).
+  #
   # ```
   # task 'create mandate'
   # cursor start: 'approve mandate'
@@ -71,6 +75,15 @@ class Flor::Pro::Cursor < Flor::Procedure
   # task 'activate mandate'
   # ```
   #
+  # The string passed to start:/initial: is looked up (down) in the cursor
+  # in the order: (example `cursor start: 'bravo'`)
+  #
+  # * tag (for example `push l 'b' tag: 'bravo'`)
+  # * string argument (for example `task 'toto' context: 'bravo'`)
+  # * string target (for example `task 'bravo'`)
+  # * name target (for example `bravo _`)
+  # * att target (for example `task 'toto' bravo: 'ok'`)
+  #
   # ## see also
   #
   # Break, continue, loop.

data/lib/flor/tools/flotojson.rb

@@ -22,7 +22,12 @@ if (ARGV & [ '-h', '--help']).any?
   puts "    --jp    pretty prints the JSON output"
   puts
   puts "    -y"
-  puts "    -yaml   dumps as YAML"
+  puts "    --yaml   dumps as YAML"
+  puts
+  puts "    -d"
+  puts "    --djan   dumps as djan"
+  puts
+  puts "    --json   dumps as JSON (it's the default)"
   puts
   puts "    -h"
   puts "    --help  prints this help message"
@@ -84,6 +89,10 @@ elsif flags['--jp'] || flags['--pj']
         )
 elsif flags['-y'] || flags['--yaml']
   puts YAML.dump(tree)
+elsif flags['-d'] || flags['--djan']
+  puts(Flor.to_djan(tree, indent: 2, width: true))
+elsif flags['--json']
+  puts JSON.dump(tree)
 else
   puts JSON.dump(tree)
 end

data/lib/flor.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flor
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.6.2
 platform: ruby
 authors:
 - John Mettraux
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-13 00:00:00.000000000 Z
+date: 2023-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: munemo
@@ -305,7 +305,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.2.33
 signing_key:
 specification_version: 4
 summary: A Ruby workflow engine