Merge branch 'release/v0.1.1'

Author: XenGi

Diff for: controller_example.py

@@ -10,10 +10,10 @@
 """
 
 __author__ = 'Ricardo Band'
-__copyright__ = 'Copyright 2013, Ricardo Band'
+__copyright__ = 'Copyright 2014, Ricardo Band'
 __credits__ = ['Ricardo Band']
 __license__ = 'MIT'
-__version__ = '0.1.0'
+__version__ = '0.1.1'
 __maintainer__ = 'Ricardo Band'
 __email__ = '[email protected]'
 __status__ = 'Development'

Diff for: emulator.py

@@ -10,10 +10,10 @@
 """
 
 __author__ = 'Ricardo Band'
-__copyright__ = 'Copyright 2013, Ricardo Band'
+__copyright__ = 'Copyright 2014, Ricardo Band'
 __credits__ = ['Ricardo Band']
 __license__ = 'MIT'
-__version__ = '0.1.0'
+__version__ = '0.1.1'
 __maintainer__ = 'Ricardo Band'
 __email__ = '[email protected]'
 __status__ = 'Development'
@@ -28,7 +28,7 @@ class Emu(object):
     """
     The Emulator is a simple pygame game.
     """
-    def __init__(self, width=40, height=40, ip='127.0.0.1', port=1337):
+    def __init__(self, width=50, height=28, ip='127.0.0.1', port=1337):
         """
         Creates a screen with the given size, generates the matrix for the
         Mate bottles and binds the socket for incoming frames.
@@ -99,4 +99,4 @@ def gameloop(self):
 
 if __name__ == '__main__':
     EMU = Emu()
-    EMU.gameloop()
+    EMU.gameloop()

Diff for: game_example.py

@@ -11,10 +11,10 @@
 """
 
 __author__ = 'Ricardo Band'
-__copyright__ = 'Copyright 2013, Ricardo Band'
+__copyright__ = 'Copyright 2014, Ricardo Band'
 __credits__ = ['Ricardo Band']
 __license__ = 'MIT'
-__version__ = '0.1.0'
+__version__ = '0.1.1'
 __maintainer__ = 'Ricardo Band'
 __email__ = '[email protected]'
 __status__ = 'Development'
@@ -138,8 +138,11 @@ def gameloop(self):
                 self.render()
         except KeyboardInterrupt:
             pass
+        # don't forget to quit the controller process if your game ends.
+        # In future releases this will be done automatically.
+        self.ctlr.quit()
 
 
 if __name__ == '__main__':
-    GAME = Game('127.0.0.1', 1337, 40, 40)
-    GAME.gameloop()
+    GAME = Game('127.0.0.1', 1337, 50, 28)
+    GAME.gameloop()

Diff for: pymlgame/__init__.py

@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
 
 __author__ = 'Ricardo Band'
-__copyright__ = 'Copyright 2013, Ricardo Band'
+__copyright__ = 'Copyright 2014, Ricardo Band'
 __credits__ = ['Ricardo Band']
 __license__ = 'MIT'
-__version__ = '0.1.0'
+__version__ = '0.1.1'
 __maintainer__ = 'Ricardo Band'
 __email__ = '[email protected]'
 __status__ = 'Development'

Diff for: pymlgame/clock.py

@@ -5,10 +5,10 @@
 """
 
 __author__ = 'Ricardo Band'
-__copyright__ = 'Copyright 2013, Ricardo Band'
+__copyright__ = 'Copyright 2014, Ricardo Band'
 __credits__ = ['Ricardo Band']
 __license__ = 'MIT'
-__version__ = '0.1.0'
+__version__ = '0.1.1'
 __maintainer__ = 'Ricardo Band'
 __email__ = '[email protected]'
 __status__ = 'Development'

Diff for: pymlgame/controller.py

@@ -5,10 +5,10 @@
 """
 
 __author__ = 'Ricardo Band'
-__copyright__ = 'Copyright 2013, Ricardo Band'
+__copyright__ = 'Copyright 2014, Ricardo Band'
 __credits__ = ['Ricardo Band']
 __license__ = 'MIT'
-__version__ = '0.1.0'
+__version__ = '0.1.1'
 __maintainer__ = 'Ricardo Band'
 __email__ = '[email protected]'
 __status__ = 'Development'
@@ -115,6 +115,12 @@ def get_events(self):
             ret.append(self.queue.pop(0))
         return ret
 
+    def quit(self):
+        """
+        Kill the Controller process.
+        """
+        self.server.server_close()
+
 
 class Event(object):
     """

Diff for: pymlgame/locals.py

@@ -5,10 +5,10 @@
 """
 
 __author__ = 'Ricardo Band'
-__copyright__ = 'Copyright 2013, Ricardo Band'
+__copyright__ = 'Copyright 2014, Ricardo Band'
 __credits__ = ['Ricardo Band']
 __license__ = 'MIT'
-__version__ = '0.1.0'
+__version__ = '0.1.1'
 __maintainer__ = 'Ricardo Band'
 __email__ = '[email protected]'
 __status__ = 'Development'

Diff for: pymlgame/screen.py

@@ -5,10 +5,10 @@
 """
 
 __author__ = 'Ricardo Band'
-__copyright__ = 'Copyright 2013, Ricardo Band'
+__copyright__ = 'Copyright 2014, Ricardo Band'
 __credits__ = ['Ricardo Band']
 __license__ = 'MIT'
-__version__ = '0.1.0'
+__version__ = '0.1.1'
 __maintainer__ = 'Ricardo Band'
 __email__ = '[email protected]'
 __status__ = 'Development'

Diff for: pymlgame/surface.py

@@ -5,10 +5,10 @@
 """
 
 __author__ = 'Ricardo Band'
-__copyright__ = 'Copyright 2013, Ricardo Band'
+__copyright__ = 'Copyright 2014, Ricardo Band'
 __credits__ = ['Ricardo Band']
 __license__ = 'MIT'
-__version__ = '0.1.0'
+__version__ = '0.1.1'
 __maintainer__ = 'Ricardo Band'
 __email__ = '[email protected]'
 __status__ = 'Development'

Diff for: setup.py

@@ -6,10 +6,10 @@
 """
 
 __author__ = 'Ricardo Band'
-__copyright__ = 'Copyright 2013, Ricardo Band'
+__copyright__ = 'Copyright 2014, Ricardo Band'
 __credits__ = ['Ricardo Band']
 __license__ = 'MIT'
-__version__ = '0.1.0'
+__version__ = '0.1.1'
 __maintainer__ = 'Ricardo Band'
 __email__ = '[email protected]'
 __status__ = 'Development'

Diff for: tests.py

@@ -6,10 +6,10 @@
 """
 
 __author__ = 'Ricardo Band'
-__copyright__ = 'Copyright 2013, Ricardo Band'
+__copyright__ = 'Copyright 2014, Ricardo Band'
 __credits__ = ['Ricardo Band']
 __license__ = 'MIT'
-__version__ = '0.1.0'
+__version__ = '0.1.1'
 __maintainer__ = 'Ricardo Band'
 __email__ = '[email protected]'
 __status__ = 'Development'
@@ -227,7 +227,8 @@ def setUp(self):
                                                               TEST_RPC_PORT))
 
     def tearDown(self):
-        self.controller.server.server_close()
+        self.controller.quit()
+        # just wait a second for the socket to close
         time.sleep(1)
 
     def test_uid(self):