Merge lp:~cjohnston/ubuntu-ci-services-itself/1270027 into lp:ubuntu-ci-services-itself

[Chris Johnston]

Change logging to fix CLI status checks

[lp:~cjohnston/ubuntu-ci-services-itself/1270027]

117. By Chris Johnston on 2014-01-17

Update per review

[Ursula Junque (ursinha)]

Can "normal output" in add_argument help be replaced by "errors only" or something along these lines? This way user knows what's the default. Other than that this looks good to me, approving.

review: Approve

=== modified file 'cli/ci_libs/ticket.py'
--- cli/ci_libs/ticket.py	2014-01-17 02:58:47 +0000
+++ cli/ci_libs/ticket.py	2014-01-17 16:38:44 +0000
@@ -104,8 +104,8 @@
         }
         patch(CI_URL + API_URL + 'updateticketstatus/' + self.ticket_id + '/',
               data=data)
-        log.info("You have successfully submitted a ticket to the Ubuntu CI "
-                 "Engine. Your ticket number is %s." % self.ticket_id)
+        print("You have successfully submitted a ticket to the Ubuntu CI"
+              " Engine. Your ticket number is %s." % self.ticket_id)
 
     def add_new_ticket(self, args):
         self._parse_changes(args)
 
=== modified file 'cli/ubuntu-ci'
--- cli/ubuntu-ci	2014-01-15 04:25:04 +0000
+++ cli/ubuntu-ci	2014-01-17 16:38:44 +0000
@@ -30,6 +30,10 @@
 
 def parse_arguments(args=None):
     parser = argparse.ArgumentParser()
+    parser.add_argument('-v', '--verbosity', action='store', dest='verbosity',
+                         default=1, type=int, choices=[1, 2, 3],
+                         help='Verbosity level; 1=errors only, 2=verbose '
+                         'output, 3=very verbose output')
     subparsers = parser.add_subparsers(title='actions', help='commands')
     ticket_parser = subparsers.add_parser('create_ticket',
                                           help='Create a new ticket')
@@ -53,10 +57,6 @@
                                help="Full path to a directory where the files "
                                     "to upload are, in case they're not with "
                                     "source.changes file")
-    ticket_parser.add_argument('-q', '--quiet', action='store_true',
-                               default=False, help='Show only error messages.')
-    ticket_parser.add_argument('-V', '--very-verbose', action='store_true',
-                               default=False, help='Show debug messages.')
 
     ticket_parser.set_defaults(func=new_ticket)
     status_parser = subparsers.add_parser('status',
@@ -70,18 +70,19 @@
 
 
 def main():
+    logging.basicConfig()
+    log = logging.getLogger()
+    log.name = "ubuntu-ci"
+
     try:
         args = parse_arguments()
 
-        if args.very_verbose:
-            logging.basicConfig(level=logging.DEBUG)
-        elif args.quiet:
-            logging.basicConfig(level=logging.ERROR)
+        if args.verbosity == 2:
+            log.setLevel(logging.INFO)
+        elif args.verbosity > 2:
+            log.setLevel(logging.DEBUG)
         else:
-            logging.basicConfig(level=logging.INFO)
-
-        log = logging.getLogger()
-        log.name = 'ubuntu-ci'
+            log.setLevel(logging.ERROR)
 
         args.func(args)
     except ChangesFileNotFound, exc:
@@ -94,6 +95,5 @@
     except Exception, exc:
         log.critical(exc)
 
-
 if __name__ == "__main__":
     main()