Merge lp:~statik/tarmac/tinyfixes into lp:tarmac

[Elliot Murphy]

[Elliot Murphy (statik)]

Fantastic project! Here are some quick fixes which make it more usable for me. I'll probably do a branch in a bit with a proposal for one way to handle the branch test_before_merge stuff.

[Paul Hummer (rockstar)]

Elliot-

  Awesome! Thanks so much for this. I'd never used OptionParser before, so
your changes are quite welcome, having done something that I couldn't find in
the docs anywhere.

 vote approve
 status approved

> === modified file 'tarmac-lander' (properties changed: -x to +x)
> --- tarmac-lander 2009-03-03 05:50:57 +0000
> +++ tarmac-lander 2009-03-05 00:11:00 +0000
> @@ -1,5 +1,5 @@
> +#!/usr/bin/env python
> # Copyright (c) 2009 - Paul Hummer
> -#!/usr/bin/env python
> from tarmac.bin import TarmacLander
>
> if __name__ == '__main__':
>

When the heck did this happen? Weird. Thanks for fixing it.

--
Paul Hummer
http://theironlion.net
1024/862FF08F C921 E962 58F8 5547 6723 0E8C 1C4D 8AC5 862F F08F

review: Approve

[Paul Hummer (rockstar)]

Commit message: OptionParser handles parsing of arguments and options now (Elliot Murphy)

=== modified file 'tarmac-lander' (properties changed: -x to +x)
--- tarmac-lander	2009-03-03 05:50:57 +0000
+++ tarmac-lander	2009-03-05 00:11:00 +0000
@@ -1,5 +1,5 @@
+#!/usr/bin/env python
 # Copyright (c) 2009 - Paul Hummer
-#!/usr/bin/env python
 from tarmac.bin import TarmacLander
 
 if __name__ == '__main__':

=== modified file 'tarmac/bin.py'
--- tarmac/bin.py	2009-03-04 05:33:47 +0000
+++ tarmac/bin.py	2009-03-05 00:29:19 +0000
@@ -21,23 +21,19 @@
 
     def __init__(self):
 
-        parser = OptionParser()
+        parser = OptionParser("%prog [options] <projectname>")
         parser.add_option('--dry-run', action='store_true', dest='dry_run',
             help='Print out the branches that would be merged and their '
                  'commit messages, but don\'t actually merge the branches.')
-        options = parser.parse_args()[0]
+        options, args = parser.parse_args()
         self.dry_run = options.dry_run
 
-        try:
-            self.project = sys.argv[1]
-        except IndexError:
+        if len(args) != 1:
             # This code is merely a placeholder until I can get proper argument
             # handling, at which point this should print usage information.
-            print (
-                'Oops!  You\'ve forgotten to specify a project to land '
-                'branches for.  Please specify your project as the first '
-                'argument to tarmac-lander.')
-            sys.exit()
+            parser.error("Please specify a project name.")
+
+        self.project, = args
 
     def _find_commit_message(self, comments):
         '''Find the proper commit comment.'''