[DEV] rework

MANIFEST.in

@@ -0,0 +1,2 @@
+include README.rst
+include bash-autocompletion/lutin

bin/monk

@@ -0,0 +1,11 @@
+#!/usr/bin/python
+# -*- coding: utf-8 -*-
+##
+## @author Edouard DUPIN
+##
+## @copyright 2012, Edouard DUPIN, all right reserved
+##
+## @license MPL v2.0 (see license file)
+##
+
+import monk

monk/__init__.py

@@ -4,33 +4,33 @@ import sys
 import os
 import inspect
 import fnmatch
-import monkDebug as debug
-import monkModule
-import monkArg
-import monkTools
+from . import module
+from . import tools
+import death.Arguments as arguments
+import death.ArgElement as arg_element
+from realog import debug
 
 
+my_args = arguments.Arguments()
+my_args.add("h", "help", desc="display this help"))
+my_args.add_section("option", "Can be set one time in all case")
+my_args.add("v", "verbose", list=[["0","None"],["1","error"],["2","warning"],["3","info"],["4","debug"],["5","verbose"]], desc="Display makefile debug level (verbose) default =2"))
+my_args.add("C", "color", desc="Display makefile output in color"))
 
-myArg = monkArg.MonkArg()
-myArg.add(monkArg.ArgDefine("h", "help", desc="display this help"))
-myArg.add_section("option", "Can be set one time in all case")
-myArg.add(monkArg.ArgDefine("v", "verbose", list=[["0","None"],["1","error"],["2","warning"],["3","info"],["4","debug"],["5","verbose"]], desc="Display makefile debug level (verbose) default =2"))
-myArg.add(monkArg.ArgDefine("C", "color", desc="Display makefile output in color"))
-
-myArg.add_section("cible", "generate in order set")
-localArgument = myArg.parse()
+my_args.add_section("cible", "generate in order set")
+local_argument = my_args.parse()
 
 ##
 ## @brief Display the help of this makefile
 ##
 def usage():
 	# generic argument displayed : 
-	myArg.display()
+	my_args.display()
 	print("		all")
 	print("			Build all (only for the current selected board) (bynary and packages)")
 	print("		clean")
 	print("			Clean all (same as previous)")
-	listOfAllModule = monkModule.list_all_module_with_desc()
+	listOfAllModule = module.list_all_module_with_desc()
 	for mod in listOfAllModule:
 		print("		" + mod[0] + " / " + mod[0] + "-clean")
 		if mod[1] != "":
@@ -61,7 +61,7 @@ def parse_generic_arg(argument,active):
 ## @brief Parse default unique argument:
 ##
 if __name__ == "__main__":
-	for argument in localArgument:
+	for argument in local_argument:
 		parse_generic_arg(argument, True)
 
 ##
@@ -70,21 +70,21 @@ if __name__ == "__main__":
 def start():
 	actionDone=False
 	# parse all argument
-	for argument in localArgument:
+	for argument in local_argument:
 		if parse_generic_arg(argument, False) == True:
 			continue
 		if argument.get_option_name() != "":
 			debug.warning("Can not understand argument : '" + argument.get_option_name() + "'")
 			usage()
 		else:
-			module = monkModule.get_module(argument.get_arg())
+			module = module.get_module(argument.get_arg())
 			module.parse_code()
 			module.generate()
 			actionDone=True
 	# if no action done : we do "all" ...
 	if actionDone==False:
 		#Must generate all docs :
-		moduleElements = monkModule.get_all_module()
+		moduleElements = module.get_all_module()
 		for module in moduleElements:
 			module.parse_code()
 		for module in moduleElements:
@@ -94,7 +94,7 @@ def start():
 ## @brief When the user use with make.py we initialise ourself
 ##
 if __name__ == '__main__':
-	sys.path.append(monkTools.get_run_folder())
+	sys.path.append(tools.get_run_folder())
 	# Import all sub path without out and archive
 	for folder in os.listdir("."):
 		if os.path.isdir(folder)==True:
@@ -102,7 +102,7 @@ if __name__ == '__main__':
 			   and folder.lower()!="archive" \
 			   and folder.lower()!="out" :
 				debug.debug("Automatic load path: '" + folder + "'")
-				monkModule.import_path(folder)
+				module.import_path(folder)
 	start()
 
 

monk/codeBB/BB_Code.py

@@ -1,5 +1,5 @@
 #!/usr/bin/python
-import monkDebug as debug
+from realog import debug
 import sys
 import monkTools
 import codeHL

monk/codeBB/BB_Image.py

@@ -1,5 +1,5 @@
 #!/usr/bin/python
-import monkDebug as debug
+from realog import debug
 import sys
 import monkTools
 import re

monk/codeBB/BB_IndentAndDot.py

@@ -1,5 +1,5 @@
 #!/usr/bin/python
-import monkDebug as debug
+from realog import debug
 import sys
 import monkTools
 import re

monk/codeBB/BB_Link.py

@@ -1,5 +1,5 @@
 #!/usr/bin/python
-import monkDebug as debug
+from realog import debug
 import sys
 import monkTools
 import re

monk/codeBB/BB_Specification.py

@@ -1,5 +1,5 @@
 #!/usr/bin/python
-import monkDebug as debug
+from realog import debug
 import sys
 import monkTools
 import re

monk/codeBB/BB_Table.py

@@ -1,5 +1,5 @@
 #!/usr/bin/python
-import monkDebug as debug
+from realog import debug
 import sys
 import monkTools
 import re

monk/codeBB/BB_Text.py

@@ -1,5 +1,5 @@
 #!/usr/bin/python
-import monkDebug as debug
+from realog import debug
 import sys
 import monkTools
 import re

monk/codeBB/BB_Title.py

@@ -1,5 +1,5 @@
 #!/usr/bin/python
-import monkDebug as debug
+from realog import debug
 import sys
 import monkTools
 import re

monk/codeBB/BB_comment.py

@@ -1,5 +1,5 @@
 #!/usr/bin/python
-import monkDebug as debug
+from realog import debug
 import sys
 import monkTools
 import re

monk/codeBB/BB_lineReturn.py

@@ -1,5 +1,5 @@
 #!/usr/bin/python
-import monkDebug as debug
+from realog import debug
 import sys
 import monkTools
 import re

monk/codeBB/codeBB.py

@@ -1,5 +1,5 @@
 #!/usr/bin/python
-import monkDebug as debug
+from realog import debug
 import sys
 import monkTools
 import re

monk/codeHL/codeHL.py

@@ -1,5 +1,5 @@
 #!/usr/bin/python
-import monkDebug as debug
+from realog import debug
 import sys
 import monkTools
 import codeHLcpp

monk/codeHL/codeHLBBcode.py

@@ -1,5 +1,5 @@
 #!/usr/bin/python
-import monkDebug as debug
+from realog import debug
 import sys
 import monkTools
 import re

monk/codeHL/codeHLJava.py

@@ -1,5 +1,5 @@
 #!/usr/bin/python
-import monkDebug as debug
+from realog import debug
 import sys
 import monkTools
 import re

monk/codeHL/codeHLPython.py

@@ -1,5 +1,5 @@
 #!/usr/bin/python
-import monkDebug as debug
+from realog import debug
 import sys
 import monkTools
 import re

monk/codeHL/codeHLXML.py

@@ -1,5 +1,5 @@
 #!/usr/bin/python
-import monkDebug as debug
+from realog import debug
 import sys
 import monkTools
 import re

monk/codeHL/codeHLcpp.py

@@ -1,5 +1,5 @@
 #!/usr/bin/python
-import monkDebug as debug
+from realog import debug
 import sys
 import monkTools
 import re

monk/codeHL/codeHLjson.py

@@ -1,5 +1,5 @@
 #!/usr/bin/python
-import monkDebug as debug
+from realog import debug
 import sys
 import monkTools
 import re

monk/codeHL/codeHLshell.py

@@ -1,5 +1,5 @@
 #!/usr/bin/python
-import monkDebug as debug
+from realog import debug
 import sys
 import monkTools
 import re

monk/codeMarkDown/MD_Code.py

@@ -1,5 +1,5 @@
 #!/usr/bin/python
-import monkDebug as debug
+from realog import debug
 import sys
 import monkTools
 import codeHL

monk/codeMarkDown/MD_Image.py

@@ -1,5 +1,5 @@
 #!/usr/bin/python
-import monkDebug as debug
+from realog import debug
 import sys
 import monkTools
 import re

monk/codeMarkDown/MD_IndentAndDot.py

@@ -1,5 +1,5 @@
 #!/usr/bin/python
-import monkDebug as debug
+from realog import debug
 import sys
 import monkTools
 import re

monk/codeMarkDown/MD_Link.py

@@ -1,5 +1,5 @@
 #!/usr/bin/python
-import monkDebug as debug
+from realog import debug
 import sys
 import monkTools
 import re

monk/codeMarkDown/MD_Specification.py

@@ -1,5 +1,5 @@
 #!/usr/bin/python
-import monkDebug as debug
+from realog import debug
 import sys
 import monkTools
 import re

monk/codeMarkDown/MD_Table.py

@@ -1,5 +1,5 @@
 #!/usr/bin/python
-import monkDebug as debug
+from realog import debug
 import sys
 import monkTools
 import re

monk/codeMarkDown/MD_Text.py

@@ -1,5 +1,5 @@
 #!/usr/bin/python
-import monkDebug as debug
+from realog import debug
 import sys
 import monkTools
 import re

monk/codeMarkDown/MD_Title.py

@@ -1,5 +1,5 @@
 #!/usr/bin/python
-import monkDebug as debug
+from realog import debug
 import sys
 import monkTools
 import re

monk/codeMarkDown/MD_comment.py

@@ -1,5 +1,5 @@
 #!/usr/bin/python
-import monkDebug as debug
+from realog import debug
 import sys
 import monkTools
 import re

monk/codeMarkDown/MD_lineReturn.py

@@ -1,5 +1,5 @@
 #!/usr/bin/python
-import monkDebug as debug
+from realog import debug
 import sys
 import monkTools
 import re

monk/codeMarkDown/codeMarkDown.py

@@ -1,5 +1,5 @@
 #!/usr/bin/python
-import monkDebug as debug
+from realog import debug
 import sys
 import monkTools
 import re

monk/module.py

@@ -3,7 +3,7 @@ import sys
 import os
 import inspect
 import fnmatch
-import monkDebug as debug
+from realog import debug
 import monkTools as tools
 import monkNode as Node
 import monkParse as Parse

monk/monkClass.py

@@ -1,5 +1,5 @@
 #!/usr/bin/python
-import monkDebug as debug
+from realog import debug
 import monkNode as Node
 import monkModule as module
 

monk/monkEnum.py

@@ -1,5 +1,5 @@
 #!/usr/bin/python
-import monkDebug as debug
+from realog import debug
 import monkNode as Node
 
 class Enum(Node.Node):

monk/monkHtml.py

@@ -1,7 +1,7 @@
 #!/usr/bin/python
-import monkDebug as debug
+from realog import debug
 import sys
-import monkTools as tools
+from . import tools
 #import CppHeaderParser
 import os
 import re

monk/monkLibrary.py

@@ -1,5 +1,5 @@
 #!/usr/bin/python
-import monkDebug as debug
+from realog import debug
 import os
 import sys
 import re

monk/monkMethode.py

@@ -1,5 +1,5 @@
 ##!/usr/bin/python
-import monkDebug as debug
+from realog import debug
 import monkNode as Node
 import monkType as Type
 import monkVariable as Variable

monk/monkNamespace.py

@@ -1,5 +1,5 @@
 #!/usr/bin/python
-import monkDebug as debug
+from realog import debug
 import monkNode as Node
 
 class Namespace(Node.Node):

monk/monkNode.py

@@ -1,6 +1,6 @@
 #!/usr/bin/python
-import monkDebug as debug
-import monkModule as module
+from realog import debug
+from . import module
 
 access_list = ['private', 'protected', 'public']
 

monk/monkParse.py

@@ -4,7 +4,7 @@ import sys
 import re
 import copy
 
-import monkTools as tools
+from . import tools
 
 sys.path.append(tools.get_current_path(__file__) + "/ply/ply/")
 sys.path.append(tools.get_current_path(__file__) + "/codeBB/")
@@ -14,7 +14,7 @@ sys.path.append(tools.get_current_path(__file__) + "/codeHL/")
 import lex
 
 import inspect
-import monkDebug as debug
+from realog import debug
 import monkClass as Class
 import monkNamespace as Namespace
 import monkStruct as Struct

monk/monkStruct.py

@@ -1,5 +1,5 @@
 #!/usr/bin/python
-import monkDebug as debug
+from realog import debug
 import monkNode as Node
 
 class Struct(Node.Node):

monk/monkType.py

@@ -1,8 +1,8 @@
 #!/usr/bin/python
-import monkDebug as debug
+from realog import debug
 import monkType as Type
 import monkNode as node
-import monkModule as module
+from . import module
 import re
 
 

monk/monkTypedef.py

@@ -1,5 +1,5 @@
 #!/usr/bin/python
-import monkDebug as debug
+from realog import debug
 import monkNode as Node
 
 class Typedef(Node.Node):

monk/monkUnion.py

@@ -1,5 +1,5 @@
 #!/usr/bin/python
-import monkDebug as debug
+from realog import debug
 import monkNode as Node
 
 class Union(Node.Node):

monk/monkUsing.py

@@ -1,5 +1,5 @@
 #!/usr/bin/python
-import monkDebug as debug
+from realog import debug
 import monkNode as Node
 import monkType as Type
 

monk/monkVariable.py

@@ -1,5 +1,5 @@
 #!/usr/bin/python
-import monkDebug as debug
+from realog import debug
 import monkType as Type
 import monkNode as Node