Changeset 75

Timestamp:

06/24/06 09:40:42 (7 years ago)

Author:

mk

Message:

Added support for eggs (closes ticket #34).

Files:

• branches/mk/cheesecake/cheesecake_index.py (modified) (11 diffs)
• branches/mk/cheesecake/util.py (modified) (2 diffs)
• branches/mk/tests/unit/test_index_class.py (modified) (2 diffs)

branches/mk/cheesecake/cheesecake_index.py

@@ -28 +28 @@
-from util import run_cmd, command_successful
-from util import unzip_package, untar_package
+from util import mkdirs
-from util import StdoutRedirector
-import logger
@@ -322 +323 @@
-        self.subindices.append(index)
-        self._indices_dict[index.name] = index
+
+    def remove_subindex(self, index_name):
+        """Remove subindex (refered by name).
+
+        :Parameters:
+          `index` : Index name
+              Index name to be removed.
+        """
+        index = self._indices_dict[index_name]
+        self.subindices.remove(index)
+        del self._indices_dict[index_name]
-
-    def _print_info_one(self):
@@ -773 +785 @@
-
-class CheesecakeError(Exception):
-
-
+
-    """
-    pass
@@ -829 +840 @@
-            "tgz": untar_package,
-            "zip": unzip_package,
+            "egg": unzip_package,
-        }
-
@@ -841 +853 @@
-            self.index["INSTALLABILITY"].add_subindex(IndexUrlDownload())
-
+        # Get package name.
-        self.determine_pkg_name()
+
+        # Configure logging as soon as possible.
-        self.configure_logging(logfile)
-
-self.get_config()
+
+ Get package, 
-        self.retrieve_pkg()
+
+        # Get package name and type.
+        self.package_name, self.package_type = self.get_package_name_and_type(self.package)
+        self.log.debug("Package name: " + self.package_name)
+        self.log.debug("Package type: " + self.package_type)
+
+        # Unpack package and list its files.
-        self.unpack_pkg()
-        self.walk_pkg()
+
+        # Install package.
-        self.install_pkg()
+
+        # When checking an egg exclude irrelevant indices.
+        if self.package_type == 'egg':
+            self.index["INSTALLABILITY"].remove_subindex('setup.py')
+            self.index["INSTALLABILITY"].remove_subindex('unpack_dir')
+            self.index["INSTALLABILITY"].remove_subindex('generated_files')
-
-    def raise_exception(self, msg):
@@ -973 +1003 @@
-        except ImportError, e:
-            msg = "Error: setuptools is not installed and is required for downloading a package by name\n"
-nw
+wn
-            msg += "Example: python cheesecake.py --url=http://www.mems-exchange.org/software/durus/Durus-3.1.tar.gz"
-            self.raise_exception(msg)
+
+        def drop_setuptools_info(stdout, error=None):
+            """Drop all setuptools output as INFO.
+            """
+            self.log.info("*** Begin setuptools output")
+            map(self.log.info, stdout.splitlines())
+            if error:
+                self.log.info(str(error))
+            self.log.info("*** End setuptools output")
-
-        try:
@@ -986 +1025 @@
-                                    self.sandbox,
-                                    force_scan=True,
-Tru
+Fals
-            captured_stdout = sys.stdout.read_buffer()
-            sys.stdout = old_stdout
@@ -997 +1036 @@
-            log.set_threshold(old_threshold)
-
-
-
-
-
-
-
-
-
+
+
-
-        if output is None:
+            drop_setuptools_info(captured_stdout)
-            self.raise_exception("Error: Could not find distribution for " + self.name)
-
@@ -1063 +1097 @@
-        shutil.copyfile(self.package_path, self.sandbox_pkg_file)
-
+    def get_package_name_and_type(self, package):
+        """Return package name and type.
+
+        Raise an exception when package type cannot be recognized.
+        """
+        for type in self.package_types.keys():
+            s = re.search(r"(.+)\.%s" % type, package)
+            if s:
+                # Package name is name of package without file extension (ex. twill-7.3).
+                return s.group(1), type
+
+        msg = "Could not determine package type for package '%s'" % package
+        msg += "\nCurrently recognized types: " + ", ".join(self.package_types.keys())
+        self.raise_exception(msg)
+
-    def unpack_pkg(self):
-        """Unpack the package in the sandbox directory.
@@ -1072 +1121 @@
-          original_package_name : str
-        """
-        self.package_type = ""
-
-        for type in self.package_types.keys():
-            s = re.search(r"(.+)\.%s" % type, self.package)
-            if s:
-                # package_name is name of package without file extension (ex. twill-7.3)
-                self.package_name = s.group(1)
-                self.package_type = type
-                break
-        if not self.package_type:
-            msg = "Could not determine package type for package '%s'" % self.package
-            msg += "\nCurrently recognized types: " + " ".join(self.package_types)
-            self.raise_exception(msg)
-        self.log.debug("Package name: " + self.package_name)
-        self.log.debug("Package type: " + self.package_type)
-
-        self.sandbox_pkg_dir = os.path.join(self.sandbox, self.package_name)
-        if os.path.isdir(self.sandbox_pkg_dir):
@@ -1160 +1193 @@
-        self.sandbox_install_dir = os.path.join(self.sandbox, "tmp_install_%s" % self.package_name)
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            self.installed = True
-
-        os.chdir(cwd)
-
-    def compute_cheesecake_index(self):

branches/mk/cheesecake/util.py

@@ -9 +9 @@
-PAD_VALUE = 4
-
-
-
-
+
+
-    """
-    arglist = cmd.split()
-    try:
-
+, env=env
-    except ProcessError, e:
-        return 1, e
@@ -149 +148 @@
-    tarinfo = t.members[0]
-    return tarinfo.name.split(os.sep)[0]
+
+def mkdirs(dir):
+    """Make directory with parent directories as needed.
+
+    Don't throw an exception if directory exists.
+    """
+    parts = dir.split(os.path.sep)
+    for length in xrange(1, len(parts)+1):
+        path = os.path.sep.join([''] + parts[:length])
+        if not os.path.exists(path):
+            os.mkdir(path)

branches/mk/tests/unit/test_index_class.py

@@ -7 +7 @@
-    >>> big_index = Index()
-    >>> index = Index()
+    >>> index.name = 'small_index'
-
-Add one index to another.
@@ -18 +19 @@
-      ...
-    ValueError: subindex have to be instance of Index
+
+Now remove subindex.
+    >>> big_index.remove_subindex('small_index')
+    >>> index in big_index.subindices
+    False
-"""