Changeset 231

Timestamp:

19-05-07 13:30:41 (6 years ago)

Author:

thomas

Message:

• moap/util/deps.py (Dependency.install, Dependency.fedora_yum, RDF.fedora_install, Cheetah, Cheetah.fedora_install, handleImportError): Add a method to make the yum install output uniform. RDF is not available at all yet in Fedora. Cheeath is though.
• moap/util/distro.py (Distro, Distro.atLeast, getDistroFromRelease, _fedora_getNameVersionFromRelease): Rename distro-specific methods internally to make more sense. Add .atLeast to do string-based version comparisons.
• moap/test/test_util_distro.py (TestRelease?.testFedora, TestRelease?.testGet, TestAtLeast?, TestAtLeast?.testFedora): Add some tests for atLeast Coverage: 73 % ( 859 / 1172)

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• moap/test/test_util_distro.py (modified) (1 diff)
• moap/util/deps.py (modified) (4 diffs)
• moap/util/distro.py (modified) (5 diffs)

trunk/ChangeLog

@@ +1 @@
+2007-05-19  Thomas Vander Stichele  <thomas at apestaart dot org>
+
+        * moap/util/deps.py (Dependency.install, Dependency.fedora_yum,
+          RDF.fedora_install, Cheetah, Cheetah.fedora_install,
+          handleImportError):
+          Add a method to make the yum install output uniform.
+          RDF is not available at all yet in Fedora.
+          Cheeath is though.
+        * moap/util/distro.py (Distro, Distro.atLeast, getDistroFromRelease,
+          _fedora_getNameVersionFromRelease):
+          Rename distro-specific methods internally to make more sense.
+          Add .atLeast to do string-based version comparisons.
+        * moap/test/test_util_distro.py (TestRelease.testFedora,
+          TestRelease.testGet, TestAtLeast, TestAtLeast.testFedora):
+          Add some tests for atLeast
+
+          Coverage: 73 %   ( 859 / 1172)
+
 2007-05-19  Thomas Vander Stichele  <thomas at apestaart dot org>
 

trunk/moap/test/test_util_distro.py

@@ -10 +10 @@
 class TestRelease(unittest.TestCase):
     def testFedora(self):
-        self.assertEquals(distro._fedora_getVersionFromRelease(
+        self.assertEquals(distro._fedora_getNameVersionFromRelease(
             'Fedora Core release 5 (Bordeaux)\n'), ('Fedora Core', '5'))
 
     def testGet(self):
         distro.getDistroFromRelease()
+
+class TestAtLeast(unittest.TestCase):
+    def testFedora(self):
+        d = distro.Distro('fedora', 'Fedora Core', '5', 'i386')
+        self.failUnless(d.atLeast('4test2'))
+        self.failUnless(d.atLeast('5'))
+        self.failIf(d.atLeast('5test2'))
+        self.failIf(d.atLeast('40'))
+        self.failIf(d.atLeast('50'))

trunk/moap/util/deps.py

@@ -19 +19 @@
         for the given distro/version/arch.
 
+        @type  distro: L{distro.Distro}
+
         @rtype:   str or None
         @returns: an explanation on how to install the dependency, or None.
@@ -27 +29 @@
             return m(distro)
 
+    def fedora_yum(self, packageName):
+        """
+        Returns a string explaining how to install the given package.
+        """
+        return "On Fedora, you can install %s with:\n" \
+                "su -c \"yum install %s\"" % (self.module, packageName)
 
 class RDF(Dependency):
@@ -34 +42 @@
 
     def fedora_install(self, distro):
-        if distro.version >= '5':
-            return "You can install RDF on Fedora with:\n" \
-                "su -c \"yum install python-redland\" -"
+        return "python-redland is not yet available in Fedora Extras.\n"
 
-        return "Your version of Fedora does not have python-redland available."
+class Cheetah(Dependency):
+    module = 'Cheetah'
+    name = "Cheetah templating language"
+    homepage = "http://cheetahtemplate.org/"
+
+    def fedora_install(self, distro):
+        if distro.atLeast('4'):
+            return self.fedora_yum('python-cheetah')
+
+        return "python-cheetah is only available in Fedora 4 or newer.\n"
 
 class genshi(Dependency):
@@ -75 +90 @@
     module = module.split('.')[0]
     deps = {}
-    for dep in [RDF(), genshi(), pygoogle(), yahoo()]:
+    for dep in [RDF(), Cheetah(), genshi(), pygoogle(), yahoo()]:
         deps[dep.module] = dep
 

trunk/moap/util/distro.py

@@ -4 +4 @@
 import os
 import re
+
+import distutils.version
 
 from moap.util import log
@@ -12 +14 @@
 
 class Distro:
+    """
+    @cvar tag:     a short lower-case identifier for the distro
+    @type tag:     str
+    @cvar name:    a longer human-readable name for the distro
+    @type name:    str
+    @cvar version: the version of the distro
+    @type version: str
+    @cvar arch:    the architecture of the distro
+    @type arch:    str
+    """
     tag = None
     name = None
@@ -22 +34 @@
         self.version = version
         self.arch = arch
+
+    def atLeast(self, version):
+        """
+        @param version: version to compare with
+        @type version:  str
+
+        Returns: whether the distro is at least as new as the given version,
+                 taking non-numbers into account.
+        """
+        mine = distutils.version.LooseVersion(self.version)
+        theirs = distutils.version.LooseVersion(version)
+        return mine >= theirs
 
 def getSysName():
@@ -65 +89 @@
             h.close()
             version = None
-            f = '_%s_getVersionFromRelease' % distro
+            f = '_%s_getNameVersionFromRelease' % distro
             if f in globals().keys():
                 log.debug('distro', "Found version function %r" % f)
@@ -74 +98 @@
 
 # distro-specific name and version getters
-def _fedora_getVersionFromRelease(contents):
+# each getter should return a list of [full name, version]
+def _fedora_getNameVersionFromRelease(contents):
     matcher = re.compile("^(Fedora Core) release (\d+) .*")
     m = matcher.search(contents)