ceml 0.7.13 → 0.8.0

data/Makefile

@@ -1,5 +1,5 @@
 ceml:
-	tt lib/ceml/tt/*.treetop
+	tt lib/ceml/lang/tt/*.treetop
 
 test:
 	testrb test

data/VERSION

@@ -1 +1 @@
-0.7.13
+0.8.0

data/ceml.gemspec

@@ -1,77 +1,89 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{ceml}
-  s.version = "0.7.13"
+  s.version = "0.8.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Joe Edelman"]
-  s.date = %q{2011-02-24}
+  s.date = %q{2011-05-27}
   s.description = %q{a language for coordinating real world events}
   s.email = %q{joe@citizenlogistics.com}
   s.extra_rdoc_files = [
     "LICENSE",
-     "README.markdown"
+    "README.markdown"
   ]
   s.files = [
     ".document",
-     ".gitignore",
-     "LICENSE",
-     "Makefile",
-     "README.markdown",
-     "Rakefile",
-     "VERSION",
-     "ceml.gemspec",
-     "editors/CEML.tmbundle/Syntaxes/ceml.tmLanguage",
-     "editors/CEML.tmbundle/info.plist",
-     "examples/breakfast-exchange.ceml",
-     "examples/citizen-investigation.ceml",
-     "examples/high-fives.ceml",
-     "guide/guide.html",
-     "guide/guide.md",
-     "guide/guide.pdf",
-     "lib/ceml.rb",
-     "lib/ceml/casting_statement.rb",
-     "lib/ceml/confluence.rb",
-     "lib/ceml/driver.rb",
-     "lib/ceml/incident.rb",
-     "lib/ceml/instruction_statements.rb",
-     "lib/ceml/role.rb",
-     "lib/ceml/script.rb",
-     "lib/ceml/tt/casting.treetop",
-     "lib/ceml/tt/instructions.treetop",
-     "lib/ceml/tt/lexer.treetop",
-     "lib/ceml/tt/scripts.treetop",
-     "test/helper.rb",
-     "test/test_casting.rb",
-     "test/test_incident.rb",
-     "test/test_instructions.rb",
-     "test/test_release.rb",
-     "test/test_scripts.rb",
-     "try"
+    "LICENSE",
+    "Makefile",
+    "README.markdown",
+    "Rakefile",
+    "VERSION",
+    "ceml.gemspec",
+    "editors/CEML.tmbundle/Syntaxes/ceml.tmLanguage",
+    "editors/CEML.tmbundle/info.plist",
+    "examples/breakfast-exchange.ceml",
+    "examples/citizen-investigation.ceml",
+    "examples/high-fives.ceml",
+    "guide/guide.html",
+    "guide/guide.md",
+    "guide/guide.pdf",
+    "lib/ceml.rb",
+    "lib/ceml/driver.rb",
+    "lib/ceml/lang.rb",
+    "lib/ceml/lang/basic_instruction.rb",
+    "lib/ceml/lang/casting_statement.rb",
+    "lib/ceml/lang/instruction_statements.rb",
+    "lib/ceml/lang/script.rb",
+    "lib/ceml/lang/tt/casting.rb",
+    "lib/ceml/lang/tt/casting.treetop",
+    "lib/ceml/lang/tt/instructions.rb",
+    "lib/ceml/lang/tt/instructions.treetop",
+    "lib/ceml/lang/tt/lexer.rb",
+    "lib/ceml/lang/tt/lexer.treetop",
+    "lib/ceml/lang/tt/scripts.rb",
+    "lib/ceml/lang/tt/scripts.treetop",
+    "lib/ceml/models.rb",
+    "lib/ceml/models/audition.rb",
+    "lib/ceml/models/bundle.rb",
+    "lib/ceml/models/cast.rb",
+    "lib/ceml/models/castable.rb",
+    "lib/ceml/models/incident.rb",
+    "lib/ceml/models/incident_model.rb",
+    "lib/ceml/models/incident_role_slot.rb",
+    "lib/ceml/models/player.rb",
+    "lib/ceml/models/queue.rb",
+    "lib/ceml/models/waiting_room.rb",
+    "lib/ceml/processor.rb",
+    "test/askchain.ceml",
+    "test/compliment.ceml",
+    "test/dialogues/accept.ceml",
+    "test/dialogues/basic_seed.ceml",
+    "test/dialogues/jordan.ceml",
+    "test/helper.rb",
+    "test/jane.ceml",
+    "test/lang/test_casting.rb",
+    "test/lang/test_instructions.rb",
+    "test/lang/test_scripts.rb",
+    "test/sync.ceml",
+    "test/test_castable.rb",
+    "test/test_dialogues.rb",
+    "test/test_incident.rb",
+    "try"
   ]
   s.homepage = %q{http://github.com/citizenlogistics/ceml}
-  s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
+  s.rubygems_version = %q{1.6.2}
   s.summary = %q{a language for coordinating real world events}
-  s.test_files = [
-    "test/helper.rb",
-     "test/test_casting.rb",
-     "test/test_incident.rb",
-     "test/test_instructions.rb",
-     "test/test_release.rb",
-     "test/test_scripts.rb"
-  ]
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<treetop>, [">= 0"])
     else
       s.add_dependency(%q<treetop>, [">= 0"])

data/guide/guide.html

@@ -31,7 +31,7 @@ tell b: Someone nearby likes the color |a.x|.  Find them.</code></pre>
 
 <h2 id='commands'>Commands</h2>
 
-<p>The above script only uses three CEML commands&#8211;<em>gather</em>, <em>ask</em>, and <em>tell</em>&#8211;but there aren&#8217;t many more commands to learn. Only four more, actually: besides <em>gather</em>, the other ingredients commands are <em>await</em> and <em>nab</em>. Besides <em>ask</em> and <em>tell</em>, the other instructions commands are <em>assign</em> and <em>certify</em>.</p>
+<p>The above script only uses three CEML commands&#8211;<em>gather</em>, <em>ask</em>, and <em>tell</em>&#8211;but there aren&#8217;t many more commands to learn. Only six more, actually: besides <em>gather</em>, the other ingredients commands are <em>await</em> and <em>nab</em>. Besides <em>ask</em> and <em>tell</em>, the other instructions commands are <em>assign</em>, <em>release</em>, <em>expect</em>, and <em>sync</em>.</p>
 
 <p>As a sneak preview, here&#8217;s an example that uses the other commands:</p>
 
@@ -40,7 +40,7 @@ await 1 concerned patient
 nab a doctor within 5 miles
 ask patient re problem: What&#39;s wrong?
 assign doctor to patient: Attend to patient&#39;s |problem|.
-certify doctor as responsive</code></pre>
+release doctor as responsive</code></pre>
 
 <h2 id='texts'>Texts</h2>
 
@@ -70,7 +70,7 @@ tell both: thanks so much for participating!</code></pre>
 
 <p>In the examples so far, the words like &#8216;enemy&#8217;, &#8216;reporter&#8217;, &#8216;guy&#8217;, &#8216;girl&#8217;, &#8216;a&#8217;, &#8216;b&#8217;, &#8216;signup&#8217;, &#8216;patient&#8217;, and &#8216;doctor&#8217; are <em>role names</em>. Most of the time, a role name can be any word you like. They are just a placeholder to connect <em>casting commands</em> like <em>gather</em> and <em>await</em>, with <em>coordination commands</em> like <em>tell</em>.</p>
 
-<p>Squads on Groundcrew, however, can define special meanings for certain roles. So on a particular squad, a &#8216;doctor&#8217; might mean someone who&#8217;s been tagged/certified with the tag &#8216;doctor&#8217;, and a patient might mean anyone else.</p>
+<p>Squads on Groundcrew, however, can define special meanings for certain roles. So on a particular squad, a &#8216;doctor&#8217; might mean someone who&#8217;s been tagged/released with the tag &#8216;doctor&#8217;, and a patient might mean anyone else.</p>
 
 <p>Some role names are always special. For instance, if you use the role name &#8216;organizer&#8217;, it always means someone who&#8217;s an official organizer for that squad. And if you use the role names &#8216;both&#8217;, &#8216;all&#8217;, &#8216;each&#8217;, or &#8216;everyone&#8217;, it means that the instruction applies to everyone regardless of how they were <em>cast</em>.</p>
 
@@ -116,15 +116,38 @@ assign player to streetcorner:
 
 <p>On iPhone or mobile web, the player will get a little map to direct them. There are several special <em>role names</em> which are used to indicate places rather than people. These include &#8220;streetcorner&#8221;, &#8220;park&#8221;, &#8220;field&#8221;, and &#8220;landmark&#8221;.</p>
 
+<h2 id='expect'>Expect</h2>
+
+<p>When you ask a question using <em>ask</em>, you may not want to let a player proceed unless they&#8217;ve answered in a way you understand or recognize. This can be accomplished using <em>expect</em>:</p>
+
+<pre><code>ask player re path:
+    Do you prefer to the path to the left or the right?
+expect /left|right/ from player:
+    Please say &quot;left&quot; or &quot;right&quot;!</code></pre>
+
+<p>The expect statement, like the release statement described below, can be passed strings, certain keywords, or regular expressions.</p>
+
+<h2 id='sync_up'>Sync up</h2>
+
+<p>There also may be times when you want to sync up several players and make sure they have both completed assignments or answered questions before they each proceed with the script:</p>
+
+<pre><code>assign redcoat:
+    March briskly towards Concord
+assign minuteman:
+    Hide in the bushes
+sync up redcoat and minuteman
+tell both:
+    Prepare to be surprised.</code></pre>
+
 <h2 id='choosing_players_await_gather_and_nab'>Choosing Players: Await, Gather, and Nab.</h2>
 
 <p>So what is really the difference between <em>await</em>, <em>gather</em>, and <em>nab</em>, you may be asking? Or perhaps you have already figured it out.</p>
 
 <p><em>Await</em> defines a kind of trigger&#8211;as soon as the conditions awaited for are met, the script will run.</p>
 
-<pre><code>await 2-5 level1 players within 50ft
+<pre><code>await 2-5 level=1 players within 50ft
 assign: shout out &quot;woo-hoo!&quot;
-certify as level2 not level1</code></pre>
+release as level=2</code></pre>
 
 <p>Unless there&#8217;s an await statement in your script, it will have to be executed manually by an organizer.</p>
 
@@ -156,27 +179,59 @@ assign:
 
 <p>Another qualifier with a special meaning is <em>concerned</em>. This is applied to players who, because of their text messaging or their tweeting or their interaction with the iphone or web apps, seem like are confused or have an urgent question or issue.</p>
 
-<p>The other qualifiers don&#8217;t mean anythings special, but they select only players who have been certified or tagged with that particular word. So &#8220;gather 5-20 level1 users&#8221; will only invite users who have been tagged or certified as level1.</p>
+<p>The other qualifiers don&#8217;t mean anythings special, but they select only players who have been released or tagged with that particular word. So &#8220;gather 5-20 level=1 users&#8221; will only invite users who have been tagged or released as level=1.</p>
+
+<h2 id='finer_control_of_matching'>Finer control of matching</h2>
+
+<p>The <em>await</em> keyword supports a variety of options that let you match players with more specificity. For instance, you may wish to only match players that text in within 10 minutes of one another:</p>
 
-<h2 id='certifying'>Certifying</h2>
+<pre><code>await 2 new players over 10 minutes</code></pre>
 
-<p>When a player has successfully completed their role in your script, you can add or change the tags associated with that player using the <em>certify</em> command.</p>
+<p>Or players that have the same favorite color:</p>
+
+<pre><code>await 2 new players with matching favorite_color</code></pre>
+
+<p>Here&#8217;s two scripts that cooperate to put people in groups by favorite color:</p>
+
+<pre><code>await new signup
+ask signup re name: What&#39;s your name?
+ask signup re favorite_color: What&#39;s your favorite color?
+
+await 2 players with matching favorite_color
+tell players: |buddy.name| also likes |favorite_color|.</code></pre>
+
+<h2 id='releasing'>Releasing</h2>
+
+<p>When a player has successfully completed their role in your script, you can add or change the tags associated with that player using the <em>release</em> command.</p>
 
 <pre><code>await 3 new signups
 assign:
     You have all just signed up!
     Take a photo of something you
     love and share with one another.
-certify as photo_sharing</code></pre>
+release as photo_sharing</code></pre>
+
+<p>You can also release a player early, subject to some conditions, by using <em>if</em> or <em>unless</em>:</p>
+
+<pre><code>await 1 boss and 1 worker
+ask worker:
+    Do you feel good about working today?
+release worker unless yes
+ask worker re skill:
+    What are you good at?
+ask boss re job:
+    You have a worker with skill |skill|.  What should they do?</code></pre>
+
+<p>There are some special keywords you can use after if or unless. These include &#8220;yes&#8221;, &#8220;no&#8221;, &#8220;done&#8221;, &#8220;okay&#8221;. You can also use a string in quotes (&#8220;activate&#8221;), in which case their answer is compared to the string case insensitively and with whitespace trimmed. Or you can use a <a href='http://en.wikipedia.org/wiki/Regular_expression'>regular expression</a> surrounded by forward slashes (/^red|blue|green$/) for more exact matching.</p>
 
 <h2 id='making_connections_between_scripts'>Making Connections between Scripts</h2>
 
-<p><em>Certify</em> and qualifications can be used to link scripts together. The certification at the end of the first script can trigger the <em>await</em> statement in the next script. Here&#8217;s an example:</p>
+<p><em>Release</em> and qualifications can be used to link scripts together. The release at the end of the first script can trigger the <em>await</em> statement in the next script. Here&#8217;s an example:</p>
 
-<pre><code>await 20 photo_sharing users
+<pre><code>await 20 stage=photo_sharing users
 ask re opinion:
     How did you like sharing photos just now?
-certify as signed_up not photo_sharing</code></pre>
+release as stage=signed_up</code></pre>
 
 <h2 id='congratulations'>Congratulations</h2>
 
@@ -199,10 +254,10 @@ assign:
     sketch out a design for something you
     want to build and take a photo
 document as designer_photo
-certify designer_photo as unreviewed
+release designer_photo as unreviewed
 
 await 6 reviewers and unreviewed designer_photo document
 ask reviewers re opinion:
     What do you think of this idea? |designer_photo|
-certify designer_photo as reviewed not unreviewed</code></pre>
+release designer_photo as reviewed not unreviewed</code></pre>
 </body></html>

data/guide/guide.md

@@ -1,7 +1,7 @@
 Beginners Guide to CEML
 =======================
 
-Thanks for taking an interest in CEML, the Coordinated Event Modeling Language.  Using CEML you'll be able to get people to do whatever you want, whether it's evacuating a submarine, finding a gym buddy, helping people nearby, or just throwing a great party.
+Thanks for taking an interest in CEML, the Coordinated Event Messaging Language.  Using CEML you'll be able to get people to do whatever you want, whether it's evacuating a submarine, finding a gym buddy, helping people nearby, or just throwing a great party.
 
 A CEML _script_ is a recipe for action.  Just like a recipe, it has three parts: a title, a list of ingredients, and then a section that says what to do with the ingredients.  Here's an example:
 
@@ -26,7 +26,7 @@ Whether you write a script compactly with short names for roles and answers or l
 Commands
 --------
 
-The above script only uses three CEML commands--*gather*, *ask*, and *tell*--but there aren't many more commands to learn.  Only four more, actually: besides *gather*, the other ingredients commands are *await* and *nab*.  Besides *ask* and *tell*, the other instructions commands are *assign* and *certify*.
+The above script only uses three CEML commands--*gather*, *ask*, and *tell*--but there aren't many more commands to learn.  Only six more, actually: besides *gather*, the other ingredients commands are *await* and *nab*.  Besides *ask* and *tell*, the other instructions commands are *assign*, *release*, *expect*, and *sync*.
 
 As a sneak preview, here's an example that uses the other commands:
 
@@ -35,7 +35,7 @@ As a sneak preview, here's an example that uses the other commands:
     nab a doctor within 5 miles
     ask patient re problem: What's wrong?
     assign doctor to patient: Attend to patient's |problem|.
-    certify doctor as responsive
+    release doctor as responsive
 
 Texts
 -----
@@ -67,7 +67,7 @@ Roles
 
 In the examples so far, the words like 'enemy', 'reporter', 'guy', 'girl', 'a', 'b', 'signup', 'patient', and 'doctor' are *role names*.  Most of the time, a role name can be any word you like.  They are just a placeholder to connect *casting commands* like *gather* and *await*, with *coordination commands* like *tell*.
 
-Squads on Groundcrew, however, can define special meanings for certain roles.  So on a particular squad, a 'doctor' might mean someone who's been tagged/certified with the tag 'doctor', and a patient might mean anyone else.
+Squads on Groundcrew, however, can define special meanings for certain roles.  So on a particular squad, a 'doctor' might mean someone who's been tagged/released with the tag 'doctor', and a patient might mean anyone else.
 
 Some role names are always special.  For instance, if you use the role name 'organizer', it always means someone who's an official organizer for that squad.  And if you use the role names 'both', 'all', 'each', or 'everyone', it means that the instruction applies to everyone regardless of how they were *cast*.
 
@@ -115,6 +115,31 @@ A special form of *assign* will additionally direct the player to a person or pl
 
 On iPhone or mobile web, the player will get a little map to direct them.  There are several special *role names* which are used to indicate places rather than people.  These include "streetcorner", "park", "field", and "landmark".
 
+Expect
+------
+
+When you ask a question using *ask*, you may not want to let a player proceed unless they've answered in a way you understand or recognize.  This can be accomplished using *expect*:
+
+    ask player re path:
+        Do you prefer to the path to the left or the right?
+    expect /left|right/ from player:
+        Please say "left" or "right"!
+
+The expect statement, like the release statement described below, can be passed strings, certain keywords, or regular expressions.
+
+Sync up
+-------
+
+There also may be times when you want to sync up several players and make sure they have both completed assignments or answered questions before they each proceed with the script:
+
+    assign redcoat:
+        March briskly towards Concord
+    assign minuteman:
+        Hide in the bushes
+    sync up redcoat and minuteman
+    tell both:
+        Prepare to be surprised.
+
 Choosing Players: Await, Gather, and Nab.
 ----------------------------------------------
 
@@ -122,9 +147,9 @@ So what is really the difference between *await*, *gather*, and *nab*, you may b
 
 *Await* defines a kind of trigger--as soon as the conditions awaited for are met, the script will run.
 
-    await 2-5 level1 players within 50ft
+    await 2-5 level=1 players within 50ft
     assign: shout out "woo-hoo!"
-    certify as level2 not level1
+    release as level=2
 
 Unless there's an await statement in your script, it will have to be executed manually by an organizer.
 
@@ -157,29 +182,63 @@ Some of these have special meanings:  the qualifier *new* is automatically appli
 
 Another qualifier with a special meaning is *concerned*.  This is applied to players who, because of their text messaging or their tweeting or their interaction with the iphone or web apps, seem like are confused or have an urgent question or issue.
 
-The other qualifiers don't mean anythings special, but they select only players who have been certified or tagged with that particular word.  So "gather 5-20 level1 users" will only invite users who have been tagged or certified as level1.
+The other qualifiers don't mean anythings special, but they select only players who have been released or tagged with that particular word.  So "gather 5-20 level=1 users" will only invite users who have been tagged or released as level=1.
+
+Finer control of matching
+-------------------------
+
+The *await* keyword supports a variety of options that let you match players with more specificity.  For instance, you may wish to only match players that text in within 10 minutes of one another:
 
-Certifying
+    await 2 new players over 10 minutes
+
+Or players that have the same favorite color:
+
+    await 2 new players with matching favorite_color
+
+Here's two scripts that cooperate to put people in groups by favorite color:
+
+    await new signup
+    ask signup re name: What's your name?
+    ask signup re favorite_color: What's your favorite color?
+
+    await 2 players with matching favorite_color
+    tell players: |buddy.name| also likes |favorite_color|.
+
+
+Releasing
 ----------
 
-When a player has successfully completed their role in your script, you can add or change the tags associated with that player using the *certify* command.
+When a player has successfully completed their role in your script, you can add or change the tags associated with that player using the *release* command.
 
     await 3 new signups
     assign:
         You have all just signed up!
         Take a photo of something you
         love and share with one another.
-    certify as photo_sharing
+    release as photo_sharing
+
+You can also release a player early, subject to some conditions, by using *if* or *unless*:
+
+    await 1 boss and 1 worker
+    ask worker:
+        Do you feel good about working today?
+    release worker unless yes
+    ask worker re skill:
+        What are you good at?
+    ask boss re job:
+        You have a worker with skill |skill|.  What should they do?
+
+There are some special keywords you can use after if or unless.  These include "yes", "no", "done", "okay".  You can also use a string in quotes ("activate"), in which case their answer is compared to the string case insensitively and with whitespace trimmed.  Or you can use a [regular expression](http://en.wikipedia.org/wiki/Regular_expression) surrounded by forward slashes (/^red|blue|green$/) for more exact matching.
 
 Making Connections between Scripts
 ----------------------------------
 
-*Certify* and qualifications can be used to link scripts together.  The certification at the end of the first script can trigger the *await* statement in the next script.  Here's an example:
+*Release* and qualifications can be used to link scripts together.  The release at the end of the first script can trigger the *await* statement in the next script.  Here's an example:
 
-    await 20 photo_sharing users
+    await 20 stage=photo_sharing users
     ask re opinion:
         How did you like sharing photos just now?
-    certify as signed_up not photo_sharing
+    release as stage=signed_up
 
 Congratulations
 ---------------
@@ -206,9 +265,9 @@ The February or March 2011 version of CEML will support passing and curating not
         sketch out a design for something you
         want to build and take a photo
     document as designer_photo
-    certify designer_photo as unreviewed
+    release designer_photo as unreviewed
 
     await 6 reviewers and unreviewed designer_photo document
     ask reviewers re opinion:
         What do you think of this idea? |designer_photo|
-    certify designer_photo as reviewed not unreviewed
+    release designer_photo as reviewed not unreviewed

data/lib/ceml/driver.rb

@@ -1,32 +1,5 @@
-require 'set'
-
-module Kernel
-  def gen_code(size = 8)
-    rand(36**size).to_s(36)
-  end
-end
-
 module CEML
   class Driver
-
-    PLAYERS   = {}
-    INCIDENTS = {}
-    def with_incident(id, script = nil, metadata = {})
-      id ||= rand(36**10).to_s(36)
-      PLAYERS[id] ||= []
-      INCIDENTS[id] ||= CEML::Incident.new to_bytecode(script), id if script
-      raise "no incident #{id}" unless INCIDENTS[id]
-      yield INCIDENTS[id], PLAYERS[id], metadata if block_given?
-
-      PLAYERS[id].select{ |p| p[:released] }.each do |p|
-        release p
-        ping_all p[:script_collection_id], p
-      end
-
-      id
-    end
-    alias_method :start, :with_incident
-
     def to_bytecode bytecode_or_script
       case bytecode_or_script
       when String;       return CEML.parse(:script, bytecode_or_script).bytecode
@@ -35,159 +8,5 @@ module CEML
       else return nil
       end
     end
-
-    def log(s)
-      # puts s
-    end
-
-    SCRIPTS = Hash.new{ |h,k| h[k] = [] }
-    def add_script script_collection_id, script
-      SCRIPTS[script_collection_id] << script
-    end
-
-    def ping_all script_collection_id, candidate, release = false
-      candidate[:script_collection_id] = script_collection_id
-      SCRIPTS[script_collection_id].each{ |s| ping script_collection_id, s.roles_to_cast, candidate, release }
-    end
-
-    def released_from_all script_collection_id, candidate
-      SCRIPTS[script_collection_id].each{ |s| release script_collection_id, s.roles_to_cast, candidate }
-    end
-
-    def release p
-      p[:tags] -= ['new']
-      if p[:released] =~ /^(\w+)=/
-        p[:tags].delete_if{ |t| t =~ /^#{$1}=/ }
-      end
-      p[:tags] += [p[:released]]
-      [:pc, :roles, :released].each{ |sym| p.delete(sym) }
-      (p[:matchables]||={}).update (p[:qs_answers]||{})
-    end
-
-    def launch id, script_collection_id, roleset, *cast
-      script = SCRIPTS[script_collection_id].select{ |s| s.roles_to_cast == roleset }.sort_by{ rand }.first
-      unless script
-        rolesets = SCRIPTS[script_collection_id].map(&:roles_to_cast)
-        raise "matching roleset not found: #{roleset.inspect} in #{rolesets.inspect}"
-      end
-      log "launching #{script.bytecode.inspect} with cast #{cast.inspect}"
-      push id, script.bytecode, *cast
-    end
-
-
-    LOCATIONS = Hash.new{ |h,k| h[k] = [] }
-    def with_confluences script_collection_id, roleset
-      yield LOCATIONS["#{script_collection_id}:#{roleset.hash}"]
-    end
-
-    def ping script_collection_id, roleset, candidate, involvement = :sticky
-      return unless roleset.any?{ |r| r.fits? candidate }
-      candidate[:ts] = CEML.clock
-      already_launched_with = nil
-      run_after = []
-
-      with_confluences script_collection_id, roleset do |confluences|
-        already_launched_with = nil
-        # live_with = confluences.select{ |c| c.live_with?(candidate) }
-        # if not live_with.empty?
-        #   already_launched_with = live_with.first.incident_id
-        #   live_with.each{ |c| c.rm candidate } if involvement != :sticky
-        #   break if involvement != :released
-        # end
-
-        locs = confluences.group_by{ |l| l.stage_with_candidate(candidate) }
-        if locs[:joinable]
-          log "joining..."
-          first = locs[:joinable].shift
-          first.push candidate unless first.incident_id == already_launched_with
-          # JOIN THEM
-          run_after << [:push, first.incident_id, nil, candidate]
-
-        elsif locs[:launchable]
-          log "launching..."
-          first = locs[:launchable].shift
-          first.push candidate
-          cast = first.cast
-          first.incident_id = gen_code
-          (locs[:launchable] + (locs[:listable]||[])).each{ |l| l.rm *cast }
-          # LAUNCH
-          run_after << [:launch, first.incident_id, script_collection_id, roleset, *cast]
-
-        elsif locs[:listable]
-          log "listing..."
-          locs[:listable].each{ |l| l.push candidate }
-
-        else
-          c = Confluence.new(roleset)
-          log "start-listing..."
-          if c.stage_with_candidate(candidate) == :launchable
-            log "start-launching..."
-            c.push candidate
-            c.incident_id = gen_code
-            run_after << [:launch, c.incident_id, script_collection_id, roleset, candidate]
-          else
-            c.push candidate
-          end
-          confluences << c
-        end
-        confluences.delete_if(&:over?)
-      end
-
-      run_after.each do |cmd|
-        send(*cmd)
-      end
-
-      # if already_launched_with and involvement == :sticky
-      #   puts "PUSHING INSTEAD"
-      #   push already_launched_with, nil, candidate
-      # end
-    end
-
-    def push incident_id, script, *updated_players
-      with_incident incident_id, script do |incident, players, metadata|
-        subpost incident, players, metadata, *updated_players
-      end
-    end
-
-    def post incident_id, *updated_players
-      push incident_id, nil, *updated_players
-    end
-
-    alias_method :run, :post
-
-    def subpost incident, players, metadata, *updated_players
-      updated_players.each do |player|
-        player_id = player[:id]
-        player[:roles] = Set.new([*player[:roles] || []])
-        player[:roles] << :agents << :players << :both << :all << :each << :everyone
-        if existing_player = players.find{ |p| p[:id] == player_id }
-          existing_player[:roles] += player.delete :roles
-          existing_player.update player
-        else
-          players << player
-        end
-      end
-      incident.run(players) do |player, meth, what|
-        meth = "player_#{meth}"
-        log "[#{incident.id}] #{meth}: #{player[:id]} #{what.inspect}"
-        if respond_to? meth
-          metadata.update :player => player, :players => players, :id => incident.id
-          result = send(meth, metadata, what)
-          metadata.delete :player
-          metadata.delete :players
-          result
-        end
-      end
-    end
-
-    JUST_SAID = {}
-    def player_said(data, what)
-      JUST_SAID[data[:player][:id]] = what
-      puts "Said #{what.inspect}"
-    end
-
-    # def player_start(data, what)
-    #   puts "STARTED #{data[:player].inspect}"
-    # end
   end
 end