Renames celery.bin.celeryev -> celery.bin.events

celery/bin/celery.py

@@ -306,7 +306,7 @@ class events(Delegate):
         celery events -d
         celery events -C mod.attr -F 1.0 --detach --maxrate=100/m -l info
     """
-    Command = 'celery.bin.celeryev:EvCommand'
+    Command = 'celery.bin.events:EvCommand'
 
 
 @command

celery/bin/celeryd.py

@@ -67,7 +67,7 @@ The :program:`celery worker` command (previously known as ``celeryd``)
 
 .. cmdoption:: -E, --events
 
-    Send events that can be captured by monitors like :program:`celeryev`,
+    Send events that can be captured by monitors like :program:`celery events`,
     `celerymon`, and others.
 
 .. cmdoption:: --purge

celery/bin/celeryev.py → celery/bin/events.py

@@ -51,7 +51,7 @@ class EvCommand(Command):
     supports_args = False
 
     def run(self, dump=False, camera=None, frequency=1.0, maxrate=None,
-            loglevel='INFO', logfile=None, prog_name='celeryev',
+            loglevel='INFO', logfile=None, prog_name='celery events',
             pidfile=None, uid=None, gid=None, umask=None,
             working_directory=None, detach=False, **kwargs):
         self.prog_name = prog_name

celery/events/cursesmon.py

@@ -53,7 +53,7 @@ class CursesMonitor(object):  # pragma: no cover
     online_str = 'Workers online: '
     help_title = 'Keys: '
     help = ('j:up k:down i:info t:traceback r:result c:revoke ^c: quit')
-    greet = 'celeryev {0}'.format(VERSION_BANNER)
+    greet = 'celery events {0}'.format(VERSION_BANNER)
     info_str = 'Info: '
 
     def __init__(self, state, keymap=None, app=None):

celery/tests/bin/test_celeryev.py → celery/tests/bin/test_events.py

@@ -4,7 +4,7 @@ from nose import SkipTest
 from mock import patch as mpatch
 
 from celery.app import app_or_default
-from celery.bin import celeryev
+from celery.bin import events
 
 from celery.tests.utils import Case, patch
 
@@ -25,10 +25,10 @@ class test_EvCommand(Case):
 
     def setUp(self):
         self.app = app_or_default()
-        self.ev = celeryev.EvCommand(app=self.app)
+        self.ev = events.EvCommand(app=self.app)
 
     @patch('celery.events.dumper', 'evdump', lambda **kw: 'me dumper, you?')
-    @patch('celery.bin.celeryev', 'set_process_title', proctitle)
+    @patch('celery.bin.events', 'set_process_title', proctitle)
     def test_run_dump(self):
         self.assertEqual(self.ev.run(dump=True), 'me dumper, you?')
         self.assertIn('celeryev:dump', proctitle.last[0])
@@ -40,14 +40,14 @@ class test_EvCommand(Case):
             raise SkipTest('curses monitor requires curses')
 
         @patch('celery.events.cursesmon', 'evtop', lambda **kw: 'me top, you?')
-        @patch('celery.bin.celeryev', 'set_process_title', proctitle)
+        @patch('celery.bin.events', 'set_process_title', proctitle)
         def _inner():
             self.assertEqual(self.ev.run(), 'me top, you?')
             self.assertIn('celeryev:top', proctitle.last[0])
         return _inner()
 
     @patch('celery.events.snapshot', 'evcam', lambda *a, **k: (a, k))
-    @patch('celery.bin.celeryev', 'set_process_title', proctitle)
+    @patch('celery.bin.events', 'set_process_title', proctitle)
     def test_run_cam(self):
         a, kw = self.ev.run(camera='foo.bar.baz', logfile='logfile')
         self.assertEqual(a[0], 'foo.bar.baz')
@@ -58,9 +58,9 @@ class test_EvCommand(Case):
         self.assertIn('celeryev:cam', proctitle.last[0])
 
     @mpatch('celery.events.snapshot.evcam')
-    @mpatch('celery.bin.celeryev.detached')
+    @mpatch('celery.bin.events.detached')
     def test_run_cam_detached(self, detached, evcam):
-        self.ev.prog_name = 'celeryev'
+        self.ev.prog_name = 'celery events'
         self.ev.run_evcam('myapp.Camera', detach=True)
         self.assertTrue(detached.called)
         self.assertTrue(evcam.called)
@@ -68,8 +68,8 @@ class test_EvCommand(Case):
     def test_get_options(self):
         self.assertTrue(self.ev.get_options())
 
-    @patch('celery.bin.celeryev', 'EvCommand', MockCommand)
+    @patch('celery.bin.events', 'EvCommand', MockCommand)
     def test_main(self):
         MockCommand.executed = []
-        celeryev.main()
+        events.main()
         self.assertTrue(MockCommand.executed)

docs/getting-started/brokers/django.rst

@@ -38,7 +38,7 @@ Limitations
 
 The Django database transport does not currently support:
 
-    * Remote control commands (celeryev, broadcast)
+    * Remote control commands (:program:`celery events` command, broadcast)
     * Events, including the Django Admin monitor.
     * Using more than a few workers (can lead to messages being executed
       multiple times).

docs/getting-started/brokers/sqlalchemy.rst

@@ -62,7 +62,7 @@ Limitations
 
 The SQLAlchemy database transport does not currently support:
 
-    * Remote control commands (celeryev, broadcast)
+    * Remote control commands (:program:`celery events` command, broadcast)
     * Events, including the Django Admin monitor.
     * Using more than a few workers (can lead to messages being executed
       multiple times).

docs/reference/index.rst

@@ -48,7 +48,7 @@
     celery.bin.base
     celery.bin.celeryd
     celery.bin.celerybeat
-    celery.bin.celeryev
+    celery.bin.events
     celery.bin.celery
     celery.bin.amqp
     celery.bin.celeryd_multi