feat(proxy): implement sampling setup (#48)

feat(test): move test folder and provide other test setup (#48) feat(proxy): add registry, runner and other supporting functionality (#48) feat(proxy): setup scientist directory for testing (#48) feat(proxy): move program execution to runner (#48) feat(proxy): add profile/scheme validation (#48) feat(proxy): clean up root param set/root inputs (#48) feat(proxy): validate sampler info (#48) feat(proxy): change profile params to be a map for cobrass.ThirdPartyCommandLine (#48) feat(proxy): add initial sequencing functionality (#48) chore(deps): incoming breaking changes from extendio & cobrass (#48) ref(proxy): reorganise runner (#48) test(proxy): migrate tests to use virtual-fs (#48) test(proxy): mock viper config (#48) test(proxy): mock configs (#48) ref(proxy): redesign configs so they can be mocked (#48) test(proxy): mock config readers (#48) ref(proxy): add supporting code for strategies and some tidy up (#48) ref(proxy): rename mirror-path to output (#48) feat(proxy): add trash flag (#48) feat(proxy): add vfs and implement strategies (#48) feat(proxy): add basic path-finder transparent mode (#48) feat(proxy): tidy up (#48)
snivilised · Dec 20, 2023 · 4b6df95 · 4b6df95
1 parent 7176a69
commit 4b6df95
Show file tree

Hide file tree

Showing 47 changed files with 3,511 additions and 886 deletions.
diff --git a/.gitignore b/.gitignore
@@ -18,8 +18,11 @@
 coverage
 coverage.out
 ginkgo.report
-
+dist/
 .task/
 
 src/i18n/out/en-US/active.en-GB.json
+test/data/research/scientist/
 
+.DS_Store
+thumbs.db
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -4,46 +4,61 @@
     "--fast"
   ],
   "cSpell.words": [
+    "beezledub",
     "bodyclose",
+    "chardata",
     "clif",
+    "cmds",
+    "cmock",
+    "cmocks",
     "cobrass",
     "cubiest",
     "deadcode",
     "deepcopy",
     "depguard",
     "dogsled",
+    "dotenv",
     "dupl",
     "errcheck",
     "exportloopref",
     "extendio",
+    "faydeaudeau",
     "fieldalignment",
+    "GOARCH",
     "goconst",
     "gocritic",
     "gocyclo",
     "gofmt",
     "goimports",
+    "golangci",
     "gomega",
     "gomnd",
+    "gomock",
     "gosec",
     "gosimple",
+    "goveralls",
     "govet",
     "graffico",
     "ineffassign",
+    "interstella",
     "jibberjabber",
     "linters",
     "lintv",
     "lorax",
     "Magick",
     "mapstructure",
     "mitchellh",
+    "mockgen",
     "mohae",
     "nakedret",
     "nolint",
     "nolintlint",
     "nosec",
     "onsi",
+    "outdir",
     "Pixa",
     "prealloc",
+    "promptui",
     "repotoken",
     "samber",
     "sidewalk",
@@ -57,7 +72,9 @@
     "unconvert",
     "unparam",
     "varcheck",
+    "watchv",
     "wgan",
+    "Wrapf",
     "xutils"
   ]
 }
diff --git a/Taskfile.yml b/Taskfile.yml
@@ -50,10 +50,15 @@ tasks:
     generates:
       - "{{.DIST_DIR}}/{{.TARGET_OS}}/{{.BINARY_NAME}}{{.BINARY_EXT}}"
 
-  b:
+  bw:
     cmds:
       - task: build-w
 
+  bm:
+    cmds:
+      - task: build-m
+
+
   build-w:
     cmds:
       - task: build_generic
@@ -77,13 +82,17 @@ tasks:
 
   # === deploy ================================================
 
-  d:
+  dw:
+    cmds:
+      - task: deploy-w
+
+  dm:
     cmds:
-      - task: deploy
+      - task: deploy-m
 
   # currently, this is hardcoded for windows
   #
-  deploy:
+  deploy-w:
     vars:
       BINARY_EXT: .exe
       TARGET_OS: windows
@@ -104,11 +113,40 @@ tasks:
       - test -f {{.DEPLOY_BINARY}}
       - test -f {{.DEPLOY_DIR}}/{{.ACTIVE_US}}
 
-  tbd:
+  # currently, this is hardcoded for mac. these deploy tasks need to be improved
+  # to remove the duplicated code
+  #
+  deploy-m:
+    vars:
+      TARGET_OS: darwin
+      DEPLOY_BINARY: "{{.DIST_DIR}}/{{.TARGET_OS}}/{{.BINARY_NAME}}"
+      DEPLOY_US: "{{.DEPLOY_DIR}}/{{.ACTIVE_US}}"
+
+    cmds:
+      - echo "deploying to location (.env) DEPLOY_TO  ==> '$DEPLOY_TO'"
+      - /bin/cp -f {{.DEPLOY_BINARY}} $DEPLOY_TO
+      - /bin/cp -f {{.DEPLOY_DIR}}/{{.ACTIVE_US}} $DEPLOY_TO
+
+    generates:
+      - $DEPLOY_TO/{{.DEPLOY_BINARY}}
+      - $DEPLOY_TO/{{.ACTIVE_US}}
+
+    preconditions:
+      - test $DEPLOY_TO
+      - test -f {{.DEPLOY_BINARY}}
+      - test -f {{.DEPLOY_DIR}}/{{.ACTIVE_US}}
+
+  tbw:
+    cmds:
+      - task: t
+      - task: bw
+      - task: dw
+
+  tbm:
     cmds:
       - task: t
-      - task: b
-      - task: d
+      - task: bm
+      - task: dm
 
   # === ginkgo ================================================
 
@@ -168,6 +206,12 @@ tasks:
     cmds:
       - goveralls -repotoken {{.COVERALLS_TOKEN}}
 
+  # === go generate ==========================================
+
+  co-gen-cfg:
+    cmds:
+      - go generate src/app/proxy
+
   # === i18n =================================================
 
   clear:

diff --git a/go.mod b/go.mod
@@ -3,52 +3,53 @@ module github.com/snivilised/pixa
 go 1.21
 
 require (
-	github.com/onsi/ginkgo/v2 v2.13.0
-	github.com/onsi/gomega v1.29.0
+	github.com/onsi/ginkgo/v2 v2.13.2
+	github.com/onsi/gomega v1.30.0
 	github.com/pkg/errors v0.9.1
-	github.com/samber/lo v1.38.1
-	github.com/snivilised/extendio v0.3.0
-	github.com/snivilised/lorax v0.4.1
-	github.com/spf13/cobra v1.7.0
-	github.com/spf13/viper v1.17.0
+	github.com/samber/lo v1.39.0
+	github.com/snivilised/extendio v0.5.0
+	github.com/snivilised/lorax v0.4.2
+	github.com/spf13/cobra v1.8.0
+	github.com/spf13/viper v1.18.1
 	go.uber.org/zap v1.26.0
 )
 
 require (
-	github.com/BurntSushi/toml v1.2.1 // indirect
-	github.com/go-logr/logr v1.2.4 // indirect
+	github.com/avfs/avfs v0.33.0 // indirect
+	github.com/go-logr/logr v1.3.0 // indirect
 	github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
 	github.com/google/go-cmp v0.6.0 // indirect
-	github.com/google/pprof v0.0.0-20230406165453-00490a63f317 // indirect
-	github.com/google/uuid v1.3.1 // indirect
+	github.com/google/pprof v0.0.0-20231212022811-ec68065c825e // indirect
+	github.com/google/uuid v1.4.0 // indirect
 	github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 // indirect
 	github.com/onsi/ginkgo v1.16.5 // indirect
-	github.com/sagikazarmark/locafero v0.3.0 // indirect
+	github.com/sagikazarmark/locafero v0.4.0 // indirect
 	github.com/sagikazarmark/slog-shim v0.1.0 // indirect
 	github.com/sourcegraph/conc v0.3.0 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
-	golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect
-	golang.org/x/tools v0.13.0 // indirect
+	golang.org/x/exp v0.0.0-20231206192017-f3f8817b8deb // indirect
+	golang.org/x/tools v0.16.0 // indirect
 )
 
 require (
 	github.com/cubiest/jibberjabber v1.0.1
-	github.com/fsnotify/fsnotify v1.6.0 // indirect
+	github.com/fsnotify/fsnotify v1.7.0 // indirect
 	github.com/hashicorp/hcl v1.0.0 // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
 	github.com/magiconair/properties v1.8.7 // indirect
 	github.com/mitchellh/mapstructure v1.5.0 // indirect
 	github.com/natefinch/lumberjack v2.0.0+incompatible
-	github.com/nicksnyder/go-i18n/v2 v2.2.2 // indirect
-	github.com/pelletier/go-toml/v2 v2.1.0 // indirect
-	github.com/snivilised/cobrass v0.3.6
-	github.com/spf13/afero v1.10.0 // indirect
-	github.com/spf13/cast v1.5.1 // indirect
+	github.com/nicksnyder/go-i18n/v2 v2.3.0 // indirect
+	github.com/pelletier/go-toml/v2 v2.1.1 // indirect
+	github.com/snivilised/cobrass v0.4.1
+	github.com/spf13/afero v1.11.0 // indirect
+	github.com/spf13/cast v1.6.0 // indirect
 	github.com/spf13/pflag v1.0.5
 	github.com/subosito/gotenv v1.6.0 // indirect
-	golang.org/x/net v0.17.0 // indirect
-	golang.org/x/sys v0.13.0 // indirect
-	golang.org/x/text v0.13.0
+	go.uber.org/mock v0.3.0
+	golang.org/x/net v0.19.0 // indirect
+	golang.org/x/sys v0.15.0 // indirect
+	golang.org/x/text v0.14.0
 	gopkg.in/ini.v1 v1.67.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )