flor 0.9.2 → 0.9.3

data/CHANGELOG.md

@@ -2,6 +2,12 @@
 # flor CHANGELOG.md
 
 
+## flor 0.9.3  released 2017-02-07
+
+- Rename the head 'tasker' as 'ganger'
+- Allow for (tasker, conf, message) ruby taskers
+
+
 ## flor 0.9.2  released 2017-02-03
 
 - Allow for domain taskers (retasking)

data/Makefile

@@ -18,6 +18,10 @@ gemspec_validate:
 name: gemspec_validate
 	@echo "$(NAME) $(VERSION)"
 
+syncver:
+	sed -E -i '' "s/VERSION = ['0-9.]+/VERSION = '$(shell grep -E "$(NAME) ([0-9.]+)" CHANGELOG.md | head -1 | sed -E 's/[^0-9\.]//g')'/" lib/$(NAME).rb
+	bundle install
+
 build: gemspec_validate
 	gem build $(NAME).gemspec
 	mkdir -p pkg

data/fail.txt

@@ -1,7 +1,16 @@
-
-rspec ./spec/pcore/cursor_spec.rb:184 # Flor pcore cursor re-break/continue accepts "break" when breaking
-rspec ./spec/pcore/cursor_spec.rb:230 # Flor pcore cursor re-break/continue accepts "break" when continuing
-rspec ./spec/pcore/cursor_spec.rb:282 # Flor pcore cursor re-break/continue accepts "break" when continuing (nest-1)
-rspec ./spec/pcore/cursor_spec.rb:327 # Flor pcore cursor re-break/continue rejects "continue" when breaking
-rspec ./spec/pcore/cursor_spec.rb:371 # Flor pcore cursor re-break/continue rejects "move" when breaking
-
+rspec ./spec/conf_spec.rb:35 # Flor::Conf.read fails when it cannot parse
+rspec ./spec/core/on_error_spec.rb:33 # Flor core the on_error: attribute fails if the handler does not exist
+rspec ./spec/core/on_error_spec.rb:46 # Flor core the on_error: attribute triggers when a child has an error
+rspec ./spec/core/on_error_spec.rb:61 # Flor core the on_error: attribute accepts the name of a function
+rspec ./spec/core/tags_spec.rb:116 # Flor core the tags attribute fails on non-string attributes
+rspec ./spec/pcore/cmp_spec.rb:230 # Flor procedures < fails when arguments are not comparable
+rspec ./spec/pcore/fail_spec.rb:20 # Flor procedures fail raises an error
+rspec ./spec/pcore/fail_spec.rb:36 # Flor procedures fail raises an error when empty too
+rspec ./spec/pcore/fail_spec.rb:55 # Flor procedures error is an alias to "fail"
+rspec ./spec/pcore/move_spec.rb:22 # Flor pcore move fails if the target cannot be found
+rspec ./spec/pcore/procedure_spec.rb:271 # Flor::Procedure status "closed" on-error #receive does not open the node
+rspec ./spec/pcore/push_spec.rb:34 # Flor procedures push fails if it cannot push to the first child
+rspec ./spec/pcore/set_spec.rb:79 # Flor procedures set fails when it cannot set a deep field
+rspec ./spec/pcore/set_spec.rb:124 # Flor procedures set fails when it cannot set a deep variable
+rspec ./spec/pcore/set_spec.rb:169 # Flor procedures set a sets locally if there is no a in the lookup chain
+rspec ./spec/pcore/set_spec.rb:225 # Flor procedures set v.a sets locally if there is no a in the lookup chain

data/lib/flor.rb

@@ -34,7 +34,7 @@ require 'raabro'
 
 module Flor
 
-  VERSION = '0.9.2'
+  VERSION = '0.9.3'
 end
 
 require 'flor/colours'

data/lib/flor/colours.rb

@@ -25,98 +25,47 @@
 
 module Flor
 
+  COLS = Hash[*%w[
+
+    reset 0;0
+    bright 1 dim 2 underlined 4 blink 5 reverse 7 hidden 8 default 39
+    black 30 red 31 green 32 yellow 33 blue 34 magenta 35 cyan 36
+    light_gray 37 dark_gray 90 light_red 91 light_green 92
+    light_yellow 93 light_blue 94 light_magenta 95 light_cyan 96 white 97
+    bg_default 49 bg_black 40 bg_red 41 bg_green 42 bg_yellow 43 bg_blue 44
+    bg_magenta 45 bg_cyan 46 bg_light_gray 47 bg_dark_gray 100
+    bg_light_red 101 bg_light_green 102 bg_light_yellow 103
+    bg_light_blue 104 bg_light_magenta 105 bg_light_cyan 106
+    bg_white 107
+
+    brown yellow purple magenta dark_grey dark_gray light_grey light_gray
+
+    rd red bl blue bu blue ba black bk black gn green gr green dg dark_gray
+    gy light_gray lg light_gray yl yellow ma magenta rs reset br bright
+    un underlined rv reverse bn blink blg bg_light_gray bri bright
+    und underlined rev reverse
+  ]]
+
   class Colours
 
-    def reset; ""; end
-
-    def bright;      ""; end
-    def dim;         ""; end
-    def underlined;  ""; end
-    def blink;       ""; end
-    def reverse;     ""; end
-    def hidden;      ""; end
-
-    def default;        ""; end
-    def black;          ""; end
-    def red;            ""; end
-    def green;          ""; end
-    def yellow;         ""; end
-    def blue;           ""; end
-    def magenta;        ""; end
-    def cyan;           ""; end
-    def light_gray;     ""; end
-
-    def dark_gray;      ""; end
-    def light_red;      ""; end
-    def light_green;    ""; end
-    def light_yellow;   ""; end
-    def light_blue;     ""; end
-    def light_magenta;  ""; end
-    def light_cyan;     ""; end
-    def white;          ""; end
-
-    def bg_default;        ""; end
-    def bg_black;          ""; end
-    def bg_red;            ""; end
-    def bg_green;          ""; end
-    def bg_yellow;         ""; end
-    def bg_blue;           ""; end
-    def bg_magenta;        ""; end
-    def bg_cyan;           ""; end
-    def bg_light_gray;     ""; end
-
-    def bg_dark_gray;      ""; end
-    def bg_light_red;      ""; end
-    def bg_light_green;    ""; end
-    def bg_light_yellow;   ""; end
-    def bg_light_blue;     ""; end
-    def bg_light_magenta;  ""; end
-    def bg_light_cyan;     ""; end
-    def bg_white;          ""; end
-
-    alias brown yellow
-    alias purple magenta
-    alias dark_grey dark_gray
-    alias light_grey light_gray
-
-    alias rd red
-    alias bl blue
-    alias bu blue
-    alias ba black
-    alias bk black
-    alias gn green
-    alias gr green
-    alias dg dark_gray
-    alias gy light_gray
-    alias lg light_gray
-    alias yl yellow
-    alias ma magenta
-
-    alias rs reset
-    alias br bright
-    alias un underlined
-    alias rv reverse
-    alias bn blink
-
-    alias blg bg_light_gray
-    alias bri bright
-    alias und underlined
-    alias rev reverse
+    Flor::COLS.each do |k, v|
+      if v.match(/\A\d/)
+        class_eval("def #{k}; \"[#{v}m\"; end")
+      else
+        class_eval("alias #{k} #{v}")
+      end
+    end
   end
 
-  class NoColours < Colours
-
-    %w[
-      reset
-      bright dim underlined blink reverse hidden
-      default black red green yellow blue magenta cyan light_gray
-      dark_gray light_red light_green light_yellow light_blue light_magenta
-      light_cyan white
-      bg_default bg_black bg_red bg_green bg_yellow bg_blue bg_magenta bg_cyan
-      bg_light_gray
-      bg_dark_gray bg_light_red bg_light_green bg_light_yellow bg_light_blue
-      bg_light_magenta bg_light_cyan bg_white
-    ].each { |m| define_method(m) { '' } }
+  class NoColours
+
+    Flor::COLS.each do |k, v|
+      if v.match(/\A\d/)
+        class_eval("def #{k}; ''; end")
+      else
+        class_eval("alias #{k} #{v}")
+      end
+    end
   end
 
   @colours = Colours.new
@@ -129,12 +78,14 @@ module Flor
 
   def self.colours(opts={})
 
-    return @no_colours unless $stdout.tty?
+    return @colours if opts[:color] == true || opts[:colour] == true
+    return @no_colours if opts[:color] == false || opts[:colour] == false
 
-    opts[:colour] = true unless opts.has_key?(:color) || opts.has_key?(:colour)
+    o = opts[:out] || $stdout
 
-    return @colours if opts[:color] || opts[:colour]
-    @no_colours
+    (o.respond_to?(:log_colours?) ? o.log_colours? : o.tty?) ?
+      @colours :
+      @no_colours
   end
 end
 

data/lib/flor/conf.rb

@@ -61,8 +61,10 @@ module Flor
 
     def self.read_env
 
+      a =
+        (ENV['FLOR_DEBUG'] || '').split(',')
       h =
-        (ENV['FLOR_DEBUG'] || '').split(',').inject({}) { |h, kv|
+        a.inject({}) { |h, kv|
           k, v = kv.split(':')
           k = 'sto' if k == 'db'
           k = "log_#{k}" if LOG_ALL_KEYS.include?(k)
@@ -72,6 +74,16 @@ module Flor
       LOG_ALL_KEYS.each { |k| h["log_#{k}"] = 1 } if h['log_all']
       LOG_DBG_KEYS.each { |k| h["log_#{k}"] = 1 } if h['log_dbg']
 
+      h['log_colours'] = true \
+        if a.include?('colours') || a.include?('colors')
+          # LOG_DEBUG=colours forces colors
+
+      if a.include?('stdout')
+        h['log_out'] = 'stdout'
+      elsif a.include?('stderr')
+        h['log_out'] = 'stderr'
+      end
+
       h
     end
 

data/lib/flor/core/executor.rb

@@ -340,7 +340,8 @@ module Flor
       m['fpoint'] = message['point']
       m['error'] = Flor.to_error(err)
 
-      Flor.detail_msg(self, m, flag: true) if @unit.conf['log_err']
+      @unit.logger.log_err(self, m, flag: true)
+      #Flor.print_detail_msg(self, m, flag: true) if @unit.conf['log_err']
 
       #if m['error']['msg'].match(/\AToo many open files in system/)
       #  puts "=" * 80 + ' ...'
@@ -359,7 +360,7 @@ module Flor
       @execution['tasks'][message['nid']] =
         { 'tasker' => message['tasker'], 'name' => message['taskname'] }
 
-      @unit.tasker.task(message)
+      @unit.ganger.task(message)
     end
     alias detask task
 
@@ -456,7 +457,7 @@ module Flor
       oep = lookup_on_error_parent(message)
       return oep.trigger_on_error if oep
 
-      Flor.detail_msg(self, message) if @unit.conf['log_err']
+      @unit.logger.log_err(self, message)
 
       []
     end

data/lib/flor/core/node.rb

@@ -331,7 +331,7 @@ class Flor::Node
       return v unless v == :no
     end
 
-    if mod != 'd' && @executor.unit.tasker.has_tasker?(@executor.exid, key)
+    if mod != 'd' && @executor.unit.has_tasker?(@executor.exid, key)
       return [ '_task', { 'task' => key }, -1 ]
     end
 

data/lib/flor/core/procedure.rb

@@ -81,7 +81,7 @@ class Flor::Procedure < Flor::Node
 
   def debug_msg(msg=message)
 
-    Flor.detail_msg(@executor, msg)
+    puts Flor.detail_msg(@executor, msg)
   end
 
   protected

data/lib/flor/core/texecutor.rb

@@ -27,23 +27,19 @@ module Flor
 
   class TransientExecutor < Executor
 
-    class TransientTasker
-
-      def has_tasker?(exid, tname); false; end
-    end
-
     class TransientUnit
 
       attr_accessor :conf, :opts
-      attr_reader :journal, :tasker, :loader
+      attr_reader :loader, :logger
+      attr_reader :journal
       attr_accessor :archive
 
       def initialize(conf)
 
         @conf = conf
         @opts = {}
+        @logger = TransientLogger.new(self)
         @journal = []
-        @tasker = TransientTasker.new
         @archive = nil
       end
 
@@ -63,6 +59,26 @@ module Flor
 
         (@archive[exid] ||= {})[n['nid']] = Flor.dup(n) if @archive
       end
+
+      def has_tasker?(exid, tname)
+
+        false
+      end
+    end
+
+    class TransientLogger
+
+      def initialize(unit)
+
+        @unit = unit
+      end
+
+      def log_err(executor, message, opts={})
+
+        return unless @unit.conf['log_err']
+
+        Flor.print_detail_msg(executor, message, flag: true)
+      end
     end
 
     def initialize(conf={})

data/lib/flor/log.rb

@@ -134,33 +134,37 @@ module Flor
 
     a << _c.rs
 
-    puts a.join
+    (opts[:out] || $stdout).puts a.join
   end
 
-  def self.print_src(src, opts={})
+  def self.print_src(src, opts={}, log_opts={})
 
-    _c = colours(opts)
+    o = (log_opts[:out] ||= $stdout)
+    _c = colours(log_opts)
 
-    puts "#{_c.dg}+---#{_c.rs}"
+    o.puts "#{_c.dg}+---#{_c.rs}"
 
-    puts "#{_c.dg}| #{opts.inspect}#{_c.rs}" if opts.any?
+    o.puts "#{_c.dg}| #{opts.inspect}#{_c.rs}" if opts.any?
 
     if src.is_a?(String)
       src.split("\n").select { |l| l.strip.length > 0 }.each do |line|
-        puts "#{_c.dg}| #{_c.yl}#{line}#{_c.rs}"
+        o.puts "#{_c.dg}| #{_c.yl}#{line}#{_c.rs}"
       end
     else
       ss = Flor.to_pretty_s(src).split("\n")
       ss.each do |line|
-        puts "#{_c.dg}| #{_c.yl}#{line}#{_c.rs}"
+        o.puts "#{_c.dg}| #{_c.yl}#{line}#{_c.rs}"
       end
     end
 
-    puts "#{_c.dg}.#{_c.rs}"
+    o.puts "#{_c.dg}.#{_c.rs}"
+
+    o.is_a?(StringIO) ? o.string : nil
   end
 
   def self.print_tree(tree, nid='0', opts={})
 
+    o = (opts[:out] ||= $stdout)
     _c = colours(opts)
 
     ind = ' ' * (opts[:ind] || 0)
@@ -172,12 +176,14 @@ module Flor
     c = tree[1].is_a?(Array) ? '' : " #{_c.yl}#{tree[1]}"
     l = " #{_c.dg}L#{tree[2]}"
 
-    puts "#{ind}#{_c.dg}+--- #{opts[:title]}#{_c.rs}" if headers && nid == '0'
-    puts "#{ind}#{_c.dg}| #{nid} #{h}#{c}#{l}#{_c.rs}"
+    o.puts "#{ind}#{_c.dg}+--- #{opts[:title]}#{_c.rs}" if headers && nid == '0'
+    o.puts "#{ind}#{_c.dg}| #{nid} #{h}#{c}#{l}#{_c.rs}"
     if tree[1].is_a?(Array)
       tree[1].each_with_index { |ct, i| print_tree(ct, "#{nid}_#{i}", opts) }
     end
-    puts "#{ind}#{_c.dg}.#{_c.rs}" if headers && nid == '0'
+    o.puts "#{ind}#{_c.dg}.#{_c.rs}" if headers && nid == '0'
+
+    o.is_a?(StringIO) ? o.string : nil
   end
 
   def self.print_flat_tree(tree, nid, opts)
@@ -232,7 +238,7 @@ module Flor
 
     s << _c.rs
 
-    puts s.string if is_root
+    opts[:out].puts(s.string) if is_root
   end
 
   def self.ret_to_s(executor, m)
@@ -306,31 +312,33 @@ module Flor
     sio.string
   end
 
-  def self.detail_msg(executor, m, opts={})
+  def self.print_detail_msg(executor, m, opts={})
 
     return if m['_detail_msg_flag']
     m['_detail_msg_flag'] = true if opts[:flag]
 
+    o = (opts[:out] ||= $stdout)
     _c = colours(opts)
 
     nid = m['nid']
     n = executor.execution['nodes'][nid]
     node = n ? Flor::Node.new(executor, n, m) : nil
 
-    puts "#{_c.dg}<Flor.detail_msg>#{_c.rs}"
-    print "#{_c.yl}"
-    Kernel::pp(m)
-    puts "#{_c.dg}payload:#{_c.yl}"
-    Kernel::pp(m['payload'])
-    puts "#{_c.dg}tree:"
-    print_tree(node.lookup_tree(nid), nid) if node
-    puts "#{_c.dg}node:#{_c.yl}"
-    Kernel::pp(n) if n
-    puts "#{_c.dg}nodes:"
-    puts nods_to_s(executor, m, opts)
+    o.puts "#{_c.dg}<Flor.print_detail_msg>#{_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:"
+    print_tree(node.lookup_tree(nid), nid, out: o) if node # FIXME
+    o.puts "#{_c.dg}node:#{_c.yl}"
+    o.puts(Flor.to_pretty_s(n)) if n
+    o.puts "#{_c.dg}nodes:"
+    o.puts nods_to_s(executor, m, opts)
     z = executor.execution['nodes'].size
-    puts "#{_c.yl}#{z} node#{z == 1 ? '' : 's'}."
-    puts "#{_c.dg}</Flor.detail_msg>#{_c.rs}"
+    o.puts "#{_c.yl}#{z} node#{z == 1 ? '' : 's'}."
+    o.puts "#{_c.dg}</Flor.print_detail_msg>#{_c.rs}"
+
+    o.is_a?(StringIO) ? o.string : nil
   end
 end