Changeset 68

Timestamp:

07/18/05 04:10:01 (3 years ago)

Author:

athomas

Message:

AdminConsoleProviderPatch:

• Moved !IAdminConsoleProvider to trac/scripts/admin.py
  

Files:

• adminconsoleproviderpatch/trunk/admin-provider.diff (modified) (10 diffs)

adminconsoleproviderpatch/trunk/admin-provider.diff

@@ -1 @@
-Index: setup.py
-===================================================================
---- setup.py    (revision 1962)
-+++ setup.py    (working copy)
-@@ -211,7 +211,7 @@
-       url=URL,
-       packages=['trac', 'trac.mimeview', 'trac.scripts', 'trac.ticket',
-                 'trac.upgrades', 'trac.versioncontrol', 'trac.web',
--                'trac.wiki'],
-+                'trac.wiki', 'trac.admin'],
-       data_files=[(_p('share/trac/templates'), glob('templates/*')),
-                   (_p('share/trac/htdocs'), glob(_p('htdocs/*.*')) + [_p('htdocs/README')]),
-                   (_p('share/trac/htdocs/css'), glob(_p('htdocs/css/*'))),
-Index: trac/scripts/admin.py
-===================================================================
-62
+76
-+++ trac/scripts/admin.py       (working copy)
-6 +39,9
+7 +39,11
- from trac.Milestone import Milestone
- from trac.perm import PermissionSystem
- from trac.ticket.model import *
-
-
+
-+from trac.loader import load_components
- 
++__all__ = [ 'IAdminConsoleProvider' ]
++
- try:
-     sum
-
+
+
-             tot += item
-         return tot
- 
++class IAdminConsoleProvider(Interface):
++    """
++    Extension point interface for components to provide an administrative
++    interface from within trac-admin.
++    """
+ 
++    def get_console_commands(tracadm):
++        """
++        Return an iterable of (name, help, callable, completer) tuples.
++
++        tracadm is a TracAdmin instance.
++
++        completer can be null. help is in the same format that trac-admin
++        uses.
++        """
++
-+class AdminCommands(trac.core.Component):
-+    """
@@ -35 +40 @@
-+    """
-+    admin_providers = ExtensionPoint(IAdminConsoleProvider)
-
+
-+    def import_providers(self, env, tracadm):
-+        load_components(env)
@@ -51 +56 @@
-     intro = ''
-     license = trac.__license_long__
-84
+101
-     _date_format = '%Y-%m-%d'
-     _datetime_format = '%Y-%m-%d %H:%M:%S'
@@ -59 +64 @@
-     def __init__(self, envdir=None):
-         cmd.Cmd.__init__(self)
-93
+110
-             self.env_set(os.path.abspath(envdir))
- 
@@ -67 +72 @@
- 
-     def emptyline(self):
-06
+23
-               '%(copy)s\n\n'                                    \
-               "Type:  '?' or 'help' for help on commands.\n" %  \
@@ -75 +80 @@
- 
-     ##
-22
+39
-     def env_check(self):
-         try:
@@ -88 +93 @@
-             return 0
-         return 1
-46
+63
-         try:
-             if not self.__env:
@@ -97 +102 @@
-         except Exception, e:
-             print 'Failed to open environment.', e
-40
+57
-                                xrange(0, (1 + len(sep)) * cnum + sum(colw))])
-         print
@@ -106 +111 @@
-         if not doc: return
-         self.print_listing(['Command', 'Description'], doc, '  --', decor) 
-32
+49
-             except AttributeError:
-                 print "No documentation found for '%s'" % arg[0]
@@ -129 +134 @@
-             if not self.interactive:
-                 print
-Index: trac/admin/__init__.py
-===================================================================
---- trac/admin/__init__.py      (revision 0)
-+++ trac/admin/__init__.py      (revision 0)
-@@ -0,0 +1 @@
-+from trac.admin.console import *
-Index: trac/admin/console.py
-===================================================================
---- trac/admin/console.py       (revision 0)
-+++ trac/admin/console.py       (revision 0)
-@@ -0,0 +1,41 @@
-+# -*- coding: iso8859-1 -*-
-+#
-+# Copyright (C) 2003, 2004, 2005 Edgewall Software
-+# Copyright (C) 2003, 2004, 2005 Alec Thomas <alec@swapoff.org>
-+#
-+# Trac is free software; you can redistribute it and/or
-+# modify it under the terms of the GNU General Public License as
-+# published by the Free Software Foundation; either version 2 of the
-+# License, or (at your option) any later version.
-+#
-+# Trac is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+# General Public License for more details.
-+#
-+# You should have received a copy of the GNU General Public License
-+# along with this program; if not, write to the Free Software
-+# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-+#
-+# Author: Alec Thomas <alec@swapoff.org>
-+
-+from trac.core import Interface
-+import sys
-+
-+__all__ = [ 'IAdminConsoleProvider' ]
-+
-+class IAdminConsoleProvider(Interface):
-+    """
-+    Extension point interface for components to provide an administrative
-+    interface from within trac-admin.
-+    """
-+
-+    def get_console_commands(tracadm):
-+        """
-+        Return an iterable of (name, help, callable, completer) tuples.
-+
-+        tracadm is a TracAdmin instance.
-+
-+        completer can be null. help is in the same format that trac-admin
-+        uses.
-+        """