Skip to content

Commit 0b14e66

Browse files
committedMar 31, 2020
Refactor project structure
- pkg is out, see golang-standards/project-layout#10 for inspiration as to why - Controllers are now in the 'controller' directory - ux is 'view', to give a whiff of MVC to the project - various other rearrangements - fix a long-running lint fail
1 parent d5a0f91 commit 0b14e66

File tree

220 files changed

+438
-436
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

220 files changed

+438
-436
lines changed
 

‎cmd/act-gccnt/main.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ import (
1010
"fmt"
1111
"os"
1212

13-
"github.com/MattWindsor91/act-tester/internal/pkg/tools/gccnt"
13+
"github.com/MattWindsor91/act-tester/internal/tool/gccnt"
1414

15-
"github.com/MattWindsor91/act-tester/internal/pkg/ux"
15+
"github.com/MattWindsor91/act-tester/internal/view"
1616

1717
// This name is because every single time I try to use v2 named as 'cli', my IDE decides to replace it with v1.
1818
// Yes, I know, I shouldn't work around IDE issues by obfuscating my code, but I'm at my wit's end.
@@ -28,7 +28,7 @@ func main() {
2828
HideHelpCommand: true,
2929
UseShortOptionHandling: true,
3030
}
31-
ux.LogTopError(app.Run(os.Args))
31+
view.LogTopError(app.Run(os.Args))
3232
}
3333

3434
const (

‎cmd/act-litmus/main.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ import (
1212
"io"
1313
"os"
1414

15-
"github.com/MattWindsor91/act-tester/internal/pkg/act"
15+
"github.com/MattWindsor91/act-tester/internal/act"
1616

17-
"github.com/MattWindsor91/act-tester/internal/pkg/tools/litmus"
17+
"github.com/MattWindsor91/act-tester/internal/tool/litmus"
1818

19-
"github.com/MattWindsor91/act-tester/internal/pkg/ux"
19+
"github.com/MattWindsor91/act-tester/internal/view"
2020
)
2121

2222
const (
@@ -27,7 +27,7 @@ const (
2727

2828
func main() {
2929
if err := run(os.Args, os.Stderr); err != nil {
30-
ux.LogTopError(err)
30+
view.LogTopError(err)
3131
}
3232
}
3333

@@ -54,7 +54,7 @@ func parseArgs(args []string, errw io.Writer) (*litmus.Litmus, error) {
5454
fs.BoolVar(&cfg.Verbose, "v", false, usageVerbose)
5555
fs.StringVar(&cfg.CArch, "carch", "", usageCArch)
5656
fs.StringVar(&cfg.Pathset.DirOut, "o", "", usageOutDir)
57-
ux.ActRunnerFlags(fs, &a)
57+
view.ActRunnerFlags(fs, &a)
5858

5959
if err := fs.Parse(args[1:]); err != nil {
6060
return nil, err

0 commit comments

Comments
 (0)