Merge branch 'mattdodge-virtualenv_absolute' into develop

klen · klen · commit a3a3b6a50ee0 · 2016-12-26T09:41:40.000+03:00
diff --git a/autoload/pymode/virtualenv.vim b/autoload/pymode/virtualenv.vim
@@ -11,7 +11,7 @@ fun! pymode#virtualenv#init() "{{{
 
 endfunction "}}}
 
-fun! pymode#virtualenv#activate(relpath) "{{{
-    let g:pymode_virtualenv_path = getcwd() . '/' . a:relpath
+fun! pymode#virtualenv#activate(path) "{{{
+    let g:pymode_virtualenv_path = a:path
     call pymode#virtualenv#init()
 endfunction "}}}
diff --git a/doc/pymode.txt b/doc/pymode.txt
@@ -212,8 +212,8 @@ Bind keys to show documentation for current word (selection)
                                                              *pymode-virtualenv*
 
 Commands:
-*:PymodeVirtualenv* <path> -- Activate virtualenv (path is related to
-current working directory)
+*:PymodeVirtualenv* <path> -- Activate virtualenv (path can be absolute or
+relative to current working directory)
 
 Enable automatic virtualenv detection                     *'g:pymode_virtualenv'*
 >
diff --git a/pymode/virtualenv.py b/pymode/virtualenv.py
@@ -15,6 +15,11 @@ def enable_virtualenv():
 
     """
     path = env.var('g:pymode_virtualenv_path')
+    # Normalize path to be an absolute path
+    # If an absolute path is provided, that path will be returned, otherwise
+    # the returned path will be an absolute path but computed relative
+    # to the current working directory
+    path = os.path.abspath(path)
     enabled = env.var('g:pymode_virtualenv_enabled')
     if path == enabled:
         env.message('Virtualenv %s already enabled.' % path)
diff --git a/t/virtualenv.vim b/t/virtualenv.vim
@@ -0,0 +1,28 @@
+describe 'pymode-virtualenv'
+
+    before
+        source  plugin/pymode.vim 
+        set filetype=python
+    end
+
+    after
+        bd!
+    end
+
+    " TODO: How can we mock the virtualenv activation to check that the
+    " proper path is set to pymode_virtualenv_enabled? Right now, the 
+    " python function enable_virtualenv gets called but fails when trying
+    " to actually activate so the env.let never gets called
+
+    it 'accepts relative paths'
+        call pymode#virtualenv#activate("sample/relative/path")
+        " Our path variable is the path argument
+        Expect g:pymode_virtualenv_path == "sample/relative/path"
+    end
+
+    it 'accepts absolute paths'
+        call pymode#virtualenv#activate("/sample/absolute/path")
+        " Our path variable is the path argument
+        Expect g:pymode_virtualenv_path == "/sample/absolute/path"
+    end
+end

Original file line number	Diff line number	Diff line change
`@@ -212,8 +212,8 @@ Bind keys to show documentation for current word (selection)`
`212`	`212`	`pymode-virtualenv`
`213`	`213`
`214`	`214`	`Commands:`
`215`		`-:PymodeVirtualenv <path> -- Activate virtualenv (path is related to`
`216`		`-current working directory)`
	`215`	`+:PymodeVirtualenv <path> -- Activate virtualenv (path can be absolute or`
	`216`	`+relative to current working directory)`
`217`	`217`
`218`	`218`	`Enable automatic virtualenv detection 'g:pymode_virtualenv'`
`219`	`219`	`>`