Merge from W. Trevor King's tree.

1 files changed, 25 insertions, 136 deletions

diff --git a/libbe/cmdutil.py b/libbe/cmdutil.py
index 079601e..6d7ab01 100644
--- a/libbe/cmdutil.py
+++ b/libbe/cmdutil.py
@@ -14,25 +14,16 @@
 #    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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-import bugdir
-import plugin
-import locale
-import os
 import optparse
+import os
+import locale
 from textwrap import TextWrapper
 from StringIO import StringIO
-import utility
+import doctest
 
-def unique_name(bug, bugs):
-    chars = 1
-    for some_bug in bugs:
-        if bug.uuid == some_bug.uuid:
-            continue
-        while (bug.uuid[:chars] == some_bug.uuid[:chars]):
-            chars+=1
-        if chars < 3:
-            chars = 3
-    return bug.uuid[:chars]
+import bugdir
+import plugin
+import utility
 
 class UserError(Exception):
     def __init__(self, msg):
@@ -43,45 +34,6 @@ class UserErrorWrap(UserError):
         UserError.__init__(self, str(exception))
         self.exception = exception
 
-def get_bug(spec, bug_dir=None):
-    matches = []
-    try:
-        if bug_dir is None:
-            bug_dir = bugdir.tree_root('.')
-    except bugdir.NoBugDir, e:
-        raise UserErrorWrap(e)
-    bugs = list(bug_dir.list())
-    for bug in bugs:
-        if bug.uuid.startswith(spec):
-            matches.append(bug)
-    if len(matches) > 1:
-        raise UserError("More than one bug matches %s.  Please be more"
-                        " specific." % spec)
-    if len(matches) == 1:
-        return matches[0]
-        
-    matches = []
-    if len(matches) == 0:
-        raise UserError("No bug matches %s" % spec)
-    return matches[0]
-
-def bug_summary(bug, bugs, no_target=False, shortlist=False):
-    target = bug.target
-    if target is None or no_target:
-        target = ""
-    else:
-        target = "  Target: %s" % target
-    if bug.assigned is None:
-        assigned = ""
-    else:
-        assigned = "  Assigned: %s" % bug.assigned
-    if shortlist == False:
-       return "  ID: %s\n  Severity: %s\n%s%s\n  Creator: %s \n%s\n" % \
-            (unique_name(bug, bugs), bug.severity, assigned, target,
-             bug.creator, bug.summary)
-    else:
-       return "%4s: %s\n" % (unique_name(bug, bugs), bug.summary)
-
 def iter_commands():
     for name, module in plugin.iter_plugins("becommands"):
         yield name.replace("_", "-"), module
@@ -104,9 +56,20 @@ def execute(cmd, args):
     encoding = locale.getpreferredencoding() or 'ascii'
     return get_command(cmd).execute([a.decode(encoding) for a in args])
 
-def help(cmd):
-    return get_command(cmd).help()
-
+def help(cmd=None):
+    if cmd != None:
+        return get_command(cmd).help()
+    else:
+        cmdlist = []
+        for name, module in iter_commands():
+            cmdlist.append((name, module.__desc__))
+        longest_cmd_len = max([len(name) for name,desc in cmdlist])
+        ret = ["Bugs Everywhere - Distributed bug tracking\n",
+               "Supported commands"]
+        for name, desc in cmdlist:
+            numExtraSpaces = longest_cmd_len-len(name)
+            ret.append("be %s%*s    %s" % (name, numExtraSpaces, "", desc))
+        return "\n".join(ret)
 
 class GetHelp(Exception):
     pass
@@ -119,34 +82,6 @@ class UsageError(Exception):
 def raise_get_help(option, opt, value, parser):
     raise GetHelp
 
-
-def iter_comment_name(bug, unique_name):
-    """Iterate through id, comment pairs, in date order.
-    (This is a user-friendly id, not the comment uuid)
-    """
-    def key(comment):
-        return comment.date
-    for num, comment in enumerate(sorted(bug.list_comments(), key=key)):
-        yield ("%s:%d" % (unique_name, num+1), comment)
-
-
-def comment_from_name(bug, unique_name, name):
-    """Use a comment name to look up a comment"""
-    for cur_name, comment in iter_comment_name(bug, unique_name):
-        if name == cur_name:
-            return comment
-    raise KeyError(name)
-
-
-def get_bug_and_comment(identifier, bug_dir=None):
-    ids = identifier.split(':')
-    bug = get_bug(ids[0], bug_dir)
-    if len(ids) == 2:
-        comment = comment_from_name(bug, ids[0], identifier)
-    else:
-        comment = None
-    return bug, comment
-
         
 class CmdOptionParser(optparse.OptionParser):
     def __init__(self, usage):
@@ -163,10 +98,9 @@ class CmdOptionParser(optparse.OptionParser):
                             self._long_opt.iterkeys()])
 
     def help_str(self):
-        fs = utility.FileString()
-        self.print_help(fs)
-        return fs.str
-
+        f = StringIO()
+        self.print_help(f)
+        return f.getvalue()
 
 def underlined(instring):
     """Produces a version of a string that is underlined with '='
@@ -178,53 +112,6 @@ def underlined(instring):
     return "%s\n%s" % (instring, "="*len(instring))
 
 
-def print_threaded_comments(comments, name_map, indent=""):
-    """Print a threaded display of comments"""
-    tw = TextWrapper(initial_indent = indent, subsequent_indent = indent, 
-                     width=80)
-    for comment, children in comments:
-        s = StringIO()
-        print >> s, "--------- Comment ---------"
-        print >> s, "Name: %s" % name_map[comment.uuid]
-        print >> s, "From: %s" % comment.From
-        print >> s, "Date: %s\n" % utility.time_to_str(comment.date)
-        print >> s, comment.body.rstrip('\n')
-
-        s.seek(0)
-        for line in s:
-            print tw.fill(line).rstrip('\n')
-        print_threaded_comments(children, name_map, indent=indent+"    ")
-
-
-def bug_tree(dir=None):
-    """Retrieve the bug tree specified by the user.  If no directory is
-    specified, the current working directory is used.
-
-    :param dir: The directory to search for the bug tree in.
-
-    >>> bug_tree() is not None
-    True
-    >>> bug_tree("/")
-    Traceback (most recent call last):
-    UserErrorWrap: The directory "/" has no bug directory.
-    """
-    if dir is None:
-        dir = os.getcwd()
-    try:
-        return bugdir.tree_root(dir)
-    except bugdir.NoBugDir, e:
-        raise UserErrorWrap(e)
-
-def print_command_list():
-    cmdlist = []
-    print """Bugs Everywhere - Distributed bug tracking
-    
-Supported commands"""
-    for name, module in iter_commands():
-        cmdlist.append((name, module.__doc__))
-    for name, desc in cmdlist:
-        print "be %s\n    %s" % (name, desc)
-
 def _test():
     import doctest
     import sys
@@ -232,3 +119,5 @@ def _test():
 
 if __name__ == "__main__":
     _test()
+
+suite = doctest.DocTestSuite()