flor 0.14.0 → 0.15.0

data/lib/flor/unit/waiter.rb

@@ -68,7 +68,6 @@ module Flor
           end
         end
 
-        #executor, message = @queue.shift
         @queue.shift[1]
       end
     end
@@ -98,7 +97,7 @@ module Flor
       oontimeout = opts[:on_timeout] || opts[:ontimeout] || 'fail'
 
       case owait
-      when true
+      when nil, true
         [ [ [ nil, %w[ failed terminated ] ] ], # serie
           otimeout,
           oontimeout,

metadata

@@ -1,110 +1,129 @@
 --- !ruby/object:Gem::Specification
 name: flor
 version: !ruby/object:Gem::Version
-  version: 0.14.0
-  prerelease: 
+  version: 0.15.0
 platform: ruby
 authors:
 - John Mettraux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-13 00:00:00.000000000 Z
+date: 2018-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: munemo
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.1
 - !ruby/object:Gem::Dependency
   name: raabro
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.3
+        version: 1.1.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.3
+        version: '1.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.1.5
 - !ruby/object:Gem::Dependency
   name: fugit
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.5
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.5
+        version: '1.1'
+- !ruby/object:Gem::Dependency
+  name: dense
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.1.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.1.1
 - !ruby/object:Gem::Dependency
   name: sequel
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.4.0
+        version: '3.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.4.0
+        version: '3.7'
 - !ruby/object:Gem::Dependency
   name: terminal-table
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: A Ruby workflow engine (ruote next generation)
@@ -114,16 +133,21 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- CHANGELOG.md
+- CREDITS.md
+- LICENSE.txt
 - Makefile
+- README.md
+- flor.gemspec
+- lib/flor.rb
 - lib/flor/changes.rb
 - lib/flor/colours.rb
 - lib/flor/conf.rb
+- lib/flor/core.rb
 - lib/flor/core/executor.rb
 - lib/flor/core/node.rb
 - lib/flor/core/procedure.rb
 - lib/flor/core/texecutor.rb
-- lib/flor/core.rb
-- lib/flor/deep.rb
 - lib/flor/djan.rb
 - lib/flor/dollar.rb
 - lib/flor/errors.rb
@@ -138,6 +162,7 @@ files:
 - lib/flor/pcore/_arr.rb
 - lib/flor/pcore/_atom.rb
 - lib/flor/pcore/_att.rb
+- lib/flor/pcore/_coll.rb
 - lib/flor/pcore/_dump.rb
 - lib/flor/pcore/_err.rb
 - lib/flor/pcore/_obj.rb
@@ -146,20 +171,34 @@ files:
 - lib/flor/pcore/_pat_guard.rb
 - lib/flor/pcore/_pat_obj.rb
 - lib/flor/pcore/_pat_or.rb
+- lib/flor/pcore/_pat_regex.rb
 - lib/flor/pcore/_skip.rb
 - lib/flor/pcore/_val.rb
+- lib/flor/pcore/all.rb
+- lib/flor/pcore/any.rb
 - lib/flor/pcore/apply.rb
 - lib/flor/pcore/arith.rb
 - lib/flor/pcore/break.rb
 - lib/flor/pcore/case.rb
 - lib/flor/pcore/cmp.rb
+- lib/flor/pcore/collect.rb
 - lib/flor/pcore/cond.rb
 - lib/flor/pcore/cursor.rb
 - lib/flor/pcore/define.rb
+- lib/flor/pcore/detect.rb
 - lib/flor/pcore/do_return.rb
+- lib/flor/pcore/each.rb
 - lib/flor/pcore/echo.rb
+- lib/flor/pcore/empty.rb
 - lib/flor/pcore/fail.rb
+- lib/flor/pcore/filter.rb
+- lib/flor/pcore/find.rb
+- lib/flor/pcore/for_each.rb
 - lib/flor/pcore/if.rb
+- lib/flor/pcore/includes.rb
+- lib/flor/pcore/inject.rb
+- lib/flor/pcore/iterator.rb
+- lib/flor/pcore/keys.rb
 - lib/flor/pcore/length.rb
 - lib/flor/pcore/logo.rb
 - lib/flor/pcore/loop.rb
@@ -170,20 +209,30 @@ files:
 - lib/flor/pcore/noeval.rb
 - lib/flor/pcore/noret.rb
 - lib/flor/pcore/not.rb
+- lib/flor/pcore/on.rb
+- lib/flor/pcore/on_cancel.rb
+- lib/flor/pcore/on_error.rb
 - lib/flor/pcore/push.rb
 - lib/flor/pcore/rand.rb
 - lib/flor/pcore/range.rb
+- lib/flor/pcore/reduce.rb
+- lib/flor/pcore/reverse.rb
+- lib/flor/pcore/select.rb
 - lib/flor/pcore/sequence.rb
 - lib/flor/pcore/set.rb
 - lib/flor/pcore/stall.rb
+- lib/flor/pcore/to_array.rb
 - lib/flor/pcore/twig.rb
 - lib/flor/pcore/until.rb
 - lib/flor/punit/cancel.rb
+- lib/flor/punit/ccollect.rb
 - lib/flor/punit/cmap.rb
 - lib/flor/punit/concurrence.rb
+- lib/flor/punit/cron.rb
+- lib/flor/punit/do_trap.rb
 - lib/flor/punit/every.rb
 - lib/flor/punit/graft.rb
-- lib/flor/punit/on.rb
+- lib/flor/punit/on_timeout.rb
 - lib/flor/punit/schedule.rb
 - lib/flor/punit/signal.rb
 - lib/flor/punit/sleep.rb
@@ -193,6 +242,9 @@ files:
 - lib/flor/to_string.rb
 - lib/flor/tools/env.rb
 - lib/flor/tools/shell.rb
+- lib/flor/tools/shell_out.rb
+- lib/flor/unit.rb
+- lib/flor/unit/caller.rb
 - lib/flor/unit/executor.rb
 - lib/flor/unit/ganger.rb
 - lib/flor/unit/hook.rb
@@ -201,49 +253,41 @@ files:
 - lib/flor/unit/journal.rb
 - lib/flor/unit/loader.rb
 - lib/flor/unit/logger.rb
+- lib/flor/unit/models.rb
 - lib/flor/unit/models/execution.rb
+- lib/flor/unit/models/message.rb
 - lib/flor/unit/models/pointer.rb
 - lib/flor/unit/models/timer.rb
 - lib/flor/unit/models/trace.rb
 - lib/flor/unit/models/trap.rb
-- lib/flor/unit/models.rb
-- lib/flor/unit/runner.rb
 - lib/flor/unit/scheduler.rb
 - lib/flor/unit/spooler.rb
 - lib/flor/unit/storage.rb
 - lib/flor/unit/taskers.rb
 - lib/flor/unit/waiter.rb
 - lib/flor/unit/wlist.rb
-- lib/flor/unit.rb
-- lib/flor.rb
-- flor.gemspec
-- LICENSE.txt
-- CHANGELOG.md
-- match.md
-- README.md
 homepage: http://github.com/floraison
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23.2
+rubygems_version: 2.7.6
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A Ruby workflow engine
 test_files: []

data/lib/flor/deep.rb

@@ -1,144 +0,0 @@
-
-module Flor
-
-  # deep.rb
-  #
-  # functions for deep getting/setting in structures
-
-  def self.to_array_index(o)
-
-    return 0 if o == 'first'
-    return -1 if o == 'last'
-    return o if o.is_a?(Integer)
-    nil
-  end
-
-  def self.split_deep_path(k)
-
-    return k if k.is_a?(Array)
-
-    k
-      .scan(/(?:\.?(-?\d+)|\.?([^\.\[]+)|\[(-?\d+)\]|\[([^\[\]]+)\])/)
-      .collect { |doti, dots, squi, squs|
-        if doti
-          doti.to_i
-        elsif dots
-          dots
-        elsif squi
-          squi.to_i
-        else
-          s0 = squs[0, 1]
-          (s0 == "'" || s0 == '"') ? squs[1..-2] : squs
-        end }
-  end
-
-  # Returns a symbol in case of failure.
-  #
-  def self.deep_get(o, k)
-
-    return o unless k
-
-    split_deep_path(k).inject([ o, [] ]) do |(val, seen), kk|
-
-      seen << kk
-
-      case val
-      when Array
-        i = to_array_index(kk)
-        return seen.join('.').to_sym unless i
-        [ val[i], seen ]
-      when Hash
-        [ val[kk], seen ]
-      else
-        return seen[0..-2].join('.').to_sym
-      end
-
-    end.first
-  end
-
-  def self.deep_set(o, k, v)
-
-    ks = split_deep_path(k)
-    key = ks.pop
-    col = deep_get(o, ks)
-
-    case col
-    when Symbol
-      col
-    when Array
-      i = to_array_index(key)
-      return ks.join('.').to_sym unless i
-      col[i] = v
-    when Hash
-      col[key] = v
-    else
-      ks.join('.').to_sym
-    end
-  end
-
-  def self.deep_insert(o, k, v)
-
-    ks = split_deep_path(k)
-    key = ks.pop
-    col = deep_get(o, ks)
-
-    case col
-    when Symbol
-      col
-    when Array
-      i = to_array_index(key)
-      return ks.join('.').to_sym unless i
-      col.insert(i, v)
-      v
-    when Hash
-      col[key] = v
-    else
-      ks.join('.').to_sym
-    end
-  end
-
-  def self.deep_unset(o, k)
-
-    ks = split_deep_path(k)
-    key = ks.pop
-    col = deep_get(o, ks)
-
-    case col
-    when Symbol
-      col
-    when Array
-      i = to_array_index(key)
-      return ks.join('.').to_sym unless i
-      col.delete_at(i)
-    when Hash
-      col.delete(key)
-    else
-      return ks.join('.').to_sym
-    end
-  end
-
-  def self.deep_has_key?(o, k)
-
-    val = o
-    ks = split_deep_path(k)
-
-    loop do
-
-      kk = ks.shift
-
-      case val
-      when Array
-        i = to_array_index(kk)
-        break false unless i
-        break (i < 0 ? -i < val.length : i < val.length) if ks.empty?
-        val = val[i]
-      when Hash
-        break val.has_key?(kk.to_s) if ks.empty? # nota bene: #to_s
-        val = val[kk.to_s]
-      else
-        break false
-      end
-    end
-  end
-end
-