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

[Michał Górny]

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

Move common CLI code to PMSTestSuite.cli.

---
 PMSTestSuite/cli.py |   85 +++++++++++++++++++++++++++++++++++++++++++++++++++
 ebuild-generator    |   60 ++++-------------------------------
 2 files changed, 92 insertions(+), 53 deletions(-)

diff --git a/PMSTestSuite/cli.py b/PMSTestSuite/cli.py
new file mode 100644
index 0000000..7e73fdd
--- /dev/null
+++ b/PMSTestSuite/cli.py
@@ -0,0 +1,85 @@
+#	vim:fileencoding=utf-8
+# (c) 2011 Michał Górny <mgorny@g.o>
+# Released under the terms of the 2-clause BSD license.
+
+import os.path
+
+from optparse import OptionParser
+
+from PMSTestSuite import PV
+from PMSTestSuite.library import load_library
+from PMSTestSuite.repository import EbuildRepository
+from PMSTestSuite.pm import get_package_managers
+
+class PMSTestSuiteCLI(object):
+	"""
+	A class encapsulating common CLI routines used by PMS Test Suite
+	scripts.
+
+	Properties:
+	1) set during __init__():
+	- optparser (OptionParser);
+	2) set during start():
+	- library (TestLibrary),
+	- pm (PackageManager),
+	- repository (EbuildRepository).
+	"""
+
+	def __init__(self, prog):
+		"""
+		Initialize the class. Set the option parser up.
+		
+		<prog> - program name for optparse output (argv[0])
+		"""
+		opt = OptionParser(
+				prog = os.path.basename(prog),
+				version = PV
+		)
+
+		# 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')
+
+		self.optparser = opt
+
+	def start(self, args):
+		"""
+		Initialize the program. Parse command-line args. Instantiate classes
+		encapsulating the Package Manager, test library and repository.
+
+		<args> - command line args (argv[1:])
+		"""
+		opt = self.optparser
+		(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:
+				try:
+					self.pm = x.inst()
+				except Exception as e:
+					opt.error(e)
+				break
+		else:
+			opt.error('Package manager not supported: %s' % opts.pm)
+
+		try:
+			self.repository = EbuildRepository(opts.repo_path)
+		except (OSError, IOError, ValueError) as e:
+			print('Repository open failed: %s' % e)
+			return 1
+
+		try:
+			self.test_library = load_library(opts.library_name)
+		except (ImportError, TypeError) as e:
+			print('Test library load failed: %s' % e)
+			return 1

diff --git a/ebuild-generator b/ebuild-generator
index 1db83ea..dd66b9f 100755
--- a/ebuild-generator
+++ b/ebuild-generator
@@ -3,66 +3,20 @@
 # (c) 2011 Michał Górny <mgorny@g.o>
 # Released under the terms of the 2-clause BSD license.
 
-import os.path, sys
+import 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
+from PMSTestSuite.cli import PMSTestSuiteCLI
 
 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')
-
-	(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:
-			try:
-				pm = x.inst()
-			except Exception as e:
-				opt.error(e)
-			break
-	else:
-		opt.error('Package manager not supported: %s' % opts.pm)
-
-	try:
-		repo = EbuildRepository(opts.repo_path)
-	except (OSError, IOError, ValueError) as e:
-		print('Repository open failed: %s' % e)
-		return 1
-
-	try:
-		lib = load_library(opts.library_name)
-	except (ImportError, TypeError) as e:
-		print('Test library load failed: %s' % e)
-		return 1
+	cli = PMSTestSuiteCLI(prog)
+	cli.start(args)
 
 	files = {}
-	for t in lib:
+	for t in cli.test_library:
 		files.update(t.get_output_files())
 
-	repo.write_files(files)
-	repo.remanifest(files, pm)
+	cli.repository.write_files(files)
+	cli.repository.remanifest(files, cli.pm)
 
 if __name__ == '__main__':
 	sys.exit(main(*sys.argv))