chore: Cleaned up code.

TEST_PLAN.md

@@ -2,101 +2,61 @@
 
 ## Current State
 
-- 63 tests, all passing (added 3 `render_table` tests)
+- 104 tests, all passing
-- Strong coverage: crypto (100%), ssh (80%), scan, features
+- Strong coverage: crypto, ssh, db CRUD + env_file + update_dir, config save/load + paths, scan, features, cant_scan, parse_args, `-c`/`--config-file` flag
-- `render_table` now takes `io.Writer` (Tier 1 item 1 done)
 - Misleading test files: `cmd_check_test`, `cmd_list_test`, `cmd_nushell_completion_test` don't test their namesake procs
-- Biggest gap: `db.odin` (15/21 procs untested), all `cmd_*` handlers untested, `parse_args` untested
+- Biggest remaining gap: all `cmd_*` handlers untested
 
-## Tier 1 — Easy wins (pure functions, minimal setup)
+## Command handler tests
 
-### 1. `render_table` (table.odin)
+Stdout will be captured by redirecting `os.stdout` to a pipe.
-- Follow existing `render_json_rows` test pattern
-- Test cases: normal data (verify box-drawing chars, column alignment), empty rows, wide unicode, single column
-- Assert against `strings.Builder` output
 
-### 2. `parse_args` (cli.odin) — BLOCKED: needs refactor
+### `cmd_version` (cmd_version.odin)
-- Reads `os.args` directly and calls `print_usage()`/`print_command_help()` as side effects
-- Cannot test without either accepting `[]string` param or extracting output
-- Minimal refactor: `parse_args(args: []string)` — caller passes `os.args`, tests pass synthetic slices
-- Return values (`ok`, `cmd.name`, `cmd.flags`, `cmd.bool_set`) are the interesting part to assert
-- Test cases: bare command, `--flag value`, `-f value`, positional args, `--help`/`-h`, unknown command, no args, mixed flags + positionals
-
-### 3. `is_encrypted_key` (ssh.odin)
-- Test cases: encrypted key (returns true), unencrypted key (returns false), RSA key, malformed key
-- Fills last gap in ssh.odin
-
-## Tier 2 — High value, medium effort (fixtures exist)
-
-### 4. `db.odin` CRUD layer
-Largest gap in the project. Infrastructure already in `db_integration_test.odin` (`fixture_key`, `fixture_db_path`, in-memory DB setup).
-
-Procs to test:
-- `db_open` / `db_close` — open in-memory DB, verify handle valid
-- `db_insert` — insert a row, verify it persists
-- `db_fetch` — fetch existing row, fetch missing row (returns false)
-- `db_delete` — delete existing row (returns true), delete missing row (returns false)
-- `db_list` — list multiple rows, empty DB
-- `db_vacuum_to_file` — vacuum to temp file, verify file exists and is non-empty
-
-Test pattern: create in-memory DB via `db_open`, insert fixture rows, query and assert, `defer db_close`.
-
-### 5. `load_config` / `save_config` (config.odin)
-- `save_config`: write a `Config` to temp dir, verify file exists and contents are valid JSON
-- `load_config`: read back a config written by `save_config`, round-trip assert
-- `load_config` error case: missing file returns error
-- Need a temp dir fixture (pattern exists in `scan_test.odin`)
-
-## Tier 3 — Command handlers (need DB + filesystem fixtures)
-
-### 6. `cmd_version` (cmd_version.odin)
 - Test default output (prints VERSION)
-- Test `--long`/`-l` flag output
-- Capture stdout, assert content
 
-### 7. `cmd_list` (cmd_list.odin)
+### `cmd_list` (cmd_list.odin)
 - Test TTY path: fixture DB with rows, capture table output
 - Test non-TTY path: capture JSON output, unmarshal and verify keys/values
 - Test empty DB: verify clean output (empty table or `[]`)
 
-### 8. `cmd_backup` (cmd_backup.odin)
+### `cmd_backup` (cmd_backup.odin)
 - Test successful backup: valid path, verify `db_insert` called
 - Test missing file: verify error message
 - Test duplicate backup: verify rejection or update behavior
 
-### 9. `cmd_remove` (cmd_remove.odin)
+### `cmd_remove` (cmd_remove.odin)
 - Test successful removal: existing entry, verify `db_delete` called
 - Test removal of non-existent entry: verify error or no-op
 
-### 10. `cmd_restore` (cmd_restore.odin)
+### `cmd_restore` (cmd_restore.odin)
 - Test successful restore: entry exists in DB, verify file written to correct path
 - Test restore of missing entry: verify error
 - Test directory creation: restore to path with missing parent dirs
 
-## Tier 4 — Hard to test (interactive / external deps)
+## Hard to test (interactive / external deps)
 
-### 11. `cmd_deps` (cmd_deps.odin)
+### `cmd_deps` (cmd_deps.odin)
 - Needs `git` and/or `fd` in PATH
 - Test TTY and non-TTY paths
 - Skip if dependencies not available (with `#assert` like TODO 28 suggests)
 
-### 12. `cmd_scan` (cmd_scan.odin)
+### `cmd_scan` (cmd_scan.odin)
 - Needs `fd` installed
 - Test with fixture git repo containing `.env` files
 - Test `find_unbacked` integration (already partially tested in `cmd_check_test.odin`)
 - Non-TTY JSON output path
 
-### 13. `cmd_edit_config` (cmd_edit_config.odin)
+### `cmd_edit_config` (cmd_edit_config.odin)
 - Needs refactoring: extract `$EDITOR` parsing into testable helper (TODO 12)
 - Test multi-word editor values (`"code -w"`)
 - Test missing `$EDITOR`
 
-### 14. `cmd_init` (cmd_init.odin)
+### `cmd_init` (cmd_init.odin)
 - Interactive prompt makes this hard
 - Needs refactoring: extract SSH key discovery and config generation into testable procs
 - Test `--force` flag behavior
 
-### 15. `prompt.odin`
+### `prompt.odin`
 - Needs refactoring to be testable
 - `render_options` could be tested if it accepted an `io.Writer`
 - `read_key` could be tested with a pipe/redirect instead of raw stdin
@@ -104,7 +64,7 @@ Test pattern: create in-memory DB via `db_open`, insert fixture rows, query and
 
 ## Notes
 
-- All command handler tests will need stdout capture. Consider extracting a helper or using `io.Writer` injection.
 - DB integration tests should use in-memory SQLite (`:memory:`) where possible.
 - Temp dir fixtures should follow the pattern in `scan_test.odin`.
 - External dependency tests (`fd`, `git`) should use `#assert` to ensure the dependency is present rather than silently skipping (TODO 28).
+- Tests that manipulate the `HOME` env var must use a mutex to prevent races with parallel test execution.

TODOS.md

@@ -56,34 +56,34 @@ Note: These todos can wait until all the subcommands have been ported.
 
 25. Add tests for untested commands.
 
-26. Add a global --config -c flag to use an alternate config.
+28. 2 scan tests silently skip when fd isn't installed, tests pass without actually testing anything. These should use #assert to be sure that fd is in path.
-
-27. version --long Odin only prints version; Go also prints commit hash and build date
-
-28. 2 scan tests silently skip	Low	When fd isn't installed, tests pass without actually testing anything. These should use #assert to be sure that fd is in path.
 
 38. Try to do all encryption / decryption in memory - only read / write encrypted data to disk.
 
 40. use a buffered writer where possible (mem.DEFAULT_PAGE_SIZE)
 
+41. add --format -f flag to commands that draw tables.
+
+42. Replace `testing.expect` calls with `testing.expect_value` calls where appropriate.
+
 ## Double-check AI output
 
 - [ ] cli.odin
 - [ ] cli_test.odin
-- [ ] cmd_backup.odin
+- [x] cmd_backup.odin
-- [ ] cmd_check.odin
+- [x] cmd_check.odin
 - [ ] cmd_check_test.odin
-- [ ] cmd_deps.odin
+- [x] cmd_deps.odin
 - [ ] cmd_edit_config.odin
-- [ ] cmd_init.odin
+- [x] cmd_init.odin
-- [ ] cmd_list.odin
+- [x] cmd_list.odin
 - [ ] cmd_list_test.odin
-- [ ] cmd_nushell_completion.odin
+- [x] cmd_nushell_completion.odin
-- [ ] cmd_nushell_completion_test.odin
+- [x] cmd_nushell_completion_test.odin
-- [ ] cmd_remove.odin
+- [x] cmd_remove.odin
-- [ ] cmd_restore.odin
+- [x] cmd_restore.odin
-- [ ] cmd_scan.odin
+- [x] cmd_scan.odin
-- [ ] cmd_sync.odin
+- [x] cmd_sync.odin
 - [x] cmd_version.odin
 - [ ] config.odin
 - [ ] config_test.odin
@@ -92,10 +92,10 @@ Note: These todos can wait until all the subcommands have been ported.
 - [ ] db.odin
 - [ ] db_integration_test.odin
 - [ ] db_test.odin
-- [ ] features.odin
+- [x] features.odin
-- [ ] features_test.odin
+- [x] features_test.odin
-- [ ] main.odin
+- [x] main.odin
-- [ ] prompt.odin
+- [x] prompt.odin
 - [ ] scan.odin
 - [ ] scan_test.odin
 - [ ] sodium.odin

cli.odin

@@ -8,10 +8,11 @@ import "core:os"
 import "core:strings"
 
 Command :: struct {
-	name:     string,
+	name:        string,
-	args:     [dynamic]string,
+	args:        [dynamic]string,
-	flags:    map[string]string,
+	flags:       map[string]string,
-	bool_set: map[string]bool,
+	bool_set:    map[string]bool,
+	config_path: string,
 }
 
 CommandInfo :: struct {
@@ -55,8 +56,8 @@ COMMANDS := []CommandInfo {
 	},
 }
 
-parse_args :: proc() -> (cmd: Command, ok: bool) {
+// FIXME: Works in kinda a wonky and awkward way.
-	args := os.args
+parse_args :: proc(args: []string) -> (cmd: Command, ok: bool) {
 	if len(args) < 2 || args[1] == "--help" || args[1] == "-h" {
 		print_usage()
 		return Command{}, false
@@ -95,6 +96,16 @@ parse_args :: proc() -> (cmd: Command, ok: bool) {
 		}
 	}
 
+	if val, ok := cmd.flags["config-file"]; ok {
+		cmd.config_path = val
+	} else if val, ok := cmd.flags["c"]; ok {
+		cmd.config_path = val
+	} else {
+		// FIXME: Handle err
+		home, _ := os.user_home_dir(context.allocator)
+		cmd.config_path = default_config_path(home)
+	}
+
 	if has_flag(&cmd, "help") {
 		print_command_help(cmd.name)
 		return Command{}, false
@@ -147,7 +158,12 @@ write_command_help :: proc(name: string, w: io.Writer) -> bool {
 		fmt.wprintf(w, "\n%s\n", info.long, flush = false)
 	}
 
-	fmt.wprintf(w, "\nFlags:\n  -h, --help   help for %s\n", info.name, flush = false)
+	fmt.wprintf(
+		w,
+		"\nFlags:\n  -h, --help   help for %s\n  -c, --config-file <path>   config file (default \"~/.envr/config.json\")\n",
+		info.name,
+		flush = false,
+	)
 	return true
 }
 
@@ -165,6 +181,7 @@ print_command_help :: proc(name: string) {
 	bufio.writer_flush(&bw)
 }
 
+// TODO: command args should be shown in usage.
 write_usage :: proc(w: io.Writer) {
 	fmt.wprintf(
 		w,
@@ -228,6 +245,7 @@ Available Commands:
 		`
 Flags:
   -h, --help   help for envr
+  -c, --config-file <path>   config file (default "~/.envr/config.json")
 
 Use "envr [command] --help" for more information about a command.
 `,

cli_test.odin

@@ -189,3 +189,170 @@ test_has_flag_empty_command :: proc(t: ^testing.T) {
 }
 
 @(test)
+test_parse_args_bare_command :: proc(t: ^testing.T) {
+	cmd, ok := parse_args([]string{"envr", "list"})
+	testing.expect(t, ok, "should succeed")
+	if !ok do return
+	defer delete(cmd.args)
+	defer delete(cmd.flags)
+	defer delete(cmd.bool_set)
+
+	testing.expect(t, cmd.name == "list", "name should be list")
+	testing.expect(t, len(cmd.args) == 0, "should have no positional args")
+	testing.expect(t, len(cmd.flags) == 0, "should have no flags")
+	testing.expect(t, len(cmd.bool_set) == 0, "should have no bool flags")
+}
+
+@(test)
+test_parse_args_positional :: proc(t: ^testing.T) {
+	cmd, ok := parse_args([]string{"envr", "backup", "/project/.env"})
+	testing.expect(t, ok, "should succeed")
+	if !ok do return
+	defer delete(cmd.args)
+	defer delete(cmd.flags)
+	defer delete(cmd.bool_set)
+
+	testing.expect(t, cmd.name == "backup")
+	testing.expect(t, len(cmd.args) == 1)
+	testing.expect(t, cmd.args[0] == "/project/.env")
+}
+
+@(test)
+test_parse_args_long_flag_with_value :: proc(t: ^testing.T) {
+	cmd, ok := parse_args([]string{"envr", "sync", "--config", "x.json"})
+	testing.expect(t, ok, "should succeed")
+	if !ok do return
+	defer delete(cmd.args)
+	defer delete(cmd.flags)
+	defer delete(cmd.bool_set)
+
+	testing.expect(t, cmd.flags["config"] == "x.json")
+}
+
+@(test)
+test_parse_args_short_flag_with_value :: proc(t: ^testing.T) {
+	cmd, ok := parse_args([]string{"envr", "sync", "-c", "x.json"})
+	testing.expect(t, ok, "should succeed")
+	if !ok do return
+	defer delete(cmd.args)
+	defer delete(cmd.flags)
+	defer delete(cmd.bool_set)
+
+	testing.expect(t, cmd.flags["c"] == "x.json")
+}
+
+@(test)
+test_parse_args_long_bool_flag :: proc(t: ^testing.T) {
+	cmd, ok := parse_args([]string{"envr", "init", "--force"})
+	testing.expect(t, ok, "should succeed")
+	if !ok do return
+	defer delete(cmd.args)
+	defer delete(cmd.flags)
+	defer delete(cmd.bool_set)
+
+	testing.expect(t, cmd.bool_set["force"] == true)
+}
+
+@(test)
+test_parse_args_short_bool_flag :: proc(t: ^testing.T) {
+	cmd, ok := parse_args([]string{"envr", "version", "-l"})
+	testing.expect(t, ok, "should succeed")
+	if !ok do return
+	defer delete(cmd.args)
+	defer delete(cmd.flags)
+	defer delete(cmd.bool_set)
+
+	testing.expect(t, cmd.bool_set["l"] == true)
+}
+
+@(test)
+test_parse_args_multiple_positionals :: proc(t: ^testing.T) {
+	cmd, ok := parse_args([]string{"envr", "backup", "a", "b"})
+	testing.expect(t, ok, "should succeed")
+	if !ok do return
+	defer delete(cmd.args)
+	defer delete(cmd.flags)
+	defer delete(cmd.bool_set)
+
+	testing.expect(t, len(cmd.args) == 2)
+	testing.expect(t, cmd.args[0] == "a")
+	testing.expect(t, cmd.args[1] == "b")
+}
+
+@(test)
+test_parse_args_mixed_flags_and_positionals :: proc(t: ^testing.T) {
+	cmd, ok := parse_args([]string{"envr", "backup", "/project/.env", "--force"})
+	testing.expect(t, ok, "should succeed")
+	if !ok do return
+	defer delete(cmd.args)
+	defer delete(cmd.flags)
+	defer delete(cmd.bool_set)
+
+	testing.expect(t, cmd.bool_set["force"] == true)
+	testing.expect(t, len(cmd.args) == 1)
+	testing.expect(t, cmd.args[0] == "/project/.env")
+}
+
+@(test)
+test_parse_args_no_args :: proc(t: ^testing.T) {
+	_, ok := parse_args([]string{"envr"})
+	testing.expect(t, !ok, "no args should return false")
+}
+
+@(test)
+test_parse_args_flag_then_positional_then_flag :: proc(t: ^testing.T) {
+	cmd, ok := parse_args([]string{"envr", "backup", "a.env", "--force", "--verbose"})
+	testing.expect(t, ok, "should succeed")
+	if !ok do return
+	defer delete(cmd.args)
+	defer delete(cmd.flags)
+	defer delete(cmd.bool_set)
+
+	testing.expect(t, cmd.bool_set["force"] == true)
+	testing.expect(t, cmd.bool_set["verbose"] == true)
+	testing.expect(t, len(cmd.args) == 1)
+	testing.expect(t, cmd.args[0] == "a.env")
+}
+
+@(test)
+test_parse_args_config_file_long_flag :: proc(t: ^testing.T) {
+	cmd, ok := parse_args([]string{"envr", "list", "--config-file", "/custom/config.json"})
+	testing.expect(t, ok, "should succeed")
+	if !ok do return
+	defer delete(cmd.args)
+	defer delete(cmd.flags)
+	defer delete(cmd.bool_set)
+
+	testing.expect(t, cmd.config_path == "/custom/config.json", "config_path should be set from --config-file")
+}
+
+@(test)
+test_parse_args_config_file_short_flag :: proc(t: ^testing.T) {
+	cmd, ok := parse_args([]string{"envr", "list", "-c", "/custom/config.json"})
+	testing.expect(t, ok, "should succeed")
+	if !ok do return
+	defer delete(cmd.args)
+	defer delete(cmd.flags)
+	defer delete(cmd.bool_set)
+
+	testing.expect(t, cmd.config_path == "/custom/config.json", "config_path should be set from -c")
+}
+
+@(test)
+test_parse_args_config_file_defaults :: proc(t: ^testing.T) {
+	cmd, ok := parse_args([]string{"envr", "list"})
+	testing.expect(t, ok, "should succeed")
+	if !ok do return
+	defer delete(cmd.args)
+	defer delete(cmd.flags)
+	defer delete(cmd.bool_set)
+
+	testing.expect(t, len(cmd.config_path) > 0, "config_path should default to non-empty path")
+	testing.expect(
+		t,
+		strings.contains(cmd.config_path, ".envr"),
+		"default config_path should contain .envr dir, got %s",
+	)
+}
+
+

cmd_backup.odin

@@ -17,19 +17,16 @@ cmd_backup :: proc(cmd: ^Command) {
 
 	file, ok := new_env_file(path)
 	if !ok {
-		// TODO: log a message
 		return
 	}
 
-	db, db_ok := db_open()
+	db, db_ok := db_open(cmd.config_path)
 	if !db_ok {
-		// TODO: log a message
 		return
 	}
 	defer db_close(&db)
 
 	if !db_insert(&db, file) {
-		// TODO: log a message
 		return
 	}
 

cmd_check.odin

@@ -11,7 +11,7 @@ cmd_check :: proc(cmd: ^Command) {
 	if len(cmd.args) > 0 {
 		check_path = cmd.args[0]
 	} else {
-		cwd, cwd_err := os.get_working_directory(context.allocator)
+		cwd, cwd_err := os.get_working_directory(context.temp_allocator)
 		if cwd_err != nil {
 			fmt.printf("Error getting current directory: %v\n", cwd_err)
 			return
@@ -31,7 +31,7 @@ cmd_check :: proc(cmd: ^Command) {
 		abs_path = resolved
 	}
 
-	db, db_ok := db_open()
+	db, db_ok := db_open(cmd.config_path)
 	if !db_ok {
 		return
 	}

cmd_deps.odin

@@ -1,10 +1,10 @@
 package main
 
-import "core:fmt"
 import "core:io"
 import "core:os"
 import "core:terminal"
 
+// TODO: Improve table rendering
 cmd_deps :: proc(cmd: ^Command) {
 	feats := check_features()
 

cmd_edit_config.odin

@@ -2,7 +2,6 @@ package main
 
 import "core:fmt"
 import "core:os"
-import "core:path/filepath"
 
 cmd_edit_config :: proc(cmd: ^Command) {
 	editor := os.get_env("EDITOR", context.allocator)
@@ -11,11 +10,7 @@ cmd_edit_config :: proc(cmd: ^Command) {
 		return
 	}
 
-	config_path, join_err := filepath.join([]string{envr_dir(), "config.json"})
+	config_path := cmd.config_path
-	if join_err != nil {
-		fmt.printf("Error building config path: %v\n", join_err)
-		return
-	}
 
 	_, stat_err := os.stat(config_path, context.allocator)
 	if stat_err != nil {

cmd_init.odin

@@ -5,10 +5,14 @@ import "core:fmt"
 cmd_init :: proc(cmd: ^Command) {
 	force := has_flag(cmd, "force") || has_flag(cmd, "f")
 
-	_, cfg_exists := load_config()
+	fmt.println(cmd.config_path)
+
+	_, cfg_exists := load_config(cmd.config_path)
 	if cfg_exists && !force {
-		fmt.println("You have already initialized envr.")
+		fmt.println(
-		fmt.println("Run again with the --force flag if you want to reinitialize.")
+			`You have already initialized envr.
+Run again with the --force flag if you want to reinitialize.`,
+		)
 		return
 	}
 
@@ -18,12 +22,13 @@ cmd_init :: proc(cmd: ^Command) {
 	}
 
 	if len(keys) == 0 {
-		fmt.println("No ssh-ed25519 keys found in ~/.ssh")
+		fmt.println(`No ssh-ed25519 keys found in ~/.ssh
-		fmt.println("Generate one with: ssh-keygen -t ed25519")
+Generate one with: ssh-keygen -t ed25519`)
 		return
 	}
 
 	selected, result := multi_select("Select SSH private keys:", keys[:])
+	defer delete(selected)
 	if result == .Cancel {
 		fmt.println("\x1b[2mCancelled.\x1b[0m")
 		return
@@ -41,7 +46,7 @@ cmd_init :: proc(cmd: ^Command) {
 		return
 	}
 
-	cfg := new_config(selected_paths[:])
+	cfg := new_config(selected_paths[:], cmd.config_path)
 	if !save_config(cfg, force = force) {
 		return
 	}

cmd_list.odin

@@ -13,8 +13,10 @@ ListEntry :: struct {
 	Path:      string `json:"path"`,
 }
 
+// TODO: Support --format flag
+// TODO: Improve table rendering
 cmd_list :: proc(cmd: ^Command) {
-	db, db_ok := db_open()
+	db, db_ok := db_open(cmd.config_path)
 	if !db_ok {
 		return
 	}
@@ -42,6 +44,7 @@ cmd_list :: proc(cmd: ^Command) {
 		w := io.to_writer(os.to_writer(os.stdout))
 		render_table(w, headers, table_rows[:])
 	} else {
+		// TODO: Should we instead print full entries here?
 		entries: [dynamic]ListEntry
 		for row in rows {
 			filename := filepath.base(row.Path)
@@ -54,7 +57,7 @@ cmd_list :: proc(cmd: ^Command) {
 			)
 		}
 
-		data, marshal_err := json.marshal(entries[:])
+		data, marshal_err := json.marshal(entries[:], allocator = context.temp_allocator)
 		if marshal_err != nil {
 			fmt.printf("Error marshaling JSON: %v\n", marshal_err)
 			return

cmd_nushell_completion.odin

@@ -5,5 +5,7 @@ import "core:fmt"
 COMPLETION_SCRIPT: string : string(#load("mod.nu"))
 
 cmd_nushell_completion :: proc(cmd: ^Command) {
+	// TODO: Use buffered writer?
 	fmt.print(COMPLETION_SCRIPT)
 }
+

cmd_remove.odin

@@ -5,38 +5,40 @@ import "core:path/filepath"
 import "core:strings"
 
 cmd_remove :: proc(cmd: ^Command) {
-    if len(cmd.args) != 1 {
+	if len(cmd.args) != 1 {
 		print_command_help("remove")
-        return
+		return
-    }
+	}
 
-    path := cmd.args[0]
+	path := cmd.args[0]
-    if len(strings.trim_space(path)) == 0 {
+	if len(strings.trim_space(path)) == 0 {
-        fmt.println("Error: No path provided")
+		fmt.println("Error: No path provided")
-        return
+		return
-    }
+	}
 
-    abs_path: string
+	// TODO: Is this the best way to do it?
-    if filepath.is_abs(path) {
+	abs_path: string
-        abs_path = path
+	if filepath.is_abs(path) {
-    } else {
+		abs_path = path
-        resolved, abs_err := filepath.abs(path)
+	} else {
-        if abs_err != nil {
+		resolved, abs_err := filepath.abs(path)
-            fmt.printf("Error getting absolute path: %v\n", abs_err)
+		if abs_err != nil {
-            return
+			fmt.printf("Error getting absolute path: %v\n", abs_err)
-        }
+			return
-        abs_path = resolved
+		}
-    }
+		abs_path = resolved
+	}
 
-    db, db_ok := db_open()
+	db, db_ok := db_open(cmd.config_path)
-    if !db_ok {
+	if !db_ok {
-        return
+		return
-    }
+	}
-    defer db_close(&db)
+	defer db_close(&db)
 
-    if !db_delete(&db, abs_path) {
+	if !db_delete(&db, abs_path) {
-        return
+		return
-    }
+	}
 
-    fmt.printf("Removed %s from the database\n", abs_path)
+	fmt.printf("Removed %s from the database\n", abs_path)
 }
+

cmd_restore.odin

@@ -6,48 +6,50 @@ import "core:path/filepath"
 import "core:strings"
 
 cmd_restore :: proc(cmd: ^Command) {
-    if len(cmd.args) != 1 {
+	if len(cmd.args) != 1 {
 		print_command_help("restore")
-        return
+		return
-    }
+	}
 
-    path := cmd.args[0]
+	path := cmd.args[0]
-    if len(strings.trim_space(path)) == 0 {
+	if len(strings.trim_space(path)) == 0 {
-        fmt.println("Error: No path provided")
+		fmt.println("Error: No path provided")
-        return
+		return
-    }
+	}
 
-    abs_path: string
+	// TODO: Is this the right way to handle this?
-    if filepath.is_abs(path) {
+	abs_path: string
-        abs_path = path
+	if filepath.is_abs(path) {
-    } else {
+		abs_path = path
-        resolved, abs_err := filepath.abs(path)
+	} else {
-        if abs_err != nil {
+		resolved, abs_err := filepath.abs(path)
-            fmt.printf("Error getting absolute path: %v\n", abs_err)
+		if abs_err != nil {
-            return
+			fmt.printf("Error getting absolute path: %v\n", abs_err)
-        }
+			return
-        abs_path = resolved
+		}
-    }
+		abs_path = resolved
+	}
 
-    db, db_ok := db_open()
+	db, db_ok := db_open(cmd.config_path)
-    if !db_ok {
+	if !db_ok {
-        return
+		return
-    }
+	}
-    defer db_close(&db)
+	defer db_close(&db)
 
-    file, fetch_ok := db_fetch(&db, abs_path)
+	file, fetch_ok := db_fetch(&db, abs_path)
-    if !fetch_ok {
+	if !fetch_ok {
-        return
+		return
-    }
+	}
 
-    dir := filepath.dir(file.Path)
+	dir := filepath.dir(file.Path)
-    os.mkdir_all(dir)
+	os.mkdir_all(dir)
 
-    write_err := os.write_entire_file(file.Path, file.contents)
+	write_err := os.write_entire_file(file.Path, file.contents)
-    if write_err != nil {
+	if write_err != nil {
-        fmt.printf("Error writing file: %v\n", write_err)
+		fmt.printf("Error writing file: %v\n", write_err)
-        return
+		return
-    }
+	}
 
-    fmt.printf("Restored %s\n", file.Path)
+	fmt.printf("Restored %s\n", file.Path)
 }
+

cmd_scan.odin

@@ -14,7 +14,7 @@ cmd_scan :: proc(cmd: ^Command) {
 		return
 	}
 
-	db, db_ok := db_open()
+	db, db_ok := db_open(cmd.config_path)
 	if !db_ok {
 		return
 	}
@@ -22,7 +22,7 @@ cmd_scan :: proc(cmd: ^Command) {
 
 	search_dirs := search_paths(db.cfg)
 	if len(search_dirs) == 0 {
-		fmt.println("No search paths configured. Please run `envr init` or edit your config.")
+		fmt.println("No search paths configured. Please run `envr init -f` or edit your config.")
 		return
 	}
 
@@ -62,6 +62,7 @@ cmd_scan :: proc(cmd: ^Command) {
 	}
 
 	selected, result := multi_select("Select .env files to backup:", files[:])
+	defer delete(selected)
 	if result == .Cancel {
 		fmt.println("\x1b[2mCancelled.\x1b[0m")
 		return

cmd_sync.odin

@@ -13,8 +13,9 @@ SyncEntry :: struct {
 }
 
 // TODO: Check for quiet failures.
+// TODO: Support --format -f flags
 cmd_sync :: proc(cmd: ^Command) {
-	db, db_ok := db_open()
+	db, db_ok := db_open(cmd.config_path)
 	if !db_ok {
 		return
 	}
@@ -26,11 +27,13 @@ cmd_sync :: proc(cmd: ^Command) {
 	}
 	defer delete(files)
 
+	// TODO: Set sane default size
 	results: [dynamic]SyncEntry
+	defer delete(results)
 
 	for &file in files {
 		old_path: string
-		old_path, _ = strings.clone(file.Path)
+		old_path, _ = strings.clone(file.Path, context.temp_allocator)
 
 		result, err_msg := db_sync(&db, &file)
 

config.odin

@@ -18,21 +18,20 @@ ScanConfig :: struct {
 }
 
 Config :: struct {
-	Keys:       [dynamic]SshKeyPair `json:"keys"`,
+	Keys:        [dynamic]SshKeyPair `json:"keys"`,
-	ScanConfig: ScanConfig `json:"scan"`,
+	ScanConfig:  ScanConfig `json:"scan"`,
+	config_path: string `json:"-"`,
 }
 
-load_config :: proc() -> (Config, bool) {
+default_config_path :: proc(home: string) -> string {
-	home, home_err := os.user_home_dir(context.temp_allocator)
+	path, err := filepath.join([]string{home, ".envr", "config.json"})
-	if home_err != nil {
+	if err != nil {
-		fmt.printf("Error getting home dir: %v\n", home_err)
+		panic("Ran out of memory when building config path")
-		return Config{}, false
-	}
-	config_path, join_err := filepath.join([]string{home, ".envr", "config.json"})
-	if join_err != nil {
-		return Config{}, false
 	}
+	return path
+}
 
+load_config :: proc(config_path: string) -> (Config, bool) {
 	data, read_err := os.read_entire_file_from_path(config_path, context.allocator)
 	if read_err != nil {
 		fmt.println("No config file found. Please run `envr init` to generate one.")
@@ -40,11 +39,13 @@ load_config :: proc() -> (Config, bool) {
 	}
 
 	cfg: Config
+	// TODO: use json 5
 	err := json.unmarshal(data, &cfg)
 	if err != nil {
 		fmt.printf("Error parsing config: %v\n", err)
 		return Config{}, false
 	}
+	cfg.config_path = config_path
 
 	return cfg, true
 }
@@ -55,15 +56,12 @@ delete_config :: proc(cfg: Config) {
 	delete(cfg.ScanConfig.Include)
 }
 
-envr_dir :: proc() -> string {
+envr_dir :: proc(config_path: string) -> string {
-	home, _ := os.user_home_dir(context.allocator)
+	return filepath.dir(config_path)
-	dir, _ := filepath.join([]string{home, ".envr"})
-	return dir
 }
 
-data_encrypted_path :: proc() -> string {
+data_encrypted_path :: proc(config_path: string) -> string {
-	dir := envr_dir()
+	path, _ := filepath.join([]string{envr_dir(config_path), "data.envr"})
-	path, _ := filepath.join([]string{dir, "data.envr"})
 	return path
 }
 
@@ -113,7 +111,10 @@ find_ssh_private_keys :: proc() -> (keys: [dynamic]string, ok: bool) {
 	return
 }
 
-new_config :: proc(private_key_paths: []string) -> Config {
+new_config :: proc(
+	private_key_paths: []string,
+	cfg_path: string = "~/.envr/config.json",
+) -> Config {
 	keys := make([dynamic]SshKeyPair, 0, len(private_key_paths))
 	for priv in private_key_paths {
 		// TODO: Is this bad?
@@ -136,30 +137,22 @@ new_config :: proc(private_key_paths: []string) -> Config {
 		Include = include,
 	}
 
-	return Config{Keys = keys, ScanConfig = scan_cfg}
+	return Config{Keys = keys, ScanConfig = scan_cfg, config_path = cfg_path}
 }
 
 save_config :: proc(cfg: Config, force: bool = false) -> bool {
-	home, home_err := os.user_home_dir(context.allocator)
+	config_dir := envr_dir(cfg.config_path)
-	if home_err != nil {
-		fmt.printf("Error getting home dir: %v\n", home_err)
-		return false
-	}
-
-	config_dir, _ := filepath.join([]string{home, ".envr"})
 
 	if !os.exists(config_dir) {
 		mkdir_err := os.make_directory(config_dir)
 		if mkdir_err != nil {
-			fmt.printf("Error creating ~/.envr directory: %v\n", mkdir_err)
+			fmt.printf("Error creating %s directory: %v\n", config_dir, mkdir_err)
 			return false
 		}
 	}
 
-	config_path, _ := filepath.join([]string{config_dir, "config.json"})
+	if os.exists(cfg.config_path) && !force {
-
+		info, stat_err := os.stat(cfg.config_path, context.allocator)
-	if os.exists(config_path) && !force {
-		info, stat_err := os.stat(config_path, context.allocator)
 		if stat_err == nil {
 			defer os.file_info_delete(info, context.allocator)
 			if info.size > 0 {
@@ -175,7 +168,7 @@ save_config :: proc(cfg: Config, force: bool = false) -> bool {
 		return false
 	}
 
-	write_err := os.write_entire_file(config_path, data)
+	write_err := os.write_entire_file(cfg.config_path, data)
 	if write_err != nil {
 		fmt.printf("Error writing config: %v\n", write_err)
 		return false

config_test.odin

@@ -1,7 +1,14 @@
 package main
 
+import "core:fmt"
+import "core:os"
+import "core:path/filepath"
+import "core:strings"
+import "core:sync"
 import "core:testing"
 
+home_mutex: sync.Mutex
+
 @(test)
 test_new_config_single_key :: proc(t: ^testing.T) {
 	paths := []string{"/home/user/.ssh/id_ed25519"}
@@ -61,3 +68,139 @@ test_new_config_exclude_patterns :: proc(t: ^testing.T) {
 	}
 }
 
+@(test)
+test_save_load_config_roundtrip :: proc(t: ^testing.T) {
+	base := fmt.tprintf("/tmp/envr-test-cfg-rt-%d", os.get_pid())
+	os.mkdir_all(base)
+	defer os.remove_all(base)
+
+	cfgPath, err := filepath.join([]string{base, "config.json"}, context.temp_allocator)
+	testing.expect(t, err == nil, "cfgPath should build successfully")
+
+	cfg := new_config([]string{"/home/user/.ssh/id_ed25519"}, cfgPath)
+	defer delete_config(cfg)
+
+	testing.expect(t, save_config(cfg, force = true), "save should succeed")
+
+	loaded, ok := load_config(cfg.config_path)
+	testing.expect(t, ok, "load should succeed")
+	if !ok do return
+	defer delete_config(loaded)
+
+	testing.expect(t, len(loaded.Keys) == 1, "should have 1 key")
+	testing.expect(t, loaded.Keys[0].Private == "/home/user/.ssh/id_ed25519")
+	testing.expect(t, loaded.Keys[0].Public == "/home/user/.ssh/id_ed25519.pub")
+	testing.expect(t, loaded.ScanConfig.Matcher == "\\.env")
+	testing.expect(t, len(loaded.ScanConfig.Exclude) == 4)
+	testing.expect(t, len(loaded.ScanConfig.Include) == 1)
+	testing.expect(t, loaded.ScanConfig.Include[0] == "~")
+}
+
+@(test)
+test_load_config_missing :: proc(t: ^testing.T) {
+	_, ok := load_config("/tmp/envr-test-cfg-nonexistent/config.json")
+	testing.expect(t, !ok, "missing config should return false")
+}
+
+@(test)
+test_save_config_no_clobber :: proc(t: ^testing.T) {
+	base := fmt.tprintf("/tmp/envr-test-cfg-noclobber-%d", os.get_pid())
+	os.mkdir_all(base)
+	defer os.remove_all(base)
+
+	cfgPath, err := filepath.join([]string{base, "config.json"}, context.temp_allocator)
+	testing.expect(t, err == nil, "cfgPath should build successfully")
+
+	cfg := new_config([]string{"/home/user/.ssh/key1"}, cfgPath)
+	defer delete_config(cfg)
+	testing.expect(t, save_config(cfg, force = true), "first save should succeed")
+
+	cfg2 := new_config([]string{"/home/user/.ssh/key2"}, cfgPath)
+	defer delete_config(cfg2)
+	testing.expect(t, !save_config(cfg2), "second save without force should fail")
+}
+
+@(test)
+test_save_config_force_overwrites :: proc(t: ^testing.T) {
+	base := fmt.tprintf("/tmp/envr-test-cfg-force-%d", os.get_pid())
+	os.mkdir_all(base)
+	defer os.remove_all(base)
+
+	cfgPath, err := filepath.join([]string{base, "config.json"}, context.temp_allocator)
+	testing.expect(t, err == nil, "cfgPath should build successfully")
+
+	cfg := new_config([]string{"/home/user/.ssh/key1"}, cfgPath)
+	defer delete_config(cfg)
+	testing.expect(t, save_config(cfg, force = true), "first save should succeed")
+
+	cfg2 := new_config([]string{"/home/user/.ssh/key2"}, cfgPath)
+	defer delete_config(cfg2)
+	testing.expect(t, save_config(cfg2, force = true), "force save should overwrite")
+
+	loaded, ok := load_config(cfgPath)
+	testing.expect(t, ok, "load should succeed")
+	if !ok do return
+	defer delete_config(loaded)
+
+	testing.expect(t, len(loaded.Keys) == 1, "should have 1 key")
+	testing.expect(
+		t,
+		loaded.Keys[0].Private == "/home/user/.ssh/key2",
+		"should be the overwritten key",
+	)
+}
+
+@(test)
+test_envr_dir :: proc(t: ^testing.T) {
+	dir := envr_dir("/tmp/envr-fake-home-envrdir/.envr/config.json")
+	testing.expectf(t, strings.has_suffix(dir, ".envr"), "dir should end with .envr, got %s", dir)
+	testing.expectf(
+		t,
+		strings.contains(dir, "envr-fake-home-envrdir"),
+		"dir should contain home dir, got %s",
+		dir,
+	)
+}
+
+@(test)
+test_data_encrypted_path :: proc(t: ^testing.T) {
+	p := data_encrypted_path("/tmp/envr-fake-home-datapath/config.json")
+	testing.expectf(t, strings.has_suffix(p, "data.envr"), "should end with data.envr, got %s", p)
+	testing.expectf(t, strings.contains(p, ".envr"), "should contain .envr dir, got %s", p)
+}
+
+@(test)
+test_search_paths_expands_tilde :: proc(t: ^testing.T) {
+	sync.mutex_lock(&home_mutex)
+	defer sync.mutex_unlock(&home_mutex)
+
+	old_home := os.get_env("HOME", context.temp_allocator)
+	defer {
+		if old_home != "" {
+			os.set_env("HOME", old_home)
+		}
+	}
+
+	os.set_env("HOME", "/tmp/envr-fake-home-search")
+
+	cfg := Config {
+		ScanConfig = ScanConfig{Include = make([dynamic]string, 0, 1)},
+	}
+	defer delete(cfg.ScanConfig.Include)
+	append(&cfg.ScanConfig.Include, "~")
+
+	paths := search_paths(cfg)
+	defer delete(paths)
+
+	testing.expect(t, len(paths) == 1, "should have 1 path")
+	if len(paths) > 0 {
+		testing.expectf(
+			t,
+			strings.contains(paths[0], "envr-fake-home-search"),
+			"should expand ~ to home, got %s",
+			paths[0],
+		)
+		testing.expect(t, !strings.contains(paths[0], "~"), "should not contain literal ~")
+	}
+}
+

crypto_test.odin

@@ -25,7 +25,11 @@ test_encrypt_decrypt_roundtrip :: proc(t: ^testing.T) {
 	testing.expect(t, dec_ok, "decryption should succeed")
 	defer delete(decrypted)
 
-	testing.expect(t, len(decrypted) == len(original), fmt.tprintf("expected %d bytes, got %d", len(original), len(decrypted)))
+	testing.expect(
+		t,
+		len(decrypted) == len(original),
+		fmt.tprintf("expected %d bytes, got %d", len(original), len(decrypted)),
+	)
 	for i in 0 ..< len(original) {
 		testing.expect(t, decrypted[i] == original[i], fmt.tprintf("byte mismatch at index %d", i))
 	}
@@ -50,8 +54,16 @@ test_encrypt_decrypt_multi_recipient :: proc(t: ^testing.T) {
 	defer delete(decrypted2)
 
 	for i in 0 ..< len(original) {
-		testing.expect(t, decrypted1[i] == original[i], fmt.tprintf("key1: byte mismatch at %d", i))
+		testing.expect(
-		testing.expect(t, decrypted2[i] == original[i], fmt.tprintf("key2: byte mismatch at %d", i))
+			t,
+			decrypted1[i] == original[i],
+			fmt.tprintf("key1: byte mismatch at %d", i),
+		)
+		testing.expect(
+			t,
+			decrypted2[i] == original[i],
+			fmt.tprintf("key2: byte mismatch at %d", i),
+		)
 	}
 }
 
@@ -85,6 +97,25 @@ test_encrypt_empty_plaintext :: proc(t: ^testing.T) {
 	testing.expect(t, len(decrypted) == 0, "decrypted empty data should be empty")
 }
 
+@(test)
+test_recipient_can_decrypt_senders_data :: proc(t: ^testing.T) {
+	key1 := make_test_key_pair("test_ed25519")
+	key2 := make_test_key_pair("test_ed25519_second")
+	original := []u8{10, 20, 30, 40, 50}
+
+	encrypted, enc_ok := encrypt(original, []SshKeyPair{key1, key2})
+	testing.expect(t, enc_ok, "encryption with 2 keys should succeed")
+	defer delete(encrypted)
+
+	decrypted, dec_ok := decrypt(encrypted, []SshKeyPair{key2})
+	testing.expect(t, dec_ok, "second recipient should decrypt without the sender key present")
+	defer delete(decrypted)
+
+	for i in 0 ..< len(original) {
+		testing.expect(t, decrypted[i] == original[i], fmt.tprintf("byte mismatch at %d", i))
+	}
+}
+
 @(test)
 test_ciphertext_has_magic :: proc(t: ^testing.T) {
 	key := make_test_key_pair("test_ed25519")
@@ -100,3 +131,4 @@ test_ciphertext_has_magic :: proc(t: ^testing.T) {
 	testing.expect(t, encrypted[2] == u8('V'), "magic byte 2")
 	testing.expect(t, encrypted[3] == u8('R'), "magic byte 3")
 }
+

db.odin

@@ -27,6 +27,7 @@ SyncDirection :: enum {
 }
 
 Db :: struct {
+	// Pointer to the sqlite db
 	db:      ^rawptr,
 	cfg:     Config,
 	changed: bool,
@@ -48,13 +49,13 @@ make_temp_path :: proc() -> string {
 	return strings.to_string(b)
 }
 
-db_open :: proc() -> (Db, bool) {
+db_open :: proc(cfg_path: string) -> (Db, bool) {
-	cfg, ok := load_config()
+	cfg, ok := load_config(cfg_path)
 	if !ok {
 		return Db{}, false
 	}
 
-	data_path := data_encrypted_path()
+	data_path := data_encrypted_path(cfg.config_path)
 	_, stat_err := os.stat(data_path, context.allocator)
 
 	db: ^rawptr
@@ -64,8 +65,8 @@ db_open :: proc() -> (Db, bool) {
 		return Db{}, false
 	}
 
-	create_sql := "CREATE TABLE IF NOT EXISTS envr_env_files (path TEXT PRIMARY KEY NOT NULL, remotes TEXT, sha256 TEXT NOT NULL, contents TEXT NOT NULL)"
+	create_sql: cstring = "CREATE TABLE IF NOT EXISTS envr_env_files (path TEXT PRIMARY KEY NOT NULL, remotes TEXT, sha256 TEXT NOT NULL, contents TEXT NOT NULL)"
-	rc = sqlite.db_exec(db, string_to_cstring(create_sql), nil, nil, nil)
+	rc = sqlite.db_exec(db, create_sql, nil, nil, nil)
 	if rc != sqlite.OK {
 		fmt.printf("Error creating table: %s\n", sqlite.db_errmsg(db))
 		sqlite.db_close(db)
@@ -108,8 +109,8 @@ db_close :: proc(d: ^Db) {
 			return
 		}
 
-		data_path := data_encrypted_path()
+		data_path := data_encrypted_path(d.cfg.config_path)
-		envr_d := envr_dir()
+		envr_d := envr_dir(d.cfg.config_path)
 		os.mkdir_all(envr_d)
 
 		write_err := os.write_entire_file(data_path, encrypted)
@@ -125,10 +126,15 @@ db_close :: proc(d: ^Db) {
 	sqlite.db_close(d.db)
 }
 
-db_list :: proc(d: ^Db) -> (results: [dynamic]EnvFile, ok: bool) {
+db_list :: proc(d: ^Db, allocator := context.allocator) -> (results: [dynamic]EnvFile, ok: bool) {
-	sql := "SELECT path, remotes, sha256, contents FROM envr_env_files"
 	stmt: ^rawptr
-	rc := sqlite.prepare_v2(d.db, string_to_cstring(sql), -1, &stmt, nil)
+	rc := sqlite.prepare_v2(
+		d.db,
+		"SELECT path, remotes, sha256, contents FROM envr_env_files",
+		-1,
+		&stmt,
+		nil,
+	)
 	if rc != sqlite.OK {
 		fmt.printf("Error preparing query: %s\n", sqlite.db_errmsg(d.db))
 		return
@@ -145,15 +151,12 @@ db_list :: proc(d: ^Db) -> (results: [dynamic]EnvFile, ok: bool) {
 			return
 		}
 
-		path := cstring_to_string(sqlite.column_text(stmt, 0))
+		remotes_json := string(sqlite.column_text(stmt, 1))
-		remotes_json := cstring_to_string(sqlite.column_text(stmt, 1))
+		remotes := make([dynamic]string, strings.count(remotes_json, ",") + 1, allocator)
-		sha := cstring_to_string(sqlite.column_text(stmt, 2))
-		contents := cstring_to_string(sqlite.column_text(stmt, 3))
-
-		remotes: [dynamic]string
 		if len(remotes_json) > 0 {
 			json.unmarshal_string(remotes_json, &remotes)
 		}
+		path := clone_cstring(sqlite.column_text(stmt, 0), allocator)
 
 		append(
 			&results,
@@ -161,8 +164,8 @@ db_list :: proc(d: ^Db) -> (results: [dynamic]EnvFile, ok: bool) {
 				Path = path,
 				Dir = filepath.dir(path),
 				Remotes = remotes,
-				Sha256 = sha,
+				Sha256 = clone_cstring(sqlite.column_text(stmt, 2), allocator),
-				contents = contents,
+				contents = clone_cstring(sqlite.column_text(stmt, 3), allocator),
 			},
 		)
 	}
@@ -176,8 +179,7 @@ db_vacuum_to_file :: proc(db: ^rawptr, path: string) -> bool {
 	b: strings.Builder
 	strings.builder_init(&b)
 	fmt.sbprintf(&b, "VACUUM INTO '%s'", path)
-	sql := strings.to_string(b)
+	rc := sqlite.db_exec(db, to_cstring(&b), nil, nil, nil)
-	rc := sqlite.db_exec(db, string_to_cstring(sql), nil, nil, nil)
 	if rc != sqlite.OK {
 		fmt.printf("Error vacuuming database: %s\n", sqlite.db_errmsg(db))
 		return false
@@ -186,7 +188,7 @@ db_vacuum_to_file :: proc(db: ^rawptr, path: string) -> bool {
 }
 
 db_restore_from_encrypted :: proc(db: ^rawptr, cfg: Config) -> bool {
-	data_path := data_encrypted_path()
+	data_path := data_encrypted_path(cfg.config_path)
 	encrypted_data, read_err := os.read_entire_file_from_path(data_path, context.temp_allocator)
 	if read_err != nil {
 		fmt.printf("Error reading encrypted database: %v\n", read_err)
@@ -221,7 +223,7 @@ db_attach_and_copy :: proc(mem_db: ^rawptr, src_path: string) -> bool {
 	fmt.sbprintf(&b, "ATTACH DATABASE '%s' AS source", src_path)
 	attach_sql := strings.to_string(b)
 
-	rc := sqlite.db_exec(mem_db, string_to_cstring(attach_sql), nil, nil, nil)
+	rc := sqlite.db_exec(mem_db, to_cstring(attach_sql), nil, nil, nil)
 	if rc != sqlite.OK {
 		fmt.printf("Error attaching database: %s\n", sqlite.db_errmsg(mem_db))
 		return false
@@ -284,8 +286,7 @@ get_git_remotes :: proc(dir: string) -> [dynamic]string {
 		return remotes
 	}
 
-	output_str := string(data)
+	lines := strings.split(string(data), "\n")
-	lines := strings.split(output_str, "\n")
 
 	for &line in lines {
 		line = strings.trim_space(line)
@@ -312,7 +313,10 @@ new_env_file :: proc(path: string) -> (EnvFile, bool) {
 		fmt.printf("Error getting absolute path: %v\n", abs_err)
 		return EnvFile{}, false
 	}
-	cloned_path, _ := strings.clone(abs_path)
+	cloned_path, err := strings.clone(abs_path)
+	if err != nil {
+		panic("Ran out of memory")
+	}
 
 	dir := filepath.dir(cloned_path)
 
@@ -325,14 +329,14 @@ new_env_file :: proc(path: string) -> (EnvFile, bool) {
 	}
 
 	digest := hash.hash_bytes(hash.Algorithm.SHA256, data)
+	// TODO: Handle error
 	hex_bytes, _ := hex.encode(digest)
-	sha_str := string(hex_bytes)
 
 	return EnvFile {
 			Path = cloned_path,
 			Dir = dir,
 			Remotes = remotes,
-			Sha256 = sha_str,
+			Sha256 = string(hex_bytes),
 			contents = string(data),
 		},
 		true
@@ -345,19 +349,33 @@ db_insert :: proc(d: ^Db, file: EnvFile) -> bool {
 		return false
 	}
 
-	sql := "INSERT OR REPLACE INTO envr_env_files (path, remotes, sha256, contents) VALUES (?, ?, ?, ?)"
+	sql: cstring =
+		"INSERT OR REPLACE INTO " +
+		"envr_env_files (path, remotes, sha256, contents) VALUES (?, ?, ?, ?)"
 	stmt: ^rawptr
-	rc := sqlite.prepare_v2(d.db, string_to_cstring(sql), -1, &stmt, nil)
+	rc := sqlite.prepare_v2(d.db, sql, -1, &stmt, nil)
 	if rc != sqlite.OK {
 		fmt.printf("Error preparing insert: %s\n", sqlite.db_errmsg(d.db))
 		return false
 	}
 	defer sqlite.finalize(stmt)
 
-	rc = sqlite.bind_text(stmt, 1, string_to_cstring(file.Path), -1, nil)
+	// TODO: deal with elsewhere?
-	rc = sqlite.bind_text(stmt, 2, string_to_cstring(string(remotes_json)), -1, nil)
+	cpath := to_cstring(file.Path)
-	rc = sqlite.bind_text(stmt, 3, string_to_cstring(file.Sha256), -1, nil)
+	defer delete(cpath)
-	rc = sqlite.bind_text(stmt, 4, string_to_cstring(file.contents), -1, nil)
+	rc = sqlite.bind_text(stmt, 1, cpath, -1, nil)
+
+	cremotes := to_cstring(string(remotes_json))
+	defer delete(cremotes)
+	rc = sqlite.bind_text(stmt, 2, cremotes, -1, nil)
+
+	csha := to_cstring(file.Sha256)
+	defer delete(csha)
+	rc = sqlite.bind_text(stmt, 3, csha, -1, nil)
+
+	ccontents := to_cstring(file.contents)
+	defer delete(ccontents)
+	rc = sqlite.bind_text(stmt, 4, ccontents, -1, nil)
 
 	rc = sqlite.step(stmt)
 	if rc != sqlite.DONE {
@@ -369,17 +387,19 @@ db_insert :: proc(d: ^Db, file: EnvFile) -> bool {
 	return true
 }
 
-db_fetch :: proc(d: ^Db, path: string) -> (EnvFile, bool) {
+db_fetch :: proc(d: ^Db, path: string, allocator := context.allocator) -> (EnvFile, bool) {
-	sql := "SELECT path, remotes, sha256, contents FROM envr_env_files WHERE path = ?"
+	sql: cstring = "SELECT path, remotes, sha256, contents FROM envr_env_files WHERE path = ?"
 	stmt: ^rawptr
-	rc := sqlite.prepare_v2(d.db, string_to_cstring(sql), -1, &stmt, nil)
+	rc := sqlite.prepare_v2(d.db, sql, -1, &stmt, nil)
 	if rc != sqlite.OK {
 		fmt.printf("Error preparing fetch: %s\n", sqlite.db_errmsg(d.db))
 		return EnvFile{}, false
 	}
 	defer sqlite.finalize(stmt)
 
-	rc = sqlite.bind_text(stmt, 1, string_to_cstring(path), -1, nil)
+	cpath := to_cstring(path, allocator)
+	defer delete(cpath, allocator)
+	rc = sqlite.bind_text(stmt, 1, cpath, -1, nil)
 	rc = sqlite.step(stmt)
 	if rc == sqlite.DONE {
 		fmt.printf("No file found with path: %s\n", path)
@@ -390,38 +410,37 @@ db_fetch :: proc(d: ^Db, path: string) -> (EnvFile, bool) {
 		return EnvFile{}, false
 	}
 
-	file_path := cstring_to_string(sqlite.column_text(stmt, 0))
+	remotes_json := string(sqlite.column_text(stmt, 1))
-	remotes_json := cstring_to_string(sqlite.column_text(stmt, 1))
+	remotes := make([dynamic]string, strings.count(remotes_json, ",") + 1, allocator)
-	sha := cstring_to_string(sqlite.column_text(stmt, 2))
-	contents := cstring_to_string(sqlite.column_text(stmt, 3))
-
-	remotes: [dynamic]string
 	if len(remotes_json) > 0 {
-		json.unmarshal_string(remotes_json, &remotes)
+		json.unmarshal_string(remotes_json, &remotes, allocator = allocator)
 	}
 
-	cloned_path, _ := strings.clone(file_path)
+	file_path := clone_cstring(sqlite.column_text(stmt, 0))
+
 	return EnvFile {
-			Path = cloned_path,
+			Path = file_path,
-			Dir = filepath.dir(cloned_path),
+			Dir = filepath.dir(file_path),
 			Remotes = remotes,
-			Sha256 = sha,
+			Sha256 = clone_cstring(sqlite.column_text(stmt, 2), allocator),
-			contents = contents,
+			contents = clone_cstring(sqlite.column_text(stmt, 3), allocator),
 		},
 		true
 }
 
 db_delete :: proc(d: ^Db, path: string) -> bool {
-	sql := "DELETE FROM envr_env_files WHERE path = ?"
+	sql: cstring = "DELETE FROM envr_env_files WHERE path = ?"
 	stmt: ^rawptr
-	rc := sqlite.prepare_v2(d.db, string_to_cstring(sql), -1, &stmt, nil)
+	rc := sqlite.prepare_v2(d.db, sql, -1, &stmt, nil)
 	if rc != sqlite.OK {
 		fmt.printf("Error preparing delete: %s\n", sqlite.db_errmsg(d.db))
 		return false
 	}
 	defer sqlite.finalize(stmt)
 
-	rc = sqlite.bind_text(stmt, 1, string_to_cstring(path), -1, nil)
+	cpath := to_cstring(path)
+	defer delete(cpath)
+	rc = sqlite.bind_text(stmt, 1, cpath, -1, nil)
 	rc = sqlite.step(stmt)
 	if rc != sqlite.DONE {
 		fmt.printf("Error deleting: %s\n", sqlite.db_errmsg(d.db))
@@ -437,19 +456,30 @@ db_delete :: proc(d: ^Db, path: string) -> bool {
 	return true
 }
 
-cstring_to_string :: proc(cs: cstring) -> string {
+to_cstring :: proc {
-	if cs == nil {
+	string_to_cstring,
-		return ""
+	strings.to_cstring,
-	}
-	s, _ := strings.clone_from_cstring(cs)
-	return s
 }
 
-string_to_cstring :: proc(s: string) -> cstring {
+string_to_cstring :: proc(s: string, allocator := context.allocator) -> cstring {
-	cs, _ := strings.clone_to_cstring(s)
+	cs, err := strings.clone_to_cstring(s, allocator)
+	if err != nil {
+		fmt.printf("Failed to convert string to cstring: %v\n", err)
+		panic("Allocation Exception")
+	}
 	return cs
 }
 
+clone_cstring :: proc(c: cstring, allocator := context.allocator) -> string {
+	str, err := strings.clone_from_cstring(c, allocator)
+	if err != nil {
+		fmt.printf("Failed to convert string to cstring: %v\n", err)
+		panic("Allocation Exception")
+	}
+
+	return str
+}
+
 db_update_required :: proc(status: SyncFlag) -> bool {
 	return .BackedUp in status || .DirUpdated in status
 }
@@ -505,7 +535,11 @@ env_file_backup :: proc(f: ^EnvFile) -> bool {
 
 	f.contents = string(data)
 	digest := hash.hash_bytes(hash.Algorithm.SHA256, data)
-	hex_bytes, _ := hex.encode(digest)
+	hex_bytes, alloc_err := hex.encode(digest)
+	if alloc_err != nil {
+		fmt.printf("Error generating hash for file %s: %v\n", f.Path, alloc_err)
+		return false
+	}
 	f.Sha256 = string(hex_bytes)
 	return true
 }
@@ -555,6 +589,7 @@ env_file_sync :: proc(f: ^EnvFile, dir: SyncDirection, d: ^Db) -> (SyncFlag, str
 	}
 
 	digest := hash.hash_bytes(hash.Algorithm.SHA256, data)
+	// TODO: Handle error
 	hex_bytes, _ := hex.encode(digest)
 	current_sha := string(hex_bytes)
 

db_integration_test.odin

@@ -199,7 +199,7 @@ test_decrypt_then_attach_sqlite :: proc(t: ^testing.T) {
 	rc = sqlite.step(stmt)
 	testing.expect(t, rc == sqlite.ROW, "expected at least one row")
 	if rc == sqlite.ROW {
-		path := cstring_to_string(sqlite.column_text(stmt, 0))
+		path := string(sqlite.column_text(stmt, 0))
 		testing.expect(t, len(path) > 0, "path should not be empty")
 	}
 }

db_test.odin

@@ -2,6 +2,8 @@ package main
 
 import "core:fmt"
 import "core:os"
+import "core:path/filepath"
+import "core:strings"
 import "core:testing"
 
 import "sqlite"
@@ -25,11 +27,11 @@ make_test_db :: proc() -> (Db, bool) {
 
 make_test_env_file :: proc(path, sha, contents: string, remotes: []string = {}) -> EnvFile {
 	f := EnvFile {
-		Path = path,
+		Path     = path,
-		Dir = "",
+		Dir      = "",
-		Sha256 = sha,
+		Sha256   = sha,
 		contents = contents,
-		Remotes = make([dynamic]string, 0, len(remotes)),
+		Remotes  = make([dynamic]string, 0, len(remotes)),
 	}
 	for r in remotes {
 		append(&f.Remotes, r)
@@ -44,12 +46,11 @@ test_db_insert_and_fetch :: proc(t: ^testing.T) {
 	if !ok do return
 	defer sqlite.db_close(d.db)
 
-	f := make_test_env_file(
+	path := "/project/.env"
-		"/project/.env",
+	sha := "abc123"
-		"abc123",
+	contents := "SECRET=value"
-		"SECRET=value",
+
-		[]string{"git@github.com:user/repo.git"},
+	f := make_test_env_file(path, sha, contents, []string{"git@github.com:user/repo.git"})
-	)
 	defer delete(f.Remotes)
 
 	testing.expect(t, db_insert(&d, f), "insert should succeed")
@@ -59,11 +60,11 @@ test_db_insert_and_fetch :: proc(t: ^testing.T) {
 	if !fetch_ok do return
 	defer delete(fetched.Remotes)
 
-	testing.expect(t, fetched.Path == "/project/.env", "path mismatch")
+	testing.expect_value(t, fetched.Path, path)
-	testing.expect(t, fetched.Sha256 == "abc123", "sha mismatch")
+	testing.expect_value(t, fetched.Sha256, sha)
-	testing.expect(t, fetched.contents == "SECRET=value", "contents mismatch")
+	testing.expect_value(t, fetched.contents, contents)
-	testing.expect(t, len(fetched.Remotes) == 1, "remotes count mismatch")
+	testing.expect_value(t, len(fetched.Remotes), 1)
-	testing.expect(t, fetched.Remotes[0] == "git@github.com:user/repo.git", "remote mismatch")
+	testing.expect_value(t, fetched.Remotes[0], "git@github.com:user/repo.git")
 }
 
 @(test)
@@ -319,3 +320,78 @@ test_shares_remote_both_empty :: proc(t: ^testing.T) {
 	testing.expect(t, !shares_remote(&f, remotes), "both empty should not share")
 }
 
+@(test)
+test_make_temp_path_format :: proc(t: ^testing.T) {
+	p := make_temp_path()
+	testing.expect(t, strings.has_suffix(p, ".db"), "should end with .db")
+	testing.expect(t, strings.contains(p, fmt.tprintf("%d", os.get_pid())), "should contain PID")
+}
+
+@(test)
+test_new_env_file :: proc(t: ^testing.T) {
+	base := fmt.tprintf("/tmp/envr-test-envfile-%d", os.get_pid())
+	os.mkdir_all(base)
+	defer os.remove_all(base)
+
+	env_path := fmt.tprintf("%s/.env", base)
+	err := os.write_entire_file(env_path, "SECRET=value\n")
+	testing.expect(t, err == nil, ".env file should exists")
+
+	file, ok := new_env_file(env_path)
+	testing.expect(t, ok, "new_env_file should succeed")
+	if !ok do return
+	defer delete(file.Remotes)
+
+	testing.expect(t, filepath.is_abs(file.Path), "path should be absolute")
+	testing.expect(t, strings.has_suffix(file.Path, "/.env"), "path should end with /.env")
+	testing.expect(t, file.contents == "SECRET=value\n", "contents mismatch")
+	testing.expect(t, len(file.Sha256) == 64, "sha256 should be 64 hex chars")
+}
+
+@(test)
+test_new_env_file_missing :: proc(t: ^testing.T) {
+	_, ok := new_env_file("/tmp/envr-nonexistent-envfile/path/.env")
+	testing.expect(t, !ok, "missing file should return false")
+}
+
+@(test)
+test_env_file_backup :: proc(t: ^testing.T) {
+	base := fmt.tprintf("/tmp/envr-test-backup-%d", os.get_pid())
+	os.mkdir_all(base)
+	defer os.remove_all(base)
+
+	env_path := fmt.tprintf("%s/.env", base)
+	err := os.write_entire_file(env_path, "KEY=12345\n")
+	testing.expect(t, err == nil, ".env file should exist")
+
+	f := EnvFile {
+		Path = env_path,
+	}
+	testing.expect(t, env_file_backup(&f), "backup should succeed")
+	testing.expect(t, f.contents == "KEY=12345\n", "contents should be populated")
+	testing.expect(t, len(f.Sha256) == 64, "sha256 should be 64 hex chars")
+}
+
+@(test)
+test_env_file_backup_missing :: proc(t: ^testing.T) {
+	f := EnvFile {
+		Path = "/tmp/envr-nonexistent-backup/.env",
+	}
+	testing.expect(t, !env_file_backup(&f), "missing file should return false")
+}
+
+@(test)
+test_update_dir :: proc(t: ^testing.T) {
+	f := EnvFile {
+		Path    = "/old/project/.env",
+		Dir     = "/old/project",
+		Remotes = make([dynamic]string, 0),
+	}
+	defer delete(f.Remotes)
+
+	update_dir(&f, "/new/location")
+
+	testing.expect(t, f.Dir == "/new/location", "dir should be updated")
+	testing.expect(t, f.Path == "/new/location/.env", "path should be updated")
+}
+

main.odin

@@ -4,7 +4,7 @@ import "core:fmt"
 import "core:os"
 
 main :: proc() {
-	cmd, ok := parse_args()
+	cmd, ok := parse_args(os.args)
 	if !ok {
 		return
 	}

prompt.odin

@@ -113,10 +113,14 @@ MultiSelect_Result :: enum {
 
 MAX_VISIBLE :: 7
 
+// Caller is responsible for deleting the responses.
 multi_select :: proc(
 	prompt: string,
 	options: []string,
-) -> (selected: [dynamic]bool, result: MultiSelect_Result) {
+) -> (
+	selected: [dynamic]bool,
+	result: MultiSelect_Result,
+) {
 	if len(options) == 0 {
 		return
 	}
@@ -166,18 +170,21 @@ multi_select :: proc(
 	}
 }
 
-render_options :: proc(prompt: string, options: []string, selected: []bool, cursor: int, scroll_offset: int) -> int {
+render_options :: proc(
-	fmt.printf(
+	prompt: string,
-		"\x1b[1;36m%s\x1b[0m (↑/↓ move, space select, enter confirm)\r\n",
+	options: []string,
-		prompt,
+	selected: []bool,
-	)
+	cursor: int,
+	scroll_offset: int,
+) -> int {
+	fmt.printf("\x1b[1;36m%s\x1b[0m (↑/↓ move, space select, enter confirm)\r\n", prompt)
 
 	end := scroll_offset + MAX_VISIBLE
 	if end > len(options) {
 		end = len(options)
 	}
 
-	for i in scroll_offset..<end {
+	for i in scroll_offset ..< end {
 		checkbox := " "
 		if selected[i] {
 			checkbox = "x"
@@ -191,3 +198,4 @@ render_options :: proc(prompt: string, options: []string, selected: []bool, curs
 
 	return end - scroll_offset
 }
+

scan.odin

@@ -69,6 +69,7 @@ run_fd :: proc(args: []string) -> (lines: []string, ok: bool) {
 	tmp_path := next_fd_tmp_path()
 	tmp_file, tmp_err := os.open(tmp_path, os.O_CREATE | os.O_WRONLY | os.O_TRUNC)
 	if tmp_err != nil {
+		// TODO: Log a message here
 		return
 	}
 

scan_test.odin

@@ -3,6 +3,7 @@ package main
 import "core:fmt"
 import "core:os"
 import "core:path/filepath"
+import "core:strings"
 import "core:testing"
 
 @(test)
@@ -85,3 +86,11 @@ test_scan_path_empty_dir :: proc(t: ^testing.T) {
 	testing.expect(t, len(results) == 0, fmt.tprintf("expected 0 results, got %d", len(results)))
 }
 
+@(test)
+test_scan_meets_expectations :: proc(t: ^testing.T) {
+	testing.expect(t, cant_scan({}), "no features should mean can't scan")
+	testing.expect(t, cant_scan({.Git}), "Git alone should mean can't scan")
+	testing.expect(t, !cant_scan({.Fd}), "having Fd should mean can scan")
+	testing.expect(t, !cant_scan({.Fd, .Git}), "both Fd and Git should mean can scan")
+}
+