[Uludag-commits] r15247 - branches/pisi-db/pisi/cli

[uludag-commits at pardus.org.tr]

Author: faik
Date: Sat Sep  1 19:21:38 2007
New Revision: 15247

Added:
   branches/pisi-db/pisi/cli/addrepo.py
   branches/pisi-db/pisi/cli/build.py
   branches/pisi-db/pisi/cli/check.py
   branches/pisi-db/pisi/cli/clean.py
   branches/pisi-db/pisi/cli/command.py
   branches/pisi-db/pisi/cli/configurepending.py
   branches/pisi-db/pisi/cli/deletecache.py
   branches/pisi-db/pisi/cli/delta.py
   branches/pisi-db/pisi/cli/emerge.py
   branches/pisi-db/pisi/cli/graph.py
   branches/pisi-db/pisi/cli/help.py
   branches/pisi-db/pisi/cli/index.py
   branches/pisi-db/pisi/cli/info.py
   branches/pisi-db/pisi/cli/install.py
   branches/pisi-db/pisi/cli/listavailable.py
   branches/pisi-db/pisi/cli/listcomponents.py
   branches/pisi-db/pisi/cli/listinstalled.py
   branches/pisi-db/pisi/cli/listpending.py
   branches/pisi-db/pisi/cli/listrepo.py
   branches/pisi-db/pisi/cli/listsources.py
   branches/pisi-db/pisi/cli/listupgrades.py
   branches/pisi-db/pisi/cli/rebuilddb.py
   branches/pisi-db/pisi/cli/remove.py
   branches/pisi-db/pisi/cli/removerepo.py
   branches/pisi-db/pisi/cli/search.py
   branches/pisi-db/pisi/cli/searchfile.py
   branches/pisi-db/pisi/cli/updaterepo.py
   branches/pisi-db/pisi/cli/upgrade.py
Removed:
   branches/pisi-db/pisi/cli/commands.py
Modified:
   branches/pisi-db/pisi/cli/pisicli.py
Log:
divide commands.py

It has growed so large. This way it is easier to find what
you are looking for.

There may be missing imports or some other errors, we will
figure those out while porting code to new db code, one
command at a time. Also unittest of each command will be
written.


Modified: branches/pisi-db/pisi/cli/pisicli.py
=================================================================
--- branches/pisi-db/pisi/cli/pisicli.py	(original)
+++ branches/pisi-db/pisi/cli/pisicli.py	Sat Sep  1 19:21:38 2007
@@ -11,7 +11,7 @@
 #
 
 import sys
-from optparse import OptionParser
+import optparse
 
 import gettext
 __trans = gettext.translation('pisi', fallback=True)
@@ -19,18 +19,45 @@
 
 import pisi
 import pisi.cli
-from pisi.cli import printu
-from pisi.uri import URI
-from pisi.cli.commands import *
+import pisi.cli.command as command
+import pisi.cli.addrepo
+import pisi.cli.build
+import pisi.cli.check
+import pisi.cli.clean
+import pisi.cli.configurepending
+import pisi.cli.deletecache
+import pisi.cli.delta
+import pisi.cli.emerge
+import pisi.cli.graph
+import pisi.cli.index
+import pisi.cli.info
+import pisi.cli.install
+import pisi.cli.listavailable
+import pisi.cli.listcomponents
+import pisi.cli.listinstalled
+import pisi.cli.listpending
+import pisi.cli.listrepo
+import pisi.cli.listsources
+import pisi.cli.listupgrades
+import pisi.cli.rebuilddb
+import pisi.cli.remove
+import pisi.cli.removerepo
+import pisi.cli.searchfile
+import pisi.cli.search
+import pisi.cli.updaterepo
+import pisi.cli.upgrade
+
+#FIXME: why does this has to be imported last
+import pisi.cli.help
 
 class ParserError(pisi.Exception):
     pass
 
-class PreParser(OptionParser):
+class PreParser(optparse.OptionParser):
     """consumes any options, and finds arguments from command line"""
 
     def __init__(self, version):
-        OptionParser.__init__(self, usage=usage_text, version=version)
+        optparse.OptionParser.__init__(self, usage=pisi.cli.help.usage_text, version=version)
 
     def error(self, msg):
         raise ParserError, msg
@@ -96,12 +123,12 @@
         except ParserError:
             raise Error(_('Command line parsing error'))
 
-        self.command = Command.get_command(cmd_name, args=orig_args)
+        self.command = command.Command.get_command(cmd_name, args=orig_args)
         if not self.command:
             raise Error(_("Unrecognized command: %s") % cmd_name)
 
     def die(self):
-        printu('\n' + self.parser.format_help())
+        pisi.cli.printu('\n' + self.parser.format_help())
         sys.exit(1)
 
     def run_command(self):