[gentoo-commits] proj/pms-test-suite:master commit in: /

[Michał Górny]

commit:     1d48ee7cff391940940520cee4135648f93e16f2
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu May 26 07:20:11 2011 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu May 26 07:20:11 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/pms-test-suite.git;a=commit;h=1d48ee7c

ebuild-generator: support option parsing.

---
 README           |    4 ++--
 ebuild-generator |   46 ++++++++++++++++++++++++++++++++++------------
 2 files changed, 36 insertions(+), 14 deletions(-)

diff --git a/README b/README
index 2e916bf..82351ca 100644
--- a/README
+++ b/README
@@ -29,10 +29,10 @@ First you need to clone the two necessary git repos:
 	git clone git://git.overlays.gentoo.org/proj/pms-test-suite-overlay.git
 
 Then run the `ebuild-generator` script, passing the path to the overlay as its
-only argument:
+-R option:
 
 	cd pms-test-suite
-	./ebuild-generator ../pms-test-suite-overlay
+	./ebuild-generator -R ../pms-test-suite-overlay
 
 
 <!-- vim:se syn=markdown :-->

diff --git a/ebuild-generator b/ebuild-generator
index a868aa4..4394a0e 100755
--- a/ebuild-generator
+++ b/ebuild-generator
@@ -3,35 +3,57 @@
 # (c) 2011 Michał Górny <mgorny@g.o>
 # Released under the terms of the 2-clause BSD license.
 
-import sys
+import os.path, sys
 
+from optparse import OptionParser
+
+import PMSTestSuite
 from PMSTestSuite.library import load_library
 from PMSTestSuite.repository import EbuildRepository
 from PMSTestSuite.pm import get_package_managers
 
-def main(*argv):
-	# XXX: optparse/argparse
-	if len(argv) < 2:
-		print('%s <repo-path>' % argv[0])
-		return 1
+def main(prog, *args):
+	opt = OptionParser(
+			prog = os.path.basename(prog),
+			version = PMSTestSuite.PV,
+			description = 'Generate the ebuilds for a test library.'
+	)
+
+	# XXX: -r for getting through PM's repo_name
+	opt.add_option('-R', '--repository-path', dest='repo_path',
+			help='Path to the repository to store ebuilds in')
+	opt.add_option('-l', '--library', dest='library_name',
+			help='Test library to use (default: standard)',
+			default='standard')
+	# XXX: get list, autodetect, more magic
+	opt.add_option('-p', '--package-manager', dest='pm',
+			help='Package manager to use',
+			default='portage')
 
-	repo_path = argv[1]
-	library_name = 'standard'
+	(opts, args) = opt.parse_args(list(args))
+
+	if not opts.repo_path:
+		opt.error('--repository-path must be specified')
+
+	for x in get_package_managers():
+		if x.name == opts.pm:
+			pm = x.inst()
+			break
+	else:
+		opt.error('Package manager not supported: %s' % opts.pm)
 
 	try:
-		repo = EbuildRepository(repo_path)
+		repo = EbuildRepository(opts.repo_path)
 	except (OSError, IOError, ValueError) as e:
 		print('Repository open failed: %s' % e)
 		return 1
 
 	try:
-		lib = load_library(library_name)
+		lib = load_library(opts.library_name)
 	except (ImportError, TypeError) as e:
 		print('Test library load failed: %s' % e)
 		return 1
 
-	pm = get_package_managers()[0].inst()
-
 	files = {}
 	for t in lib:
 		files.update(t.get_output_files())