From: W. Trevor King <wking@tremily.us>
Date: Tue, 1 Jan 2013 02:04:52 +0000 (-0500)
Subject: swc-installation-test-2.py: Add EasyInstallDependency class
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=9f5ac6f5d50076ff395a073b863cd93e2fc5af89;p=swc-workshop.git

swc-installation-test-2.py: Add EasyInstallDependency class

Distribute's easy_install supports --version (at least since 0.6.21),
but Setuptool's original version does not (at least as of 0.6c9).
Assume that if we get some kind of reasonable output from
`easy_install --version` we're dealing with the Setuptools version.
---

diff --git a/swc-installation-test-2.py b/swc-installation-test-2.py
index b0eeb29..d9e50d4 100755
--- a/swc-installation-test-2.py
+++ b/swc-installation-test-2.py
@@ -253,7 +253,7 @@ class CommandDependency (Dependency):
         self.version_regexp = version_regexp
         self.version_stream = version_stream
 
-    def _get_version_stream(self):
+    def _get_version_stream(self, expect=(0,)):
         command = self.command + (self.exe_extension or '')
         try:
             p = _subprocess.Popen(
@@ -267,7 +267,7 @@ class CommandDependency (Dependency):
                 )# from e
         stdout,stderr = p.communicate()
         status = p.wait()
-        if status:
+        if status not in expect:
             lines = [
                 "failed to execute '{0} {1}':".format(
                     command, self.version_option),
@@ -302,7 +302,6 @@ for command,long_name,minimum_version in [
         ('dash', 'Debian Almquist Shell', None),
         ('tcsh', 'TENEX C Shell', None),
         ('zsh', 'Z Shell', None),
-        ('easy_install', 'Setuptools easy_install', None),
         ('git', 'Git', (1, 8, 0)),
         ('hg', 'Mercurial', (2, 0, 0)),
         ('make', None, None),
@@ -326,6 +325,26 @@ for command,long_name,minimum_version in [
 del command, long_name, minimum_version  # cleanup namespace
 
 
+class EasyInstallDependency (CommandDependency):
+    def _get_version(self):
+        try:
+            return super(EasyInstallDependency, self)._get_version()
+        except DependencyError as e:
+            version_stream = self.version_stream
+            try:
+                self.version_stream = 'stderr'
+                stream = self._get_version_stream(expect=(1,))
+                if 'option --version not recognized' in stream:
+                    return 'unknown (possibly Setuptools?)'
+            finally:
+                self.version_stream = version_stream
+
+
+CHECKER['easy_install'] = EasyInstallDependency(
+    command='easy_install', long_name='Setuptools easy_install',
+    minimum_version=None)
+
+
 class PythonPackageDependency (Dependency):
     def __init__(self, package, **kwargs):
         if 'name' not in kwargs: