[gentoo-commits] proj/R_overlay:master commit in: roverlay/depres/

[André Erdmann]

commit:     0fb00e79cfb4e686c8b68d8645b177531e5a7668
Author:     André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Fri Jun 29 22:34:34 2012 +0000
Commit:     André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Fri Jun 29 22:34:34 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=0fb00e79

DepEnv: collect more infos about the dep_str

* using regex for extracting dep name, version, ..

	modified:   roverlay/depres/depenv.py

---
 roverlay/depres/depenv.py |   57 +++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 57 insertions(+), 0 deletions(-)

diff --git a/roverlay/depres/depenv.py b/roverlay/depres/depenv.py
index 0cb81e8..eba03a8 100644
--- a/roverlay/depres/depenv.py
+++ b/roverlay/depres/depenv.py
@@ -1,6 +1,38 @@
 # R overlay --
 # Copyright 2006-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+import re
+
+
+# excluding A-Z since dep_str_low will be used to find a match
+_NAME = '(?P<name>[a-z0-9_\-/]+)'
+_VER  = '(?P<ver>[0-9._\-]+)'
+# { <, >, <=, >=, =, != } (TODO !=)
+_VERMOD = '(?P<vmod>[<>]|[<>!]?[=])'
+
+# this lists ... <fixme>
+V_REGEX_STR = frozenset ( (
+	# 'R >= 2.15', 'R >=2.15' etc. (but not 'R>=2.15'!)
+	'^%s\s+%s?\s*%s\s*$' % ( _NAME, _VERMOD, _VER ),
+
+	# TODO: merge these regexes: ([{ )]}]
+
+	# 'R (>= 2.15)', 'R(>=2.15)' etc.
+	'^%s\s*\(%s?\s*%s\s*\)$' % ( _NAME, _VERMOD, _VER ),
+
+	# 'R [>= 2.15]', 'R[>=2.15]' etc.
+	'^%s\s*\[%s?\s*%s\s*\]$' % ( _NAME, _VERMOD, _VER ),
+
+
+	# 'R {>= 2.15}', 'R{>=2.15}' etc.
+	'^%s\s*\{%s?\s*%s\s*\}$' % ( _NAME, _VERMOD, _VER ),
+) )
+
+VERSION_REGEX = frozenset ( re.compile ( regex ) for regex in V_REGEX_STR )
+
+FIXVERSION_REGEX = re.compile ( '[_\-]' )
+
+TRY_ALL_REGEXES = False
 
 
 class DepEnv ( object ):
@@ -22,11 +54,36 @@ class DepEnv ( object ):
 		self.status      = DepEnv.STATUS_UNDONE
 		self.resolved_by = None
 
+		self.try_all_regexes = TRY_ALL_REGEXES
+
+		self._depsplit()
+
+
 		# TODO: analyze dep_str:
 		#   extract dep name, dep version, useless comments,...
 
 	# --- end of __init__ (...) ---
 
+	def _depsplit ( self ):
+		result = list()
+		for r in VERSION_REGEX:
+			m = r.match ( self.dep_str_low )
+			if m is not None:
+
+				result.append ( dict (
+					name             = m.group ( 'name' ),
+					version_modifier = m.group ( 'vmod' ),
+					version          = FIXVERSION_REGEX.sub (
+												'.', m.group ( 'ver' )
+											)
+				) )
+
+				if not self.try_all_regexes: break
+
+		if result:
+			self.fuzzy = tuple ( result )
+	# --- end of _depsplit (...) ---
+
 	def set_resolved ( self, resolved_by, append=False ):
 		"""Marks this DepEnv as resolved with resolved_by as corresponding
 		portage package.