temporary files (for testing etc.)

7 files changed, 48 insertions, 20 deletions

diff --git a/Makefile b/Makefile
index 105c432..10911c0 100644
--- a/Makefile
+++ b/Makefile
@@ -1,27 +1,31 @@
 # runs tests
 EXAMPLES = ./examples
 
-#PY_DESC_TESTER = ./run_descreader.py
+# make PYVER=<2|3> <target>
+PYVER = 3
+PY = python$(PYVER)
+
+PY_DESC_TESTER = ./run_descreader.py
 PY_NOP = ./nop.py
 PY_EBU = ./run_ebuildcreation.py
 
-.PHONY: default dummy test test-nop test-ebuild_creation test-desc
+.PHONY: default dummy test test-nop \
+	test-ebuild_creation test-desc
 
-default: test
+default: dummy test
 
 dummy:
+	$(PY) --version
 
 test-nop: $(PY_NOP)
-	@chmod u+x $(PY_NOP)
-	@$(PY_NOP)
+	@$(PY) $(PY_NOP)
 
 # test-desc (file) has been removed in favor of test-desc (tar),
-#  which has is included in ebuild creation
+#  which is included in ebuild creation
 test-ebuild_creation: test-nop $(PY_EBU) $(EXAMPLES)/packages
-	@chmod u+x $(PY_EBU)
-	$(PY_EBU) $(EXAMPLES)/packages/*.tar.gz
+	$(PY) $(PY_EBU) $(EXAMPLES)/packages/*.tar.gz
 
-#test-desc:
-# ...
+test-desc: test-nop $(PY_DESC_TESTER) $(EXAMPLES)/packages
+	$(PY) $(PY_DESC_TESTER) $(EXAMPLES)/packages/*.tar.gz
 
-test: test-nop test-ebuild_creation
+test: test-nop test-desc test-ebuild_creation
diff --git a/examples/DESCRIPTION/NbClust.desc b/examples/DESCRIPTION/NbClust_1.0
index 817adfd..817adfd 100644
--- a/examples/DESCRIPTION/NbClust.desc
+++ b/examples/DESCRIPTION/NbClust_1.0
diff --git a/examples/DESCRIPTION/SPARQL.desc b/examples/DESCRIPTION/SPARQL_1.0
index 555866d..555866d 100644
--- a/examples/DESCRIPTION/SPARQL.desc
+++ b/examples/DESCRIPTION/SPARQL_1.0
diff --git a/examples/DESCRIPTION/Taxonstand.desc b/examples/DESCRIPTION/Taxonstand_1.0
index 94355f7..94355f7 100644
--- a/examples/DESCRIPTION/Taxonstand.desc
+++ b/examples/DESCRIPTION/Taxonstand_1.0
diff --git a/roverlay/tmpconst.py b/roverlay/tmpconst.py
index a051531..3f10aaa 100644
--- a/roverlay/tmpconst.py
+++ b/roverlay/tmpconst.py
@@ -2,6 +2,9 @@
 # Copyright 2006-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+# matches .tgz .tbz2 .tar .tar.gz .tar.bz2
+RPACKAGE_SUFFIX_REGEX = '[.](tgz|tbz2|tar|(tar[.](gz|bz2)))'
+
 PACKAGE_CATEGORY = 'sci-R'
 
 DESCRIPTION_FIELD_SEPARATOR = ':'
@@ -23,11 +26,14 @@ DESCRIPTION_VALID_OS_TYPES = [ "unix" ]
 
 	access to these values is
 	* for aliases
-		DESCRIPTION_FIELD_MAP [<field name>] [case sensitive? withcase : nocase] [<index>]
+		DESCRIPTION_FIELD_MAP [<field name>] [alias] [case sensitive ? withcase : nocase] [<index>]
 
 	* for flags
 		DESCRIPTION_FIELD_MAP [<field name>] [flags] [<index>]
 
+	* default values
+		DESCRIPTION_FIELD_MAP [<field name>] [default_value]
+
 	notable flags:
 	* isList : indicates that this field has several values that are
 	           separated by commata/semicolons =:<DESCRIPTION_LIST_SPLIT_REGEX>
@@ -61,24 +67,40 @@ DESCRIPTION_FIELD_MAP = {
 		'flags' : [ 'mandatory', 'joinValues' ]
 	},
 	'Suggests' : {
-		'nocase' : [ 'Suggests', 'Suggest',
+		'alias' : {
+			'nocase' : [ 'Suggests', 'Suggest',
 							'%Suggests', 'Suggets', 'Recommends' ]
+		},
 	},
 	'Depends' : {
-		'nocase' : [ 'Depends', 'Dependencies', 'Dependes',
+		'alias' : {
+			'nocase' : [ 'Depends', 'Dependencies', 'Dependes',
 							'%Depends', 'Depents', 'Require', 'Requires' ],
+		},
 		'flags' : [ 'isList' ],
+		'default_value' : '',
 	},
 	'Imports' : {
-		'nocase' : [ 'Imports', 'Import' ]
+		'alias' : {
+			'nocase' : [ 'Imports', 'Import' ]
+		},
 	},
 	'LinkingTo' : {
-		'nocase' : [ 'LinkingTo', 'LinkingdTo' ]
+		'alias' : {
+			'nocase' : [ 'LinkingTo', 'LinkingdTo' ]
+		},
 	},
 	'SystemRequirements' : {
-		'nocase' : [ 'SystemRequirements', 'SystemRequirement' ]
+		'alias' : {
+			'nocase' : [ 'SystemRequirements', 'SystemRequirement' ]
+		},
 	},
 	'OS_Type' : {
-		'nocase' : [ 'OS_TYPE' ]
+		'alias' : {
+			'nocase' : [ 'OS_TYPE' ]
+		},
+	},
+	'test-default' : {
+		'default_value' : 'some default value'
 	}
 }
diff --git a/run_descreader.py b/run_descreader.py
index 0171cff..9ea0c92 100755
--- a/run_descreader.py
+++ b/run_descreader.py
@@ -15,8 +15,9 @@ try:
 
 	print ( "<=== run_descreader end ===>\n" )
 
-except Error as err:
+except Exception as err:
 	print ( str ( err ) )
 	print ( "<=== run_descreader failed ===>\n" )
+	raise
 
 
diff --git a/run_ebuildcreation.py b/run_ebuildcreation.py
index 6e64bd3..e67b772 100755
--- a/run_ebuildcreation.py
+++ b/run_ebuildcreation.py
@@ -22,6 +22,7 @@ try:
 
 	sys.stderr.write ( "<=== run_ebuildcreation end ===>\n" )
 
-except Error as err:
+except Exception as err:
 	sys.stderr.write ( str ( err ) + "\n" )
 	sys.stderr.write ( "<=== run_ebuildcreation failed ===>\n" )
+	raise