Further cleanup

* README is now relevant
* Auth now properly skipped with os-image-url and os-auth-token provided

1 files changed, 40 insertions, 64 deletions

diff --git a/tools/install_venv.py b/tools/install_venv.py
index ddf0a95..d404744 100644
--- a/tools/install_venv.py
+++ b/tools/install_venv.py
@@ -1,25 +1,21 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
-# Copyright 2010 United States Government as represented by the
-# Administrator of the National Aeronautics and Space Administration.
+# Copyright 2012 OpenStack LLC
 # All Rights Reserved.
 #
-# Copyright 2010 OpenStack LLC.
-#
-#    Licensed under the Apache License, Version 2.0 (the "License"); you may
-#    not use this file except in compliance with the License. You may obtain
-#    a copy of the License at
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
 #
-#         http://www.apache.org/licenses/LICENSE-2.0
+#    http://www.apache.org/licenses/LICENSE-2.0
 #
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#    License for the specific language governing permissions and limitations
-#    under the License.
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+# implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 
 """
-Installation script for Glance's development virtualenv
+virtualenv installation script
 """
 
 import os
@@ -31,13 +27,19 @@ ROOT = os.path.dirname(os.path.dirname(os.path.realpath(__file__)))
 VENV = os.path.join(ROOT, '.venv')
 PIP_REQUIRES = os.path.join(ROOT, 'tools', 'pip-requires')
 TEST_REQUIRES = os.path.join(ROOT, 'tools', 'test-requires')
+PY_VERSION = "python%s.%s" % (sys.version_info[0], sys.version_info[1])
 
 
 def die(message, *args):
-    print >> sys.stderr, message % args
+    print >>sys.stderr, message % args
     sys.exit(1)
 
 
+def check_python_version():
+    if sys.version_info < (2, 6):
+        die("Need Python Version >= 2.6")
+
+
 def run_command(cmd, redirect_output=True, check_exit_code=True):
     """
     Runs a command in an out-of-process shell, returning the
@@ -56,94 +58,68 @@ def run_command(cmd, redirect_output=True, check_exit_code=True):
 
 
 HAS_EASY_INSTALL = bool(run_command(['which', 'easy_install'],
-                                    check_exit_code=False).strip())
+                    check_exit_code=False).strip())
 HAS_VIRTUALENV = bool(run_command(['which', 'virtualenv'],
-                                    check_exit_code=False).strip())
+                    check_exit_code=False).strip())
 
 
 def check_dependencies():
     """Make sure virtualenv is in the path."""
 
+    print 'Checking for virtualenv...'
     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', 'easy_install']):
-                die('ERROR: virtualenv not found.\n\n'
-                    'Glance development requires virtualenv, please install'
-                    ' it using your favorite package management tool')
+            if not (run_command(['which', 'easy_install']) and
+                    run_command(['easy_install', 'virtualenv'])):
+                die('ERROR: virtualenv not found.\n\nNova development'
+                    ' requires virtualenv, please install it using your'
+                    ' favorite package management tool')
             print 'done.'
     print 'done.'
 
 
 def create_virtualenv(venv=VENV):
-    """
-    Creates the virtual environment and installs PIP only into the
+    """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(['tools/with_venv.sh', 'easy_install',
-                        'pip>1.0']).strip():
+    if not run_command(['tools/with_venv.sh', 'easy_install', 'pip']).strip():
         die("Failed to install pip.")
     print 'done.'
 
 
-def pip_install(*args):
-    run_command(['tools/with_venv.sh',
-                 'pip', 'install', '--upgrade'] + list(args),
-                redirect_output=False)
-
-
 def install_dependencies(venv=VENV):
     print 'Installing dependencies with pip (this can take a while)...'
-
-    pip_install('pip')
-
-    pip_install('-r', PIP_REQUIRES)
-    pip_install('-r', TEST_REQUIRES)
-
-    # Tell the virtual env how to "import glance"
-    py_ver = _detect_python_version(venv)
-    pthfile = os.path.join(venv, "lib", py_ver, "site-packages", "glance.pth")
-    f = open(pthfile, 'w')
-    f.write("%s\n" % ROOT)
-
-
-def _detect_python_version(venv):
-    lib_dir = os.path.join(venv, "lib")
-    for pathname in os.listdir(lib_dir):
-        if pathname.startswith('python'):
-            return pathname
-    raise Exception('Unable to detect Python version')
+    run_command(['tools/with_venv.sh', 'pip', 'install', '-r',
+                PIP_REQUIRES, '-r', TEST_REQUIRES], redirect_output=False)
 
 
 def print_help():
     help = """
- Glance development environment setup is complete.
-
- Glance development uses virtualenv to track and manage Python dependencies
- while in development and testing.
+    Virtual environment configuration complete.
 
- To activate the Glance virtualenv for the extent of your current shell session
- you can run:
+    To activate the virtualenv for the extent of your current shell
+    session you can run:
 
- $ source .venv/bin/activate
+    $ source %s/bin/activate
 
- Or, if you prefer, you can run commands in the virtualenv on a case by case
- basis by running:
+    Or, if you prefer, you can run commands in the virtualenv on a case by case
+    basis by running:
 
- $ tools/with_venv.sh <your command>
+    $ tools/with_venv.sh <your command>
 
- Also, make test will automatically use the virtualenv.
-    """
+    """ % VENV
     print help
 
 
 def main(argv):
+    check_python_version()
     check_dependencies()
     create_virtualenv()
     install_dependencies()