Skip to content

Commit 84e3c48

Browse files
anthamantham
committed
Enable gofumpt
1 parent c8e6d0e commit 84e3c48

File tree

4 files changed

+42
-42
lines changed

4 files changed

+42
-42
lines changed

‎shell/fish.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@ import (
44
"regexp"
55
)
66

7-
type fishParser struct {
8-
}
7+
type fishParser struct{}
98

109
func newFishParser() *fishParser {
1110
return &fishParser{}

‎shell/parser_test.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,5 +69,4 @@ function f2 () {
6969
{Name: "f1", Description: "This is a function to run"},
7070
{Name: "f2", Description: ""},
7171
})
72-
7372
}

‎workspace/workspace.go

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,17 @@ import (
1717
"github.com/antham/wo/shell"
1818
)
1919

20-
const configDir = ".config/wo"
21-
const envVariablePrefix = "WO"
20+
const (
21+
configDir = ".config/wo"
22+
envVariablePrefix = "WO"
23+
)
2224

23-
const bash = "bash"
24-
const fish = "fish"
25-
const sh = "sh"
26-
const zsh = "zsh"
25+
const (
26+
bash = "bash"
27+
fish = "fish"
28+
sh = "sh"
29+
zsh = "zsh"
30+
)
2731

2832
type Workspace struct {
2933
Name string
@@ -238,15 +242,15 @@ func (s WorkspaceManager) getExtension() string {
238242
}
239243

240244
func (s WorkspaceManager) createConfigFolder() error {
241-
return errors.Join(os.MkdirAll(s.getConfigDir(), 0777), os.MkdirAll(s.getFunctionDir(), 0777), os.MkdirAll(s.getEnvDir(), 0777))
245+
return errors.Join(os.MkdirAll(s.getConfigDir(), 0o777), os.MkdirAll(s.getFunctionDir(), 0o777), os.MkdirAll(s.getEnvDir(), 0o777))
242246
}
243247

244248
func (s WorkspaceManager) createWorkspaceEnvFolder(name string) error {
245-
return os.MkdirAll(s.getWorkspaceEnvDir(name), 0777)
249+
return os.MkdirAll(s.getWorkspaceEnvDir(name), 0o777)
246250
}
247251

248252
func (s WorkspaceManager) createWorkspaceDefaultEnv(name string) error {
249-
_, err := os.OpenFile(s.resolveWorkspaceEnvFile(name, "default"), os.O_CREATE, 0666)
253+
_, err := os.OpenFile(s.resolveWorkspaceEnvFile(name, "default"), os.O_CREATE, 0o666)
250254
return err
251255
}
252256

‎workspace/workspace_test.go

Lines changed: 28 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,6 @@ func TestNewWorkspaceManager(t *testing.T) {
6969
s.test(NewWorkspaceManager())
7070
})
7171
}
72-
7372
}
7473

7574
func TestList(t *testing.T) {
@@ -83,7 +82,7 @@ func TestList(t *testing.T) {
8382
"Invalid function file",
8483
func() {
8584
path := getConfigPath(t) + "/functions/bash"
86-
assert.NoError(t, os.WriteFile(path+"/front", []byte{}, 0777))
85+
assert.NoError(t, os.WriteFile(path+"/front", []byte{}, 0o777))
8786
},
8887
func(ws []Workspace, err error) {
8988
assert.ErrorContains(t, err, "the workspace does not exist")
@@ -102,17 +101,17 @@ func TestList(t *testing.T) {
102101
"Get all workspaces ordered alphabetically",
103102
func() {
104103
functionPath := getConfigPath(t) + "/functions/bash"
105-
assert.NoError(t, os.WriteFile(functionPath+"/front.bash", []byte{}, 0777))
106-
assert.NoError(t, os.WriteFile(functionPath+"/api.bash", []byte{}, 0777))
107-
assert.NoError(t, os.WriteFile(functionPath+"/db.bash", []byte{}, 0777))
104+
assert.NoError(t, os.WriteFile(functionPath+"/front.bash", []byte{}, 0o777))
105+
assert.NoError(t, os.WriteFile(functionPath+"/api.bash", []byte{}, 0o777))
106+
assert.NoError(t, os.WriteFile(functionPath+"/db.bash", []byte{}, 0o777))
108107

109108
envPath := getConfigPath(t) + "/envs/bash"
110-
assert.NoError(t, os.MkdirAll(envPath+"/front", 0777))
111-
assert.NoError(t, os.MkdirAll(envPath+"/api", 0777))
112-
assert.NoError(t, os.MkdirAll(envPath+"/db", 0777))
113-
assert.NoError(t, os.WriteFile(envPath+"/front/prod.bash", []byte{}, 0777))
114-
assert.NoError(t, os.WriteFile(envPath+"/api/dev.bash", []byte{}, 0777))
115-
assert.NoError(t, os.WriteFile(envPath+"/db/staging.bash", []byte{}, 0777))
109+
assert.NoError(t, os.MkdirAll(envPath+"/front", 0o777))
110+
assert.NoError(t, os.MkdirAll(envPath+"/api", 0o777))
111+
assert.NoError(t, os.MkdirAll(envPath+"/db", 0o777))
112+
assert.NoError(t, os.WriteFile(envPath+"/front/prod.bash", []byte{}, 0o777))
113+
assert.NoError(t, os.WriteFile(envPath+"/api/dev.bash", []byte{}, 0o777))
114+
assert.NoError(t, os.WriteFile(envPath+"/db/staging.bash", []byte{}, 0o777))
116115
},
117116
func(ws []Workspace, err error) {
118117
assert.NoError(t, err)
@@ -168,11 +167,11 @@ test_func1() {
168167
test_func2() {
169168
170169
}
171-
`), 0777))
170+
`), 0o777))
172171

173172
envPath := getConfigPath(t) + "/envs/bash"
174-
assert.NoError(t, os.MkdirAll(envPath+"/front", 0777))
175-
assert.NoError(t, os.WriteFile(envPath+"/front/prod.bash", []byte(``), 0777))
173+
assert.NoError(t, os.MkdirAll(envPath+"/front", 0o777))
174+
assert.NoError(t, os.WriteFile(envPath+"/front/prod.bash", []byte(``), 0o777))
176175
},
177176
func(w Workspace, err error) {
178177
assert.NoError(t, err)
@@ -206,7 +205,6 @@ test_func2() {
206205
s.test(w.Get("front"))
207206
})
208207
}
209-
210208
}
211209

212210
func TestEdit(t *testing.T) {
@@ -318,8 +316,8 @@ func TestLoad(t *testing.T) {
318316
"prod",
319317
func() {
320318
envPath := getConfigPath(t) + "/envs/bash"
321-
assert.NoError(t, os.MkdirAll(envPath+"/test", 0777))
322-
assert.NoError(t, os.WriteFile(envPath+"/test/prod.bash", []byte{}, 0777))
319+
assert.NoError(t, os.MkdirAll(envPath+"/test", 0o777))
320+
assert.NoError(t, os.WriteFile(envPath+"/test/prod.bash", []byte{}, 0o777))
323321
os.Setenv("SHELL", "bash")
324322
},
325323
func(args []string) {
@@ -331,8 +329,8 @@ func TestLoad(t *testing.T) {
331329
"prod",
332330
func() {
333331
envPath := getConfigPath(t) + "/envs/fish"
334-
assert.NoError(t, os.MkdirAll(envPath+"/test", 0777))
335-
assert.NoError(t, os.WriteFile(envPath+"/test/prod.fish", []byte{}, 0777))
332+
assert.NoError(t, os.MkdirAll(envPath+"/test", 0o777))
333+
assert.NoError(t, os.WriteFile(envPath+"/test/prod.fish", []byte{}, 0o777))
336334
os.Setenv("SHELL", "fish")
337335
},
338336
func(args []string) {
@@ -397,8 +395,8 @@ func TestRunFunction(t *testing.T) {
397395
"prod",
398396
func() {
399397
envPath := getConfigPath(t) + "/envs/bash"
400-
assert.NoError(t, os.MkdirAll(envPath+"/test", 0777))
401-
assert.NoError(t, os.WriteFile(envPath+"/test/prod.bash", []byte{}, 0777))
398+
assert.NoError(t, os.MkdirAll(envPath+"/test", 0o777))
399+
assert.NoError(t, os.WriteFile(envPath+"/test/prod.bash", []byte{}, 0o777))
402400
os.Setenv("SHELL", "/bin/bash")
403401
},
404402
func(args []string) {
@@ -411,8 +409,8 @@ func TestRunFunction(t *testing.T) {
411409
"prod",
412410
func() {
413411
envPath := getConfigPath(t) + "/envs/fish"
414-
assert.NoError(t, os.MkdirAll(envPath+"/test", 0777))
415-
assert.NoError(t, os.WriteFile(envPath+"/test/prod.fish", []byte{}, 0777))
412+
assert.NoError(t, os.MkdirAll(envPath+"/test", 0o777))
413+
assert.NoError(t, os.WriteFile(envPath+"/test/prod.fish", []byte{}, 0o777))
416414
os.Setenv("SHELL", "/bin/fish")
417415
},
418416
func(args []string) {
@@ -462,13 +460,13 @@ func TestRemove(t *testing.T) {
462460
"test",
463461
func() {
464462
path := getConfigPath(t)
465-
assert.NoError(t, os.MkdirAll(path+"/envs/bash/test", 0777))
466-
assert.NoError(t, os.MkdirAll(path+"/envs/bash/front", 0777))
467-
assert.NoError(t, os.WriteFile(path+"/envs/bash/test/prod.bash", []byte{}, 0777))
468-
assert.NoError(t, os.WriteFile(path+"/envs/bash/test/dev.bash", []byte{}, 0777))
469-
assert.NoError(t, os.WriteFile(path+"/envs/bash/front/dev.bash", []byte{}, 0777))
470-
assert.NoError(t, os.WriteFile(path+"/functions/bash/front.bash", []byte{}, 0777))
471-
assert.NoError(t, os.WriteFile(path+"/functions/bash/test.bash", []byte{}, 0777))
463+
assert.NoError(t, os.MkdirAll(path+"/envs/bash/test", 0o777))
464+
assert.NoError(t, os.MkdirAll(path+"/envs/bash/front", 0o777))
465+
assert.NoError(t, os.WriteFile(path+"/envs/bash/test/prod.bash", []byte{}, 0o777))
466+
assert.NoError(t, os.WriteFile(path+"/envs/bash/test/dev.bash", []byte{}, 0o777))
467+
assert.NoError(t, os.WriteFile(path+"/envs/bash/front/dev.bash", []byte{}, 0o777))
468+
assert.NoError(t, os.WriteFile(path+"/functions/bash/front.bash", []byte{}, 0o777))
469+
assert.NoError(t, os.WriteFile(path+"/functions/bash/test.bash", []byte{}, 0o777))
472470
},
473471
func(e error) {
474472
assert.NoError(t, e)

0 commit comments

Comments
 (0)