Improve symlink command

utahta · utahta · commit 7b2fa2f0ebb9 · 2011-08-07T00:39:13.000+09:00
diff --git a/pythonbrew/commands/symlink.py b/pythonbrew/commands/symlink.py
@@ -1,7 +1,9 @@
 import os
+import sys
 from pythonbrew.basecommand import Command
-from pythonbrew.define import PATH_PYTHONS, PATH_BIN
-from pythonbrew.util import Package, symlink, unlink
+from pythonbrew.define import PATH_PYTHONS, PATH_BIN, PATH_VENVS
+from pythonbrew.util import Package, symlink, unlink, get_using_python_pkgname,\
+    is_installed
 from pythonbrew.log import logger
 
 class SymlinkCommand(Command):
@@ -32,6 +34,12 @@ def __init__(self):
             default=None,
             help="Use as default the specified python version."
         )
+        self.parser.add_option(
+            "-v", "--venv",
+            dest="venv",
+            default=None,
+            help="Use the virtual environment python."
+        )
     
     def run_command(self, options, args):
         if options.default:
@@ -43,6 +51,28 @@ def run_command(self, options, args):
                     self._symlink(bin, bin, pkgname)
                 else:
                     self._symlink('python', 'py', pkgname)
+        elif options.venv:
+            if options.pythons:
+                pkgname = Package(options.pythons[0]).name
+            else:
+                pkgname = get_using_python_pkgname()
+            if not is_installed(pkgname):
+                logger.error('`%s` is not installed.')
+                sys.exit(1)
+            
+            venv_pkgdir = os.path.join(PATH_VENVS, pkgname)
+            venv_dir = os.path.join(venv_pkgdir, options.venv)
+            if not os.path.isdir(venv_dir):
+                logger.error("`%s` environment not found in %s." % (options.venv, venv_pkgdir))
+                sys.exit(1)
+            pkg = Package(pkgname)
+            if args:
+                bin = args[0]
+                dstbin = '%s%s-%s' % (bin, pkg.version, options.venv)
+                self._symlink(bin, dstbin, pkgname)
+            else:
+                dstbin = 'py%s-%s' % (pkg.version, options.venv)
+                self._symlink('python', dstbin, pkgname)
         else:
             pythons = self._get_pythons(options.pythons)
             for pkgname in pythons:
diff --git a/pythonbrew/commands/venv.py b/pythonbrew/commands/venv.py
@@ -96,7 +96,6 @@ def run_command_create(self, options, args):
         if options.no_site_packages:
             virtualenv_options += '--no-site-packages'
         
-        print 'in create'
         output = []
         for arg in args[1:]:
             target_dir = os.path.join(self._workon_home, arg)
