flor 1.3.1 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4d69af5b3896b5a00daa44d3fc0c60e08d9ee893916e5aeff81869cc35b2967e
-  data.tar.gz: 6a780ea13692c00c23826462de49ad87f32e036103200d530fd247b4208fb682
+  metadata.gz: 298a6b2c9d3752b561ee8933ae00ed7a3f63682fb758dbe899097c6f7f56c00d
+  data.tar.gz: 3e2602737b9de7a452549d0f8ed34752618b1322a5508d178abe6559d549c045
 SHA512:
-  metadata.gz: a39bbe96e2d6f5d48502c3c364b3fab6411098ab569aa3fec5ec8a3ae47e0c15bec321c312b6b70c9ef9f2cf49e5feced6e672fa3dbb0edd5f2772fea7007138
-  data.tar.gz: c46e23499dffdf92acd34ac2961b91d3cbeeafdd98b40e30fdb0de8110293eecc8fc0fa1e5e0cb842a769f4e9b85ecebb032b6686b2e547d716aeca2b6862d37
+  metadata.gz: 28ae10c78676391537dde7cd7e0082338650c6aeba60fbcffa2ca5a4cb2dd2f168d7ff61019472c5f6f3d2216cabfe6e9bccb7cdae4856b513e0663f4d4ec362
+  data.tar.gz: 6379738cddfc5b74d37a30fa23260924649866b49dc670f37a0540a47a5079062288851ce07306350e227d73d0fd873f2199c3ea01b3399bce61572b8cebe497

data/CHANGELOG.md

@@ -2,6 +2,12 @@
 # CHANGELOG.md
 
 
+## flor 1.4.0  released 2021-11-10
+
+* Add :tree to Execution#to_h
+* Scaffold bin/flotojson
+
+
 ## flor 1.3.1  released 2021-04-19
 
 * Fix flor_pointers var deletion mechanism (type = ' var ')

data/lib/flor/core/node.rb

@@ -149,7 +149,7 @@ class Flor::Node
     tree = lookup_tree(Flor.parent_nid(nid))
     return tree[1][cid] if tree
 
-    #tree = lookup_tree(Flor.parent_nid(nid, true))
+    #tree = lookup_tree(Flor.parent_nid(nid, remove_subnid=true))
     #return tree[1][cid] if tree
       #
       # might become necessary at some point

data/lib/flor/parser.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Flor
 
   def self.parse(input, fname=nil, opts={})
@@ -727,3 +728,4 @@ fail "don't know how to invert #{operation.inspect}" # FIXME
     sio.string
   end
 end
+

data/lib/flor/tools/flotojson.rb

@@ -0,0 +1,64 @@
+# frozen_string_literal: true
+
+# flotojson.rb
+
+require 'flor'
+
+FLAGS_WITH_VALUE = []
+
+flags = {}
+files = []
+
+if (ARGV & [ '-h', '--help']).any?
+  puts
+  puts "bin/flotojson [flags] filename"
+  puts
+  puts "  turns a flor .flo process definition to its tree representation"
+  puts
+  puts "  flags:"
+  puts "    --pp   pretty prints instead of dumping as JSON"
+  puts
+  exit 0
+end
+
+args = ARGV.dup
+
+loop do
+
+  a = args.shift; break unless a
+
+  if a.size > 1 && a[0, 1] == '-'
+    flags[a] = FLAGS_WITH_VALUE.include?(a) ? a.shift : true
+  else
+    files << a
+  end
+end
+
+#STDERR.puts flags.inspect
+#STDERR.puts files.inspect
+
+#    t =
+#      tree.is_a?(String) ?
+#      Flor.parse(tree, opts[:fname] || opts[:path], opts) :
+#      tree
+#
+#    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
+
+fname = files.first
+content = File.read(fname)
+tree = Flor.parse(content, fname, {})
+
+if flags['--pp']
+  pp tree
+else
+  puts JSON.dump(tree)
+end
+

data/lib/flor/unit/models/execution.rb

@@ -20,7 +20,29 @@ module Flor
     #end
 
     def nodes; data['nodes']; end
+
     def zero_node; nodes['0']; end
+
+    # Returns the nids, the lower in the tree, the earlier in the returned
+    # array.
+    #
+    def sorted_nids
+
+      nodes.keys
+        .inject([]) { |a, nid|
+          l = nid.split('_').length
+          (a[l] ||= []) << nid
+          a }
+        .compact
+        .collect(&:sort)
+        .flatten(1)
+    end
+
+    def lowest_node
+
+      nodes[sorted_nids.first]
+    end
+
     def closing_messages; data['closing_messages']; end
 
     def execution(reload=false); self; end
@@ -47,14 +69,16 @@ module Flor
 
     def full_tree
 
-      tree = nodes['0']['tree']
+      nids = sorted_nids
+      nid0 = nids.shift
 
-      #nodes.each do |nid, n|
-      #  next if nid == '0'
-      #  t = n['tree']; next unless t
-      #end
-        #
-        # FIXME
+      return nil unless nid0
+
+      tree = Flor.dup(nodes[nid0]['tree'])
+
+      nids.each { |nid|
+        next unless nid.split('_', 2).first == nid0
+        replace_sub_tree(tree, nid, nodes[nid]['tree']) }
 
       tree
     end
@@ -80,21 +104,22 @@ module Flor
       cs = m[:counts] = {}
       is = m[:nids] = { tasks: [], failures: [] }
 
-      fs = 0
-      ts = 0
+      cs[:failures] = 0
+      cs[:tasks] = 0
+      cs[:nodes] = nodes.count
+        #
       nodes.each do |k, v|
         if v['task']
-          ts += 1
+          cs[:tasks] += 1
           is[:tasks] << k
         end
         if v['failure']
-          fs += 1
+          cs[:failures] += 1
           is[:failures] << k
         end
       end
-      cs[:nodes] = nodes.count
-      cs[:failures] = fs
-      cs[:tasks] = ts
+
+      h[:tree] = full_tree
 
       h
     end
@@ -149,6 +174,30 @@ module Flor
       lookup_node(query, opts)['nid']
     end
 
+    protected
+
+    def replace_sub_tree(tree, nid, t)
+
+      return unless t
+      return if nid.index('-') # stay vanilla
+
+      snid = nid.split('_').collect(&:to_i)[1..-1]
+      a = get_child_array(tree, snid)
+
+      return unless a # shouldn't we fail?
+
+      a[snid.first] = Flor.dup(t)
+    end
+
+    def get_child_array(tree, snid)
+
+      return nil if tree.nil?
+      return nil if snid.length < 1
+      return nil unless tree[1].is_a?(Array)
+      return tree[1] if snid.length == 1
+      n = snid.shift; get_child_array(tree[1][n], snid)
+    end
+
     class << self
 
       def by_status(s)

data/lib/flor.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flor
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.4.0
 platform: ruby
 authors:
 - John Mettraux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-04-19 00:00:00.000000000 Z
+date: 2021-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: munemo
@@ -249,6 +249,7 @@ files:
 - lib/flor/to_string.rb
 - lib/flor/tools/env.rb
 - lib/flor/tools/firb.rb
+- lib/flor/tools/flotojson.rb
 - lib/flor/tools/shell.rb
 - lib/flor/tools/shell_out.rb
 - lib/flor/tt.rb