Merge branch 'master' of wking.cfbe

[be.git] / libbe / command / assign.py

diff --git a/libbe/command/assign.py b/libbe/command/assign.py
index e43a1bc3c66943313cbe7bbba7acba578d598ec0..9d6e0b0b40984ca4f4d56356a67da71ba0c831fd 100644 (file)
--- a/libbe/command/assign.py
+++ b/libbe/command/assign.py
@@ -1,65 +1,70 @@
-# Copyright (C) 2005-2009 Aaron Bentley and Panometrics, Inc.
+# Copyright (C) 2005-2010 Aaron Bentley <abentley@panoramicfeedback.com>
 #                         Gianluca Montecchi <gian@grys.it>
 #                         Marien Zwart <marienz@gentoo.org>
 #                         Thomas Gerigk <tgerigk@gmx.de>
 #                         W. Trevor King <wking@drexel.edu>
 #
-# This program 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.
+# This file is part of Bugs Everywhere.
 #
-# This program 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.
+# Bugs Everywhere 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.
 #
-# 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.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# Bugs Everywhere 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 Bugs Everywhere.  If not, see <http://www.gnu.org/licenses/>.
 
 import libbe
 import libbe.command
 import libbe.command.util
 
+
 class Assign (libbe.command.Command):
-    """Assign an individual or group to fix a bug
+    u"""Assign an individual or group to fix a bug
 
     >>> import sys
     >>> import libbe.bugdir
     >>> bd = libbe.bugdir.SimpleBugDir(memory=False)
-    >>> cmd = Assign()
-    >>> cmd._setup_io = lambda i_enc,o_enc : None
-    >>> cmd.stdout = sys.stdout
+    >>> io = libbe.command.StringInputOutput()
+    >>> io.stdout = sys.stdout
+    >>> ui = libbe.command.UserInterface(io=io)
+    >>> ui.storage_callbacks.set_storage(bd.storage)
+    >>> cmd = Assign(ui=ui)
 
     >>> bd.bug_from_uuid('a').assigned is None
     True
-    >>> ret = cmd.run(bd.storage, bd, {'user-id':u'Fran\xe7ois'}, ['-', '/a'])
+    >>> ui._user_id = u'Fran\xe7ois'
+    >>> ret = ui.run(cmd, args=['-', '/a'])
     >>> bd.flush_reload()
     >>> bd.bug_from_uuid('a').assigned
     u'Fran\\xe7ois'
 
-    >>> ret = cmd.run(bd.storage, bd, args=['someone', '/a', '/b'])
+    >>> ret = ui.run(cmd, args=['someone', '/a', '/b'])
     >>> bd.flush_reload()
     >>> bd.bug_from_uuid('a').assigned
     'someone'
     >>> bd.bug_from_uuid('b').assigned
     'someone'
 
-    >>> ret = cmd.run(bd.storage, bd, args=['none', '/a'])
+    >>> ret = ui.run(cmd, args=['none', '/a'])
     >>> bd.flush_reload()
     >>> bd.bug_from_uuid('a').assigned is None
     True
+    >>> ui.cleanup()
     >>> bd.cleanup()
     """
     name = 'assign'
 
     def __init__(self, *args, **kwargs):
         libbe.command.Command.__init__(self, *args, **kwargs)
-        self.requires_bugdir = True
         self.args.extend([
                 libbe.command.Argument(
-                    name='assignee', metavar='ASSIGNEE', default=None,
+                    name='assigned', metavar='ASSIGNED', default=None,
                     completion_callback=libbe.command.util.complete_assigned),
                 libbe.command.Argument(
                     name='bug-id', metavar='BUG-ID', default=None,
@@ -67,27 +72,28 @@ class Assign (libbe.command.Command):
                     completion_callback=libbe.command.util.complete_bug_id),
                 ])
 
-    def _run(self, storage, bugdir, **params):
-        assignee = params['assignee']
-        if assignee == 'none':
-            assignee = None
-        elif assignee == '-':
-            assignee = params['user-id']
+    def _run(self, **params):
+        assigned = params['assigned']
+        if assigned == 'none':
+            assigned = None
+        elif assigned == '-':
+            assigned = self._get_user_id()
+        bugdir = self._get_bugdir()
         for bug_id in params['bug-id']:
             bug,dummy_comment = \
                 libbe.command.util.bug_comment_from_user_id(bugdir, bug_id)
-            if bug.assigned != assignee:
-                bug.assigned = assignee
+            if bug.assigned != assigned:
+                bug.assigned = assigned
         return 0
 
     def _long_help(self):
         return """
 Assign a person to fix a bug.
 
-Assignees should be the person's Bugs Everywhere identity, the same
+Assigneds should be the person's Bugs Everywhere identity, the same
 string that appears in Creator fields.
 
-Special assignee strings:
+Special assigned strings:
   "-"      assign the bug to yourself
   "none"   un-assigns the bug
 """