Finalize newadm to qadmin rename.

diff --git a/doc/Makefile b/doc/Makefile
index 78fa96ca67bbc31de9daf35a056e259151a063ab..d5ee4e4905190e59cdebfe7167e038a838e55d08 100644 (file)
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -11,7 +11,7 @@ EPYARGS = --no-private --url="http://pgfoundry.org/projects/skytools/" \
 
 HTMLS = londiste.cmdline.html londiste.config.html README.html INSTALL.html \
        londiste.ref.html TODO.html pgq-sql.html pgq-admin.html pgq-nodupes.html \
-       $(SCRIPT_HTMLS) faq.html set.notes.html newadm.html skytools3.html devnotes.html
+       $(SCRIPT_HTMLS) faq.html set.notes.html qadmin.html skytools3.html devnotes.html
 
 SCRIPT_TXTS = walmgr.txt cube_dispatcher.txt table_dispatcher.txt \
              queue_mover.txt queue_splitter.txt bulk_loader.txt \

diff --git a/doc/newadm.txt b/doc/qadmin.txt
similarity index 89%
rename from doc/newadm.txt
rename to doc/qadmin.txt
index 456bc71ed84f8e258fb66f45763929913f77d683..9a27465829813e596be7800d91add934d04d25dd 100644 (file)
--- a/doc/newadm.txt
+++ b/doc/qadmin.txt
@@ -1,4 +1,4 @@
-= newadm =
+= qadmin =
 
 == Goal ==
 
@@ -79,10 +79,10 @@ Information:
 
 == Smaller Open Questions ==
 
-* What arguments should newadm accept from command line?
+* What arguments should qadmin accept from command line?
 
-  psql-style: newadm [switches] [dbname [username]]
-  ssh-style:  newadm [switches] [command [args]]
+  psql-style: qadmin [switches] [dbname [username]]
+  ssh-style:  qadmin [switches] [command [args]]
 
 * Command style and syntax.
 
@@ -113,16 +113,16 @@ Information:
   - Tab-completion of quoted idents. (?)
   - Multi-line commands. (?)
 
-* Cascading: It would be useful to also have cascading commands available in newadm.
+* Cascading: It would be useful to also have cascading commands available in qadmin.
    ( SWITCHOVER / CREATE NODE / PAUSE NODE / CHANGE PROVIDER ).
    But currently they are implemented using DBScript framework.  And
    we don't want to have several implementations of the commands.
    There seems to be 2 ways forward:
-   - Convert newadm to DBScript.  It is possible to make config-less DBScript.
-   - Implement command under newadm in non-DBScript way and make
-     CascadeAdmin call newadm implementation.
+   - Convert qadmin to DBScript.  It is possible to make config-less DBScript.
+   - Implement command under qadmin in non-DBScript way and make
+     CascadeAdmin call qadmin implementation.
 
-* Londiste: It seems to be good idea to make Londiste management also available in newadm.
+* Londiste: It seems to be good idea to make Londiste management also available in qadmin.
   - LONDISTE ADD|REMOVE TABLE <tbl>
   - LONDISTE ADD|REMOVE SEQUENCE <seq>
   - LONDISTE SHOW TABLES / SHOW LONDISTE TABLES / SHOW TABLES ?

diff --git a/doc/skytools3.txt b/doc/skytools3.txt
index a539f30e55e370996d520a1fac6b6841c60ead01..18a637c12b1b3f3096825171ce35eefa4d8577f0 100644 (file)
--- a/doc/skytools3.txt
+++ b/doc/skytools3.txt
@@ -138,7 +138,7 @@ Further reading
 ---------------
 
 * Skytools 3 todo list: TODO.txt
-* Newadm design and todo list: newadm.txt
+* Newadm design and todo list: qadmin.txt
 * Technical notes about cascading: set.notes.txt
 * Notes for contributors: devnotes.txt
 

diff --git a/python/qadmin.py b/python/qadmin.py
index 5aaada514574a953f913364679a16ae0fd4db76c..1e444d88eda2f1d09264290ac06738016c5e47f3 100755 (executable)
--- a/python/qadmin.py
+++ b/python/qadmin.py
@@ -34,7 +34,7 @@ show_queue_stats <q>;
 __version__ = '0.1'
 
 cmdline_usage = '''\
-Usage: newadm [switches]
+Usage: qadmin [switches]
 
 Initial connection options:
     -h host
@@ -471,7 +471,7 @@ class AdminConsole:
                 print cmdline_usage
                 sys.exit(0)
             elif o == "--version":
-                print "newadm version %s" % __version__
+                print "qadmin version %s" % __version__
                 sys.exit(0)
             elif o == "-h":
                 cstr_map['host'] = a
@@ -548,7 +548,7 @@ class AdminConsole:
         readline.parse_and_bind('tab: complete')
         readline.set_completer(self.rl_completer_safe)
         #print 'delims: ', repr(readline.get_completer_delims())
-        hist_file = os.path.expanduser("~/.newadm_history")
+        hist_file = os.path.expanduser("~/.qadmin_history")
         try:
             readline.read_history_file(hist_file)
         except IOError:

diff --git a/setup.py b/setup.py
index a583b21b751d1cdc64a277a86024004050df0ee2..4b11023eb3572f015a2329f9ed2f78885233566d 100755 (executable)
--- a/setup.py
+++ b/setup.py
@@ -35,7 +35,7 @@ setup(
     package_dir = {'': 'python'},
     packages = ['skytools', 'londiste', 'pgq', 'pgq.cascade'],
     scripts = ['python/londiste.py',
-               'python/newadm.py',
+               'python/qadmin.py',
                'python/pgqadm.py',
                'python/walmgr.py',
                'scripts/bulk_loader.py',