Preliminary handling of actual emails.

[pyrisk.git] / pyrisk / base.py

diff --git a/pyrisk/base.py b/pyrisk/base.py
index 463ddff84526f27209c870a8028efff9a637e54f..2a9028173a298ec5ae2f9f022fbf41cdf8f621fa 100644 (file)
--- a/pyrisk/base.py
+++ b/pyrisk/base.py
@@ -21,8 +21,6 @@ import random
 
 from .log import Logger
 
-VERSION='0.1'
-
 
 class PlayerError (Exception):
     pass
@@ -508,6 +506,7 @@ class Engine (ID_CmpMixin):
         for p in self.players:
             p.alive = True
         random.shuffle(self.players)
+        self.log('Game started with %s' % self.players)
         self.deck.shuffle()
         self.select_territories()
         self.place_initial_armies()
@@ -788,12 +787,15 @@ def test():
     return failures
 
 def random_game():
-    from player.email import EmailPlayer
+    from player.email import IncomingEmailDispatcher, OutgoingEmailDispatcher, EmailPlayer
     world = generate_earth()
-    players = [EmailPlayer('Alice', 'alice@example.com', 'server@example.com'),
+    ied = IncomingEmailDispatcher(fifo_path='/tmp/pyrisk.in')
+    oed = OutgoingEmailDispatcher(return_address='server@example.com')
+    players = [EmailPlayer('Alice', 'alice@big.edu'),
                Player('Bob'), Player('Charlie')]
     e = Engine(world, players)
     e.run()
+    ied.close()
 
 if __name__ == '__main__':
     import sys