From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org)
	by finch.gentoo.org with esmtp (Exim 4.60)
	(envelope-from <gentoo-commits+bounces-470421-garchives=archives.gentoo.org@lists.gentoo.org>)
	id 1SaU48-0001rn-LX
	for garchives@archives.gentoo.org; Fri, 01 Jun 2012 15:47:05 +0000
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id B67C8E0700;
	Fri,  1 Jun 2012 15:46:37 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
	by pigeon.gentoo.org (Postfix) with ESMTP id 5D723E068E
	for <gentoo-commits@lists.gentoo.org>; Fri,  1 Jun 2012 15:46:37 +0000 (UTC)
Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163])
	(using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id 5662E1B4010
	for <gentoo-commits@lists.gentoo.org>; Fri,  1 Jun 2012 15:46:36 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
	by hornbill.gentoo.org (Postfix) with ESMTP id 27592E5428
	for <gentoo-commits@lists.gentoo.org>; Fri,  1 Jun 2012 15:46:35 +0000 (UTC)
From: "André Erdmann" <dywi@mailerd.de>
To: gentoo-commits@lists.gentoo.org
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "André Erdmann" <dywi@mailerd.de>
Message-ID: <1338562569.ac0b226fd7d16dad7a4b8d30b4293fe401406c1c.dywi@gentoo>
Subject: [gentoo-commits] proj/R_overlay:master commit in: roverlay/
X-VCS-Repository: proj/R_overlay
X-VCS-Files: roverlay/__init__.py roverlay/config.py roverlay/const.py roverlay/descriptionfields.py roverlay/descriptionreader.py roverlay/ebuild.py roverlay/ebuildjob.py roverlay/fileio.py roverlay/tmpconst.py
X-VCS-Directories: roverlay/
X-VCS-Committer: dywi
X-VCS-Committer-Name: André Erdmann
X-VCS-Revision: ac0b226fd7d16dad7a4b8d30b4293fe401406c1c
X-VCS-Branch: master
Date: Fri,  1 Jun 2012 15:46:35 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: quoted-printable
X-Archives-Salt: de33e48b-ffd7-42b4-8d01-60281b289e2c
X-Archives-Hash: 79a8b3ce192c9d2ba767ec3404a0f40d

commit:     ac0b226fd7d16dad7a4b8d30b4293fe401406c1c
Author:     Andr=C3=A9 Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Fri Jun  1 14:56:09 2012 +0000
Commit:     Andr=C3=A9 Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Fri Jun  1 14:56:09 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=3Dproj/R_overlay.git=
;a=3Dcommit;h=3Dac0b226f

2012-01-06:
	* description field definition is now configurable

	modified:   roverlay/__init__.py
	modified:   roverlay/config.py
	new file:   roverlay/const.py
	modified:   roverlay/descriptionfields.py
	renamed:    roverlay/fileio.py -> roverlay/descriptionreader.py
	modified:   roverlay/ebuild.py
	modified:   roverlay/ebuildjob.py
	deleted:    roverlay/tmpconst.py

---
 roverlay/__init__.py                         |    5 +
 roverlay/config.py                           |  164 ++++++++++++-
 roverlay/const.py                            |   51 ++++
 roverlay/descriptionfields.py                |  343 ++++++++++++++++++++=
+++---
 roverlay/{fileio.py =3D> descriptionreader.py} |  248 ++++++------------=
-
 roverlay/ebuild.py                           |    5 +-
 roverlay/ebuildjob.py                        |   15 +-
 roverlay/tmpconst.py                         |  108 --------
 8 files changed, 615 insertions(+), 324 deletions(-)

diff --git a/roverlay/__init__.py b/roverlay/__init__.py
index b1557ef..f50cec9 100644
--- a/roverlay/__init__.py
+++ b/roverlay/__init__.py
@@ -4,6 +4,11 @@
=20
 import logging
=20
+
+from roverlay import config
+
+config.access().load_field_definition ( 'description_fields.conf' )
+
 logging.basicConfig (
 	level=3Dlogging.DEBUG,
 	filename=3D'roverlay.log',

diff --git a/roverlay/config.py b/roverlay/config.py
index 248fc22..b0bf7a3 100644
--- a/roverlay/config.py
+++ b/roverlay/config.py
@@ -3,20 +3,53 @@
 # Distributed under the terms of the GNU General Public License v2
=20
 import sys
-
-from roverlay import descriptionfields
+import shlex
=20
 try:
 	import configparser
-except ImportError:
+except ImportError as running_python2:
+	# configparser is named ConfigParser in python2
 	import ConfigParser as configparser
=20
+
+
+
+from roverlay import descriptionfields
+from roverlay import const
+
+
+
+
 def access():
+	"""Returns the ConfigTree."""
 	return ConfigTree() if ConfigTree.instance is None else ConfigTree.inst=
ance
+# --- end of access (...) ---
+
+
+def get ( key, fallback_value=3DNone ):
+	"""Searches for key in the ConfigTree and returns its value if possible=
,
+	else fallback_value.
+	'key' is a config path [<section>[.<subsection>*]]<option name>.
+
+	arguments:
+	* key --
+	* fallback_value --
+	"""
+	if fallback_value:
+		return access().get ( key, fallback_value )
+	else:
+		return access().get ( key )
+# --- end of get (...) ---
+
=20
 class InitialLogger:
=20
 	def __init__ ( self ):
+		"""Initializes an InitialLogger.
+		It implements the debug/info/warning/error/critical/exception methods
+		known from the logging module and its output goes directly to sys.stde=
rr.
+		This can be used until the real logging has been configured.
+		"""
 		self.debug     =3D lambda x : sys.stderr.write ( "DBG  " + str ( x ) +=
 "\n" )
 		self.info      =3D lambda x : sys.stderr.write ( "INFO " + str ( x ) +=
 "\n" )
 		self.warning   =3D lambda x : sys.stderr.write ( "WARN " + str ( x ) +=
 "\n" )
@@ -24,11 +57,23 @@ class InitialLogger:
 		self.critical  =3D lambda x : sys.stderr.write ( "CRIT " + str ( x ) +=
 "\n" )
 		self.exception =3D lambda x : sys.stderr.write ( "EXC! " + str ( x ) +=
 "\n" )
=20
+	# --- end of __init__ (...) ---
+
 class ConfigTree:
 	# static access to the first created ConfigTree
 	instance =3D None
=20
-	def __init__ ( self ):
+	def __init__ ( self, import_const=3DTrue ):
+		"""Initializes an ConfigTree, which is a container for options/config =
values.
+		values can be stored directly (such as the field_definitions) or in a
+		tree-like { section -> subsection[s] -> option =3D value } structure.
+		Config keys cannot contain dots because they're used as config path
+		separator.
+
+		arguments:
+		* import_const -- whether to deepcopy constants into the config tree o=
r
+		                  not. Copying allows faster lookups.
+		"""
 		if ConfigTree.instance is None:
 			ConfigTree.instance =3D self
=20
@@ -36,8 +81,52 @@ class ConfigTree:
=20
 		self.parser =3D dict()
=20
+		self._config =3D const.clone() if import_const else None
+		self._const_imported =3D import_const
+		self._field_definitions =3D None
+
+	# --- end of __init__ (...) ---
+
+
+	def get ( self, key, fallback_value=3DNone ):
+		"""Searches for key in the ConfigTree and returns its value.
+		Searches in const if ConfigTree does not contain the requested key and
+		returns the fallback_value if key not found.
+
+		arguments:
+		* key --
+		* fallback_value --
+		"""
+		if self._config:
+			config_path =3D key.split ( '.' )
+			config_path.reverse ()
+
+			config_position =3D self._config
+			while len ( config_path ) and config_position:
+				next_key =3D config_path.pop ()
+				if next_key in config_position:
+					config_position =3D config_position [next_key]
+				else:
+					config_position =3D None
+
+			if config_position:
+				return config_position
+
+		if self._const_imported:
+			return fallback_value
+		else:
+			return const.lookup ( key, fallback_value )
+
+	# --- end of get (...) ---
=20
 	def load_field_definition ( self, def_file, lenient=3DFalse ):
+		"""Loads a field definition file. Please see the example file for form=
at
+		details.
+
+		arguments:
+		* def_file -- file (str) to read, this can be a list of str if lenient=
 is True
+		* lenient  -- if True: do not fail if a file cannot be read; defaults =
to False
+		"""
 		if not 'field_def' in self.parser:
 			self.parser ['field_def'] =3D configparser.SafeConfigParser ( allow_n=
o_value=3DTrue )
=20
@@ -57,4 +146,71 @@ class ConfigTree:
 			self.logger.exception ( mshe )
 			raise
=20
+	# --- end of load_field_definition (...) ---
+
+
+	def get_field_definition ( self, force_update=3DFalse ):
+		"""Gets the field definition stored in this ConfigTree.
+
+		arguments:
+		* force_update -- enforces recreation of the field definition data.
+		"""
+		if force_update or not self._field_definitions:
+			self._field_definitions =3D self._make_field_definition ()
+
+		return self._field_definitions
+
+	# --- end of get_field_definition (...) ---
+
+
+	def _make_field_definition ( self ):
+		"""Creates and returns field definition data. Please see the example
+		field definition config file for details.
+		"""
+
+		def get_list ( value_str ):
+			if value_str is None:
+				return []
+			else:
+				l =3D value_str.split ( ', ' )
+				return [ e for e in l if e.strip() ]
+
+		if not 'field_def' in self.parser:
+			return None
+
+		fdef =3D descriptionfields.DescriptionFields ()
+
+		for field_name in self.parser ['field_def'].sections():
+			field =3D descriptionfields.DescriptionField ( field_name )
+			for option, value in self.parser ['field_def'].items ( field_name, 1 =
):
+
+				if option =3D=3D 'alias' or option =3D=3D 'alias_withcase':
+					for alias in get_list ( value ):
+						field.add_simple_alias ( alias, True )
+
+				elif option =3D=3D 'alias_nocase':
+					for alias in get_list ( value ):
+						field.add_simple_alias ( alias, False )
+
+				elif option =3D=3D 'default_value':
+					field.set_default_value ( value )
+
+				elif option =3D=3D 'allowed_value':
+					field.add_allowed_value ( value )
+
+				elif option =3D=3D 'allowed_values':
+					for item in get_list ( value ):
+						field.add_allowed_value ( item )
+
+				elif option =3D=3D 'flags':
+					for flag in get_list ( value ):
+						field.add_flag ( flag )
+				else:
+					# treat option as flag
+					field.add_flag ( option )
+
+			fdef.add ( field )
+
+		return fdef
=20
+	# --- end of _make_field_definition (...) ---

diff --git a/roverlay/const.py b/roverlay/const.py
new file mode 100644
index 0000000..32630cf
--- /dev/null
+++ b/roverlay/const.py
@@ -0,0 +1,51 @@
+# R Overlay -- constants
+# Copyright 2006-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+import copy
+import time
+
+_CONSTANTS =3D dict (
+	DESCRIPTION =3D dict (
+		field_separator  =3D ':',
+		comment_char     =3D '#',
+		list_split_regex =3D '\s*[,;]{1}\s*',
+		file_name        =3D 'DESCRIPTION',
+	),
+	R_PACKAGE =3D dict (
+		suffix_regex       =3D '[.](tgz|tbz2|tar|(tar[.](gz|bz2)))',
+		name_ver_separator =3D '_',
+	),
+	EBUILD =3D dict (
+		indent         =3D '\t',
+		default_header =3D [	'# Copyright 1999-' + str ( time.gmtime() [0] ) +=
 ' Gentoo Foundation',
+									'# Distributed under the terms of the GNU General Public Licens=
e v2',
+									'# $Header: $',
+									'',
+									'EAPI=3D4',
+									'',
+									'inherit R-packages'
+								],
+	)
+)
+
+def lookup ( key, fallback_value=3DNone ):
+	path =3D key.split ( '.' )
+	path.reverse ()
+
+	const_position =3D _CONSTANTS
+
+	while len ( path ) and const_position:
+		next_key =3D path.pop ()
+		if next_key in const_position:
+			const_position =3D const_position [next_key]
+		else:
+			const_position =3D None
+
+	if const_position:
+		return const_position
+	else:
+		return fallback_value
+
+def clone ( ):
+	return copy.deepcopy ( _CONSTANTS )

diff --git a/roverlay/descriptionfields.py b/roverlay/descriptionfields.p=
y
index 9c028c2..72175cb 100644
--- a/roverlay/descriptionfields.py
+++ b/roverlay/descriptionfields.py
@@ -2,39 +2,95 @@
 # Copyright 2006-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
=20
-
-# split from tmpconst / fileio to make configuration possible, but TODO
-
 class DescriptionField:
+	"""Configuration for a field in the R package description file."""
=20
 	def __init__ ( self, name ):
+		"""Initializes a DescriptionField with a valid(!) name.
+
+		arguments:
+		* name -- name of the field, has to be True (neither empty nor None)
+
+		raises: Exception if name not valid
+		"""
+
 		if not name:
 			raise Exception ( "description field name is empty." )
=20
 		self.name =3D name
=20
+	# --- end of __init__ (...) ---
=20
=20
 	def get_name ( self ):
+		"""Returns the name of this DescriptionField."""
 		return self.name
=20
-	def add_flag ( self, flag, lowercase=3DTrue ):
-		if not hasattr ( self, flags ):
+	# --- end of get_name (...) ---
+
+
+	def add_flag ( self, flag ):
+		"""Adds a flag to this DescriptionField. Flags are always stored in
+		their lowercase form.
+
+		arguments:
+		* flag -- name of the flag
+		"""
+		if not hasattr ( self, 'flags' ):
 			self.flags =3D set ()
=20
-		self.flags.add ( flag, flag.lower() if lowercase else flag )
+		self.flags.add ( flag.lower() )
=20
 		return None
=20
+	# --- end of add_flag (...) ---
+
+
+	def add_allowed_value ( self, value ):
+		"""Adds an allowed value to this DescriptionField, which creates a
+		value whitelist for it. You can later check if a value is allowed usin=
g
+		value_allowed (<value> [, <case insensitive?>]).
+
+		arguments:
+		* value -- allowed value
+		"""
+
+		if not hasattr ( self, 'allowed_values' ):
+			self.allowed_values =3D set ()
+
+		self.allowed_values.add ( value )
+
+		return None
+
+	# --- end of add_allowed_value (...) ---
+
=20
 	def del_flag ( self, flag ):
-		if hasattr ( self, flags ):
-			self.flags.discard ( flag )
+		"""Removes a flag from this DescriptionField. Does nothing if the flag
+		does not exist.
+		"""
+		if hasattr ( self, 'flags' ):
+			self.flags.discard ( flag.lower() )
 		return None
=20
+	# --- end of del_flag (...) ---
+
=20
 	def add_alias ( self, alias, alias_type=3D'withcase' ):
-		if not hasattr ( self, aliases ):
+		"""Adds an alias for this DescriptionField's name. This can also be us=
ed
+		to combine different fields ('Description' and 'Title') or to fix
+		typos ('Depend' -> 'Depends').
+
+		arguments:
+		* alias -- alias name
+		* alias_type -- type of the alias; currently this is limited to
+		                 'withcase' : alias is case sensitive,
+		                 'nocase'   : alias is case insensitive
+		                any other type leads to an error
+
+		raises: KeyError if alias_type unknown.
+		"""
+		if not hasattr ( self, 'aliases' ):
 			self.aliases =3D dict ()
=20
 		to_add =3D dict (
@@ -50,37 +106,83 @@ class DescriptionField:
=20
 		return None
=20
+	# --- end of add_alias (...) ---
=20
=20
 	def add_simple_alias ( self, alias, withcase=3DTrue ):
-		if withcase:
-			return self.add_alias ( alias, alias_type=3D'withcase' )
-		else:
-			return self.add_alias ( alias, alias_type=3D'nocase' )
+		"""Adds an alias to this DescriptionField. Its type is either withcase
+		or nocase. See add_alias (...) for details.
+
+		arguments:
+		alias --
+		withcase -- if True (the default): alias_type is withcase, else nocase
+
+		raises: KeyError (passed from add_alias (...))
+		"""
+		return self.add_alias ( alias, ( 'withcase' if withcase else 'nocase' =
) )
=20
+	# --- end of add_simple_alias (...) ---
=20
=20
 	def get_default_value ( self ):
-		if hasattr ( self, 'default_value' ):
-			return self.default_value
-		else:
-			return None
+		"""Returns the default value for this DescriptionField if it exists,
+		else None.
+		"""
+		return self.default_value if hasattr ( self, 'default_value' ) else No=
ne
=20
+	# --- end of get_default_value (...) ---
+
+
+	def set_default_value ( self, value ):
+		"""Sets the default value for this this DescriptionField.
+
+		arguments:
+		* value -- new default value
+		"""
+		self.default_value =3D value
+
+	# --- end of set_default_value (...) ---
+
+
+	def get_flags ( self ):
+		"""Returns the flags of this DescriptionField or an empty list (=3Dno =
flags)."""
+		return self.flags if hasattr ( self, 'flags' ) else []
+
+	# --- end of get_flags (...) ---
+
+
+	def get_allowed_values ( self ):
+		"""Returns the allowed values of this DescriptionField or an empty lis=
t,
+		which should be interpreted as 'no value restriction'.
+		"""
+		return self.allowed_values if hasattr ( self, 'allowed_values' ) else =
[]
+
+	# --- end of get_allowed_values (...) ---
=20
-	def get ( self, key, fallback_value=3DNone ):
-		if hasattr ( self, key ):
-			return self.key
-		else:
-			return fallback_value
=20
 	def matches ( self, field_identifier ):
+		"""Returns whether field_identifier equals the name of this Descriptio=
nField.
+
+		arguments:
+		* field_identifier --
+		"""
 		return bool ( self.name =3D=3D field_identifier ) if field_identifier =
else False
=20
+	# --- end of matches (...) ---
+
+
 	def matches_alias ( self, field_identifier ):
+		"""Returns whether field_identifier equals any alias of this Descripti=
onField.
+
+		arguments:
+		* field_identifier --
+		"""
=20
 		if not field_identifier:
+			# bad identifier
 			return False
-		if not hasattr ( self, aliases ):
+		elif not hasattr ( self, aliases ):
+			# no aliases
 			return False
=20
 		if 'withcase' in self.aliases:
@@ -92,30 +194,211 @@ class DescriptionField:
 			if field_id_lower in self.aliases ['nocase']:
 				return True
=20
-	def has_flag ( self, flag, lowercase=3DTrue ):
-		if not hasattr ( self, flags ):
+	# --- end of matches_alias (...) ---
+
+
+	def has_flag ( self, flag  ):
+		"""Returns whether this DescriptionField has the given flag.
+
+		arguments:
+		* flag --
+		"""
+		if not hasattr ( self, 'flags' ):
 			return False
=20
-		return bool ( (flag.lower() if lowercase else flag) in self.flags )
+		return bool ( flag.lower() in self.flags )
+
+	def value_allowed ( self, value, nocase=3DTrue ):
+		"""Returns whether value is allowed for this DescriptionField.
+
+		arguments:
+		* value -- value to check
+		* nocase -- if True (the default): be case insensitive
+		"""
+		allowed_values =3D self.get_allowed_values ()
+
+		if not allowed_values:
+			return True
+		elif nocase:
+			lowval =3D value.lower()
+			for allowed in allowed_values:
+				if allowed.lower() =3D=3D lowval:
+					return True
+
+		else:
+			return bool ( value in allowed_values )
+
+		return False
+
+	# --- end of has_flag (...) ---
+
+# --- end of DescriptionField ---
+
=20
 class DescriptionFields:
+	"""DescriptionFields stores several instances of DescriptionField and p=
rovides
+	'search in all' methods such as get_fields_with_flag (<flag>).
+	"""
=20
 	def __init__ ( self ):
-		fields =3D dict ()
+		"""Initializes an DescriptionFields object."""
+		self.fields =3D dict ()
+		# result 'caches'
+		## flag -> [<fields>]
+		self._fields_by_flag   =3D None
+		## option -> [<fields>]
+		self._fields_by_option =3D None
+
+	# --- end of __init__ (...) ---
+
=20
 	def add ( self, desc_field ):
+		"""Adds an DescriptionField. Returns 1 desc_field was a DescriptionFie=
ld
+		and has been added as obj ref, 2 if a new DescriptionField with
+		name=3Ddesc_field has been created and added and 0 if this was not
+		possible.
+
+		arguments:
+		* desc_field -- this can either be a DescriptionField or a name.
+		"""
 		if desc_field:
 			if isinstance ( desc_field, DescriptionField ):
-				fields [desc_field.get_name()] =3D desc_field
+				self.fields [desc_field.get_name()] =3D desc_field
 				return 1
 			elif isinstance ( desc_field, str ):
-				fields [desc_field] =3D DescriptionField ( desc_field )
+				self.fields [desc_field] =3D DescriptionField ( desc_field )
 				return 2
=20
 		return 0
=20
+	# --- end of add (...) ---
+
+
 	def get ( self, field_name ):
+		"""Returns the DescriptionField to which field_name belongs to.
+		This method does, unlike others in DescriptionFields, return a
+		reference to the matching DescriptionField object, not the field name!
+		Returns None if field_name not found.
+
+		arguments:
+		* field_name --
+		"""
+
 		return self.fields [field_name] if field_name in self.fields else None
=20
-	# ... TODO
+	# --- end of get (...) ---
+
+
+	def find_field ( self, field_name ):
+		"""Determines the name of the DescriptionField to which field_name bel=
ongs
+		to. Returns the name of the matching field or None.
+
+		arguments:
+		* field_name --
+		"""
+
+		field =3D get ( field_name )
+		if field is None:
+			for field in self.fields:
+				if field.matches_alias ( field_name ):
+					return field.get_name ()
+		else:
+			return field.get_name ()
+
+	# --- end of find_field (...) ---
+
+
+	def _field_search ( self ):
+		"""Scans all stored DescriptionField(s) and creates fast-accessible
+		data to be used in get_fields_with_<sth> (...).
+		"""
+		flagmap   =3D dict ()
+		optionmap =3D dict (
+			defaults       =3D dict (),
+			allowed_values =3D set ()
+		)
+
+		for field_name in self.fields.keys():
+
+			d =3D self.fields [field_name].get_default_value()
+			if not d is None:
+				optionmap ['defaults'] [field_name] =3D d
+
+			if self.fields [field_name].get_allowed_values():
+				optionmap ['allowed_values'].add ( field_name )
+
+			for flag in self.fields [field_name].get_flags():
+				if not flag in flagmap:
+					flagmap [flag] =3D set ()
+				flagmap [flag].add ( field_name )
+
+		self._fields_by_flag   =3D flagmap
+		self._fields_by_option =3D optionmap
+		return None
+
+	# --- end of _field_search (...) ---
+
+
+	def get_fields_with_flag ( self, flag, force_update=3DFalse ):
+		"""Returns the names of the fields that have the given flag.
+
+		arguments:
+		* flag --
+		* force_update -- force recreation of data
+		"""
+		if force_update or self._fields_by_flag is None:
+			self._field_search ()
+
+		flag =3D flag.lower()
+
+		if flag in self._fields_by_flag:
+			return self._fields_by_flag [flag]
+		else:
+			return []
+
+	# --- end of get_fields_with_flag (...) ---
+
+
+	def get_fields_with_option ( self, option, force_update=3DFalse ):
+		"""Returns a struct with fields that have the given option. The actual
+		data type depends on the requested option.
+
+		arguments:
+		* option --
+		* force_update -- force recreation of data
+		"""
+		if force_update or self._fields_by_option is None:
+			self._field_search ()
+
+		if option in self._fields_by_option:
+			return self._fields_by_option [option]
+		else:
+			return []
+
+	# --- end of get_field_with_option (...) ---
+
+
+	def get_fields_with_default_value ( self, force_update=3DFalse ):
+		"""Returns a dict { '<field name>' -> '<default value>' } for all
+		fields that have a default value.
+
+		arguments:
+		* force_update -- force recreation of data
+		"""
+		return self.get_fields_with_option ( 'defaults', force_update )
+
+	# --- end of get_fields_with_default_value (...) ---
+
+
+	def get_fields_with_allowed_values ( self, force_update=3DFalse ):
+		"""Returns a set { <field name> } for all fields that allow only
+		certain values.
+
+		arguments:
+		* force_update -- force recreation of data
+		"""
+		return self.get_fields_with_option ( 'allowed_values', force_update )
+
+	# --- end of get_fields_with_allowed_values (...) ---
=20
+# --- end of DescriptionFields ---

diff --git a/roverlay/fileio.py b/roverlay/descriptionreader.py
similarity index 54%
rename from roverlay/fileio.py
rename to roverlay/descriptionreader.py
index 5c01527..2af4372 100644
--- a/roverlay/fileio.py
+++ b/roverlay/descriptionreader.py
@@ -1,4 +1,4 @@
-# R Overlay -- file in/out
+# R Overlay -- description reader
 # Copyright 2006-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
=20
@@ -7,21 +7,25 @@ import tarfile
 import logging
 import os.path
=20
-
-# temporary import until config and real constants are implemented
-from roverlay import tmpconst as const
+from roverlay import config
+from roverlay import descriptionfields
=20
 class DescriptionReader:
 	"""Description Reader"""
=20
 	LOGGER =3D logging.getLogger ( 'DescriptionReader' )
=20
+
 	def __init__ ( self, package_file, read_now=3DFalse ):
 		"""Initializes a DESCRIPTION file reader."""
=20
-		self.fileinfo  =3D self.make_fileinfo ( package_file )
-		self.logger    =3D DescriptionReader.LOGGER.getChild ( self.get_log_na=
me() )
-		self.desc_data =3D None
+		if not config.access().get_field_definition():
+			raise Exception ( "Field definition is missing, cannot initialize Des=
criptionReader." )
+
+		self.field_definition =3D config.access().get_field_definition()
+		self.fileinfo         =3D self.make_fileinfo ( package_file )
+		self.logger           =3D DescriptionReader.LOGGER.getChild ( self.get=
_log_name() )
+		self.desc_data        =3D None
=20
=20
 		if read_now:
@@ -30,10 +34,13 @@ class DescriptionReader:
 	# --- end of __init__ (...) ---
=20
 	def get_log_name ( self ):
+		"""Returns a logging name that can be used in other modules."""
 		try:
 			return self.fileinfo ['filename']
 		except Exception as any_exception:
 			return '__undef__'
+	# --- end of get_log_name (...) ---
+
=20
 	def get_desc ( self, run_if_unset=3DTrue ):
 		if self.desc_data is None:
@@ -58,10 +65,11 @@ class DescriptionReader:
=20
 		package_file =3D os.path.basename ( filepath )
=20
-		filename =3D re.sub ( const.RPACKAGE_SUFFIX_REGEX + '$', '', package_f=
ile )
+		filename =3D re.sub ( config.get ( 'R_PACKAGE.suffix_regex' ) + '$', '=
', package_file )
=20
-		# todo move that separator to const
-		package_name, sepa, package_version =3D filename.partition ( '_' )
+		package_name, sepa, package_version =3D filename.partition (
+			config.get ( 'R_PACKAGE.name_ver_separator', '_' )
+		)
=20
 		if not sepa:
 			# file name unexpected, tarball extraction will (probably) fail
@@ -78,7 +86,6 @@ class DescriptionReader:
=20
 	# --- end of make_fileinfo (...) ---
=20
-
 	def _parse_read_data ( self, read_data ):
 		"""Verifies and parses/fixes read data.
=20
@@ -86,80 +93,42 @@ class DescriptionReader:
 		* read_data -- data from file, will be modified
 		"""
=20
-		def get_fields_with_flag ( flag, foce_update=3DFalse ):
-
-			matching_fields =3D []
-
-			field =3D None
-			for field in const.DESCRIPTION_FIELD_MAP.keys():
-				if flag is None:
-					matching_fields.append ( field )
-
-				elif 'flags' in const.DESCRIPTION_FIELD_MAP [field]:
-					if flag in const.DESCRIPTION_FIELD_MAP [field] ['flags']:
-						matching_fields.append ( field )
-
-			del field
-			return matching_fields
-
-		# --- end of get_fields_with_flag (...) ---
-
-		def value_in_strlist ( _val, _list, case_insensitive=3DTrue ):
-			"""Returns true if value is in the given list."""
-			el =3D None
-			if case_insensitive:
-				lowval =3D _val.lower()
-				for el in _list:
-					if el.lower() =3D=3D lowval:
-						return True
-				del lowval
-			else:
-				for el in _list:
-					if el =3D=3D _val:
-						return True
-
-			del el
-			return False
-		# --- end of value_in_strlist (...) ---
-
-		field =3D None
=20
 		# insert default values
-		for field in const.DESCRIPTION_FIELD_MAP.keys():
-			if not field in read_data and 'default_value' in const.DESCRIPTION_FI=
ELD_MAP [field]:
-				read_data [field] =3D const.DESCRIPTION_FIELD_MAP [field] ['default_=
value']
+		default_values =3D self.field_definition.get_fields_with_default_value=
()
+		for field_name in default_values.keys():
+			if not field_name in read_data:
+				read_data [field_name] =3D default_values [field_name]
+
=20
 		# join values to a single string
-		for field in get_fields_with_flag ( 'joinValues' ):
-			if field in read_data.keys():
-				read_data [field] =3D ' ' . join ( read_data [field] )
+		for field_name in self.field_definition.get_fields_with_flag ( 'joinVa=
lues' ):
+			print ( "?, ".join ( [ field_name, 'join', str ( read_data ) ] ) )
+			if field_name in read_data:
+				read_data [field_name] =3D ' ' . join ( read_data [field_name] )
=20
 		# ensure that all mandatory fields are set
-		missing_fields =3D list()
+		missing_fields =3D set ()
=20
-		for field in get_fields_with_flag ( 'mandatory' ):
-			if field in read_data:
-				if not len (read_data [field]):
-					missing_fields.append ( field )
+		for field_name in self.field_definition.get_fields_with_flag ( 'mandat=
ory' ):
+			if field_name in read_data:
+				if read_data [field_name] is None or len ( read_data [field_name] ) =
< 1:
+					missing_fields.add ( field_name )
+				#else: ok
 			else:
-				missing_fields.append ( field )
-
-
+				missing_fields.add ( field_name )
=20
=20
 		# check for fields that allow only certain values
-		unsuitable_fields =3D dict()
+		unsuitable_fields =3D set()
=20
-		for field in read_data.keys():
-			if 'allowed_values' in const.DESCRIPTION_FIELD_MAP [field]:
-				if not value_in_strlist (
-							read_data [field],
-							const.DESCRIPTION_FIELD_MAP [field] ['allowed_values']
-						):
-					unsuitable_fields.append [field] =3D read_data [field]
-
-		del field
+		restricted_fields =3D self.field_definition.get_fields_with_allowed_va=
lues()
+		for field_name in restricted_fields:
+			if field_name in read_data:
+				if not self.field_definition.get ( field_name ).value_allowed ( read=
_data [field_name] ):
+					unsuitable_fields.add ( field_name )
=20
+		# summarize results
 		valid =3D not bool ( len ( missing_fields ) or len ( unsuitable_fields=
 ) )
 		if not valid:
 			self.logger.info ( "Cannot use R package" ) # name?
@@ -200,27 +169,6 @@ class DescriptionReader:
 			multiple values arranged in a list (dep0, dep1 [, depK]*).
 			"""
=20
-			def check_fieldflag ( field, flag_to_check=3DNone ):
-				"""Checks if the given field has the specified flag and returns a bo=
ol.
-
-				arguments:
-				* field -- name of the field that should be checked
-				* flag_to_check -- name of the flag to check; optional, defaults to =
None
-
-				This method acts as 'field has any flags?' if flag_to_check is None =
(its default value).
-				"""
-
-				if field in const.DESCRIPTION_FIELD_MAP:
-					if 'flags' in const.DESCRIPTION_FIELD_MAP [field]:
-						if flag_to_check in const.DESCRIPTION_FIELD_MAP [field] ['flags']:
-							return True
-						elif flag_to_check is None:
-							# 'flags' exist, return true
-							return True
-
-				return False
-			# --- end of check_fieldflag (...) ---
-
 			svalue_str =3D value_str.strip()
=20
 			if not svalue_str:
@@ -231,16 +179,17 @@ class DescriptionReader:
 				# default return if no context given
 				return [ svalue_str ]
=20
-			elif check_fieldflag ( field_context ):
-				# value str is not empty and have flags for field_context, check the=
se
-
-				if check_fieldflag ( field_context, 'isList' ):
-						# split up this list (that is separated by commata and/or semicolo=
ns)
-						return re.split (const.DESCRIPTION_LIST_SPLIT_REGEX, svalue_str, 0=
)
+			elif field_context in self.field_definition.get_fields_with_flag ( 'i=
sList' ):
+					# split up this list (that is separated by commata and/or semicolon=
s)
+					return re.split (
+						config.get ( 'DESCRIPTION.list_split_regex' ),
+						svalue_str,
+						0
+					)
=20
-				elif check_fieldflag ( field_context, 'isWhitespaceList' ):
-						# split up this list (that is separated whitespace)
-						return re.split ( '\s+', svalue_str, 0 )
+			elif field_context in self.field_definition.get_fields_with_flag ( 'i=
sWhitespaceList' ):
+					# split up this list (that is separated whitespace)
+					return re.split ( '\s+', svalue_str, 0 )
=20
=20
 			# default return
@@ -275,9 +224,12 @@ class DescriptionReader:
 				# filepath is a tarball, open tar handle + file handle
 				th =3D tarfile.open ( filepath, 'r' )
 				if pkg_name:
-					fh =3D th.extractfile ( os.path.join ( pkg_name, const.DESCRIPTION_=
FILE_NAME ) )
+					fh =3D th.extractfile ( os.path.join (
+						pkg_name,
+						config.get ( 'DESCRIPTION.file_name' )
+						) )
 				else:
-					fh =3D th.extractfile ( const.DESCRIPTION_FILE_NAME )
+					fh =3D th.extractfile ( config.get ( 'DESCRIPTION.file_name' ) )
=20
 				# have to decode the lines
 				read =3D lambda lines : [ line.decode().rstrip() for line in lines ]
@@ -298,60 +250,9 @@ class DescriptionReader:
=20
 		# --- end of get_desc_from_file (...) ---
=20
-		def find_field ( field_identifier ):
-			"""Determines the real name of a field.
-
-			arguments:
-			* field_identifier -- name of the field as it appears in the DESCRIPT=
ION file
-
-			At first, it is checked whether field_identifier matches the name of
-			a field listed in DESCRIPTION_FIELD_MAP (any match results in immedia=
te return).
-			Then, a new iteration over the field map compares field_identifier
-			with all aliases until the first case-(in)sensitive match (-> immedia=
te return).
-			None will be returned if none of the above searches succeed.
-
-			In other words: this method decides whether a field_identifier will b=
e used and if so,
-			with which name.
-			"""
-
-			# save some time by prevent searching if field_id is empty
-			if not field_identifier:
-				return None
-
-			# search for real field names first
-			for field in const.DESCRIPTION_FIELD_MAP.keys():
-				if field_identifier =3D=3D field:
-					return field
-
-			field_id_lower =3D field_identifier.lower()
-
-			for field in const.DESCRIPTION_FIELD_MAP.keys():
-
-				# does extra information (-> alias(es)) for this field exist?
-				if 'alias' in const.DESCRIPTION_FIELD_MAP [field]:
-
-					if 'withcase' in const.DESCRIPTION_FIELD_MAP [field] ['alias']:
-						for alias in const.DESCRIPTION_FIELD_MAP [field] ['alias'] ['withc=
ase']:
-							if field_identifier =3D=3D alias:
-								return field
-
-					if 'nocase' in const.DESCRIPTION_FIELD_MAP [field] ['alias']:
-						for alias in const.DESCRIPTION_FIELD_MAP [field] ['alias'] ['nocas=
e']:
-							if field_id_lower =3D=3D alias.lower():
-								return field
-
-					#if 'other_alias_type' in const.DESCRIPTION_FIELD_MAP [field] ['ali=
as']:
-
-			# returning None if no valid field identifier matches
-			return None
-
-		# --- end of find_field (...) ---
-
-
 		self.desc_data =3D None
 		read_data =3D dict ()
=20
-
 		try:
 			desc_lines =3D get_desc_from_file (
 				self.fileinfo ['filepath'],
@@ -362,14 +263,15 @@ class DescriptionReader:
 			self.logger.exception ( err )
 			return self.desc_data
=20
+		field_context =3D None
=20
-		field_context =3D val =3D line =3D sline =3D None
 		for line in desc_lines:
+			field_context_ref =3D None
=20
 			# using s(tripped)line whenever whitespace doesn't matter
 			sline =3D line.lstrip()
=20
-			if (not sline) or (line [0] =3D=3D const.DESCRIPTION_COMMENT_CHAR):
+			if (not sline) or (line [0] =3D=3D config.get ( 'DESCRIPTION.comment_=
char' ) ):
 				# empty line or comment
 				pass
=20
@@ -389,14 +291,26 @@ class DescriptionReader:
 				# line introduces a new field context, forget last one
 				field_context =3D None
=20
-				line_components =3D sline.partition ( const.DESCRIPTION_FIELD_SEPARA=
TOR )
+				line_components =3D sline.partition ( config.get ( 'DESCRIPTION.fiel=
d_separator' ) )
=20
 				if line_components [1]:
 					# line contains a field separator, set field context
-					field_context =3D find_field ( line_components [0] )
+					field_context_ref =3D self.field_definition.get ( line_components [=
0] )
+
+					if field_context_ref is None:
+						# useless line, skip
+						self.logger.info ( "Skipped a description field: '%s'.", line_comp=
onents [0] )
+					elif field_context_ref.has_flag ( 'ignore' ):
+						# field ignored
+						self.logger.debug ( "Ignored field '%s'.", field_context )
+
+					else:
+						field_context =3D field_context_ref.get_name()
+
+						if not field_context:
+							raise Exception ( "Field name is not valid! This should've alread=
y been catched in DescriptionField..." )
=20
-					if field_context:
-						# create a new empty list for field_context
+						# create a new empty list for this field_context
 						read_data [field_context] =3D []
=20
 						# add values to read_data
@@ -404,9 +318,7 @@ class DescriptionReader:
 						for val in make_values ( line_components [2], field_context ):
 							read_data [field_context] . append ( val )
=20
-					else:
-						# useless line, skip
-						self.logger.info ( "Skipped a description field: '%s'.", line_comp=
onents [0] )
+
=20
 				else:
 					# reaching this branch means that
@@ -415,11 +327,7 @@ class DescriptionReader:
 					# this should not occur in description files (bad syntax?)
 					self.logger.warning ( "Unexpected line in description file: '%s'.",=
 line_components [0] )
=20
-
-				del line_components
-
-		del sline, line, val, field_context
-
+		# -- end for --
=20
 		if self._parse_read_data ( read_data ):
 			self.logger.debug ( "Successfully read file '%s' with data =3D %s.",
@@ -430,4 +338,4 @@ class DescriptionReader:
 		# get_desc() is preferred, but this method returns the desc data, too
 		return self.desc_data
=20
-	# --- end of readfile (...) ---
+	# --- end of run (...) ---

diff --git a/roverlay/ebuild.py b/roverlay/ebuild.py
index 1634ef3..4493bb7 100644
--- a/roverlay/ebuild.py
+++ b/roverlay/ebuild.py
@@ -2,9 +2,10 @@
 # Copyright 2006-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
=20
+import roverlay.config
+
 class Ebuild:
-	# could move this to const
-	EBUILD_INDENT =3D "\t"
+	EBUILD_INDENT =3D roverlay.config.get ( 'EBUILD.indent', '\t' )
=20
 	ADD_REMAP =3D {
 		# pkg vs package

diff --git a/roverlay/ebuildjob.py b/roverlay/ebuildjob.py
index 0357e77..b6c9456 100644
--- a/roverlay/ebuildjob.py
+++ b/roverlay/ebuildjob.py
@@ -2,16 +2,18 @@
 # Copyright 2006-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
=20
-import time
 import logging
 import re
=20
-from roverlay.fileio import DescriptionReader
+from roverlay.descriptionreader import DescriptionReader
 from roverlay.ebuild import Ebuild
+from roverlay import config
=20
 class EbuildJob:
 	LOGGER =3D logging.getLogger ( 'EbuildJob' )
=20
+	DEFAULT_EBUILD_HEADER =3D config.get ( 'EBUILD.default_header' )
+
 	# move this to const / config
 	DEPENDENCY_FIELDS =3D {
 		'R_SUGGESTS' : [ 'Suggests' ],
@@ -142,14 +144,7 @@ class EbuildJob:
=20
 			## default ebuild header, could use some const here (eclass name,..)
 			ebuild.add ( 'ebuild_header',
-								[ 	'# Copyright 1999-' + str ( time.gmtime() [0] ) + ' Gentoo Fo=
undation',
-									'# Distributed under the terms of the GNU General Public Licens=
e v2',
-									'# $Header: $',
-									'',
-									'EAPI=3D4',
-									'',
-									'inherit R-packages'
-								],
+								EbuildJob.DEFAULT_EBUILD_HEADER,
 								False
 							)
=20

diff --git a/roverlay/tmpconst.py b/roverlay/tmpconst.py
deleted file mode 100644
index 8519aad..0000000
--- a/roverlay/tmpconst.py
+++ /dev/null
@@ -1,108 +0,0 @@
-# R overlay -- constants (temporary file)
-# 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 =3D '[.](tgz|tbz2|tar|(tar[.](gz|bz2)))'
-
-PACKAGE_CATEGORY =3D 'sci-R'
-
-DESCRIPTION_FIELD_SEPARATOR =3D ':'
-
-DESCRIPTION_COMMENT_CHAR =3D '#'
-
-DESCRIPTION_LIST_SPLIT_REGEX =3D '\s*[,;]{1}\s*'
-
-DESCRIPTION_FILE_NAME =3D 'DESCRIPTION'
-
-# moved to <field> -> 'allowed_values'
-##DESCRIPTION_VALID_OS_TYPES =3D [ "unix" ]
-
-
-# note for 2012-05-25: make this struct more organized, assign real valu=
es
-"""The map of used fields in the DESCRIPTION file
-
-	stores the real field name as well as field flags and aliases
-	that can be case-sensitive (withcase) or not (nocase)
-
-	access to these values is
-	* for aliases
-		DESCRIPTION_FIELD_MAP [<field name>] [alias] [case sensitive ? withcas=
e : 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 =3D:<DESCRIPTION_LIST_SPLIT_=
REGEX>
-	   this disables isWhitespaceList
-
-	* isWhitespaceList : indicates that this field has several values separ=
ated
-	                     by whitespace
-
-	* joinValues : indicates that the values of this field should be concat=
enated
-	               after reading them (with a ' ' as separator)
-	   (this implies that the read values are one string)
-
-	* mandatory : cannot proceed if a file does not contain this field (imp=
lies ignoring default values)
-
-"""
-
-DESCRIPTION_FIELD_MAP =3D {
-	'Description' : {
-		'flags' : [ 'joinValues' ],
-	},
-	'Title' : {
-		'flags' : [ 'joinValues' ],
-	},
-	'Package' : {
-		'flags' : [ 'joinValues' ],
-	},
-	'License' : {
-		'flags' : [ 'isList' ],
-	},
-	'Version' : {
-		'flags' : [ 'mandatory', 'joinValues' ]
-	},
-	'Suggests' : {
-		'alias' : {
-			'nocase' : [ 'Suggests', 'Suggest',
-							'%Suggests', 'Suggets', 'Recommends' ]
-		},
-	},
-	'Depends' : {
-		'alias' : {
-			'nocase' : [ 'Depends', 'Dependencies', 'Dependes',
-							'%Depends', 'Depents', 'Require', 'Requires' ],
-		},
-		'flags' : [ 'isList' ],
-		'default_value' : '',
-	},
-	'Imports' : {
-		'alias' : {
-			'nocase' : [ 'Imports', 'Import' ]
-		},
-	},
-	'LinkingTo' : {
-		'alias' : {
-			'nocase' : [ 'LinkingTo', 'LinkingdTo' ]
-		},
-	},
-	'SystemRequirements' : {
-		'alias' : {
-			'nocase' : [ 'SystemRequirements', 'SystemRequirement' ]
-		},
-	},
-	'OS_Type' : {
-		'alias' : {
-			'nocase' : [ 'OS_TYPE' ]
-		},
-		'allowed_values' : [ 'unix' ],
-	},
-	'test-default' : {
-		'default_value' : 'some default value'
-	}
-}