summaryrefslogtreecommitdiff
path: root/cmd/planr/sub
diff options
context:
space:
mode:
authorFlu0r1ne <flur01ne@flu0r1ne.net>2021-09-03 18:13:49 -0500
committerFlu0r1ne <flur01ne@flu0r1ne.net>2021-09-03 18:13:49 -0500
commit38912d85394604fe9cc238ef6eb9f6e75ceb38f9 (patch)
tree861fc3af5d44ef8fbad738638f498c6e63bd1747 /cmd/planr/sub
parentaff7b69cab2ac1d09b47f28c6fa653febd8595ea (diff)
downloaddeb-planr-38912d85394604fe9cc238ef6eb9f6e75ceb38f9.tar.xz
deb-planr-38912d85394604fe9cc238ef6eb9f6e75ceb38f9.zip
Add config command to retrieve configuration values and clean command to clean build files
Diffstat (limited to 'cmd/planr/sub')
-rw-r--r--cmd/planr/sub/build.go17
-rw-r--r--cmd/planr/sub/clean.go6
-rw-r--r--cmd/planr/sub/config.go28
-rw-r--r--cmd/planr/sub/evaluate.go4
4 files changed, 36 insertions, 19 deletions
diff --git a/cmd/planr/sub/build.go b/cmd/planr/sub/build.go
index 142ef1c..4a1cda9 100644
--- a/cmd/planr/sub/build.go
+++ b/cmd/planr/sub/build.go
@@ -2,22 +2,9 @@ package sub
import (
"golang.flu0r1ne.net/planr"
- "golang.flu0r1ne.net/planr/adapters/gtest"
- "os"
)
-func Runner() planr.Runner {
- r := planr.Runner {}
- r.RegisterAdapter(&gtest.GtestAdapter{})
-
- if wd, err := os.Getwd(); err == nil {
- r.SetConfigDirFromTree(wd)
- }
-
- return r
-}
-
-func Build(params []string) {
- Runner().Build()
+func Build(runner planr.Runner, params []string) {
+ runner.Build()
}
diff --git a/cmd/planr/sub/clean.go b/cmd/planr/sub/clean.go
index d40e967..d658c10 100644
--- a/cmd/planr/sub/clean.go
+++ b/cmd/planr/sub/clean.go
@@ -1,5 +1,7 @@
package sub
-func Clean(params []string) {
- Runner().Clean()
+import "golang.flu0r1ne.net/planr"
+
+func Clean(runner planr.Runner, params []string) {
+ runner.Clean()
}
diff --git a/cmd/planr/sub/config.go b/cmd/planr/sub/config.go
new file mode 100644
index 0000000..ee372c8
--- /dev/null
+++ b/cmd/planr/sub/config.go
@@ -0,0 +1,28 @@
+package sub
+
+import (
+ "golang.flu0r1ne.net/planr"
+ "fmt"
+ "os"
+)
+
+
+func Config(runner planr.Runner, params []string) {
+ if len(params) != 1 {
+ fmt.Fprintf(os.Stderr, "Usage: planr config <parameter>\n")
+ os.Exit(1)
+ }
+
+ key := params[0]
+
+ switch key {
+ case "builddir":
+ fmt.Printf("%s\n", runner.BuildDir())
+ case "configdir":
+ fmt.Printf("%s\n", runner.ConfigDir())
+ case "srcdir":
+ fmt.Printf("%s\n", runner.SrcDir())
+ default:
+ fmt.Fprintf(os.Stderr, "\"%s\" not found in configuration\n", key)
+ }
+}
diff --git a/cmd/planr/sub/evaluate.go b/cmd/planr/sub/evaluate.go
index d183b86..79d377e 100644
--- a/cmd/planr/sub/evaluate.go
+++ b/cmd/planr/sub/evaluate.go
@@ -4,8 +4,8 @@ import (
"golang.flu0r1ne.net/planr"
)
-func Evaluate(params []string) {
- tcs := Runner().Evaluate()
+func Evaluate(runner planr.Runner, params []string) {
+ tcs := runner.Evaluate()
earned := 0.0
total := 0.0