diff --git a/Makefile b/Makefile index 72d96bd..a12b18f 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ build: - mkdir -p bin/ && go build -o bin/ ./cmd/nixose + mkdir -p bin/ && go build -o bin/ ./cmd/nix-compose test: - go test + go test -v .PHONY: build test diff --git a/cmd/nixose/main.go b/cmd/nix-compose/main.go similarity index 82% rename from cmd/nixose/main.go rename to cmd/nix-compose/main.go index e76a15f..e91638c 100644 --- a/cmd/nixose/main.go +++ b/cmd/nix-compose/main.go @@ -10,7 +10,7 @@ import ( "strings" "time" - "github.com/aksiksi/nixose" + nixcompose "github.com/aksiksi/nix-compose" ) var paths = flag.String("paths", "", "paths to Compose files") @@ -18,7 +18,7 @@ var envFiles = flag.String("env_files", "", "paths to .env files") var envFilesOnly = flag.Bool("env_files_only", false, "only use env files in the NixOS container definitions") var output = flag.String("output", "", "path to output Nix file") var project = flag.String("project", "", "project name used as a prefix for generated resources") -var projectSeparator = flag.String("project_separator", nixose.DefaultProjectSeparator, "seperator for project prefix") +var projectSeparator = flag.String("project_separator", nixcompose.DefaultProjectSeparator, "seperator for project prefix") var serviceInclude = flag.String("service_include", "", "regex pattern for services to include") var autoStart = flag.Bool("auto_start", true, "control auto-start setting for containers") var runtime = flag.String("runtime", "podman", `"podman" or "docker"`) @@ -36,11 +36,11 @@ func main() { paths := strings.Split(*paths, ",") envFiles := strings.Split(*envFiles, ",") - var containerRuntime nixose.ContainerRuntime + var containerRuntime nixcompose.ContainerRuntime if *runtime == "podman" { - containerRuntime = nixose.ContainerRuntimePodman + containerRuntime = nixcompose.ContainerRuntimePodman } else if *runtime == "docker" { - containerRuntime = nixose.ContainerRuntimeDocker + containerRuntime = nixcompose.ContainerRuntimeDocker } else { log.Fatalf("Invalid --runtime: %q", *runtime) } @@ -55,8 +55,8 @@ func main() { } start := time.Now() - g := nixose.Generator{ - Project: nixose.NewProjectWithSeparator(*project, *projectSeparator), + g := nixcompose.Generator{ + Project: nixcompose.NewProjectWithSeparator(*project, *projectSeparator), Runtime: containerRuntime, Paths: paths, EnvFiles: envFiles, diff --git a/compose.go b/compose.go index ef6debb..49e73b2 100644 --- a/compose.go +++ b/compose.go @@ -1,4 +1,4 @@ -package nixose +package nixcompose import ( "cmp" diff --git a/go.mod b/go.mod index 043f7d7..f8dcff0 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/aksiksi/nixose +module github.com/aksiksi/nix-compose go 1.21 diff --git a/helpers.go b/helpers.go index 9155718..5a1386a 100644 --- a/helpers.go +++ b/helpers.go @@ -1,4 +1,4 @@ -package nixose +package nixcompose import ( "bufio" diff --git a/nixose.go b/nix.go similarity index 99% rename from nixose.go rename to nix.go index 4325e47..19549da 100644 --- a/nixose.go +++ b/nix.go @@ -1,4 +1,4 @@ -package nixose +package nixcompose import ( "fmt" diff --git a/nixose_test.go b/nix_test.go similarity index 99% rename from nixose_test.go rename to nix_test.go index b1a488c..ee15405 100644 --- a/nixose_test.go +++ b/nix_test.go @@ -1,4 +1,4 @@ -package nixose +package nixcompose import ( "context" diff --git a/template.go b/template.go index 2aa29a3..94f6bf0 100644 --- a/template.go +++ b/template.go @@ -1,4 +1,4 @@ -package nixose +package nixcompose import ( "embed"