From 25ed67b2e938525a850982d33acdbaec097de04d Mon Sep 17 00:00:00 2001 From: Dan Jones Date: Sun, 15 Sep 2024 12:02:22 -0500 Subject: [PATCH 1/4] =?UTF-8?q?=F0=9F=94=A5=20Delete=20temp=20files=20in?= =?UTF-8?q?=20testing=20code?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cmd/lenore/main.go | 9 +++++---- config/load_test.go | 1 + 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/cmd/lenore/main.go b/cmd/lenore/main.go index edc4dc8..052d36d 100644 --- a/cmd/lenore/main.go +++ b/cmd/lenore/main.go @@ -12,7 +12,9 @@ import ( ) func main() { - conf, err := config.LoadFromToml(getTomlFile()) + f := getTomlFile() + defer os.Remove(f) + conf, err := config.LoadFromToml(f) quitErr(err) fmt.Printf("%+v\n", conf) @@ -28,6 +30,7 @@ func main() { fmt.Println(string(out)) fmt.Println(serv.ID) } + func quitErr(err error) { if err != nil { panic(err) @@ -36,9 +39,7 @@ func quitErr(err error) { func getTomlFile() string { tmp, err := os.CreateTemp("", "*.toml") - if err != nil { - panic(err) - } + quitErr(err) defer tmp.Close() p := tmp.Name() diff --git a/config/load_test.go b/config/load_test.go index b289496..c532392 100644 --- a/config/load_test.go +++ b/config/load_test.go @@ -15,6 +15,7 @@ func TestLoadTomlMissing(t *testing.T) { func TestLoadTomlGood(t *testing.T) { tmp, _ := os.CreateTemp("", "*.toml") + defer os.Remove(tmp.Name()) defer tmp.Close() fmt.Fprintln(tmp, `name = "Cool"`) fmt.Fprintln(tmp, "[conn]") From c703a26c10b3954c7d22b141ad09e231be67b883 Mon Sep 17 00:00:00 2001 From: Dan Jones Date: Sun, 15 Sep 2024 12:37:42 -0500 Subject: [PATCH 2/4] =?UTF-8?q?=E2=9C=A8=20Load=20store=20from=20config=20?= =?UTF-8?q?name?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- store/factory.go | 4 ++++ store/factory_test.go | 10 ++++++++++ 2 files changed, 14 insertions(+) diff --git a/store/factory.go b/store/factory.go index fbcc5c0..c6c5aa8 100644 --- a/store/factory.go +++ b/store/factory.go @@ -26,6 +26,10 @@ func GetFactory(name string) StoreFactory { } func MakeStore(name string, conf config.Config) (Store, error) { + if name == "" { + name = conf.Conn.Store + } + f, ok := factories[name] if !ok { return nil, fmt.Errorf("%w: %s", ErrNoFactory, name) diff --git a/store/factory_test.go b/store/factory_test.go index 38568ac..9cde562 100644 --- a/store/factory_test.go +++ b/store/factory_test.go @@ -45,3 +45,13 @@ func TestMakeStoreNoError(t *testing.T) { assert.NotNil(t, s) assert.NoError(t, e) } + +func TestMakeStoreNoName(t *testing.T) { + AddFactory("mock", f) + defer delete(factories, "mock") + s, e := MakeStore("", config.Config{ + Conn: config.ConnSettings{Store: "mock"}, + }) + assert.NotNil(t, s) + assert.NoError(t, e) +} From 8a069859ea51b74825232dede293834418f2f527 Mon Sep 17 00:00:00 2001 From: Dan Jones Date: Mon, 28 Oct 2024 11:50:18 -0500 Subject: [PATCH 3/4] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20Rename=20constancts=20?= =?UTF-8?q?to=20not=20be=20uppercase?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app_test.go | 12 ++++++------ config/config_test.go | 4 ++-- config/env.go | 18 +++++++++--------- config/env_test.go | 22 +++++++++++----------- 4 files changed, 28 insertions(+), 28 deletions(-) diff --git a/app_test.go b/app_test.go index 426985e..3475516 100644 --- a/app_test.go +++ b/app_test.go @@ -22,7 +22,7 @@ func TestDefaultEnvironment(t *testing.T) { a, er := NewApp("0.0.0", c, testmocks.GetStore()) assert.NoError(t, er) if assert.NotNil(t, a) { - assert.Equal(t, config.DEV, a.Environment()) + assert.Equal(t, config.Dev, a.Environment()) } } @@ -31,11 +31,11 @@ func TestGivenEnvironment(t *testing.T) { given config.Env exp config.Env }{ - {config.DEV, config.DEV}, - {config.PROD, config.PROD}, - {config.QA, config.QA}, - {config.Env("foo"), config.DEV}, - {config.Env("✨"), config.DEV}, + {config.Dev, config.Dev}, + {config.Prod, config.Prod}, + {config.Qa, config.Qa}, + {config.Env("foo"), config.Dev}, + {config.Env("✨"), config.Dev}, } for _, c := range cases { diff --git a/config/config_test.go b/config/config_test.go index 2586018..12c0e4c 100644 --- a/config/config_test.go +++ b/config/config_test.go @@ -8,12 +8,12 @@ import ( func TestEnvDefaultsToDev(t *testing.T) { c := Config{} - assert.Equal(t, DEV, c.Environment()) + assert.Equal(t, Dev, c.Environment()) } func TestInvalidEnvReturnsDev(t *testing.T) { c := Config{Env: Env("foobar")} - assert.Equal(t, DEV, c.Environment()) + assert.Equal(t, Dev, c.Environment()) } func TestValidEnvReturnsCorrect(t *testing.T) { diff --git a/config/env.go b/config/env.go index 99f8aa0..b38e4fd 100644 --- a/config/env.go +++ b/config/env.go @@ -3,24 +3,24 @@ package config type Env string const ( - DEV Env = "dev" - PROD Env = "prod" - QA Env = "qa" - TEST Env = "test" + Dev Env = "dev" + Prod Env = "prod" + Qa Env = "qa" + Test Env = "test" ) var Envs = [...]Env{ - DEV, - PROD, - QA, - TEST, + Dev, + Prod, + Qa, + Test, } func ValidEnvOrDev(e Env) Env { if ValidEnv(e) { return e } - return DEV + return Dev } func ValidEnv(env Env) bool { diff --git a/config/env_test.go b/config/env_test.go index 2084c0a..680a79b 100644 --- a/config/env_test.go +++ b/config/env_test.go @@ -21,10 +21,10 @@ func TestValidEnv(t *testing.T) { e Env exp bool }{ - {DEV, true}, - {PROD, true}, - {QA, true}, - {TEST, true}, + {Dev, true}, + {Prod, true}, + {Qa, true}, + {Test, true}, {Env("foobar"), false}, {Env(""), false}, {Env("✨"), false}, @@ -42,13 +42,13 @@ func TestValidEnvOrDev(t *testing.T) { give Env exp Env }{ - {DEV, DEV}, - {PROD, PROD}, - {QA, QA}, - {TEST, TEST}, - {Env("foobar"), DEV}, - {Env(""), DEV}, - {Env("✨"), DEV}, + {Dev, Dev}, + {Prod, Prod}, + {Qa, Qa}, + {Test, Test}, + {Env("foobar"), Dev}, + {Env(""), Dev}, + {Env("✨"), Dev}, } for _, c := range cases { From c73dfc0d3af4ed74c0042e5621f8091e2174c420 Mon Sep 17 00:00:00 2001 From: Dan Jones Date: Mon, 28 Oct 2024 13:48:22 -0500 Subject: [PATCH 4/4] =?UTF-8?q?=F0=9F=9A=9A=20Rename=20project?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Taskfile.yml | 4 ++-- app.go | 8 ++++---- app_test.go | 6 +++--- cmd/{lenore => combluotion}/main.go | 8 ++++---- config/version.go | 4 ++-- go.mod | 2 +- imports/default.go | 2 +- internal/testmocks/store.go | 2 +- store/factory.go | 2 +- store/factory_test.go | 4 ++-- store/sqlite/repo.go | 4 ++-- store/store.go | 2 +- 12 files changed, 24 insertions(+), 24 deletions(-) rename cmd/{lenore => combluotion}/main.go (78%) diff --git a/Taskfile.yml b/Taskfile.yml index 86e777a..4d15ae8 100644 --- a/Taskfile.yml +++ b/Taskfile.yml @@ -75,6 +75,6 @@ tasks: sources: - '**/*.go' generates: - - build/lenore + - build/combluotion cmds: - - go build -o build/lenore cmd/lenore/main.go + - go build -o build/combluotion cmd/combluotion/main.go diff --git a/app.go b/app.go index 9ffe16d..514df57 100644 --- a/app.go +++ b/app.go @@ -1,13 +1,13 @@ -package lenore +package combluotion import ( "errors" "fmt" "time" - "codeberg.org/danjones000/lenore/config" - _ "codeberg.org/danjones000/lenore/imports" - "codeberg.org/danjones000/lenore/store" + "codeberg.org/danjones000/combluotion/config" + _ "codeberg.org/danjones000/combluotion/imports" + "codeberg.org/danjones000/combluotion/store" vocab "github.com/go-ap/activitypub" "github.com/go-ap/client" boxap "github.com/go-ap/fedbox/activitypub" diff --git a/app_test.go b/app_test.go index 3475516..e850b11 100644 --- a/app_test.go +++ b/app_test.go @@ -1,11 +1,11 @@ -package lenore +package combluotion import ( "fmt" "testing" - "codeberg.org/danjones000/lenore/config" - "codeberg.org/danjones000/lenore/internal/testmocks" + "codeberg.org/danjones000/combluotion/config" + "codeberg.org/danjones000/combluotion/internal/testmocks" vocab "github.com/go-ap/activitypub" "github.com/stretchr/testify/assert" ) diff --git a/cmd/lenore/main.go b/cmd/combluotion/main.go similarity index 78% rename from cmd/lenore/main.go rename to cmd/combluotion/main.go index 052d36d..0b6b769 100644 --- a/cmd/lenore/main.go +++ b/cmd/combluotion/main.go @@ -6,9 +6,9 @@ import ( "fmt" "os" - "codeberg.org/danjones000/lenore" - "codeberg.org/danjones000/lenore/config" - "codeberg.org/danjones000/lenore/store" + "codeberg.org/danjones000/combluotion" + "codeberg.org/danjones000/combluotion/config" + "codeberg.org/danjones000/combluotion/store" ) func main() { @@ -21,7 +21,7 @@ func main() { db, err := store.MakeStore(conf.Conn.Store, conf) quitErr(err) - app, err := lenore.NewApp(config.Version, conf, db) + app, err := combluotion.NewApp(config.Version, conf, db) quitErr(err) fmt.Println(app) diff --git a/config/version.go b/config/version.go index 3731179..3b5ef9d 100644 --- a/config/version.go +++ b/config/version.go @@ -1,9 +1,9 @@ package config const ( - AppName string = "lenore" + AppName string = "combluotion" Version string = "0.0.1" - Url string = "https://codeberg.org/danjones000/lenore" + Url string = "https://codeberg.org/danjones000/combluotion" DevUrl string = "https://codeberg.org/danjones000" Email string = "danjones@goodevilgenius.org" UserAgent string = AppName + "/" + Version + " (" + Url + "; " + Email + ")" diff --git a/go.mod b/go.mod index 2226a1c..b5296f3 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module codeberg.org/danjones000/lenore +module codeberg.org/danjones000/combluotion go 1.23.1 diff --git a/imports/default.go b/imports/default.go index a757ab4..c06d2b1 100644 --- a/imports/default.go +++ b/imports/default.go @@ -1,5 +1,5 @@ package imports import ( - _ "codeberg.org/danjones000/lenore/store/sqlite" + _ "codeberg.org/danjones000/combluotion/store/sqlite" ) diff --git a/internal/testmocks/store.go b/internal/testmocks/store.go index d4a6e54..ae408d9 100644 --- a/internal/testmocks/store.go +++ b/internal/testmocks/store.go @@ -1,7 +1,7 @@ package testmocks import ( - "codeberg.org/danjones000/lenore/config" + "codeberg.org/danjones000/combluotion/config" vocab "github.com/go-ap/activitypub" "github.com/go-ap/filters" ) diff --git a/store/factory.go b/store/factory.go index c6c5aa8..4d19fc4 100644 --- a/store/factory.go +++ b/store/factory.go @@ -4,7 +4,7 @@ import ( "errors" "fmt" - "codeberg.org/danjones000/lenore/config" + "codeberg.org/danjones000/combluotion/config" ) var ErrNoFactory = errors.New("unknown factory") diff --git a/store/factory_test.go b/store/factory_test.go index 9cde562..5af7acf 100644 --- a/store/factory_test.go +++ b/store/factory_test.go @@ -3,8 +3,8 @@ package store import ( "testing" - "codeberg.org/danjones000/lenore/config" - "codeberg.org/danjones000/lenore/internal/testmocks" + "codeberg.org/danjones000/combluotion/config" + "codeberg.org/danjones000/combluotion/internal/testmocks" "github.com/stretchr/testify/assert" ) diff --git a/store/sqlite/repo.go b/store/sqlite/repo.go index 87a43e3..c0e780e 100644 --- a/store/sqlite/repo.go +++ b/store/sqlite/repo.go @@ -1,8 +1,8 @@ package sqlite import ( - "codeberg.org/danjones000/lenore/config" - "codeberg.org/danjones000/lenore/store" + "codeberg.org/danjones000/combluotion/config" + "codeberg.org/danjones000/combluotion/store" "github.com/go-ap/storage-sqlite" ) diff --git a/store/store.go b/store/store.go index de38416..e66fa9b 100644 --- a/store/store.go +++ b/store/store.go @@ -1,7 +1,7 @@ package store import ( - "codeberg.org/danjones000/lenore/config" + "codeberg.org/danjones000/combluotion/config" st "github.com/go-ap/fedbox/storage" proc "github.com/go-ap/processing" "github.com/openshift/osin"