Merge lp:~jelmer/tribunal/fix-no-args into lp:tribunal

[Jelmer Vernooij]

Support running 'tribunal-subunit' with no arguments.

Support running 'tribunal-subunit' with no arguments - this will just bring up the main window.

This is useful when launching tribunal-subunit from the Applications menu.

[Martin Pool (mbp)]

I guess for the moment this means you get a useless window, but it will become useful when we add a file/open option?

review: Approve

[Jelmer Vernooij (jelmer)]

Yep, exactly.

=== modified file 'tribunal/app.py'
--- tribunal/app.py	2010-08-22 00:55:27 +0000
+++ tribunal/app.py	2010-09-27 09:06:45 +0000
@@ -76,44 +76,44 @@
         opts, args = parser.parse_args(argv)
 
         if opts.testr:
-            source = TestRepositorySource(opts.testr)            
+            source = TestRepositorySource(opts.testr)
         elif args == ['-']:
             source = FileTestSource(sys.stdin)
         elif len(args) == 1:
-            if os.path.isdir(args[0]):
-                source = TestRepositorySource(".")
-            else:
+            if os.path.isfile(args[0]):
                 source = FileTestSource(file(args[0], 'rb'))
-        elif os.path.exists(os.path.join(args[0], ".testr.conf")):
-            dialog = gtk.Dialog(title="No testrepository present",
-                parent=None,
-                buttons=(gtk.STOCK_YES, gtk.RESPONSE_YES,
-                        gtk.STOCK_NO, gtk.RESPONSE_NO))
-            label = gtk.Label("No test repository is present. Create one?")
-            dialog.vbox.pack_start(label, True, True, 0)
-            label.show()
-            resp = dialog.run()
-            dialog.destroy()
-            if resp == gtk.RESPONSE_YES:
-                import testrepository.repository.file    
-                factory = testrepository.repository.file.RepositoryFactory()
-                factory.initialise(".")
+            elif os.path.isdir(os.path.join(args[0], ".testrepository")):
                 source = TestRepositorySource(".")
+            elif os.path.exists(os.path.join(args[0], ".testr.conf")):
+                dialog = gtk.Dialog(title="No testrepository present",
+                    parent=None,
+                    buttons=(gtk.STOCK_YES, gtk.RESPONSE_YES,
+                            gtk.STOCK_NO, gtk.RESPONSE_NO))
+                label = gtk.Label("No test repository is present. Create one?")
+                dialog.vbox.pack_start(label, True, True, 0)
+                label.show()
+                resp = dialog.run()
+                dialog.destroy()
+                if resp == gtk.RESPONSE_YES:
+                    import testrepository.repository.file
+                    factory = testrepository.repository.file.RepositoryFactory()
+                    factory.initialise(".")
+                    source = TestRepositorySource(".")
             else:
+                print "Unable to open %s" % args[0]
                 sys.exit(1)
         else:
-            print "usage: tribunal-subunit SUBUNIT_FILE"
-            print "       tribunal-subunit --testr DIR"
-            sys.exit(1)
+            source = None
 
         self._construct_and_show_window()
-        self._window.set_source(source)
-        try:
-            stream = source.get_subunit_stream()
-        except NoStreamPresent:
-            pass
-        else:
-            self._window.load_from_subunit_stream(stream)
+        if source is not None:
+            self._window.set_source(source)
+            try:
+                stream = source.get_subunit_stream()
+            except NoStreamPresent:
+                pass
+            else:
+                self._window.load_from_subunit_stream(stream)
         self._event_loop.start()
 
     def _set_default_icons(self):