Merge remote-tracking branch 'upstream/master'

CHANGES.txt

@@ -1,5 +1,13 @@
 Revision history
 ----------------
+v0.2.5 2015-07-21
+  * Add mailbox module
+  * Remove ActorHub, RemoteActor and ActorAddressBook
+  * Set debug to false as default to avoid tokens to be displayed in IPython Notebooks
+  * Add -o --outfile option to pyc file generation
+  * Add commandline option to generate pretty-printed AST
+  * Add commandline options to convert mochi file Python source file
+  * Fix some bugs
 v0.2.4.2, 2015-05-06
   * Fix a bug related to eventlet's monkey patching on Python 3.2 (pypy3)
 v0.2.4.1, 2015-05-06

README.en.md

@@ -108,18 +108,48 @@ sleep(1)
 sleep(1)
 # -> foo 1000
 # -> bar 2000
+```
+
+### Distributed Computing
+```python
+# comsumer.mochi
+from mochi.actor.mailbox import KombuMailbox, ZmqInbox
 
-remote_actor = RemoteActor('tcp://localhost:9999/test')
-remote_actor ! ['remote!', 3000]
+def consumer():
+    receive:
+        'exit':
+            print('exit!')
+        other:
+            print(other)
+            consumer()
 
-hub = ActorHub('tcp://*:9999')
-hub.register('test', actor2)
-hub.run()
+mailbox = KombuMailbox('sqs://<access_key_id>@<secret_access_key>:80//',
+                       '<queue_name>',
+                       dict(region='<region>'))
+spawn_with_mailbox(consumer, mailbox)
+
+mailbox = ZmqInbox('tcp://*:9999')
+spawn_with_mailbox(consumer, mailbox)
 
 wait_all()
-# -> remote! 3000
 ```
 
+```python
+# producer.mochi
+from mochi.actor.mailbox import KombuMailbox, ZmqOutbox
+
+mailbox = KombuMailbox('sqs://<access_key_id>@<secret_access_key>:80//',
+                       '<queue_name>',
+                       dict(region='<region>'))
+mailbox ! [1, 2, 3]
+mailbox ! 'exit'
+
+mailbox = ZmqOutbox('tcp://localhost:9999')
+mailbox ! [4, 5, 6]
+mailbox ! 'exit'
+```
+
+
 ### Flask
 ```python
 from flask import Flask
@@ -189,16 +219,20 @@ aif([10, 20], first(it), "empty")
 - pyrsistent >= 0.10.1
 - pathlib >= 1.0.1
 - eventlet >= 0.17.1
-- pyzmq >= 14.5.0
 - msgpack-python >= 0.4.6
-- kazoo >= 2.0
 - typeannotations >= 0.1.0
 
 
 ## Installation
 ```sh
 $ pip3 install mochi
+```
+### Optional Installation
+```sh
 $ pip3 install flask Flask-RESTful Pillow RxPY  # to run the examples
+$ pip3 install pyzmq # to use ZmqInbox and ZmqOutbox
+$ pip3 install kombu # to use KombuMailbox
+$ pip3 install boto # to use SQS as transport of KombuMailbox
 ```
 
 Th error of the following may occur when you run Mochi on PyPy.

README.ja.md

@@ -118,16 +118,45 @@ sleep(1)
 sleep(1)
 # -> foo 1000
 # -> bar 2000
+```
+
+### 分散コンピューティング
+```python
+# comsumer.mochi
+from mochi.actor.mailbox import KombuMailbox, ZmqInbox
 
-remote_actor = RemoteActor('tcp://localhost:9999/test')
-remote_actor ! ['remote!', 3000]
+def consumer():
+    receive:
+        'exit':
+            print('exit!')
+        other:
+            print(other)
+            consumer()
 
-hub = ActorHub('tcp://*:9999')
-hub.register('test', actor2)
-hub.run()
+mailbox = KombuMailbox('sqs://<access_key_id>@<secret_access_key>:80//',
+                       '<queue_name>',
+                       dict(region='<region>'))
+spawn_with_mailbox(consumer, mailbox)
+
+mailbox = ZmqInbox('tcp://*:9999')
+spawn_with_mailbox(consumer, mailbox)
 
 wait_all()
-# -> remote! 3000
+```
+
+```python
+# producer.mochi
+from mochi.actor.mailbox import KombuMailbox, ZmqOutbox
+
+mailbox = KombuMailbox('sqs://<access_key_id>@<secret_access_key>:80//',
+                       '<queue_name>',
+                       dict(region='<region>'))
+mailbox ! [1, 2, 3]
+mailbox ! 'exit'
+
+mailbox = ZmqOutbox('tcp://localhost:9999')
+mailbox ! [4, 5, 6]
+mailbox ! 'exit'
 ```
 
 ### Flask
@@ -199,16 +228,21 @@ aif([10, 20], first(it), "empty")
 - pyrsistent >= 0.10.1
 - pathlib >= 1.0.1
 - eventlet >= 0.17.1
-- pyzmq >= 14.5.0
 - msgpack-python >= 0.4.6
-- kazoo >= 2.0
 - typeannotations >= 0.1.0
 
 ## インストール
 
 ```sh
 $ pip3 install mochi
-$ pip3 install flask Flask-RESTful Pillow RxPY  # examplesを実行するために必要
+```
+
+### オプションのインストール
+```sh
+$ pip3 install flask Flask-RESTful Pillow RxPY  # to run the examples
+$ pip3 install pyzmq # to use ZmqInbox and ZmqOutbox
+$ pip3 install kombu # to use KombuMailbox
+$ pip3 install boto # to use SQS as transport of KombuMailbox
 ```
 
 PyPyでmochiを実行した場合に下記のエラーになることがあります。

README.md

@@ -108,18 +108,48 @@ sleep(1)
 sleep(1)
 # -> foo 1000
 # -> bar 2000
+```
+
+### Distributed Computing
+```python
+# comsumer.mochi
+from mochi.actor.mailbox import KombuMailbox, ZmqInbox
 
-remote_actor = RemoteActor('tcp://localhost:9999/test')
-remote_actor ! ['remote!', 3000]
+def consumer():
+    receive:
+        'exit':
+            print('exit!')
+        other:
+            print(other)
+            consumer()
 
-hub = ActorHub('tcp://*:9999')
-hub.register('test', actor2)
-hub.run()
+mailbox = KombuMailbox('sqs://<access_key_id>@<secret_access_key>:80//',
+                       '<queue_name>',
+                       dict(region='<region>'))
+spawn_with_mailbox(consumer, mailbox)
+
+mailbox = ZmqInbox('tcp://*:9999')
+spawn_with_mailbox(consumer, mailbox)
 
 wait_all()
-# -> remote! 3000
 ```
 
+```python
+# producer.mochi
+from mochi.actor.mailbox import KombuMailbox, ZmqOutbox
+
+mailbox = KombuMailbox('sqs://<access_key_id>@<secret_access_key>:80//',
+                       '<queue_name>',
+                       dict(region='<region>'))
+mailbox ! [1, 2, 3]
+mailbox ! 'exit'
+
+mailbox = ZmqOutbox('tcp://localhost:9999')
+mailbox ! [4, 5, 6]
+mailbox ! 'exit'
+```
+
+
 ### Flask
 ```python
 from flask import Flask
@@ -189,17 +219,21 @@ aif([10, 20], first(it), "empty")
 - pyrsistent >= 0.10.1
 - pathlib >= 1.0.1
 - eventlet >= 0.17.1
-- pyzmq >= 14.5.0
 - msgpack-python >= 0.4.6
-- kazoo >= 2.0
 - typeannotations >= 0.1.0
 - astunparse>=1.2.2
 
 
 ## Installation
 ```sh
 $ pip3 install mochi
+```
+### Optional Installation
+```sh
 $ pip3 install flask Flask-RESTful Pillow RxPY  # to run the examples
+$ pip3 install pyzmq # to use ZmqInbox and ZmqOutbox
+$ pip3 install kombu # to use KombuMailbox
+$ pip3 install boto # to use SQS as transport of KombuMailbox
 ```
 
 The following may occur when you run Mochi on PyPy.

README.rst

@@ -125,15 +125,48 @@ Actor
     # -> foo 1000
     # -> bar 2000
 
-    remote_actor = RemoteActor('tcp://localhost:9999/test')
-    remote_actor ! ['remote!', 3000]
 
-    hub = ActorHub('tcp://*:9999')
-    hub.register('test', actor2)
-    hub.run()
+Distributed Computing
+~~~~~~~~~~~~~~~~~~~~~
+.. code:: python
+
+    # comsumer.mochi
+    from mochi.actor.mailbox import KombuMailbox, ZmqInbox
+
+    def consumer():
+        receive:
+            'exit':
+                print('exit!')
+            other:
+                print(other)
+                consumer()
+
+    mailbox = KombuMailbox('sqs://<access_key_id>@<secret_access_key>:80//',
+                           '<queue_name>',
+                           dict(region='<region>'))
+    spawn_with_mailbox(consumer, mailbox)
+
+    mailbox = ZmqInbox('tcp://*:9999')
+    spawn_with_mailbox(consumer, mailbox)
 
     wait_all()
-    # -> remote! 3000
+
+
+.. code:: python
+
+    # producer.mochi
+    from mochi.actor.mailbox import KombuMailbox, ZmqOutbox
+
+    mailbox = KombuMailbox('sqs://<access_key_id>@<secret_access_key>:80//',
+                           '<queue_name>',
+                           dict(region='<region>'))
+    mailbox ! [1, 2, 3]
+    mailbox ! 'exit'
+
+    mailbox = ZmqOutbox('tcp://localhost:9999')
+    mailbox ! [4, 5, 6]
+    mailbox ! 'exit'
+
 
 Flask
 ~~~~~
@@ -212,9 +245,7 @@ Requirements
 -  pyrsistent >= 0.10.1
 -  pathlib >= 1.0.1
 -  eventlet >= 0.17.1
--  pyzmq >= 14.5.0
 -  msgpack-python >= 0.4.6
--  kazoo >= 2.0
 -  typeannotations >= 0.1.0
 
 Installation
@@ -225,6 +256,17 @@ Installation
     $ pip3 install mochi
     $ pip3 install flask Flask-RESTful Pillow RxPY  # to run the examples
 
+
+Optional Installation
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. code:: sh
+
+    $ pip3 install flask Flask-RESTful Pillow RxPY  # to run the examples
+    $ pip3 install pyzmq # to use ZmqInbox and ZmqOutbox
+    $ pip3 install kombu # to use KombuMailbox
+    $ pip3 install boto # to use SQS as transport of KombuMailbox
+
 Th error of the following may occur when you run Mochi on PyPy.
 
 ..