ceml 0.5.5 → 0.5.6

data/VERSION

@@ -1 +1 @@
-0.5.5
+0.5.6

data/ceml.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ceml}
-  s.version = "0.5.5"
+  s.version = "0.5.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Joe Edelman"]
-  s.date = %q{2011-01-17}
+  s.date = %q{2011-01-18}
   s.description = %q{a language for coordinating real world events}
   s.email = %q{joe@citizenlogistics.com}
   s.extra_rdoc_files = [

data/lib/ceml/driver.rb

@@ -36,23 +36,28 @@ module CEML
       with_incident(id, script)
     end
 
-    def post incident_id, player
+    def post incident_id, player = nil
       with_incident incident_id do |incident, players|
         subpost incident, players, player
       end
     end
 
-    def subpost incident, players, player
-      player_id = player[:id]
-      player[:roles] = Set.new([*player[:roles] || []])
-      player[:roles] << :agents
-      if existing_player = players.find{ |p| p[:id] == player_id }
-        existing_player[:roles] += player.delete :roles
-        existing_player.update player
-      else
-        players << player
+    def subpost incident, players, player = nil
+      if player
+        player_id = player[:id]
+        player[:roles] = Set.new([*player[:roles] || []])
+        player[:roles] << :agents
+        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}"
+        send(meth, incident.id, player, what) if respond_to? meth
       end
-      run incident, players
     end
 
     JUST_SAID = {}
@@ -61,11 +66,8 @@ module CEML
       puts "Said #{what.inspect}"
     end
 
-    def run(incident, players)
-      incident.run(players) do |player, meth, what|
-        meth = "player_#{meth}"
-        send(meth, incident.id, player, what) if respond_to? meth
-      end
-    end
+    # def player_delay(incident_id, player, seconds)
+    #   sleep seconds if seconds < 20
+    # end
   end
 end

data/lib/ceml/incident.rb

@@ -41,6 +41,10 @@ module CEML
         bytecode = [[:start]]
         instrs = script.instructions_for(roles)
         instrs.each do |inst|
+          if inst.delay
+            bytecode << [:start_delay, inst.delay]
+            bytecode << [:complete_delay]
+          end
           case inst.cmd
           when :register
             bytecode << [:answered_q, inst]
@@ -84,8 +88,18 @@ module CEML
       cb :said, params.merge(:said => x)
     end
 
-    def start
-      # roles.include? :agent or return false
+    def start;  true; end
+    def finish; true; end
+
+    def start_delay seconds
+      this[:continue_at] = Time.now.utc.to_i + seconds
+      cb :delay, seconds
+      true
+    end
+
+    def complete_delay
+      return false unless Time.now.utc.to_i >= this[:continue_at]
+      this.delete(:continue_at)
       true
     end
 
@@ -131,9 +145,5 @@ module CEML
       say :proceed
       true
     end
-
-    def finish
-      true
-    end
   end
 end

data/lib/ceml/instruction_statements.rb

@@ -1,7 +1,7 @@
 module CEML
   module InstructionStatements
     def list
-        [instruction_stmt] + more.elements.map(&:instruction_stmt)
+      [instruction_stmt.basic_statement] + more.elements.map{ |x| x.instruction_stmt.basic_statement }
     end
 
     def instructions

data/lib/ceml/tt/instructions.treetop

@@ -2,7 +2,7 @@ module CEML
 grammar Instructions
     include Lexer
 
-    rule instruction_stmt
+    rule basic_statement
         (ask_stmt / tell_stmt / assign_stmt / register_stmt) {
 
             INTERPOLATE_REGEX = /\|(\w+)\.?(\w+)?\|/
@@ -15,6 +15,12 @@ grammar Instructions
               end
             end
 
+            def delay
+                if parent.respond_to? :later and not parent.later.empty?
+                    parent.later.duration.seconds
+                end
+            end
+
             def role;  id.text_value.to_sym; end
             def text;  super.text_value; end
             def var
@@ -23,13 +29,21 @@ grammar Instructions
             end
             def key;   var || text; end
             def cmd;
-              text_value =~ /^ask/  and return :ask
+              text_value =~ /^ask/           and return :ask
               text_value =~ /^(tell|assign)/ and return :tell
-              text_value =~ /^register/ and return :register
+              text_value =~ /^register/      and return :register
             end
         }
     end
 
+    rule instruction_stmt
+        later:later? basic_statement
+    end
+
+    rule later
+        duration ws 'later' ws
+    end
+
     rule register_stmt
         'register' ws id ws varname:id
     end

data/lib/ceml/tt/lexer.treetop

@@ -22,10 +22,10 @@ grammar Lexer
     end
 
     rule number
-      ([1-9]+ [0-9]* / '0' / 'an' / 'a' / 'the') {
+      ([1-9]+ [0-9]* / '0' / 'an' / 'a' / 'one' / 'the') {
           def value
             case text_value
-            when 'a', 'an', 'the' then 1
+            when 'a', 'an', 'the', 'one' then 1
             else text_value.to_i
             end
           end
@@ -44,6 +44,16 @@ grammar Lexer
       !(reserved_word ws) [a-zA-Z_]+
     end
 
+    rule duration
+      number ws? time_unit:('seconds' / 'second' / 's' / 'minutes' / 'minute' / 'min')
+      {
+          def seconds
+              number.text_value.to_f * case time_unit.text_value
+              when /^mi/; 60; else 1; end
+          end
+      }
+    end
+
     rule distance
       number ws? distance_unit:('miles' / 'mile' / 'mi' / 'km' / 'kilometers' / 'k' / 'meters' / 'm' / 'ft' / 'feet' / 'f' / 'blocks' / 'block')
       {

data/test/helper.rb

@@ -31,6 +31,10 @@ class Test::Unit::TestCase
     DRIVER.post @iid, :id => id, :roles => roles
   end
 
+  def roll
+    DRIVER.post @iid
+  end
+
   def asked id, rx
     assert p = CEML::Driver::JUST_SAID[id]
     assert_equal :ask, p[:said]

data/test/test_incident.rb

@@ -82,6 +82,18 @@ class TestIncident < Test::Unit::TestCase
     end
   end
 
+  def test_delay
+    s = CEML.parse(:script, "tell agents: hello\n5s later tell agents: goodbye")
+    play s do
+      player :bill, :agent
+      told :bill, /hello/
+      silent :bill
+      sleep 5
+      roll
+      told :bill, /goodbye/
+    end
+  end
+
   def test_signup_1
     s = CEML.parse(:script, "await 1 new signup\ntell signup: thanks")
     play do

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 5
-  - 5
-  version: 0.5.5
+  - 6
+  version: 0.5.6
 platform: ruby
 authors: 
 - Joe Edelman
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-17 00:00:00 -08:00
+date: 2011-01-18 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency