mudhorn/oh-my-posh
1
0
Fork 0
mirror of https://github.com/JanDeDobbeleer/oh-my-posh.git synced 2025-02-21 02:55:37 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

refactor: rename getcwd to pwd

Browse source
This commit is contained in:
Jan De Dobbeleer 2022-01-20 13:35:46 +01:00 committed by Jan De Dobbeleer
parent 6afa7711b2
commit fc456da107
23 changed files with 44 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/console_title.go
View file

@ -51,7 +51,7 @@ func (t *consoleTitle) getTemplateText() string {
}
func (t *consoleTitle) getPwd() string {
pwd := t.env.getcwd()
pwd := t.env.pwd()
pwd = strings.Replace(pwd, t.env.homeDir(), "~", 1)
return pwd
}

4
src/console_title_test.go
View file

@ -53,7 +53,7 @@ func TestGetConsoleTitle(t *testing.T) {
ConsoleTitleTemplate: tc.Template,
}
env := new(MockedEnvironment)
env.On("getcwd").Return(tc.Cwd)
env.On("pwd").Return(tc.Cwd)
env.On("homeDir").Return("/usr/home")
env.On("getPathSeperator").Return(tc.PathSeperator)
env.On("templateCache").Return(&templateCache{
@ -115,7 +115,7 @@ func TestGetConsoleTitleIfGethostnameReturnsError(t *testing.T) {
ConsoleTitleTemplate: tc.Template,
}
env := new(MockedEnvironment)
env.On("getcwd").Return(tc.Cwd)
env.On("pwd").Return(tc.Cwd)
env.On("homeDir").Return("/usr/home")
env.On("templateCache").Return(&templateCache{
Env: map[string]string{

2
src/engine.go
View file

@ -66,7 +66,7 @@ func (e *engine) render() string {
if !e.config.OSC99 {
return e.print()
}
cwd := e.env.getcwd()
cwd := e.env.pwd()
e.writeANSI(e.ansi.consolePwd(cwd))
return e.print()
}

16
src/environment.go
View file

@ -90,7 +90,7 @@ type wifiInfo struct {
type Environment interface {
getenv(key string) string
getcwd() string
pwd() string
homeDir() string
hasFiles(pattern string) bool
hasFilesInDir(dir, pattern string) bool
@ -224,10 +224,10 @@ func (env *environment) getenv(key string) string {
return val
}
func (env *environment) getcwd() string {
defer env.trace(time.Now(), "getcwd")
func (env *environment) pwd() string {
defer env.trace(time.Now(), "pwd")
defer func() {
env.log(Error, "getcwd", env.cwd)
env.log(Error, "pwd", env.cwd)
}()
if env.cwd != "" {
return env.cwd
@ -243,7 +243,7 @@ func (env *environment) getcwd() string {
}
dir, err := os.Getwd()
if err != nil {
env.log(Error, "getcwd", err.Error())
env.log(Error, "pwd", err.Error())
return ""
}
env.cwd = correctPath(dir)
@ -252,7 +252,7 @@ func (env *environment) getcwd() string {
func (env *environment) hasFiles(pattern string) bool {
defer env.trace(time.Now(), "hasFiles", pattern)
cwd := env.getcwd()
cwd := env.pwd()
pattern = cwd + env.getPathSeperator() + pattern
matches, err := filepath.Glob(pattern)
if err != nil {
@ -506,7 +506,7 @@ func (env *environment) HTTPRequest(url string, timeout int, requestModifiers ..
func (env *environment) hasParentFilePath(path string) (*fileInfo, error) {
defer env.trace(time.Now(), "hasParentFilePath", path)
currentFolder := env.getcwd()
currentFolder := env.pwd()
for {
searchPath := filepath.Join(currentFolder, path)
info, err := os.Stat(searchPath)
@ -571,7 +571,7 @@ func (env *environment) templateCache() *templateCache {
val := splitted[1:]
tmplCache.Env[key] = strings.Join(val, separator)
}
pwd := env.getcwd()
pwd := env.pwd()
pwd = strings.Replace(pwd, env.homeDir(), "~", 1)
tmplCache.PWD = pwd
tmplCache.Folder = base(pwd, env)

2
src/environment_test.go
View file

@ -41,6 +41,6 @@ func TestWindowsPathWithDriveLetter(t *testing.T) {
PWD: &tc.CWD,
},
}
assert.Equal(t, env.getcwd(), tc.Expected)
assert.Equal(t, env.pwd(), tc.Expected)
}
}

2
src/environment_unix.go
View file

@ -87,7 +87,7 @@ func (env *environment) getWindowsRegistryKeyValue(path string) (*windowsRegistr
}
func (env *environment) inWSLSharedDrive() bool {
return env.isWsl() && strings.HasPrefix(env.getcwd(), "/mnt/")
return env.isWsl() && strings.HasPrefix(env.pwd(), "/mnt/")
}
func (env *environment) convertToWindowsPath(path string) string {

4
src/segment.go
View file

@ -198,7 +198,7 @@ func (segment *Segment) cwdIncluded() bool {
return true
}
return dirMatchesOneOf(segment.env, segment.env.getcwd(), list)
return dirMatchesOneOf(segment.env, segment.env.pwd(), list)
}
func (segment *Segment) cwdExcluded() bool {
@ -207,7 +207,7 @@ func (segment *Segment) cwdExcluded() bool {
value = segment.Properties[IgnoreFolders]
}
list := parseStringArray(value)
return dirMatchesOneOf(segment.env, segment.env.getcwd(), list)
return dirMatchesOneOf(segment.env, segment.env.pwd(), list)
}
func (segment *Segment) getColor(templates []string, defaultColor string) string {

4
src/segment_angular.go
View file

@ -24,13 +24,13 @@ func (a *angular) init(props Properties, env Environment) {
getVersion: func() (string, error) {
const fileName string = "package.json"
const fileFolder string = "/node_modules/@angular/core"
angularFilePath := a.language.env.getcwd() + fileFolder
angularFilePath := a.language.env.pwd() + fileFolder
if !a.language.env.hasFilesInDir(angularFilePath, fileName) {
return "", fmt.Errorf("%s not found in %s", fileName, angularFilePath)
}
// parse file
objmap := map[string]json.RawMessage{}
content := a.language.env.getFileContent(a.language.env.getcwd() + fileFolder + "/" + fileName)
content := a.language.env.getFileContent(a.language.env.pwd() + fileFolder + "/" + fileName)
err := json.Unmarshal([]byte(content), &objmap)
if err != nil {
return "", err

2
src/segment_angular_test.go
View file

@ -24,7 +24,7 @@ func TestAngularCliVersionDisplayed(t *testing.T) {
var env = new(MockedEnvironment)
// mock getVersion methods
env.On("getcwd").Return("/usr/home/dev/my-app")
env.On("pwd").Return("/usr/home/dev/my-app")
env.On("homeDir").Return("/usr/home")
env.On("hasFiles", params.extension).Return(true)
env.On("hasFilesInDir", "/usr/home/dev/my-app/node_modules/@angular/core", "package.json").Return(true)

2
src/segment_deprecated_test.go
View file

@ -755,7 +755,7 @@ func TestPythonVirtualEnv(t *testing.T) {
env.On("getenv", "CONDA_DEFAULT_ENV").Return(tc.CondaDefaultEnvName)
env.On("getenv", "PYENV_VERSION").Return(tc.PyEnvName)
env.On("getPathSeperator").Return("")
env.On("getcwd").Return("/usr/home/project")
env.On("pwd").Return("/usr/home/project")
env.On("homeDir").Return("/usr/home")
env.onTemplate()
props := properties{

2
src/segment_dotnet_test.go
View file

@ -26,7 +26,7 @@ func bootStrapDotnetTest(args *dotnetArgs) *dotnet {
env.On("hasFiles", "*.cs").Return(true)
env.On("getPathSeperator").Return("")
env.On("getcwd").Return("/usr/home/project")
env.On("pwd").Return("/usr/home/project")
env.On("homeDir").Return("/usr/home")
env.onTemplate()
props := properties{

2
src/segment_git_test.go
View file

@ -590,7 +590,7 @@ func TestGetGitCommand(t *testing.T) {
env := new(MockedEnvironment)
env.On("isWsl").Return(tc.IsWSL)
env.On("getRuntimeGOOS").Return(tc.GOOS)
env.On("getcwd").Return(tc.CWD)
env.On("pwd").Return(tc.CWD)
wslUname := "5.10.60.1-microsoft-standard-WSL2"
if tc.IsWSL1 {
wslUname = "4.4.0-19041-Microsoft"

2
src/segment_golang_test.go
View file

@ -21,7 +21,7 @@ func getMockedLanguageEnv(params *mockedLanguageParams) (*MockedEnvironment, pro
env.On("hasCommand", params.cmd).Return(true)
env.On("runCommand", params.cmd, []string{params.versionParam}).Return(params.versionOutput, nil)
env.On("hasFiles", params.extension).Return(true)
env.On("getcwd").Return("/usr/home/project")
env.On("pwd").Return("/usr/home/project")
env.On("homeDir").Return("/usr/home")
env.onTemplate()
props := properties{

2
src/segment_java_test.go
View file

@ -57,7 +57,7 @@ func TestJava(t *testing.T) {
env.On("hasCommand", "java").Return(true)
env.On("runCommand", "java", []string{"-Xinternalversion"}).Return(tc.Version, nil)
env.On("hasFiles", "pom.xml").Return(true)
env.On("getcwd").Return("/usr/home/project")
env.On("pwd").Return("/usr/home/project")
env.On("homeDir").Return("/usr/home")
if tc.JavaHomeEnabled {
env.On("getenv", "JAVA_HOME").Return("/usr/java")

2
src/segment_language.go
View file

@ -126,7 +126,7 @@ func (l *language) enabled() bool {
l.extensions = l.props.getStringArray(LanguageExtensions, l.extensions)
inHomeDir := func() bool {
return l.env.getcwd() == l.env.homeDir()
return l.env.pwd() == l.env.homeDir()
}
homeEnabled := l.props.getBool(HomeEnabled, l.homeEnabled)
if inHomeDir() && !homeEnabled {

2
src/segment_language_test.go
View file

@ -48,7 +48,7 @@ func bootStrapLanguageTest(args *languageArgs) *language {
if args.inHome {
cwd = home
}
env.On("getcwd").Return(cwd)
env.On("pwd").Return(cwd)
env.On("homeDir").Return(home)
env.onTemplate()
if args.properties == nil {

4
src/segment_path.go
View file

@ -58,7 +58,7 @@ func (pt *path) enabled() bool {
}
func (pt *path) string() string {
pt.pwd = pt.env.getcwd()
pt.pwd = pt.env.pwd()
switch style := pt.props.getString(Style, Agnoster); style {
case Agnoster:
pt.Path = pt.getAgnosterPath()
@ -259,7 +259,7 @@ func (pt *path) getFolderPath() string {
func (pt *path) getPwd() string {
pwd := *pt.env.getArgs().PSWD
if pwd == "" {
pwd = pt.env.getcwd()
pwd = pt.env.pwd()
}
pwd = pt.replaceMappedLocations(pwd)
return pwd

18
src/segment_path_test.go
View file

@ -19,7 +19,7 @@ func (env *MockedEnvironment) getenv(key string) string {
return args.String(0)
}
func (env *MockedEnvironment) getcwd() string {
func (env *MockedEnvironment) pwd() string {
args := env.Called()
return args.String(0)
}
@ -274,7 +274,7 @@ func TestRootLocationHome(t *testing.T) {
for _, tc := range cases {
env := new(MockedEnvironment)
env.On("homeDir").Return(tc.HomePath)
env.On("getcwd").Return(tc.Pwd)
env.On("pwd").Return(tc.Pwd)
args := &args{
PSWD: &tc.Pswd,
}
@ -426,7 +426,7 @@ func TestAgnosterPathStyles(t *testing.T) {
env := new(MockedEnvironment)
env.On("getPathSeperator").Return(tc.PathSeperator)
env.On("homeDir").Return(tc.HomePath)
env.On("getcwd").Return(tc.Pwd)
env.On("pwd").Return(tc.Pwd)
env.On("getRuntimeGOOS").Return(tc.GOOS)
env.On("stackCount").Return(0)
args := &args{
@ -547,7 +547,7 @@ func TestGetFullPath(t *testing.T) {
}
env.On("getPathSeperator").Return(tc.PathSeparator)
env.On("homeDir").Return("/usr/home")
env.On("getcwd").Return(tc.Pwd)
env.On("pwd").Return(tc.Pwd)
env.On("getRuntimeGOOS").Return(tc.GOOS)
env.On("stackCount").Return(tc.StackCount)
args := &args{
@ -598,7 +598,7 @@ func TestGetFullPathCustomMappedLocations(t *testing.T) {
env := new(MockedEnvironment)
env.On("getPathSeperator").Return("/")
env.On("homeDir").Return("/usr/home")
env.On("getcwd").Return(tc.Pwd)
env.On("pwd").Return(tc.Pwd)
env.On("getRuntimeGOOS").Return("")
args := &args{
PSWD: &tc.Pwd,
@ -649,7 +649,7 @@ func TestGetFolderPathCustomMappedLocations(t *testing.T) {
env := new(MockedEnvironment)
env.On("getPathSeperator").Return("/")
env.On("homeDir").Return("/usr/home")
env.On("getcwd").Return(pwd)
env.On("pwd").Return(pwd)
env.On("getRuntimeGOOS").Return("")
args := &args{
PSWD: &pwd,
@ -696,7 +696,7 @@ func TestAgnosterPath(t *testing.T) { // nolint:dupl
env := new(MockedEnvironment)
env.On("homeDir").Return(tc.Home)
env.On("getPathSeperator").Return(tc.PathSeparator)
env.On("getcwd").Return(tc.PWD)
env.On("pwd").Return(tc.PWD)
env.On("getRuntimeGOOS").Return("")
args := &args{
PSWD: &tc.PWD,
@ -744,7 +744,7 @@ func TestAgnosterLeftPath(t *testing.T) { // nolint:dupl
env := new(MockedEnvironment)
env.On("homeDir").Return(tc.Home)
env.On("getPathSeperator").Return(tc.PathSeparator)
env.On("getcwd").Return(tc.PWD)
env.On("pwd").Return(tc.PWD)
env.On("getRuntimeGOOS").Return("")
args := &args{
PSWD: &tc.PWD,
@ -792,7 +792,7 @@ func TestGetPwd(t *testing.T) {
env := new(MockedEnvironment)
env.On("getPathSeperator").Return("/")
env.On("homeDir").Return("/usr/home")
env.On("getcwd").Return(tc.Pwd)
env.On("pwd").Return(tc.Pwd)
env.On("getRuntimeGOOS").Return("")
args := &args{
PSWD: &tc.Pswd,

2
src/segment_python_test.go
View file

@ -50,7 +50,7 @@ func TestPythonTemplate(t *testing.T) {
env.On("getenv", "CONDA_DEFAULT_ENV").Return(tc.VirtualEnvName)
env.On("getenv", "PYENV_VERSION").Return(tc.VirtualEnvName)
env.On("getPathSeperator").Return("")
env.On("getcwd").Return("/usr/home/project")
env.On("pwd").Return("/usr/home/project")
env.On("homeDir").Return("/usr/home")
env.onTemplate()
props := properties{

2
src/segment_ruby_test.go
View file

@ -96,7 +96,7 @@ func TestRuby(t *testing.T) {
env.On("hasFiles", "*.rb").Return(tc.HasRubyFiles)
env.On("hasFiles", "Rakefile").Return(tc.HasRakeFile)
env.On("hasFiles", "Gemfile").Return(tc.HasGemFile)
env.On("getcwd").Return("/usr/home/project")
env.On("pwd").Return("/usr/home/project")
env.On("homeDir").Return("/usr/home")
env.onTemplate()
props := properties{

2
src/segment_terraform.go
View file

@ -27,7 +27,7 @@ func (tf *terraform) init(props Properties, env Environment) {
func (tf *terraform) enabled() bool {
cmd := "terraform"
if !tf.env.hasCommand(cmd) || !tf.env.hasFolder(tf.env.getcwd()+"/.terraform") {
if !tf.env.hasCommand(cmd) || !tf.env.hasFolder(tf.env.pwd()+"/.terraform") {
return false
}
tf.WorkspaceName, _ = tf.env.runCommand(cmd, "workspace", "show")

2
src/segment_terraform_test.go
View file

@ -16,7 +16,7 @@ func bootStrapTerraformTest(args *terraformArgs) *terraform {
env := new(MockedEnvironment)
env.On("hasCommand", "terraform").Return(args.hasTfCommand)
env.On("hasFolder", "/.terraform").Return(args.hasTfFolder)
env.On("getcwd").Return("")
env.On("pwd").Return("")
env.On("runCommand", "terraform", []string{"workspace", "show"}).Return(args.workspaceName, nil)
env.onTemplate()
k := &terraform{

6
src/segment_test.go
View file

@ -82,7 +82,7 @@ func TestShouldIncludeFolder(t *testing.T) {
env := new(MockedEnvironment)
env.On("getRuntimeGOOS").Return(linuxPlatform)
env.On("homeDir").Return("")
env.On("getcwd").Return(cwd)
env.On("pwd").Return(cwd)
segment := &Segment{
Properties: properties{
IncludeFolders: tc.IncludeFolders,
@ -99,7 +99,7 @@ func TestShouldIncludeFolderRegexInverted(t *testing.T) {
env := new(MockedEnvironment)
env.On("getRuntimeGOOS").Return(linuxPlatform)
env.On("homeDir").Return("")
env.On("getcwd").Return(cwd)
env.On("pwd").Return(cwd)
segment := &Segment{
Properties: properties{
ExcludeFolders: []string{"(?!Projects[\\/]).*"},
@ -120,7 +120,7 @@ func TestShouldIncludeFolderRegexInvertedNonEscaped(t *testing.T) {
env := new(MockedEnvironment)
env.On("getRuntimeGOOS").Return(linuxPlatform)
env.On("homeDir").Return("")
env.On("getcwd").Return(cwd)
env.On("pwd").Return(cwd)
segment := &Segment{
Properties: properties{
ExcludeFolders: []string{"(?!Projects/).*"},