mudhorn/oh-my-posh
1
0
Fork 0
mirror of https://github.com/JanDeDobbeleer/oh-my-posh.git synced 2024-09-20 05:27:31 -07:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

feat(python): add support for pyvenv.cfg prompt

Browse source
This commit is contained in:
Javier Dehesa 2023-05-05 15:39:20 +01:00 committed by Jan De Dobbeleer
parent cef49107fb
commit 8f03f415e1
2 changed files with 49 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
src/segments/python.go
View file

@ -63,6 +63,10 @@ func (p *Python) loadContext() {
if !p.language.props.GetBool(FetchVirtualEnv, true) {
return
}
if prompt := p.pyvenvCfgPrompt(); len(prompt) > 0 {
p.Venv = prompt
return
}
venvVars := []string{
"VIRTUAL_ENV",
"CONDA_ENV_PATH",
@ -142,3 +146,33 @@ func (p *Python) pyenvVersion() (string, error) {
}
return parts[0], nil
}
func (p *Python) pyvenvCfgPrompt() string {
path := p.language.env.CommandPath("python")
if len(path) == 0 {
path = p.language.env.CommandPath("python3")
}
if len(path) == 0 {
return ""
}
pyvenvDir := filepath.Dir(path)
if !p.language.env.HasFilesInDir(pyvenvDir, "pyvenv.cfg") {
pyvenvDir = filepath.Dir(pyvenvDir)
}
if !p.language.env.HasFilesInDir(pyvenvDir, "pyvenv.cfg") {
return ""
}
pyvenvCfg := p.env.FileContent(filepath.Join(pyvenvDir, "pyvenv.cfg"))
for _, line := range strings.Split(pyvenvCfg, "\n") {
lineSplit := strings.SplitN(line, "=", 2)
if len(lineSplit) != 2 {
continue
}
key := strings.TrimSpace(lineSplit[0])
if key == "prompt" {
value := strings.TrimSpace(lineSplit[1])
return value
}
}
return ""
}

15
src/segments/python_test.go
View file

@ -2,6 +2,7 @@ package segments
import (
"errors"
"path/filepath"
"testing"
"github.com/jandedobbeleer/oh-my-posh/src/mock"
@ -26,6 +27,7 @@ func TestPythonTemplate(t *testing.T) {
FetchVersion bool
PythonPath string
ResolveSymlink ResolveSymlink
PyvenvCfg string
}{
{Case: "No virtual env present", FetchVersion: true, Expected: "3.8.4", Template: "{{ if .Venv }}{{ .Venv }} {{ end }}{{ .Full }}"},
{Case: "Virtual env present", FetchVersion: true, Expected: "VENV 3.8.4", VirtualEnvName: "VENV", Template: "{{ if .Venv }}{{ .Venv }} {{ end }}{{ .Full }}"},
@ -76,6 +78,15 @@ func TestPythonTemplate(t *testing.T) {
Template: "{{ .Venv }} {{ .Full }}",
ResolveSymlink: ResolveSymlink{Path: "/home/user/.pyenv/versions/demo", Err: nil},
},
{
Case: "pyvenv.cfg prompt",
FetchVersion: true,
VirtualEnvName: "VENV",
PythonPath: "/home/user/.pyenv/shims/python",
Template: "{{ if .Venv }}{{ .Venv }} {{ end }}{{ .Major }}.{{ .Minor }}",
PyvenvCfg: "home = /usr/bin/\nprompt = pyvenvCfgPrompt\n",
Expected: "pyvenvCfgPrompt 3.8",
},
}
for _, tc := range cases {
@ -86,6 +97,8 @@ func TestPythonTemplate(t *testing.T) {
env.On("RunCommand", "python", []string{"--version"}).Return("Python 3.8.4", nil)
env.On("RunCommand", "pyenv", []string{"version-name"}).Return(tc.VirtualEnvName, nil)
env.On("HasFiles", "*.py").Return(true)
env.On("HasFilesInDir", mock2.Anything, "pyvenv.cfg").Return(len(tc.PyvenvCfg) > 0)
env.On("FileContent", filepath.Join(filepath.Dir(tc.PythonPath), "pyvenv.cfg")).Return(tc.PyvenvCfg)
env.On("Getenv", "VIRTUAL_ENV").Return(tc.VirtualEnvName)
env.On("Getenv", "CONDA_ENV_PATH").Return(tc.VirtualEnvName)
env.On("Getenv", "CONDA_DEFAULT_ENV").Return(tc.VirtualEnvName)
@ -122,6 +135,8 @@ func TestPythonPythonInContext(t *testing.T) {
env := new(mock.MockedEnvironment)
env.On("GOOS").Return("")
env.On("PathSeparator").Return("/")
env.On("CommandPath", mock2.Anything).Return("")
env.On("HasFilesInDir", mock2.Anything, "pyvenv.cfg").Return(false)
env.On("Getenv", "VIRTUAL_ENV").Return(tc.VirtualEnvName)
env.On("Getenv", "CONDA_ENV_PATH").Return("")
env.On("Getenv", "CONDA_DEFAULT_ENV").Return("")