New Atom implementation

Now it requires gentoopm from app-portage/gentoopm package,
see https://github.com/mgorny/gentoopm/

Add tests

Closes: nicolasbock#99
Closes: nicolasbock#96

Author: waebbl

ebuildtester/atom.py

@@ -1,3 +1,6 @@
+import gentoopm
+
+
 class AtomException(Exception):
     pass
 
@@ -10,36 +13,51 @@ def __init__(self, atom):
         self.package = None
         self.version = None
 
-        # We don't store the optional '='.
-        temp = atom.split("=")
-        self.atom = temp[-1]
-
         try:
-            self.category, self.package = self.atom.split("/")
-        except ValueError:
-            raise AtomException(
-                "ATOM has to be of the form [=]SECTION/PACKAGE[-VERSION]")
+            pm = gentoopm.get_package_manager()
 
-        # Split off version.
-        try:
-            temp = self.package.index("-")
-            if temp > -1:
-                self.version = self.package[temp + 1:]
-                self.package = self.package[:temp]
+            self.category = pm.Atom(atom).key.category
+            self.package = pm.Atom(atom).key.package
+            self.version = pm.Atom(atom).version
+
+            if self.category is None or self.package is None:
+                raise ValueError
         except ValueError:
-            pass
+            raise AtomException("ATOM has to be of the form [=]SECTION/PACKAGE[-VERSION]")
+
+    def atomCategory(self):
+        """Returns the package category without name"""
+        return self.category
+
+    def atomName(self):
+        """Returns the package name without category"""
+        return self.package
+
+    def atomVersion(self):
+        """Returns the package version"""
+        return self.version
+
+    def atomCatName(self):
+        """Returns the package category and name without version"""
+        return "/".join([self.category, self.package])
+
+    def atomString(self):
+        """Returns a portage compatible string representation"""
+        if self.version is None:
+            return self.atomCatName()
+
+        return ("=" + "/".join([self.category,
+                                "-".join([self.package,
+                                          self.version])]))
 
     def __str__(self):
-        if self.version is not None:
-            prefix = "="
-            suffix = "-" + self.version
-        else:
-            prefix = ""
-            suffix = ""
-        return prefix + self.category + "/" + self.package + suffix
+        return self.atomString()
 
     def __eq__(self, other):
-        result = (self.atom == other.atom)
+        result = (self.category == other.category
+                  and self.package == other.package
+                  and self.version == other.version)
+
         return result
 
     def __repr__(self):

requirements.txt

@@ -1,4 +1,5 @@
 bandit
+git+https://github.com/mgorny/[email protected]#egg=gentoopm
 pycodestyle
 pytest
 sphinx

tests/test_atom.py

@@ -28,3 +28,42 @@ def test_str(self):
         atom_1 = Atom("=CATEGORY/PACKAGE-1.0.0-r1")
         atom_2 = Atom(str(atom_1))
         self.assertEqual(atom_1, atom_2)
+
+    def test_atomName(self):
+        self.assertEqual(Atom("CATEGORY/PACKAGE").atomName(), "PACKAGE")
+        self.assertEqual(Atom("=CATEGORY/PACKAGE-1.0.0").atomName(), "PACKAGE")
+        self.assertEqual(Atom("CATEGORY/PACKAGE-1.0.0").atomName(), "PACKAGE")
+        self.assertEqual(Atom("=CATEGORY/PACKAGE-DEP-1.0b-r1").atomName(),
+                         "PACKAGE-DEP")
+
+    def test_atomCategory(self):
+        self.assertEqual(Atom("CATEGORY/PACKAGE").atomCategory(), "CATEGORY")
+        self.assertEqual(Atom("=CATEGORY/PACKAGE-1.0.0").atomCategory(),
+                         "CATEGORY")
+
+    def test_atomVersion(self):
+        self.assertEqual(Atom("=CATEGORY/PACKAGE-1").atomVersion(), "1")
+        self.assertEqual(Atom("=CATEGORY/PACKAGE-1.0").atomVersion(), "1.0")
+        self.assertEqual(Atom("=CATEGORY/PACKAGE-1.0-r1").atomVersion(),
+                         "1.0-r1")
+        self.assertEqual(Atom("=CATEGORY/PACKAGE-DEP-1.0b-r1").atomVersion(),
+                         "1.0b-r1")
+
+    def test_atomCatName(self):
+        self.assertEqual(Atom("CATEGORY/PACKAGE").atomCatName(),
+                         "CATEGORY/PACKAGE")
+        self.assertEqual(Atom("=CATEGORY/PACKAGE-1.0").atomCatName(),
+                         "CATEGORY/PACKAGE")
+
+    def test_atomString(self):
+        atom1 = Atom("=CATEGORY/PACKAGE-1.0.0")
+        atom2 = Atom(atom1.atomString())
+        self.assertEqual(atom1, atom2)
+
+    def test_atom(self):
+        atom1 = Atom("=CATEGORY/PACKAGE-DEP-1.0b-r1")
+        self.assertEqual(atom1.atomCategory(), "CATEGORY")
+        self.assertEqual(atom1.atomName(), "PACKAGE-DEP")
+        self.assertEqual(atom1.atomCatName(), "CATEGORY/PACKAGE-DEP")
+        self.assertEqual(atom1.atomVersion(), "1.0b-r1")
+        self.assertEqual(atom1.atomString(), "=CATEGORY/PACKAGE-DEP-1.0b-r1")