[gentoo-commits] proj/gentoopm:master commit in: gentoopm/portagepm/, gentoopm/pkgcorepm/, gentoopm/paludispm/, gentoopm/basepm/

[Michał Górny]

commit:     448e5a4f8a9bd934048145b094c4faee3bb7769a
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 28 19:39:31 2011 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Jul 28 19:39:31 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gentoopm.git;a=commit;h=448e5a4f

Introduce PMRequiredUseAtom type.

---
 gentoopm/basepm/depend.py    |   44 +++++++++++++++++++++++++++++++++++++++++-
 gentoopm/basepm/pkg.py       |    9 ++++++++
 gentoopm/paludispm/depend.py |    6 +++-
 gentoopm/paludispm/pkg.py    |    4 ++-
 gentoopm/pkgcorepm/depend.py |    4 +-
 gentoopm/portagepm/pkg.py    |    3 +-
 6 files changed, 63 insertions(+), 7 deletions(-)

diff --git a/gentoopm/basepm/depend.py b/gentoopm/basepm/depend.py
index 923cdbf..307d32d 100644
--- a/gentoopm/basepm/depend.py
+++ b/gentoopm/basepm/depend.py
@@ -5,7 +5,49 @@
 
 from abc import abstractmethod, abstractproperty
 
-from gentoopm.util import ABCObject
+from gentoopm.util import ABCObject, StringCompat
+
+class PMRequiredUseAtom(StringCompat):
+	"""
+	An atom for C{REQUIRED_USE} specification.
+	"""
+
+	def __init__(self, s):
+		self._blocks = s.startswith('!')
+		if self._blocks:
+			s = s[1:]
+		self._flag = s
+
+	@property
+	def name(self):
+		"""
+		Relevant USE flag name.
+
+		@type: string
+		"""
+		return self._flag
+
+	@property
+	def blocking(self):
+		"""
+		Whether the atom blocks the USE flag (requires it not to be set).
+
+		@type: bool
+		"""
+		return self._blocks
+
+	@property
+	def requiring(self):
+		"""
+		Whether the atom requires the USE flag to be set.
+
+		@type: bool
+		"""
+		return not self._blocks
+
+	def __str__(self):
+		return '%s%s' % ('!' if self._blocks else '',
+				self.name)
 
 class PMBaseDep(ABCObject):
 	"""

diff --git a/gentoopm/basepm/pkg.py b/gentoopm/basepm/pkg.py
index 33a4435..397ff7f 100644
--- a/gentoopm/basepm/pkg.py
+++ b/gentoopm/basepm/pkg.py
@@ -318,6 +318,15 @@ class PMPackage(PMAtom, FillMissingComparisons):
 		pass
 
 	@abstractproperty
+	def required_use(self):
+		"""
+		Get the C{REQUIRED_USE} specification.
+
+		@type: L{PMPackageDepSet}
+		"""
+		pass
+
+	@abstractproperty
 	def slotted(self):
 		"""
 		Return an atom matching all packages in the same slot as the associated

diff --git a/gentoopm/paludispm/depend.py b/gentoopm/paludispm/depend.py
index 9084f3d..c16b3d0 100644
--- a/gentoopm/paludispm/depend.py
+++ b/gentoopm/paludispm/depend.py
@@ -20,8 +20,10 @@ class PaludisBaseDep(PMBaseDep):
 	def __iter__(self):
 		for d in self._deps:
 			if isinstance(d, paludis.PackageDepSpec):
+				assert(self._args.cls is None)
 				yield PaludisAtom(d, self._args.env)
 			elif isinstance(d, paludis.BlockDepSpec):
+				assert(self._args.cls is None)
 				yield PaludisAtom(d.blocking, self._args.env,
 						block = _block_re.match(d.text).group(0))
 			elif isinstance(d, paludis.AnyDepSpec):
@@ -33,8 +35,8 @@ class PaludisBaseDep(PMBaseDep):
 			elif isinstance(d, paludis.ConditionalDepSpec):
 				yield PaludisConditionalDep(d, self._args)
 			elif isinstance(d, paludis.PlainTextDepSpec):
-				# XXX: this is in REQUIRED_USE as well
-				yield str(d)
+				assert(self._args.cls is not None)
+				yield self._args.cls(str(d))
 			else:
 				raise NotImplementedError('Unable to parse %s' % repr(d))
 

diff --git a/gentoopm/paludispm/pkg.py b/gentoopm/paludispm/pkg.py
index c29c0d7..151cd92 100644
--- a/gentoopm/paludispm/pkg.py
+++ b/gentoopm/paludispm/pkg.py
@@ -5,6 +5,7 @@
 
 import paludis
 
+from gentoopm.basepm.depend import PMRequiredUseAtom
 from gentoopm.basepm.metadata import PMPackageMetadata
 from gentoopm.basepm.pkg import PMPackage, PMPackageDescription, \
 		PMInstallablePackage, PMInstalledPackage, PMBoundPackageKey, \
@@ -141,7 +142,8 @@ class PaludisID(PMPackage, PaludisAtom):
 		k = self._pkg.find_metadata('REQUIRED_USE')
 		if k is None:
 			return None
-		return PaludisPackageDepSet(k.parse_value(), self)
+		return PaludisPackageDepSet(k.parse_value(), self,
+				PMRequiredUseAtom)
 
 	@property
 	def use(self):

diff --git a/gentoopm/pkgcorepm/depend.py b/gentoopm/pkgcorepm/depend.py
index fd3dcce..3f25576 100644
--- a/gentoopm/pkgcorepm/depend.py
+++ b/gentoopm/pkgcorepm/depend.py
@@ -10,7 +10,7 @@ from pkgcore.restrictions.packages import Conditional
 from pkgcore.restrictions.values import ContainmentMatch
 
 from gentoopm.basepm.depend import PMPackageDepSet, PMConditionalDep, \
-	PMAnyOfDep, PMAllOfDep, PMExactlyOneOfDep, PMBaseDep
+	PMAnyOfDep, PMAllOfDep, PMExactlyOneOfDep, PMBaseDep, PMRequiredUseAtom
 from gentoopm.pkgcorepm.atom import PkgCoreAtom
 
 class PkgCoreBaseDep(PMBaseDep):
@@ -24,7 +24,7 @@ class PkgCoreBaseDep(PMBaseDep):
 				yield PkgCoreAtom(d)
 			elif isinstance(d, ContainmentMatch): # REQUIRED_USE
 				assert(len(d.vals) == 1)
-				yield next(iter(d.vals))
+				yield PMRequiredUseAtom(next(iter(d.vals)))
 			elif isinstance(d, OrRestriction):
 				yield PkgCoreAnyOfDep(d, self._pkg)
 			elif isinstance(d, AndRestriction):

diff --git a/gentoopm/portagepm/pkg.py b/gentoopm/portagepm/pkg.py
index 5af125a..9653262 100644
--- a/gentoopm/portagepm/pkg.py
+++ b/gentoopm/portagepm/pkg.py
@@ -5,6 +5,7 @@
 
 from portage.versions import cpv_getkey, cpv_getversion, vercmp
 
+from gentoopm.basepm.depend import PMRequiredUseAtom
 from gentoopm.basepm.metadata import PMPackageMetadata
 from gentoopm.basepm.pkg import PMPackage, PMPackageDescription, \
 		PMInstalledPackage, PMInstallablePackage, PMBoundPackageKey, \
@@ -186,7 +187,7 @@ class PortageDBCPV(PMPackage, CompletePortageAtom):
 	@property
 	def required_use(self):
 		return PortagePackageDepSet(self._aux_get('REQUIRED_USE'),
-				self._applied_use, str) # XXX
+				self._applied_use, PMRequiredUseAtom)
 
 	def __str__(self):
 		return '=%s' % self._cpv