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

[Michał Górny]

commit:     9f9e1ac9078d45a71b9b0e4a31af0248cb1caf43
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun May 29 17:35:58 2011 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun May 29 17:35:58 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/pms-test-suite.git;a=commit;h=9f9e1ac9

Subclass PMSTestSuiteCLI for actual programs.

---
 PMSTestSuite/cli.py |    2 +-
 ebuild-generator    |   25 ++++++++++++++++---------
 2 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/PMSTestSuite/cli.py b/PMSTestSuite/cli.py
index 7e73fdd..a7856d4 100644
--- a/PMSTestSuite/cli.py
+++ b/PMSTestSuite/cli.py
@@ -49,7 +49,7 @@ class PMSTestSuiteCLI(object):
 
 		self.optparser = opt
 
-	def start(self, args):
+	def _start(self, args):
 		"""
 		Initialize the program. Parse command-line args. Instantiate classes
 		encapsulating the Package Manager, test library and repository.

diff --git a/ebuild-generator b/ebuild-generator
index dd66b9f..94b227a 100755
--- a/ebuild-generator
+++ b/ebuild-generator
@@ -7,16 +7,23 @@ import sys
 
 from PMSTestSuite.cli import PMSTestSuiteCLI
 
-def main(prog, *args):
-	cli = PMSTestSuiteCLI(prog)
-	cli.start(args)
+class EbuildGenCLI(PMSTestSuiteCLI):
+	def __init__(self, prog, *args):
+		PMSTestSuiteCLI.__init__(self, prog)
+		self._args = args
 
-	files = {}
-	for t in cli.test_library:
-		files.update(t.get_output_files())
+	def main(self):
+		self._start(self._args)
 
-	cli.repository.write_files(files)
-	cli.repository.remanifest(files, cli.pm)
+		files = {}
+		for t in self.test_library:
+			files.update(t.get_output_files())
+
+		self.repository.write_files(files)
+		self.repository.remanifest(files, self.pm)
+
+		return 0
 
 if __name__ == '__main__':
-	sys.exit(main(*sys.argv))
+	cli = EbuildGenCLI(*sys.argv)
+	sys.exit(cli.main())