Merge lp:~markgius/horizon/tools_install_venv_fix into lp:~hudson-openstack/horizon/trunk

[Mark Gius]

Fixes for Bug #727414 and #785989. Also brings file into compliance with PEP8.

Tested on Ubuntu 10.04.2.

Unmerged revisions

48. By Mark Gius on 2011-05-23

Merging

47. By Mark Gius on 2011-05-23

Fixes for #727414 and #785989. Also PEP8 compliance

=== modified file 'openstack-dashboard/tools/install_venv.py'
--- openstack-dashboard/tools/install_venv.py	2011-05-14 00:07:04 +0000
+++ openstack-dashboard/tools/install_venv.py	2011-05-23 20:45:57 +0000
@@ -34,69 +34,87 @@
 
 
 def die(message, *args):
-  print >>sys.stderr, message % args
-  sys.exit(1)
-
-
-def run_command(cmd, redirect_output=True, check_exit_code=True, cwd=ROOT):
-  """
-  Runs a command in an out-of-process shell, returning the
-  output of that command.  Working directory is ROOT.
-  """
-  if redirect_output:
-    stdout = subprocess.PIPE
-  else:
-    stdout = None
-
-  proc = subprocess.Popen(cmd, cwd=cwd, stdout=stdout)
-  output = proc.communicate()[0]
-  if check_exit_code and proc.returncode != 0:
-    die('Command "%s" failed.\n%s', ' '.join(cmd), output)
-  return output
-
-
-HAS_EASY_INSTALL = bool(run_command(['which', 'easy_install'], check_exit_code=False).strip())
-HAS_VIRTUALENV = bool(run_command(['which', 'virtualenv'], check_exit_code=False).strip())
+    print >> sys.stderr, message % args
+    sys.exit(1)
+
+
+def run_command(cmd, redirect_output=True, fail_exit_nonzero=True, cwd=ROOT):
+    """
+    Runs a command in an out-of-process shell, returning the output of that
+    command and the return code.  Working directory is ROOT.
+    """
+    if redirect_output:
+        stdout = subprocess.PIPE
+    else:
+        stdout = None
+
+    proc = subprocess.Popen(cmd, cwd=cwd, stdout=stdout)
+    output = proc.communicate()[0]
+    if fail_exit_nonzero and proc.returncode != 0:
+        die('Command "%s" failed.\n%s', ' '.join(cmd), output)
+    return (output, proc.returncode)
+
+
+HAS_EASY_INSTALL = 0 == run_command(['which', 'easy_install'],
+                                    fail_exit_nonzero=False)[1]
+HAS_VIRTUALENV = 0 == run_command(['which', 'virtualenv'],
+                                    fail_exit_nonzero=False)[1]
 
 
 def check_dependencies():
-  """Make sure virtualenv is in the path."""
-
-  if not HAS_VIRTUALENV:
-    print 'not found.'
-    # Try installing it via easy_install...
-    if HAS_EASY_INSTALL:
-      print 'Installing virtualenv via easy_install...',
-      if not run_command(['which', 'virtualenv']):
-        die('ERROR: virtualenv not found.\n\nevelopment requires virtualenv,'
-            ' please install it using your favorite package management tool')
-      print 'done.'
-  print 'done.'
+    """Make sure virtualenv is in the path."""
+
+    print 'checking dependencies...'
+    if not HAS_VIRTUALENV:
+        print 'virtualenv not found.'
+        # Try installing it via easy_install...
+        if HAS_EASY_INSTALL:
+            print 'Installing virtualenv via easy_install...'
+            output, exitstatus = run_command(['easy_install', 'virtualenv'],
+                                             fail_exit_nonzero=False)
+            if not exitstatus == 0:
+                die('ERROR: easy_install of virtualenv failed.'
+                    '\n\ndevelopment requires virtualenv, please install'
+                    ' it using your favorite package management tool')
+
+            # verify that the place we just installed it is in the path
+            output, exitstatus = run_command(['which', 'virtualenv'])
+            if not exitstatus == 0:
+                die('ERROR: virtualenv not found in path.\n\ndevelopment '
+                    ' requires virtualenv, please install it using your'
+                    ' favorite package management tool and ensure'
+                    ' virtualenv is in your path')
+            print 'done.'
+        else:
+            die('easy_install not found.\n\nInstall easy_install'
+                ' (python-setuptools in ubuntu) or virtualenv by hand,'
+                ' then rerun.')
+    print 'dependency check done.'
 
 
 def create_virtualenv(venv=VENV):
-  """Creates the virtual environment and installs PIP only into the
-  virtual environment
-  """
-  print 'Creating venv...',
-  run_command(['virtualenv', '-q', '--no-site-packages', VENV])
-  print 'done.'
-  print 'Installing pip in virtualenv...',
-  if not run_command([WITH_VENV, 'easy_install', 'pip']).strip():
-    die("Failed to install pip.")
-  print 'done.'
+    """Creates the virtual environment and installs PIP only into the
+    virtual environment
+    """
+    print 'Creating venv...',
+    run_command(['virtualenv', '-q', '--no-site-packages', VENV])
+    print 'done.'
+    print 'Installing pip in virtualenv...',
+    if not 0 == run_command([WITH_VENV, 'easy_install', 'pip'])[1]:
+        die("Failed to install pip.")
+    print 'done.'
 
 
 def install_dependencies(venv=VENV):
-  print 'Installing dependencies with pip (this can take a while)...'
-  run_command([WITH_VENV, 'pip', 'install', '-E', venv, '-r', PIP_REQUIRES],
-              redirect_output=False)
+    print 'Installing dependencies with pip (this can take a while)...'
+    run_command([WITH_VENV, 'pip', 'install', '-E', venv, '-r', PIP_REQUIRES],
+                redirect_output=False)
 
-  # Tell the virtual env how to "import dashboard"
-  py = 'python%d.%d' % (sys.version_info[0], sys.version_info[1])
-  pthfile = os.path.join(venv, "lib", py, "site-packages", "dashboard.pth")
-  f = open(pthfile, 'w')
-  f.write("%s\n" % ROOT)
+    # Tell the virtual env how to "import dashboard"
+    py = 'python%d.%d' % (sys.version_info[0], sys.version_info[1])
+    pthfile = os.path.join(venv, "lib", py, "site-packages", "dashboard.pth")
+    f = open(pthfile, 'w')
+    f.write("%s\n" % ROOT)
 
 
 def install_django_openstack():
@@ -112,7 +130,7 @@
 
 
 def print_summary():
-  summary = """
+    summary = """
  OpenStack Dashboard development environment setup is complete.
 
  To activate the virtualenv for the extent of your current shell session you
@@ -120,16 +138,16 @@
 
  $ source .dashboard-venv/bin/activate
   """
-  print summary
+    print summary
 
 
 def main():
-  check_dependencies()
-  create_virtualenv()
-  install_dependencies()
-  install_django_openstack()
-  install_django_nova_syspanel()
-  print_summary()
+    check_dependencies()
+    create_virtualenv()
+    install_dependencies()
+    install_django_openstack()
+    install_django_nova_syspanel()
+    print_summary()
 
 if __name__ == '__main__':
-  main()
+    main()