Renames celery.bin.camqadm -> celery.bin.amqp

celery/bin/camqadm.py → celery/bin/amqp.py

@@ -331,7 +331,7 @@ class AMQShell(cmd.Cmd):
 
 
 class AMQPAdmin(object):
-    """The celery :program:`camqadm` utility."""
+    """The celery :program:`celery amqp` utility."""
     Shell = AMQShell
 
     def __init__(self, *args, **kwargs):
@@ -371,7 +371,7 @@ class AMQPAdminCommand(Command):
         return AMQPAdmin(*args, **options).run()
 
 
-def camqadm(*args, **options):
+def run(*args, **options):
     AMQPAdmin(*args, **options).run()
 
 

celery/bin/celery.py

@@ -341,7 +341,7 @@ class amqp(Delegate):
         celery amqp queue.delete queue yes yes
 
     """
-    Command = 'celery.bin.camqadm:AMQPAdminCommand'
+    Command = 'celery.bin.amqp:AMQPAdminCommand'
 
 
 @command(name='list')

celery/tests/bin/test_camqadm.py → celery/tests/bin/test_amqp.py

@@ -3,12 +3,12 @@ from __future__ import absolute_import
 from mock import Mock, patch
 
 from celery import Celery
-from celery.bin.camqadm import (
+from celery.bin.amqp import (
     AMQPAdmin,
     AMQShell,
     dump_message,
     AMQPAdminCommand,
-    camqadm,
+    run,
     main,
 )
 
@@ -127,22 +127,22 @@ class test_AMQShell(AppCase):
         a.run()
         self.assertIn('bibi', self.fh.getvalue())
 
-    @patch('celery.bin.camqadm.AMQPAdminCommand')
+    @patch('celery.bin.amqp.AMQPAdminCommand')
     def test_main(self, Command):
         c = Command.return_value = Mock()
         main()
         c.execute_from_commandline.assert_called_with()
 
-    @patch('celery.bin.camqadm.AMQPAdmin')
-    def test_camqadm(self, cls):
+    @patch('celery.bin.amqp.AMQPAdmin')
+    def test_amqp(self, cls):
         c = cls.return_value = Mock()
-        camqadm()
+        run()
         c.run.assert_called_with()
 
-    @patch('celery.bin.camqadm.AMQPAdmin')
+    @patch('celery.bin.amqp.AMQPAdmin')
     def test_AMQPAdminCommand(self, cls):
         c = cls.return_value = Mock()
-        camqadm()
+        run()
         c.run.assert_called_with()
 
         x = AMQPAdminCommand(app=self.app)

docs/reference/celery.bin.camqadm.rst → docs/reference/celery.bin.amqp.rst

@@ -1,11 +1,11 @@
 ===========================================================
- celery.bin.camqadm
+ celery.bin.amqp
 ===========================================================
 
 .. contents::
     :local:
-.. currentmodule:: celery.bin.camqadm
+.. currentmodule:: celery.bin.amqp
 
-.. automodule:: celery.bin.camqadm
+.. automodule:: celery.bin.amqp
     :members:
     :undoc-members:

docs/reference/index.rst

@@ -50,5 +50,5 @@
     celery.bin.celerybeat
     celery.bin.celeryev
     celery.bin.celery
-    celery.bin.camqadm
+    celery.bin.amqp
     celery.bin.celeryd_multi