ceml 0.7.13 → 0.8.0

data/test/test_dialogues.rb

@@ -0,0 +1,58 @@
+require 'ceml'
+require 'test/helper'
+require 'set'
+
+class TestCemlTests < Test::Unit::TestCase
+
+  def setup
+    CEML::Queue.new.calls.clear
+  end
+
+  def test_cemltests
+    Dir["test/dialogues/*.ceml"].each do |f|
+      name = File.basename(f, '.ceml')
+      test    = File.new(f).read
+      scripts, test = test.split("\n---\n")
+
+      puts "Running cemltest #{name}..."
+
+      s = CEML.parse(:scripts, scripts).map(&:castable)
+      bundle_id = s.hash.to_s
+      CEML::Processor.set_bundle(bundle_id, s)
+      CEML::Processor.reset_bundle(bundle_id)
+      pl = Set.new
+      play do
+        test.each_line do |line|
+          puts ">>>> #{line}"
+          case line.strip
+          when /^(\w+) *< *(.*)$/
+            if $2.empty?
+              silent $1
+            else
+              told $1, /#{$2}/
+            end
+          when /^(\w+) *> *(.*)$/
+            player_id, msg = $1, $2
+            player = {:id => player_id, :received => msg }
+            if !pl.include?(player_id)
+              player[:tags] = ['new']
+              pl << player_id
+            end
+            player[:recognized] = :yes if msg == 'y' || msg =~ /^yes/i
+            player[:recognized] = :abort if msg == 'abort'
+            player[:recognized] = :done if msg =~ /^done/i || msg == 'd'
+            CEML::Processor.ping(bundle_id, player)
+            CEML::Processor.run
+          when /^\((\d+)\s*(\w+)\)$/
+            CEML.incr_clock CEML.dur($1.to_i, $2)
+            CEML::Processor.run_latest
+            CEML::Processor.run
+          when /^#/
+          else "Skipping line #{line}..."
+          end
+        end
+      end
+    end
+  end
+
+end

data/test/test_incident.rb

@@ -1,93 +1,29 @@
 require 'ceml'
 require 'test/helper'
 
-SYNC_SCRIPT = <<XXX
-await 1 alpha and 1 beta
-ask alpha re color: What color?
-ask beta re color: What color?
-sync both
-tell alpha: Hi there
-tell beta: Goodbye
-XXX
-
-COMPLIMENT_SCRIPT = <<XXX
-"Overwhelm a specific person with compliments"
-gather 5-20 players within 4 blocks
-ask organizer re target: Describe their appearance and location
-tell agents: Look for |somebody.target| and compliment them briefly, then move on.
-XXX
-
-JANE_SCRIPT = <<XXX
-
-await 1 new signup
-record signup first_name
-ask signup re shoeless:
-  Hello |his.first_name|. You are Level Zero. Lowly level zero.
-  To advance to Level 1, please remove a shoe. Keep it off,
-  and text back "shoeless".
-tell signup:
-  O ho! Well done |his.first_name|. Now the other players
-  know you're in the game, too. But you're still a sad Level 1.
-ask signup re game:
-  To advance to Level 2, answer this question. What was your
-  favorite game when you were 10 years old? Tell me now.
-tell signup:
-  Ah yes. |his.game| WAS an amazing game. You should try to play
-  it again--sometime this week, perhaps?
-  In the meantime you are but a mere Level 2. Let's see if we can do
-  something about that. (You still have your shoe off, right?)
-ask signup re friend:
-  While you're texting... Pick someone in your address book you
-  haven't talked to in a while. Send them an SMS
-  just to say hello. Then tell me their first name.
-tell signup:
-  That was awfully nice of you to message |his.friend|
-  Welcome to the amazing Level 3. You'll like it here. Stay awhile.
-tell signup:
-  Just kidding. Level 4 is way better than this. To get to
-  Level 4, wait for an appropriate moment in Jane's talk
-  and shout an encouraging "Amen!" Yes. Out loud.
-ask signup re amen:
-  If you're not the spiritual type, a forceful "YEAH!" will do.
-  When you've accomplished your mission, text me "amen".
-tell signup:
-  Wow. I didn't think you had it in you. No one has ever gotten to
-  Level 4 before. This is VERY exciting.
-tell signup:
-  If you get to Level 5, I'll give you a secret password. Tell it to
-  Jane, and you'll get some very fancy loot.
-ask signup re ovation:
-  All you have to do is wait until the end of Jane's talk--and try to
-  spark a standing ovation. Good luck! Text ovation afterward for your
-  password.
-tell signup:
-  You did it! You are Level 5. You are AMAZING. The conquering hero of
-  the entire audience! Now I can give you your password.
-tell signup:
-  Ask Jane to sign a copy of her book to Mr. Gamey McGameful. Of course,
-  this will only work if she saw you standing in that ovation. You were
-  standing, right?
-XXX
-
 class TestIncident < Test::Unit::TestCase
 
+  def setup
+    CEML::Queue.new.calls.clear
+  end
+
   def test_sync
-    s = scriptfam SYNC_SCRIPT
+    s = scriptfam SCRIPTS['sync']
     play do
-      ping s, :id => 'alpha'
-      ping s, :id => 'beta'
+      ping s, :id => 'alpha', :tags => ['new']
+      ping s, :id => 'beta', :tags => ['new']
       asked 'alpha', /olor/
       asked 'beta', /olor/
       says 'alpha', "red"
       silent 'alpha'
       says 'beta', "blue"
-      told 'alpha', /Hi/
-      told 'beta', /Goodbye/
+      told 'beta', /Hi/
+      told 'alpha', /Goodbye/
     end
   end
 
   def test_jane
-    s = scriptfam JANE_SCRIPT
+    s = scriptfam SCRIPTS['jane']
     play do
       ping s, :id => 'fred', :tags => ['new'], :received => 'freddy'
       asked 'fred', /Hello freddy. You are Level Zero./
@@ -128,42 +64,40 @@ class TestIncident < Test::Unit::TestCase
     s = scriptfam "await 2 new signups\ntell signups: thanks"
     play do
       ping s, :id => 'fred', :tags => ['new']
-      silent 'fred'
-      ping s, :id => 'wilma', :tags => ['old']
-      silent 'fred'
-      ping s, :id => 'betty', :tags => ['new']
+      # silent 'fred'
+      # ping s, :id => 'wilma', :tags => ['old']
+      # silent 'fred'
+      # ping s, :id => 'betty', :tags => ['new']
       told 'fred', /thanks/
     end
   end
 
 
-  def test_inside_timewindow
-    s = scriptfam "await 2 new signups over 10s\ntell signups: thanks"
-    play do
-      ping s, :id => 'fred', :tags => ['new']
-      silent 'fred'
-      CEML.incr_clock 5
-      ping s, :id => 'betty', :tags => ['new']
-      told 'fred', /thanks/
-    end
-  end
-
-  def test_outside_timewindow
-    s = scriptfam "await 2 new signups over 10s\ntell signups: thanks"
-    play do
-      ping s, :id => 'fred', :tags => ['new']
-      silent 'fred'
-      CEML.incr_clock 15
-      ping s, :id => 'betty', :tags => ['new']
-      silent 'fred'
-    end
-  end
+  # def test_inside_timewindow
+  #   s = scriptfam "await 2 new signups over 10s\ntell signups: thanks"
+  #   play do
+  #     ping s, :id => 'fred', :tags => ['new']
+  #     silent 'fred'
+  #     CEML.incr_clock 5
+  #     ping s, :id => 'betty', :tags => ['new']
+  #     told 'fred', /thanks/
+  #   end
+  # end
+  #
+  # def test_outside_timewindow
+  #   s = scriptfam "await 2 new signups over 10s\ntell signups: thanks"
+  #   play do
+  #     ping s, :id => 'fred', :tags => ['new']
+  #     silent 'fred'
+  #     CEML.incr_clock 15
+  #     ping s, :id => 'betty', :tags => ['new']
+  #     silent 'fred'
+  #   end
+  # end
 
   def test_interpolation
     s = "\"Soccer in the park\"\ngather 2 players within 1mi\nask players re color: which color?\ntell players: its |someone.color|\n"
     s = CEML.parse(:script, s)
-    instrs = s.instructions_for(s.roles)
-    assert !instrs.empty?
     play s do
       player :bill, :players
       player :fred, :players
@@ -176,23 +110,36 @@ class TestIncident < Test::Unit::TestCase
     end
   end
 
+  def test_abort
+    s = "\"Soccer in the park\"\ngather 2 players within 1mi\nask players re color: which color?\ntell players: its |someone.color|\n"
+    s = CEML.parse(:script, s)
+    play s do
+      player :bill, :players
+      player :fred, :players
+      asked :bill, /color\?/i
+      asked :fred, /color\?/i
+      says :bill, 'abort'
+      told :bill,  /aborted/i
+    end
+  end
+
   def test_await
-    s = scriptfam "await a,b,c\ntell a: foo\ntell b: bar\ntell c: baz"
+    s = scriptfam "await new a, new b, new c\ntell a: foo\ntell b: bar\ntell c: baz"
     play do
-      ping s, :id => 'fred'
+      ping s, :id => 'fred', :tags => ['new']
       silent 'fred'
-      ping s, :id => 'wilma'
+      ping s, :id => 'wilma', :tags => ['new']
       silent 'fred'
       silent 'wilma'
-      ping s, :id => 'betty'
+      ping s, :id => 'betty', :tags => ['new']
       told 'fred', /foo/
       told 'betty', /baz/
     end
   end
 
   def test_incident
-    play COMPLIMENT_SCRIPT do
-      player :joe, :organizer, :agent
+    play SCRIPTS['compliment'] do
+      player :joe, :organizer
       player :bill, :agent
 
       asked :joe, /^Describe/
@@ -202,27 +149,17 @@ class TestIncident < Test::Unit::TestCase
     end
   end
 
-ASKCHAIN_SCRIPT = <<XXX
-"Meet your neighbor"
-gather 2 players within 1 block
-ask players re color: what's your favorite color?
-ask players re observation: find someone near you with the color |somebody.color|. what are they wearing?
-ask players re rightmatch: are you wearing |somebody.observation|?
-ask players re task: take your new partner and see if you can find something beautiful in the park.
-XXX
-
-
   def test_askchain
-    play ASKCHAIN_SCRIPT do
-      player :joe, :players, :agent
-      player :bill, :players, :agent
-
-      asked :joe,  /favorite color/
-      asked :bill, /favorite color/
-      says :joe, "red"
-      says :bill, "green"
-      asked :joe, /with the color green/
-      asked :bill, /with the color red/
+    play SCRIPTS['askchain'] do
+      player :joey, :players
+      player :billy, :players
+
+      asked :joey,  /favorite color/
+      asked :billy, /favorite color/
+      says :joey, "red"
+      says :billy, "green"
+      asked :joey, /with the color green/
+      asked :billy, /with the color red/
     end
   end
 

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ceml
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  hash: 63
+  prerelease: 
   segments: 
   - 0
-  - 7
-  - 13
-  version: 0.7.13
+  - 8
+  - 0
+  version: 0.8.0
 platform: ruby
 authors: 
 - Joe Edelman
@@ -14,16 +15,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-24 00:00:00 -08:00
+date: 2011-05-27 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: treetop
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -40,7 +43,6 @@ extra_rdoc_files:
 - README.markdown
 files: 
 - .document
-- .gitignore
 - LICENSE
 - Makefile
 - README.markdown
@@ -56,58 +58,80 @@ files:
 - 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
+- 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/test_casting.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
-- test/test_instructions.rb
-- test/test_release.rb
-- test/test_scripts.rb
 - try
 has_rdoc: true
 homepage: http://github.com/citizenlogistics/ceml
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: a language for coordinating real world events
-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
+test_files: []
+

data/.gitignore

@@ -1,23 +0,0 @@
-lib/ceml/tt/*.rb
-
-## MAC OS
-.DS_Store
-
-## TEXTMATE
-*.tmproj
-tmtags
-
-## EMACS
-*~
-\#*
-.\#*
-
-## VIM
-*.swp
-
-## PROJECT::GENERAL
-coverage
-rdoc
-pkg
-
-## PROJECT::SPECIFIC

data/lib/ceml/confluence.rb

@@ -1,63 +0,0 @@
-require 'geokit'
-require 'forwardable'
-
-module CEML
-  class Confluence
-    attr_accessor :hash, :created, :roles_to_cast, :incident_id, :star
-    alias_method :launched?, :incident_id
-
-    def initialize roles_to_cast, candidate = nil
-      @hash    = {}
-      @created = true
-      @roles_to_cast = roles_to_cast
-      push candidate if candidate
-    end
-
-    def rm *candidates
-      @roles_to_cast.each{ |role| role.rm *candidates }
-    end
-
-    def best_role_for candidate
-      # puts "confluence finding best role #{object_id} #{candidate[:id]} #{star}"
-      winner = @roles_to_cast.max_by{ |role| role.affinity(candidate, star) }
-      winner unless winner.affinity(candidate, star)[0] == -1
-    end
-
-    def stage_with_candidate candidate
-      return :uninterested if cast_with?(candidate)
-      best_role = best_role_for(candidate)
-      return :uninterested unless best_role
-      return :joinable if launched?
-      other_roles = @roles_to_cast - [best_role]
-      return :launchable if best_role.one_left? and other_roles.all?(&:filled?)
-      return :listable
-    end
-
-    def push candidate
-      best_role = best_role_for(candidate)
-      candidate[:roles] = best_role.name.to_sym
-      best_role.casted << candidate
-      @star ||= candidate
-    end
-
-    def full?
-      @roles_to_cast.all?{ |role| role.allowed == 0 }
-    end
-
-    def over?
-      @roles_to_cast.any?{ |r| r.over?(star) }
-    end
-
-    def cast_with?(candidate)
-      @roles_to_cast.any?{ |r| r.casted.any?{ |guy| guy[:id] == candidate[:id] } }
-    end
-
-    def live_with?(candidate)
-      launched? and cast_with?(candidate)
-    end
-
-    def cast
-      @roles_to_cast.map{ |r| r.casted }.flatten
-    end
-  end
-end

data/lib/ceml/role.rb

@@ -1,61 +0,0 @@
-module CEML
-
-  class Criteria < Struct.new :plus_tags, :minus_tags, :matching, :radius, :timewindow
-    def complexity; plus_tags.size; end
-    def =~(candidate)
-      candidate[:tags] ||= []
-      (plus_tags - candidate[:tags]).empty? and (minus_tags & candidate[:tags]).empty?
-    end
-  end
-
-  class Role < Struct.new :name, :criteria, :range, :casted
-    # def <=>(b); b.criteria.complexity <=> criteria.complexity; end
-    def affinity candidate, star
-      return [-1, -1, -1 ] unless fits?(candidate, star)
-      [ criteria.complexity, -needed, -allowed ]
-    end
-
-    def comparable_object
-      [name, criteria, range]
-    end
-
-    def ==(other); comparable_object == other.comparable_object; end
-    def hash; comparable_object.hash; end
-
-    def filled?;   needed == 0; end
-    def one_left?; needed == 1; end
-
-    def rm(*ids); casted.delete_if{ |guy| ids.include? guy[:id] }; end
-    def needed; [range.min - casted.size, 0].max; end
-    def allowed; [range.max - casted.size, 0].max; end
-
-    def over?(star)
-      return unless criteria.timewindow and star
-      CEML.clock - star[:ts] > criteria.timewindow
-    end
-
-    def fits?(candidate, star = nil)
-      return false unless criteria =~ candidate
-      return false if casted.size >= range.max
-      return false if casted.any?{ |guy| guy[:id] == candidate[:id] }
-      return true unless star
-      c = criteria
-      if c.matching
-        return unless c.matching.all? do |g|
-          candidate[:matchables][g] && star[:matchables][g] &&
-          candidate[:matchables][g].downcase.strip == star[:matchables][g].downcase.strip
-        end
-      end
-      if c.radius
-        c_ll = Geokit::LatLng(candidate[:lat], candidate[:lng])
-        s_ll = Geokit::LatLng(star[:lat], star[:lng])
-        return unless c_ll.distance_to(s_ll, :meters) <= c.radius
-      end
-      if c.timewindow
-        # puts "checking timewindow #{c.timewindow} #{candidate[:ts] - star[:ts]}"
-        return unless candidate[:ts] - star[:ts] <= c.timewindow
-      end
-      return true
-    end
-  end
-end

data/lib/ceml/tt/casting.treetop

@@ -1,65 +0,0 @@
-module CEML
-grammar Casting
-    include Lexer
-
-    rule casting_statement
-      ('gather' / 'await' / 'nab') ws roles modifiers:modifier_phrase* <CastingStatement>
-    end
-
-    rule modifier_phrase
-      over_phrase / within_phrase / with_matching_phrase
-    end
-
-    rule over_phrase
-        ws 'over' ws duration
-    end
-
-    rule within_phrase
-        ws 'within' ws distance
-    end
-
-    rule with_matching_phrase
-        ws 'with' ws 'matching' ws thing:id
-    end
-
-    rule roles
-        role more:(and role)* {
-            def list
-                [role] + more.elements.map{ |e| e.role }
-            end
-
-            def names; list.map{ |r| r.name.to_sym };         end
-            def [](x); list.detect{ |r| r.name.to_sym == x }; end
-            def min;   list.map(&:min).inject(0, &:+);        end
-            def max;   list.map(&:max).inject(0, &:+);        end
-        }
-    end
-
-    rule qualifier
-        id
-    end
-
-    rule rolename
-        id
-    end
-
-    rule role
-      (rolename &and / range ws qualifier ws rolename / range ws rolename / qualifier ws rolename / rolename) {
-        def name; if respond_to? :rolename then rolename.text_value else text_value end; end
-        def min
-            return range.value.min if respond_to? :range
-            name =~ /s$/ ? 2 : 1
-        end
-        def max
-            return range.value.max if respond_to? :range
-            name =~ /s$/ ? 10000 : 1
-        end
-        def qualifiers
-            return [qualifier.text_value] if respond_to? :qualifier
-            return []
-        end
-      }
-    end
-
-end
-end