feat: toml config support (#9)
## What's new - TOML config support - add config init command to justfile https://github.com/versenilvis/IRIS/pull/9/commits/a5bb6c23d74ca73385b3590d2eb275ce6429906b - add copy binary file to local bin on reload https://github.com/versenilvis/IRIS/pull/9/commits/4da3acdbc58c28f20fa0021d15fec82823ba392b - init config on setup https://github.com/versenilvis/IRIS/pull/9/commits/fb48b6bb832f38e24fab9211d92858bab9a58a07 ## Fix - add lsof to support macos because /proc filesystem is Linux-specific and does not exist on macOS 0439d829573864fcf902fc4127f7d45384bfab01 - git push doesnt suggest current branch, fix https://github.com/versenilvis/IRIS/pull/9/commits/b498532b401b764a4a1a2c70b3cb44b7caf72320 - use timeout context for lsof command in reload handler https://github.com/versenilvis/IRIS/pull/9/commits/1a2baee951e6538a729da12aedfe53960e51102d
This commit is contained in:
VERSE
GitHub
@@ -0,0 +1,236 @@
|
||||
package tests
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"os"
|
||||
"path/filepath"
|
||||
"testing"
|
||||
"time"
|
||||
|
||||
"github.com/versenilvis/iris/config"
|
||||
"github.com/versenilvis/iris/root"
|
||||
)
|
||||
|
||||
func TestDefaultConfigAndState(t *testing.T) {
|
||||
cfg := config.DefaultConfig()
|
||||
if cfg.Core.Version != 1 {
|
||||
t.Errorf("expected version 1, got %d", cfg.Core.Version)
|
||||
}
|
||||
if cfg.UI.MaxSuggestions != 100 {
|
||||
t.Errorf("expected suggestions 100, got %d", cfg.UI.MaxSuggestions)
|
||||
}
|
||||
|
||||
state := config.DefaultState()
|
||||
if state.LastMode != "spec" {
|
||||
t.Errorf("expected last mode spec, got %q", state.LastMode)
|
||||
}
|
||||
}
|
||||
|
||||
func TestCustomDuration(t *testing.T) {
|
||||
var dur config.Duration
|
||||
err := dur.UnmarshalText([]byte("6h"))
|
||||
if err != nil {
|
||||
t.Fatalf("unexpected error unmarshalling duration: %v", err)
|
||||
}
|
||||
if time.Duration(dur) != 6*time.Hour {
|
||||
t.Errorf("expected 6 hours, got %v", time.Duration(dur))
|
||||
}
|
||||
|
||||
b, err := dur.MarshalText()
|
||||
if err != nil {
|
||||
t.Fatalf("unexpected error marshaling duration: %v", err)
|
||||
}
|
||||
if string(b) != "6h0m0s" {
|
||||
t.Errorf("expected 6h0m0s, got %q", string(b))
|
||||
}
|
||||
|
||||
err = dur.UnmarshalText([]byte("invalid"))
|
||||
if err == nil {
|
||||
t.Errorf("expected error for invalid duration")
|
||||
}
|
||||
}
|
||||
|
||||
func TestValidationAndEnvironmentOverrides(t *testing.T) {
|
||||
tmpDir, err := os.MkdirTemp("", "iris-config-env-test")
|
||||
if err != nil {
|
||||
t.Fatalf("failed to create temp dir: %v", err)
|
||||
}
|
||||
defer os.RemoveAll(tmpDir)
|
||||
|
||||
_ = os.Setenv("XDG_CONFIG_HOME", tmpDir)
|
||||
defer func() { _ = os.Unsetenv("XDG_CONFIG_HOME") }()
|
||||
|
||||
_ = os.Setenv("IRIS_CORE_DEBUG", "true")
|
||||
_ = os.Setenv("IRIS_CORE_SHELL", "fish")
|
||||
_ = os.Setenv("IRIS_CORE_MODE", "history")
|
||||
_ = os.Setenv("IRIS_UI_GHOST_TEXT", "false")
|
||||
_ = os.Setenv("IRIS_UI_MAX_SUGGESTIONS", "250")
|
||||
_ = os.Setenv("IRIS_UI_MAX_HEIGHT", "25")
|
||||
_ = os.Setenv("IRIS_UPDATER_CHANNEL", "nightly")
|
||||
_ = os.Setenv("IRIS_UPDATER_INTERVAL", "12h")
|
||||
_ = os.Setenv("IRIS_UPDATER_CHECK_ON_STARTUP", "false")
|
||||
|
||||
defer func() {
|
||||
_ = os.Unsetenv("IRIS_CORE_DEBUG")
|
||||
_ = os.Unsetenv("IRIS_CORE_SHELL")
|
||||
_ = os.Unsetenv("IRIS_CORE_MODE")
|
||||
_ = os.Unsetenv("IRIS_UI_GHOST_TEXT")
|
||||
_ = os.Unsetenv("IRIS_UI_MAX_SUGGESTIONS")
|
||||
_ = os.Unsetenv("IRIS_UI_MAX_HEIGHT")
|
||||
_ = os.Unsetenv("IRIS_UPDATER_CHANNEL")
|
||||
_ = os.Unsetenv("IRIS_UPDATER_INTERVAL")
|
||||
_ = os.Unsetenv("IRIS_UPDATER_CHECK_ON_STARTUP")
|
||||
}()
|
||||
|
||||
cfg, err := config.Load()
|
||||
if err != nil {
|
||||
t.Fatalf("failed to load config: %v", err)
|
||||
}
|
||||
|
||||
if !cfg.Core.Debug {
|
||||
t.Errorf("expected debug to be true")
|
||||
}
|
||||
if cfg.Core.Shell != "fish" {
|
||||
t.Errorf("expected shell fish, got %q", cfg.Core.Shell)
|
||||
}
|
||||
if cfg.Core.Mode != "history" {
|
||||
t.Errorf("expected mode history, got %q", cfg.Core.Mode)
|
||||
}
|
||||
if cfg.UI.GhostText {
|
||||
t.Errorf("expected ghost text to be false")
|
||||
}
|
||||
if cfg.UI.MaxSuggestions != 250 {
|
||||
t.Errorf("expected max suggestions 250, got %d", cfg.UI.MaxSuggestions)
|
||||
}
|
||||
if cfg.UI.MaxHeight != 25 {
|
||||
t.Errorf("expected max height 25, got %d", cfg.UI.MaxHeight)
|
||||
}
|
||||
if cfg.Updater.Channel != "nightly" {
|
||||
t.Errorf("expected channel nightly, got %q", cfg.Updater.Channel)
|
||||
}
|
||||
if time.Duration(cfg.Updater.CheckInterval) != 12*time.Hour {
|
||||
t.Errorf("expected 12h, got %v", time.Duration(cfg.Updater.CheckInterval))
|
||||
}
|
||||
if cfg.Updater.CheckOnStartup {
|
||||
t.Errorf("expected check on startup to be false")
|
||||
}
|
||||
|
||||
_ = os.Setenv("IRIS_CORE_MODE", "invalid")
|
||||
_, err = config.Load()
|
||||
if err == nil {
|
||||
t.Errorf("expected validation error for invalid mode in env")
|
||||
}
|
||||
}
|
||||
|
||||
func TestLoadSave(t *testing.T) {
|
||||
tmpDir, err := os.MkdirTemp("", "iris-config-test")
|
||||
if err != nil {
|
||||
t.Fatalf("failed to create temp dir: %v", err)
|
||||
}
|
||||
defer os.RemoveAll(tmpDir)
|
||||
|
||||
_ = os.Setenv("XDG_CONFIG_HOME", tmpDir)
|
||||
defer func() { _ = os.Unsetenv("XDG_CONFIG_HOME") }()
|
||||
|
||||
cfg, err := config.Load()
|
||||
if err != nil {
|
||||
t.Fatalf("failed to load: %v", err)
|
||||
}
|
||||
|
||||
cfg.Core.Shell = "zsh"
|
||||
cfg.UI.MaxHeight = 20
|
||||
|
||||
err = config.Save(cfg)
|
||||
if err != nil {
|
||||
t.Fatalf("failed to save: %v", err)
|
||||
}
|
||||
|
||||
loaded, err := config.Load()
|
||||
if err != nil {
|
||||
t.Fatalf("failed to load after save: %v", err)
|
||||
}
|
||||
|
||||
if loaded.Core.Shell != "zsh" {
|
||||
t.Errorf("expected loaded shell to be zsh, got %q", loaded.Core.Shell)
|
||||
}
|
||||
if loaded.UI.MaxHeight != 20 {
|
||||
t.Errorf("expected loaded height to be 20, got %d", loaded.UI.MaxHeight)
|
||||
}
|
||||
}
|
||||
|
||||
func TestMigration(t *testing.T) {
|
||||
tmpDir, err := os.MkdirTemp("", "iris-migrate-test")
|
||||
if err != nil {
|
||||
t.Fatalf("failed to create temp dir: %v", err)
|
||||
}
|
||||
defer os.RemoveAll(tmpDir)
|
||||
|
||||
_ = os.Setenv("HOME", tmpDir)
|
||||
_ = os.Setenv("XDG_DATA_HOME", filepath.Join(tmpDir, ".local", "share"))
|
||||
defer func() {
|
||||
_ = os.Unsetenv("HOME")
|
||||
_ = os.Unsetenv("XDG_DATA_HOME")
|
||||
}()
|
||||
|
||||
legacyDir := filepath.Join(tmpDir, ".iris")
|
||||
if errMkdir := os.MkdirAll(legacyDir, 0755); errMkdir != nil {
|
||||
t.Fatalf("failed to create legacy dir: %v", errMkdir)
|
||||
}
|
||||
|
||||
legacyStateJson := `{"mode": "history"}`
|
||||
_ = os.WriteFile(filepath.Join(legacyDir, "state.json"), []byte(legacyStateJson), 0644)
|
||||
|
||||
legacyUpdateJson := `{"seen_version": "v1.2.3", "last_check": 1234567890}`
|
||||
_ = os.WriteFile(filepath.Join(legacyDir, "update_state.json"), []byte(legacyUpdateJson), 0644)
|
||||
|
||||
err = config.MigrateFromLegacyJSON()
|
||||
if err != nil {
|
||||
t.Fatalf("migration failed: %v", err)
|
||||
}
|
||||
|
||||
state := config.LoadState()
|
||||
if state.LastMode != "history" {
|
||||
t.Errorf("expected migrated last mode 'history', got %q", state.LastMode)
|
||||
}
|
||||
if state.Updater.SeenVersion != "v1.2.3" {
|
||||
t.Errorf("expected migrated seen version 'v1.2.3', got %q", state.Updater.SeenVersion)
|
||||
}
|
||||
if state.Updater.LastCheckTime.Unix() != 1234567890 {
|
||||
t.Errorf("expected migrated check time 1234567890, got %v", state.Updater.LastCheckTime.Unix())
|
||||
}
|
||||
|
||||
if _, err := os.Stat(filepath.Join(legacyDir, "state.json.bak")); err != nil {
|
||||
t.Errorf("expected backup file state.json.bak to exist")
|
||||
}
|
||||
if _, err := os.Stat(filepath.Join(legacyDir, "update_state.json.bak")); err != nil {
|
||||
t.Errorf("expected backup file update_state.json.bak to exist")
|
||||
}
|
||||
}
|
||||
|
||||
func TestConfigCommands(t *testing.T) {
|
||||
tmpDir, err := os.MkdirTemp("", "iris-config-cmd-test")
|
||||
if err != nil {
|
||||
t.Fatalf("failed to create temp dir: %v", err)
|
||||
}
|
||||
defer os.RemoveAll(tmpDir)
|
||||
|
||||
origConfigHome := os.Getenv("XDG_CONFIG_HOME")
|
||||
defer func() {
|
||||
_ = os.Setenv("XDG_CONFIG_HOME", origConfigHome)
|
||||
}()
|
||||
_ = os.Setenv("XDG_CONFIG_HOME", tmpDir)
|
||||
|
||||
root.ConfigInitCmd.Run(root.ConfigInitCmd, []string{})
|
||||
|
||||
configPath := filepath.Join(tmpDir, "iris", "config.toml")
|
||||
if _, err := os.Stat(configPath); err != nil {
|
||||
t.Errorf("expected config file to be created at %s, but it was not", configPath)
|
||||
}
|
||||
|
||||
buf := new(bytes.Buffer)
|
||||
root.ConfigShowCmd.SetOut(buf)
|
||||
root.ConfigShowCmd.Run(root.ConfigShowCmd, []string{})
|
||||
if buf.Len() == 0 {
|
||||
t.Errorf("expected show command to output configuration")
|
||||
}
|
||||
}
|
||||
+8
-5
@@ -11,7 +11,6 @@ import (
|
||||
)
|
||||
|
||||
func TestWriteCrashLog(t *testing.T) {
|
||||
|
||||
tmpDir, err := os.MkdirTemp("", "iris-test-*")
|
||||
if err != nil {
|
||||
t.Fatalf("failed to create temp dir: %v", err)
|
||||
@@ -19,15 +18,18 @@ func TestWriteCrashLog(t *testing.T) {
|
||||
defer os.RemoveAll(tmpDir)
|
||||
|
||||
origHome := os.Getenv("HOME")
|
||||
origCache := os.Getenv("XDG_CACHE_HOME")
|
||||
defer func() {
|
||||
_ = os.Setenv("HOME", origHome)
|
||||
_ = os.Setenv("XDG_CACHE_HOME", origCache)
|
||||
}()
|
||||
_ = os.Setenv("HOME", tmpDir)
|
||||
_ = os.Setenv("XDG_CACHE_HOME", filepath.Join(tmpDir, ".cache"))
|
||||
|
||||
testErr := "test panic message"
|
||||
root.WriteCrashLog(testErr)
|
||||
|
||||
dir := filepath.Join(tmpDir, ".iris", "crashes")
|
||||
dir := filepath.Join(tmpDir, ".cache", "iris", "crashes")
|
||||
files, err := os.ReadDir(dir)
|
||||
if err != nil {
|
||||
t.Fatalf("failed to read crashes dir: %v", err)
|
||||
@@ -55,7 +57,6 @@ func TestWriteCrashLog(t *testing.T) {
|
||||
}
|
||||
|
||||
func TestCrashLogCommand(t *testing.T) {
|
||||
|
||||
tmpDir, err := os.MkdirTemp("", "iris-test-*")
|
||||
if err != nil {
|
||||
t.Fatalf("failed to create temp dir: %v", err)
|
||||
@@ -63,10 +64,13 @@ func TestCrashLogCommand(t *testing.T) {
|
||||
defer os.RemoveAll(tmpDir)
|
||||
|
||||
origHome := os.Getenv("HOME")
|
||||
origCache := os.Getenv("XDG_CACHE_HOME")
|
||||
defer func() {
|
||||
_ = os.Setenv("HOME", origHome)
|
||||
_ = os.Setenv("XDG_CACHE_HOME", origCache)
|
||||
}()
|
||||
_ = os.Setenv("HOME", tmpDir)
|
||||
_ = os.Setenv("XDG_CACHE_HOME", filepath.Join(tmpDir, ".cache"))
|
||||
|
||||
var buf bytes.Buffer
|
||||
root.CrashCmd.SetOut(&buf)
|
||||
@@ -81,7 +85,6 @@ func TestCrashLogCommand(t *testing.T) {
|
||||
root.WriteCrashLog("mock error")
|
||||
buf.Reset()
|
||||
root.CrashCmd.Run(root.CrashCmd, []string{})
|
||||
// expect the output to contain crash_ and .log, which is the path of the new crash log file
|
||||
if !strings.Contains(buf.String(), "crash_") || !strings.Contains(buf.String(), ".log") {
|
||||
t.Errorf("expected crash log path, got: %q", buf.String())
|
||||
}
|
||||
@@ -93,7 +96,7 @@ func TestCrashLogCommand(t *testing.T) {
|
||||
t.Errorf("expected 'crash log cleared', got: %q", buf.String())
|
||||
}
|
||||
|
||||
dir := filepath.Join(tmpDir, ".iris", "crashes")
|
||||
dir := filepath.Join(tmpDir, ".cache", "iris", "crashes")
|
||||
if _, err := os.Stat(dir); !os.IsNotExist(err) {
|
||||
t.Errorf("expected crashes directory to be deleted, but it exists")
|
||||
}
|
||||
|
||||
@@ -164,6 +164,12 @@ func TestGitSuggestions(t *testing.T) {
|
||||
if !found {
|
||||
t.Errorf("git push origin should suggest active branch '%s'", activeBranch)
|
||||
}
|
||||
if len(res) > 0 {
|
||||
parts := strings.Fields(res[0].Cmd)
|
||||
if len(parts) == 0 || parts[len(parts)-1] != activeBranch {
|
||||
t.Errorf("expected active branch '%s' to be first suggestion, got: %s", activeBranch, res[0].Cmd)
|
||||
}
|
||||
}
|
||||
})
|
||||
|
||||
t.Run("push origin no duplicate branches", func(t *testing.T) {
|
||||
|
||||
+25
-15
@@ -4,7 +4,9 @@ import (
|
||||
"os"
|
||||
"path/filepath"
|
||||
"testing"
|
||||
"time"
|
||||
|
||||
"github.com/versenilvis/iris/config"
|
||||
"github.com/versenilvis/iris/root"
|
||||
)
|
||||
|
||||
@@ -43,25 +45,33 @@ func TestUpdateState(t *testing.T) {
|
||||
|
||||
// Override home dir for testing
|
||||
homeBackup := os.Getenv("HOME")
|
||||
if err := os.Setenv("HOME", tmpDir); err != nil {
|
||||
err = os.Setenv("HOME", tmpDir)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
defer func() { _ = os.Setenv("HOME", homeBackup) }()
|
||||
|
||||
// Ensure .iris directory exists
|
||||
_ = os.MkdirAll(filepath.Join(tmpDir, ".iris"), 0755)
|
||||
|
||||
state := root.LoadUpdateState()
|
||||
state.SeenVersion = "v1.0.0"
|
||||
state.LastCheck = 123456789
|
||||
|
||||
root.SaveUpdateState(state)
|
||||
|
||||
loaded := root.LoadUpdateState()
|
||||
if loaded.SeenVersion != state.SeenVersion {
|
||||
t.Errorf("Expected SeenVersion %q, got %q", state.SeenVersion, loaded.SeenVersion)
|
||||
xdgBackup := os.Getenv("XDG_DATA_HOME")
|
||||
err = os.Setenv("XDG_DATA_HOME", filepath.Join(tmpDir, ".local", "share"))
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if loaded.LastCheck != state.LastCheck {
|
||||
t.Errorf("Expected LastCheck %d, got %d", state.LastCheck, loaded.LastCheck)
|
||||
defer func() { _ = os.Setenv("XDG_DATA_HOME", xdgBackup) }()
|
||||
|
||||
state := config.LoadState()
|
||||
state.Updater.SeenVersion = "v1.0.0"
|
||||
state.Updater.LastCheckTime = time.Unix(123456789, 0)
|
||||
|
||||
err = config.SaveState(state)
|
||||
if err != nil {
|
||||
t.Fatalf("failed to save state: %v", err)
|
||||
}
|
||||
|
||||
loaded := config.LoadState()
|
||||
if loaded.Updater.SeenVersion != state.Updater.SeenVersion {
|
||||
t.Errorf("Expected SeenVersion %q, got %q", state.Updater.SeenVersion, loaded.Updater.SeenVersion)
|
||||
}
|
||||
if loaded.Updater.LastCheckTime.Unix() != state.Updater.LastCheckTime.Unix() {
|
||||
t.Errorf("Expected LastCheck %v, got %v", state.Updater.LastCheckTime, loaded.Updater.LastCheckTime)
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user