TIMOB-9309: BlackBerry: Convert argparse to optparse part2

support/blackberry/blackberry.py

@@ -11,7 +11,7 @@
 
 import os, sys, shutil
 from blackberryndk import BlackberryNDK
-from argparse import ArgumentParser
+from optparse import OptionParser
 
 template_dir = os.path.abspath(os.path.dirname(sys._getframe(0).f_code.co_filename))
 top_support_dir = os.path.dirname(template_dir)
@@ -148,8 +148,7 @@ def __unitTestTraceback():
 
 def __runUnitTests():
 	from tiunittest import UnitTest
-
-	ndk = None if args.test == True else args.test
+	ndk = options.ndk.decode("utf-8") if options.ndk != None else None
 
 	bbndk = BlackberryNDK(ndk)
 	bb = Blackberry('TemplateTest', 'com.macadamian.template', bbndk)
@@ -165,30 +164,29 @@ def __runUnitTests():
 	print '\nFinished Running Unit Tests'
 	UnitTest.printDetails()
 
-
 if __name__ == '__main__':
 	# This script is only meant to be invoked from project.py
-	# Setup script usage
-	parser = ArgumentParser(description = 'Creates blackberry project')
-	parser.add_argument('name', help = 'Blackberry project name', nargs = '?')
-	parser.add_argument('id', help = 'Blackberry project id', nargs = '?')
-	parser.add_argument('dir', help = 'Blackberry project directory', nargs = '?')
-	parser.add_argument('ndk', help = 'Blackberry NDK path', nargs = '?')
-	parser.add_argument('-t', '--test', help = 'run unit tests', metavar = 'ndk_location', nargs = '?', const = True)
-	args = parser.parse_args()
-
-	if args.test:
+	# Setup script usage using optparse
+	parser = OptionParser(usage='--name name --id id --dir dir [--ndk ndk] [-t]', description='Creates blackberry project')
+	parser.add_option('--name', help='Blackberry project name', dest='name')
+	parser.add_option('--id', help='Blackberry project id', dest='id')
+	parser.add_option('--dir', help='Blackberry project directory', dest='dir')
+	parser.add_option('--ndk', help='Blackberry NDK path', dest='ndk')
+	parser.add_option('-t', '--test', help='run unit tests', dest='test', action='store_true')
+	(options, args) = parser.parse_args()
+
+	if options.test:
 		__runUnitTests()
 		sys.exit(0)
 	else:
-		if args.name == None or args.id == None or args.dir == None or args.ndk == None:
+		if options.name == None or options.id == None or options.dir == None:
 			parser.print_usage()
 			sys.exit(1)
 
 	try:
-		bbndk = BlackberryNDK(args.ndk.decode("utf-8"))
-		bb = Blackberry(args.name.decode("utf-8"), args.id.decode("utf-8"), bbndk)
-		bb.create(args.dir.decode("utf-8"))
+		bbndk = BlackberryNDK(options.ndk.decode("utf-8") if options.ndk != None else None)
+		bb = Blackberry(options.name.decode("utf-8"), options.id.decode("utf-8"), bbndk)
+		bb.create(options.dir.decode("utf-8"))
 	except Exception, e:
 		print >>sys.stderr, e
 		sys.exit(1)

support/blackberry/blackberryndk.py

@@ -6,7 +6,7 @@
 #          spaces for the tools to work correctly
 
 import os, sys, platform, subprocess, pprint, shutil
-from argparse import ArgumentParser
+from optparse import OptionParser
 
 class Device:
 	''' TODO Mac: Look at how qde works with sim for this class '''
@@ -344,19 +344,21 @@ def __runUnitTests(ipAddress = None):
 
 
 if __name__ == "__main__":
-	parser = ArgumentParser(description = 'Prints the NDK directory and version')
-	parser.add_argument('ndk_path', help = 'path to the blackberry ndk', nargs='?')
-	parser.add_argument('-t', '--test', help = 'run unit tests', action = 'store_true')
-	parser.add_argument('--ip_address', help='simulator IP address for unit tests')
-	args = parser.parse_args()
+
+	# Setup script usage using optparse
+	parser = OptionParser(usage='[ndk_path] [-t] [--ip_address IP ADDRESS]', description='Prints the NDK directory and version')
+
+	parser.add_option('-t', '--test', help='run unit tests', action='store_true', dest='test')
+	parser.add_option('--ip_address', help='simulator IP address for unit tests', dest='ip_address')
+	(options, args) = parser.parse_args()
 
 	try:
-		ndk = BlackberryNDK(args.ndk_path)
+		ndk = BlackberryNDK(args[0].decode('utf-8') if len(args) != 0 else None)
 		print "BLACKBERRY_NDK=%s" % ndk.getBlackberryNdk()
 		print "BLACKBERRY_NDK_VERSION=%s" % ndk.getVersion()
 	except Exception, e:
 		print >>sys.stderr, e
 		sys.exit(1)
 
-	if args.test:
-		__runUnitTests(args.ip_address.decode('utf-8') if args.ip_address != None else None)
+	if options.test:
+		__runUnitTests(options.ip_address.decode('utf-8') if options.ip_address != None else None)

support/project.py

@@ -111,7 +111,7 @@ def main():
 
 	if blackberry:
 		blackberry_gen = os.path.join(template_dir,'blackberry','blackberry.py')
-		run([sys.executable, blackberry_gen, name, appid, directory, blackberry_ndk])
+		run([sys.executable, blackberry_gen, '--name', name, '--id', appid, '--dir', directory, '--ndk', blackberry_ndk])
 
 	# copy LICENSE and README
 	for file in ['LICENSE','README']: