Merge lp:~dkessel/testdrive/fix-testdrive-gtk-version into lp:testdrive

[Daniel Kessel]

Fixes bug 1235834.

Implements -v / --version option for testdrive-gtk, and changes "-v" for "--verbose" to "-d" to avoid a conflict with "-v" for "--version"

[lp:~dkessel/testdrive/fix-testdrive-gtk-version]

435. By Daniel Kessel on 2013-10-28

revert: use -v for verbose

[Jackson Doak (noskcaj)]

Looks good, merged.

review: Approve

=== modified file 'bin/testdrive-gtk'
--- bin/testdrive-gtk	2013-10-24 15:56:46 +0000
+++ bin/testdrive-gtk	2013-10-28 19:11:26 +0000
@@ -986,17 +986,40 @@
     # Support for command line options.
     import logging
     import optparse
-    parser = optparse.OptionParser(version="%prog %ver")
+
+    logger = logging.getLogger("testdrive")
+    logger.setLevel(logging.INFO)
+    
+    # Logging to the console
+	ch = logging.StreamHandler()
+	ch.setLevel(logging.DEBUG)
+
+	# Logger formatter
+	formatter = logging.Formatter("%(levelname)s: %(message)s")
+	ch.setFormatter(formatter)
+
+	# Add the handlers
+	logger.addHandler(ch)
+
+    parser = optparse.OptionParser()
     parser.add_option(
         "-v", "--verbose", action="store_true", dest="verbose",
         help=_("Show debug messages"))
+	parser.add_option(
+		"--version", action="store_true", dest="version",
+		default=False,
+		help=_("print version and system data, and exit")) 
     (options, args) = parser.parse_args()
 
+    if options.version:
+        version = commands.getstatusoutput("dpkg -l testdrive-gtk | tail -n1 | awk '{print $3}'")
+        logger.info(_("testdrive-gtk %s") % version[1])
+        sys.exit(0)
+        
     # Set the logging level to show debug messages.
     if options.verbose:
-        logging.basicConfig(level=logging.DEBUG)
-        logging = logging.getLogger('testdrive')
-        logging.debug('logging enabled')
+        logger.setLevel(logging.DEBUG)
+        logger.debug("logging enabled")
 
     # Run the application.
     window = TestdrivegtkWindow()