diff --git a/README.md b/README.md index 37747ddf..df6edec7 100644 --- a/README.md +++ b/README.md @@ -36,7 +36,7 @@ Using flor in your Ruby project requires you to clearly separate business proces ## quickstart -This quickstart sets up a flor unit tied to a SQLite database, resets the databse, binds two taskers and then launches a flow execution involving the two taskers. Finally, it prints out the resulting workitem as the execution has just terminated. +This quickstart sets up a flor unit tied to a SQLite database, resets the database, binds two taskers and then launches a flow execution involving the two taskers. Finally, it prints out the resulting workitem as the execution has just terminated. ```ruby require 'flor/unit' @@ -94,7 +94,7 @@ p r['payload']['log'] This quickstart is at [doc/quickstart0/](doc/quickstart0/), it's a minimal, one-file Ruby quickstart. -There is also [doc/quickstart1/](doc/quickstart1/), a more complex example, that shows a flor setup, where taskers and flows are layed out in a flor directory tree. +There is also [doc/quickstart1/](doc/quickstart1/), a more complex example, that shows a flor setup, where taskers and flows are laid out in a flor directory tree. ## documentation diff --git a/doc/common_attributes.md b/doc/common_attributes.md index 2fde6cc5..0fb86518 100644 --- a/doc/common_attributes.md +++ b/doc/common_attributes.md @@ -6,7 +6,7 @@ Attributes shared by all the procedures. ## vars: -Vanilla procedures don't have variables set at their level. The `vars` attribute sets a vanilla hash in the targetted procedure. +Vanilla procedures don't have variables set at their level. The `vars` attribute sets a vanilla hash in the targeted procedure. ## vars: hash @@ -46,7 +46,7 @@ sequence vars: { a_0: 'a', a_1: 'A', a_z: 'z', b_0: 'b' } # only a_0 and a_1 are visible ``` -If the first element of the array is "-", "^" or "!", the array is a blacklist. The var names explicitely listed are bound to nil values (shadowing the value in the parent node). +If the first element of the array is "-", "^" or "!", the array is a blacklist. The var names explicitly listed are bound to nil values (shadowing the value in the parent node). An array beginning with a "+" is a whitelist. @@ -109,7 +109,7 @@ The tag attribute sets one or more tags on a node. The tag can be used with the Read more on [tags](tags.md). -Read also about [sequence](procedures/sequence.md), it can implicitely enter into a tag: +Read also about [sequence](procedures/sequence.md), it can implicitly enter into a tag: ``` sequence 'second phase' # <-- equivalent to sequence tag: 'second phase' doug _ @@ -180,7 +180,7 @@ sequence david 'perform task d' ``` -Alice and Bob have 60 to peform their tasks (they're probably automated) while Charly has 2 days and 12 hours. David has no time constraint. +Alice and Bob have 60 to perform their tasks (they're probably automated) while Charly has 2 days and 12 hours. David has no time constraint. When a timeout triggers, the subtree rooted in the node with the timeout: attribute gets cancelled @@ -204,7 +204,7 @@ Read more at [on_timeout](on_timeout.md). ## flank: -Explicitely flags a procedure as "flanking". +Explicitly flags a procedure as "flanking". In this sample, the `a; b` sequence happens in parallel to the `c; d` parent sequence. As soon as `d` replies to its parent sequence, the flanking child will get cancelled. @@ -240,7 +240,7 @@ sequence set a 2 disabled ``` -Please note that the stopping of the node occurs right after the evaluation of the off/disable/disabled, not upon initial evalution of the node. So +Please note that the stopping of the node occurs right after the evaluation of the off/disable/disabled, not upon initial evaluation of the node. So ``` sequence set d true diff --git a/doc/fragments.md b/doc/fragments.md index 418e5a01..8c18fc33 100644 --- a/doc/fragments.md +++ b/doc/fragments.md @@ -12,7 +12,7 @@ Fragments of documentation that will be reused later on. ##### setting FLOR_DEBUG -This is a targetted run of a spec file: +This is a targeted run of a spec file: ``` FLOR_DEBUG=msg,err bundle exec rspec spec/punit/cancel_spec.rb ``` diff --git a/doc/glossary.md b/doc/glossary.md index 6d98acc4..3e7dc20a 100644 --- a/doc/glossary.md +++ b/doc/glossary.md @@ -49,7 +49,7 @@ TODO ## execution -An execution is an instance of a flow or in other words a live occurence of a process/workflow. It's identified by an [execution id](#exid) ([exid](#exid)). +An execution is an instance of a flow or in other words a live occurrence of a process/workflow. It's identified by an [execution id](#exid) ([exid](#exid)). ## executor @@ -120,7 +120,7 @@ is equivalent to: define f x x * 3 ``` -("def" sets the reference of the new fucntion in f.ret, it gets picked by "set" and placed in the variable 'f') +("def" sets the reference of the new function in f.ret, it gets picked by "set" and placed in the variable 'f') Flor wants [functions](#function), [procedures](#procedure), and [taskers](#tasker) calls to look similar. A single way to call. @@ -203,7 +203,7 @@ Or "node id". A key for the node in its execution. Is of the form `/^\d+(_\d+)*$/`, the root node having the "0" nid. -A nid is implicitely suffixed with `-0`. Nids with a `-\d+` suffix may appear for loops and [branches](#branch) executing multiple times. +A nid is implicitly suffixed with `-0`. Nids with a `-\d+` suffix may appear for loops and [branches](#branch) executing multiple times. See [subnid](#subnid). diff --git a/doc/launching.md b/doc/launching.md index e71079bf..b4cee6b5 100644 --- a/doc/launching.md +++ b/doc/launching.md @@ -113,7 +113,7 @@ When given an array of strings, the `#launch` will wait for each string to happe * `wait: [ '0_0 task', '0_1 task' ]` - same as right above * `wait: '0_0 execute'` - wait for the execution to reach node 0_0 * `wait: '0_0 receive'` - wait for the first receive message handed to 0_0 -* `wait: 'end'` - wait for an execution to pause (usually an execution runs for 77 messages before pausing and yielding for other executions to run, it might alos "end" when sleeping or waiting for external messages) +* `wait: 'end'` - wait for an execution to pause (usually an execution runs for 77 messages before pausing and yielding for other executions to run, it might also "end" when sleeping or waiting for external messages) * `wait: 'terminated'` - wait until the execution terminates (useful for testing or when using small flows without human participants) * `wait: 'failed'` - wait until the execution emits a failed message (mostly useful when testing a flow) * `wait: 'entered'` - wait until the execution enters a tagged branch diff --git a/doc/patterns__control_flow.md b/doc/patterns__control_flow.md index 81b65cc4..43d86cba 100644 --- a/doc/patterns__control_flow.md +++ b/doc/patterns__control_flow.md @@ -140,7 +140,7 @@ The [case](procedures/case.md) and [match](procedures/match.md) are the other tw [wp/explanation](http://www.workflowpatterns.com/patterns/control/basic/wcp4.php) | [wp/animation](http://www.workflowpatterns.com/patterns/control/basic/wcp4_animation.php) | [top](#top) ### Simple Merge -A simple merge occur when two (or more) exclusive branch converge. As seen in exclusive choice this pattern is implicitely supported. It simply occurs when the ‘then’ or the ‘else’ clause of an [if](procedures/if.md) terminates and the flow resumes. +A simple merge occur when two (or more) exclusive branch converge. As seen in exclusive choice this pattern is implicitly supported. It simply occurs when the ‘then’ or the ‘else’ clause of an [if](procedures/if.md) terminates and the flow resumes. [wp/explanation](http://www.workflowpatterns.com/patterns/control/basic/wcp5.php) | [wp/animation](http://www.workflowpatterns.com/patterns/control/basic/wcp5_animation.php) | [top](#top) @@ -182,7 +182,7 @@ sequence task "transfer-patient" # ... ``` -The [concurrence](procedures/concurrence.md) procedure, by default, waits for all its children to respond before ending and replying to its parent procedure (here a [sequence](procecures/sequence.md). The sequence then hands the flow to the `task "transfer-patient"` followup. +The [concurrence](procedures/concurrence.md) procedure, by default, waits for all its children to respond before ending and replying to its parent procedure (here a [sequence](procedures/sequence.md). The sequence then hands the flow to the `task "transfer-patient"` followup. [wp/explanation](http://www.workflowpatterns.com/patterns/control/advanced_branching/wcp7.php) | [wp/animation](http://www.workflowpatterns.com/patterns/control/advanced_branching/wcp7_animation.php) | [top](#top) @@ -276,7 +276,7 @@ sequence The [concurrence](procedures/concurrence.md) expects one reply and then cancels the remaining branches. -Here is a varient using [c-each](procedures/c_each.md): +Here is a variant using [c-each](procedures/c_each.md): ```python sequence diff --git a/doc/procedures/README.md b/doc/procedures/README.md index 2d5fa3ac..00abf0a8 100644 --- a/doc/procedures/README.md +++ b/doc/procedures/README.md @@ -22,7 +22,7 @@ * [do-return](do_return.md) - Takes a set of arguments and returns a function that will return those arguments again. * [each](each.md) - Each is a simplified version of [for-each](for_each.md). * [empty?](empty.md) - Returns true if the given collection or string is empty. -* [fail, error](fail.md) - Explicitely raises an error. +* [fail, error](fail.md) - Explicitly raises an error. * [filter, filter-out](filter.md) - Filters a collection * [find](find.md) - Finds the first matching element. * [flatten](flatten.md) - Flattens the given array @@ -61,7 +61,7 @@ * [timestamp, ltimestamp](timestamp.md) - Places a string timestamp in f.ret. * [to-array, to-object](to_array.md) - Turns the argument into an array or an object. * [type-of, type](type_of.md) - returns the type of argument or the incoming f.ret. -* [until, while](until.md) - Loops until or while a condiation evalutates to true. +* [until, while](until.md) - Loops until or while a condiation evaluates to true. ## unit @@ -78,7 +78,7 @@ * [graft, import](graft.md) - Graft a subtree into the current execution. * [on_timeout](on_timeout.md) - Counterpart to the on_timeout: attribute. * [schedule](schedule.md) - Schedules a function in time. -* [signal](signal.md) - Used in conjuction with "on". +* [signal](signal.md) - Used in conjunction with "on". * [sleep](sleep.md) - Makes a branch of an execution sleep for a while. * [task](task.md) - Tasks a tasker with a task. * [trap](trap.md) - Watches the messages emitted in the execution and reacts when a message matches certain criteria. diff --git a/doc/procedures/andor.md b/doc/procedures/andor.md index 62ad556d..25baddf7 100644 --- a/doc/procedures/andor.md +++ b/doc/procedures/andor.md @@ -10,7 +10,7 @@ as one of them returns a trueish value. Returns false else. and false true - # => evalutes to false + # => evaluates to false ``` ``` diff --git a/doc/procedures/apply.md b/doc/procedures/apply.md index 326204fe..ab08bf5f 100644 --- a/doc/procedures/apply.md +++ b/doc/procedures/apply.md @@ -12,7 +12,7 @@ sequence apply sum 1 2 ``` -It is usually used implicitely, as in +It is usually used implicitly, as in ``` sequence define sum a b diff --git a/doc/procedures/case.md b/doc/procedures/case.md index 1af57b64..afb2742d 100644 --- a/doc/procedures/case.md +++ b/doc/procedures/case.md @@ -87,7 +87,7 @@ case 'ovomolzin' ### defaulting to f.ret -When nothing is explicitely provided for consideration by "case", the +When nothing is explicitly provided for consideration by "case", the incoming `f.ret` is used. ``` diff --git a/doc/procedures/fail.md b/doc/procedures/fail.md index 3441006e..34f7e5dc 100644 --- a/doc/procedures/fail.md +++ b/doc/procedures/fail.md @@ -1,7 +1,7 @@ # fail, error -Explicitely raises an error. +Explicitly raises an error. ``` fail "not enough water in the tank" diff --git a/doc/procedures/match.md b/doc/procedures/match.md index 215974e2..c5217835 100644 --- a/doc/procedures/match.md +++ b/doc/procedures/match.md @@ -155,7 +155,7 @@ match ## "bind" -"bind" binds explicitely a value and allows for a sub-pattern. +"bind" binds explicitly a value and allows for a sub-pattern. ``` match [ 1 4 ] [ 1 (bind y (or 2 3)) ]; "match y:$(y)" diff --git a/doc/procedures/reverse.md b/doc/procedures/reverse.md index 5a5a78b5..59005678 100644 --- a/doc/procedures/reverse.md +++ b/doc/procedures/reverse.md @@ -16,7 +16,7 @@ Reverses f.ret if there are no arguments reverse _ # sets f.ret to [ 4, 6, 5 ] ``` -Will fail if it finds nothing reversable. +Will fail if it finds nothing reversible. # see also diff --git a/doc/procedures/set.md b/doc/procedures/set.md index 88008474..aeb28a5f 100644 --- a/doc/procedures/set.md +++ b/doc/procedures/set.md @@ -48,7 +48,7 @@ sequence set __2 g h [ 9 10 11 12 13 ] # ==> g: 11, h: 12 - # `__` is not prefixed by a var name, so it justs discard + # `__` is not prefixed by a var name, so it just discards # what it captures set i j___ [ 14 15 16 17 18 19 ] diff --git a/doc/procedures/signal.md b/doc/procedures/signal.md index aa621f2d..c7731f93 100644 --- a/doc/procedures/signal.md +++ b/doc/procedures/signal.md @@ -1,7 +1,7 @@ # signal -Used in conjuction with "on". +Used in conjunction with "on". An external (or internal) agent may send a signal to an execution and the execution may have a "on" handler for it. diff --git a/doc/procedures/trap.md b/doc/procedures/trap.md index 05416345..81b46afd 100644 --- a/doc/procedures/trap.md +++ b/doc/procedures/trap.md @@ -136,7 +136,7 @@ Please note how "on" accepts a block while "trap" accepts a function. The range limit determines what is the range, or scope of the trap. By default the trap only care about nodes below its parent. In other words, -the trap binds itself to its parent and observes the messages occuring +the trap binds itself to its parent and observes the messages occurring in the execution in the branch of nodes whose root is the parent. The possible values for `range:` are: diff --git a/doc/procedures/until.md b/doc/procedures/until.md index 7df3f730..18529752 100644 --- a/doc/procedures/until.md +++ b/doc/procedures/until.md @@ -1,7 +1,7 @@ # until, while -Loops until or while a condiation evalutates to true. +Loops until or while a condiation evaluates to true. ``` set i 0 diff --git a/doc/services/loader.md b/doc/services/loader.md index 8f4a8a49..6342ec6d 100644 --- a/doc/services/loader.md +++ b/doc/services/loader.md @@ -36,7 +36,7 @@ Here is an example tree: │   │   └── team_b # the com/example/team_b tasker │   │   ├── dot.json │   │   └── tasker.rb -│   └── com.example.accounting.json # taskers for com/example/accouting +│   └── com.example.accounting.json # taskers for com/example/accounting ├── usr │   └── com.example.sales │   └── co diff --git a/doc/services/readme.md b/doc/services/readme.md index 60fd4e6d..2a2987a3 100644 --- a/doc/services/readme.md +++ b/doc/services/readme.md @@ -16,7 +16,7 @@ * logger - currently bicephalous, the hooker hands it all messages for logging (will do nothing unless in debug mode) and receives log/info/warn/error calls and logs them -(I should proably split this logger in two) +(I should probably split this logger in two) * wait list - a small service only relevant in spec/tests, lets Ruby code wait until an message is seen in flor diff --git a/doc/strings.md b/doc/strings.md index 4d867c0d..cc8d5d64 100644 --- a/doc/strings.md +++ b/doc/strings.md @@ -49,7 +49,7 @@ Adding a string to a number yields an error. + 1 "lo" # fails... ``` -If the first operand to a `+` is a string, then all subsquent operands are turned into strings and the result is the concatenation of all the strings. +If the first operand to a `+` is a string, then all subsequent operands are turned into strings and the result is the concatenation of all the strings. ``` + '' 1 true [ 1 2 ] # yields "1true[1, 2]" ``` diff --git a/lib/flor/core/executor.rb b/lib/flor/core/executor.rb index 2856e50c..bd697c91 100644 --- a/lib/flor/core/executor.rb +++ b/lib/flor/core/executor.rb @@ -156,7 +156,7 @@ def make_node(message) end # # vars: variables - # vdomain: variable domain (used in conjuction with the loader) + # vdomain: variable domain (used in conjunction with the loader) # cnid: closure nid # dbg: used to debug messages (useful @node['dbg'] when 'receive') diff --git a/lib/flor/core/procedure.rb b/lib/flor/core/procedure.rb index 694e099d..c057cc3d 100644 --- a/lib/flor/core/procedure.rb +++ b/lib/flor/core/procedure.rb @@ -872,7 +872,7 @@ def do_wrap_cancel_children(h={}) end # Called by the executor, in turns call cancel and cancel_when_ methods - # which may be overriden. + # which may be overridden. # def do_cancel @@ -908,7 +908,7 @@ def do_cancel end # Called by the executor, in turns call kill and kill_when_ methods - # which may be overriden. + # which may be overridden. # def do_kill @@ -941,7 +941,7 @@ def kill_when_ended [] # no effect end - # The core cancel work, is overriden by some procedure implementations. + # The core cancel work, is overridden by some procedure implementations. # def cancel diff --git a/lib/flor/pcore/andor.rb b/lib/flor/pcore/andor.rb index ca487aa9..5124c6cd 100644 --- a/lib/flor/pcore/andor.rb +++ b/lib/flor/pcore/andor.rb @@ -11,7 +11,7 @@ class Flor::Pro::Andor < Flor::Procedure # and # false # true - # # => evalutes to false + # # => evaluates to false # ``` # # ``` diff --git a/lib/flor/pcore/apply.rb b/lib/flor/pcore/apply.rb index cafe2ffd..c8af6ab0 100644 --- a/lib/flor/pcore/apply.rb +++ b/lib/flor/pcore/apply.rb @@ -13,7 +13,7 @@ class Flor::Pro::Apply < Flor::Procedure # apply sum 1 2 # ``` # - # It is usually used implicitely, as in + # It is usually used implicitly, as in # ``` # sequence # define sum a b diff --git a/lib/flor/pcore/case.rb b/lib/flor/pcore/case.rb index db9fa6ee..7e331426 100644 --- a/lib/flor/pcore/case.rb +++ b/lib/flor/pcore/case.rb @@ -88,7 +88,7 @@ class Flor::Pro::Case < Flor::Procedure # # ### defaulting to f.ret # - # When nothing is explicitely provided for consideration by "case", the + # When nothing is explicitly provided for consideration by "case", the # incoming `f.ret` is used. # # ``` diff --git a/lib/flor/pcore/define.rb b/lib/flor/pcore/define.rb index 2b22ccec..fe0f9b6c 100644 --- a/lib/flor/pcore/define.rb +++ b/lib/flor/pcore/define.rb @@ -103,7 +103,7 @@ def flatten_tree return [ tre, sig ] unless wrapped?(sig) - # There is a parenthese around the parameters, let's unwrap that... + # There are parentheses around the parameters, let's unwrap that... hed = Flor.dup(tre[1][0, off]) sig = Flor.dup(sig) diff --git a/lib/flor/pcore/fail.rb b/lib/flor/pcore/fail.rb index f2f7b027..1f557516 100644 --- a/lib/flor/pcore/fail.rb +++ b/lib/flor/pcore/fail.rb @@ -2,7 +2,7 @@ class Flor::Pro::Fail < Flor::Procedure # - # Explicitely raises an error. + # Explicitly raises an error. # # ``` # fail "not enough water in the tank" diff --git a/lib/flor/pcore/match.rb b/lib/flor/pcore/match.rb index d4341e3c..2491237c 100644 --- a/lib/flor/pcore/match.rb +++ b/lib/flor/pcore/match.rb @@ -156,7 +156,7 @@ class Flor::Pro::Match < Flor::Pro::Case # # ## "bind" # - # "bind" binds explicitely a value and allows for a sub-pattern. + # "bind" binds explicitly a value and allows for a sub-pattern. # ``` # match [ 1 4 ] # [ 1 (bind y (or 2 3)) ]; "match y:$(y)" diff --git a/lib/flor/pcore/reverse.rb b/lib/flor/pcore/reverse.rb index 0166e00f..c216f30e 100644 --- a/lib/flor/pcore/reverse.rb +++ b/lib/flor/pcore/reverse.rb @@ -17,7 +17,7 @@ class Flor::Pro::Reverse < Flor::Procedure # reverse _ # sets f.ret to [ 4, 6, 5 ] # ``` # - # Will fail if it finds nothing reversable. + # Will fail if it finds nothing reversible. # # # see also # diff --git a/lib/flor/pcore/set.rb b/lib/flor/pcore/set.rb index dbf47bca..64848c43 100644 --- a/lib/flor/pcore/set.rb +++ b/lib/flor/pcore/set.rb @@ -49,7 +49,7 @@ class Flor::Pro::Set < Flor::Procedure # set __2 g h # [ 9 10 11 12 13 ] # # ==> g: 11, h: 12 - # # `__` is not prefixed by a var name, so it justs discard + # # `__` is not prefixed by a var name, so it just discards # # what it captures # set i j___ # [ 14 15 16 17 18 19 ] diff --git a/lib/flor/pcore/until.rb b/lib/flor/pcore/until.rb index 15affbd0..80c56e83 100644 --- a/lib/flor/pcore/until.rb +++ b/lib/flor/pcore/until.rb @@ -2,7 +2,7 @@ class Flor::Pro::Until < Flor::Procedure # - # Loops until or while a condiation evalutates to true. + # Loops until or while a condiation evaluates to true. # # ``` # set i 0 diff --git a/lib/flor/punit/c_iterator.rb b/lib/flor/punit/c_iterator.rb index de5b96ef..fdb1dc2a 100644 --- a/lib/flor/punit/c_iterator.rb +++ b/lib/flor/punit/c_iterator.rb @@ -156,6 +156,7 @@ def reff_att_children is.each { |i| t1[i][1][0][0] = '_reff' } @node['tree'] = [ t[0], t1, *t[2..-1] ] +Flor.pp @node['tree'] end end diff --git a/lib/flor/punit/signal.rb b/lib/flor/punit/signal.rb index 001b9edf..ec09ddff 100644 --- a/lib/flor/punit/signal.rb +++ b/lib/flor/punit/signal.rb @@ -2,7 +2,7 @@ class Flor::Pro::Signal < Flor::Procedure # - # Used in conjuction with "on". + # Used in conjunction with "on". # # An external (or internal) agent may send a signal to an execution and the # execution may have a "on" handler for it. diff --git a/lib/flor/punit/trap.rb b/lib/flor/punit/trap.rb index 9ad744d8..c05f0d67 100644 --- a/lib/flor/punit/trap.rb +++ b/lib/flor/punit/trap.rb @@ -139,7 +139,7 @@ class Flor::Pro::Trap < Flor::Procedure # # The range limit determines what is the range, or scope of the trap. # By default the trap only care about nodes below its parent. In other words, - # the trap binds itself to its parent and observes the messages occuring + # the trap binds itself to its parent and observes the messages occurring # in the execution in the branch of nodes whose root is the parent. # # The possible values for `range:` are: diff --git a/lib/flor/tools/shell.rb b/lib/flor/tools/shell.rb index 7c1c9b73..3256ffc6 100644 --- a/lib/flor/tools/shell.rb +++ b/lib/flor/tools/shell.rb @@ -645,7 +645,7 @@ def cmd_conf(line) puts Flor.to_d( { key: @unit.conf[key] }, colour: true, indent: 1, width: true) elsif key - # alreay done + # already done else page(Flor.to_d(@unit.conf, colour: true, indent: 1, width: true)) end diff --git a/spec/core/fields_spec.rb b/spec/core/fields_spec.rb index 5e7b7721..a2d846ef 100644 --- a/spec/core/fields_spec.rb +++ b/spec/core/fields_spec.rb @@ -17,7 +17,7 @@ describe 'a field as head' do - it 'is derefenced upon application' do + it 'is dereferenced upon application' do r = @executor.launch(%q{ set f.a diff --git a/spec/core/variables_spec.rb b/spec/core/variables_spec.rb index a26d1958..da98c09d 100644 --- a/spec/core/variables_spec.rb +++ b/spec/core/variables_spec.rb @@ -17,7 +17,7 @@ describe 'a variable as head' do - it 'is derefenced upon application' do + it 'is dereferenced upon application' do r = @executor.launch(%{ set a @@ -86,7 +86,7 @@ describe 'a variable as head (deep)' do - it 'is derefenced upon application' do + it 'is dereferenced upon application' do r = @executor.launch(%{ set a { b: sequence } diff --git a/spec/pcore/set_spec.rb b/spec/pcore/set_spec.rb index 5c4e7cab..46c33f7b 100644 --- a/spec/pcore/set_spec.rb +++ b/spec/pcore/set_spec.rb @@ -164,7 +164,7 @@ expect(r['payload']['ret']).to eq(11) end - it 'leaves f.ret unless explicitely setting it' do + it 'leaves f.ret unless explicitly setting it' do r = @executor.launch( %q{ diff --git a/spec/punit/c_each_spec.rb b/spec/punit/c_each_spec.rb index 2ab10529..eb8f23f4 100644 --- a/spec/punit/c_each_spec.rb +++ b/spec/punit/c_each_spec.rb @@ -133,21 +133,23 @@ expect(r['vars']['l']).to eq([ 'lab alpha', 'lab biometa' ]) end - it 'accepts expect: and remaining: (3)' -# -# r = @unit.launch( -# %q{ -# set l [] -# set labs [ 'lab arcturus', 'lab brizer', 'lab cruz' ] -# -# c-each labs v.lab expect: 2 remaining: 'cancel' -# sleep for: "$(idx)s" -# push l lab -# }, -# wait: true) -# -# expect(r['vars']['l']).to eq([ 'lab arcturus', 'lab brizer' ]) -# end + it 'accepts expect: and remaining: (3)' do + + r = @unit.launch( + %q{ + set l [] + set labs [ 'lab arcturus', 'lab brizer', 'lab cruz' ] + + c-each labs v.lab expect: 2 remaining: 'cancel' + sleep for: "$(idx)s" + push l lab + }, + wait: true) +pp r + + expect(r['point']).to eq('terminated') + expect(r['vars']['l']).to eq([ 'lab arcturus', 'lab brizer' ]) + end end end diff --git a/spec/punit/concurrence_spec.rb b/spec/punit/concurrence_spec.rb index 693d8c18..eed4324a 100644 --- a/spec/punit/concurrence_spec.rb +++ b/spec/punit/concurrence_spec.rb @@ -961,7 +961,7 @@ def rs expect(msg['vars']['l']).to eq([ 'err@0_1_1_1', 'err@0_1_2_1' ]) end - it 'is overriden by the child own on_error' do + it 'is overridden by the child own on_error' do msg = @unit.launch( %q{ diff --git a/spec/unit/scheduler_spec.rb b/spec/unit/scheduler_spec.rb index f64c362d..79909425 100644 --- a/spec/unit/scheduler_spec.rb +++ b/spec/unit/scheduler_spec.rb @@ -158,7 +158,7 @@ }) end - it 'rejects unparseable flows' do + it 'rejects unparsable flows' do expect { @unit.launch('sequence,,,,') diff --git a/spec/unit/task_applications_spec.rb b/spec/unit/task_applications_spec.rb index 8b2fa609..8989f753 100644 --- a/spec/unit/task_applications_spec.rb +++ b/spec/unit/task_applications_spec.rb @@ -464,7 +464,7 @@ expect(r['payload']['seen'].size).to eq(1) end - it "fails explicitely if the domain tasker doesn't know where to reroute" do + it "fails explicitly if the domain tasker doesn't know where to reroute" do r = @unit.launch( %q{ unknown_alpha _ }, @@ -476,7 +476,7 @@ ).to eq("don't know how to apply \"unknown_alpha\"") end - it "fails explicitely if the domain tasker doesn't know where to reroute" do + it "fails explicitly if the domain tasker doesn't know where to reroute" do r = @unit.launch( %q{