diff options
40 files changed, 123 insertions, 188 deletions
diff --git a/.builds/lint.yml b/.builds/lint.yml deleted file mode 100644 index 53667fa..0000000 --- a/.builds/lint.yml +++ /dev/null @@ -1,20 +0,0 @@ -image: alpine/3.23 -submitter: - git.sr.ht: - enabled: true - allow-refs: - - refs/heads/main -packages: - - go - - shellcheck - - shfmt -sources: - - https://git.sr.ht/~eugenetriguba/bolt -triggers: - - action: email - condition: failure - to: builds@eugenetriguba.com -tasks: - - lint: | - cd bolt - ./scripts/lint.sh diff --git a/.builds/test.yml b/.builds/test.yml deleted file mode 100644 index 0cf4ec9..0000000 --- a/.builds/test.yml +++ /dev/null @@ -1,42 +0,0 @@ -image: archlinux -submitter: - git.sr.ht: - enabled: true - allow-refs: - - refs/heads/main -packages: - - go - - docker - - jq -sources: - - https://git.sr.ht/~eugenetriguba/bolt -triggers: - - action: email - condition: failure - to: builds@eugenetriguba.com -tasks: - - setup: | - sudo dockerd > /tmp/dockerd.log 2>&1 & - - test-latest-all: | - cd bolt - ./scripts/test.sh - ./scripts/combine-coverage.sh - - test-mssql-compat: | - cd bolt - ./scripts/test.sh mssql-2017-latest - ./scripts/test.sh mssql-2019-latest - ./scripts/test.sh mssql-2022-latest - ./scripts/test.sh mssql-2025-latest - - test-mysql-compat: | - cd bolt - ./scripts/test.sh mysql-5.7 - ./scripts/test.sh mysql-8 - ./scripts/test.sh mysql-9 - - test-postgresql-compat: | - cd bolt - ./scripts/test.sh postgresql-13 - ./scripts/test.sh postgresql-14 - ./scripts/test.sh postgresql-15 - ./scripts/test.sh postgresql-16 - ./scripts/test.sh postgresql-17 - ./scripts/test.sh postgresql-18 diff --git a/CHANGELOG.md b/CHANGELOG.md index 6ab8e34..7c70d4d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Changed +- Source code moved from git.sr.ht/~eugenetriguba/bolt to + git.eugenetriguba.com/bolt/cli. The module path is now + `git.eugenetriguba.com/bolt/cli`. - New migrations are zero-padded to four digits. ### Removed diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 9a0263e..0622517 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,20 +1,15 @@ # Contributing to Bolt -Thank you for your interest in contributing to Bolt! This document provides -guidelines and instructions for contributing to the project. - -Bolt is hosted on [SourceHut](https://sr.ht/~eugenetriguba/Bolt/). If you're new -to SourceHut, see the [git.sr.ht quickstart](https://man.sr.ht/git.sr.ht/). - -You do not need an account on SourceHut to contribute. +This document provides guidelines and instructions for contributing to the +project. ## How to Contribute -Bolt uses an [email-based workflow](https://git-send-email.io/) for -accepting contributions. +Bolt is hosted at <https://git.eugenetriguba.com/bolt/cli> and uses an +[email-based workflow](https://git-send-email.io/) for accepting contributions. - All questions, discussions, requests, or patches should be submitted via - email to my [public-inbox mailing list](https://lists.sr.ht/~eugenetriguba/public-inbox). + email to [hello@eugenetriguba.com](mailto:hello@eugenetriguba.com). For patches, use the subject prefix `[PATCH bolt]`. For anything else, please use a prefix of `[bolt]`. @@ -30,7 +25,7 @@ accepting contributions. 1. Clone the repository: ```bash -git clone https://git.sr.ht/~eugenetriguba/bolt +git clone https://git.eugenetriguba.com/bolt/cli bolt cd bolt ``` @@ -1,9 +1,7 @@ # Bolt -[](https://godoc.org/git.sr.ht/~eugenetriguba/bolt) -[](https://goreportcard.com/report/git.sr.ht/~eugenetriguba/bolt) +[](https://pkg.go.dev/git.eugenetriguba.com/bolt/cli)  -[](https://builds.sr.ht/~eugenetriguba/bolt/commits/main?) Bolt is a command-line tool for database migrations. @@ -52,7 +50,7 @@ Version Message Applied Clone the repository: ``` -git clone https://git.sr.ht/~eugenetriguba/bolt +git clone https://git.eugenetriguba.com/bolt/cli bolt ``` Build the binary: @@ -73,7 +71,7 @@ sudo make install If you're on macOS (or Linux and use Homebrew), you can install Bolt from the tap: ```bash -brew tap eugenetriguba/bolt https://git.sr.ht/~eugenetriguba/homebrew-bolt +brew tap eugenetriguba/bolt https://git.eugenetriguba.com/bolt/homebrew-tap brew install bolt ``` diff --git a/cmd/bolt/bolt.go b/cmd/bolt/bolt.go index 82fc874..0e2a649 100644 --- a/cmd/bolt/bolt.go +++ b/cmd/bolt/bolt.go @@ -3,7 +3,7 @@ package main import ( "os" - "git.sr.ht/~eugenetriguba/bolt/internal/cli" + "git.eugenetriguba.com/bolt/cli/internal/cli" ) func main() { @@ -1,11 +1,11 @@ -module git.sr.ht/~eugenetriguba/bolt +module git.eugenetriguba.com/bolt/cli go 1.24.0 require ( - git.sr.ht/~eugenetriguba/checkmate v0.5.0 - git.sr.ht/~eugenetriguba/envelope v0.2.0 - git.sr.ht/~eugenetriguba/subcmd v0.5.0 + git.eugenetriguba.com/checkmate v0.6.0 + git.eugenetriguba.com/envelope v0.3.0 + git.eugenetriguba.com/subcmd v0.6.0 github.com/BurntSushi/toml v1.6.0 github.com/go-sql-driver/mysql v1.9.3 github.com/jackc/pgx/v5 v5.8.0 @@ -1,11 +1,11 @@ filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA= filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4= -git.sr.ht/~eugenetriguba/checkmate v0.5.0 h1:6AuloFbKgXCsEA7h4mOa8sdGaepKHSlegzHY9QMPmXU= -git.sr.ht/~eugenetriguba/checkmate v0.5.0/go.mod h1:Pxv1PKcBSbOqmoEOZxOBJVv9dHUGU+zcwuwfnGqZEQk= -git.sr.ht/~eugenetriguba/envelope v0.2.0 h1:+vq3MENb2Xo1K7D/jZJcOHB9dBTbdHOEvzKoRtWyQpc= -git.sr.ht/~eugenetriguba/envelope v0.2.0/go.mod h1:DcP27+64+elmsPbHqA90L/z3zkiyguRAk3wfKVBtnA8= -git.sr.ht/~eugenetriguba/subcmd v0.5.0 h1:Bw2gihoIvfCp2GBYqa6xz6bdeAqGILnTLIew5dEd/8M= -git.sr.ht/~eugenetriguba/subcmd v0.5.0/go.mod h1:esfBef99WFG9yXM9DLgmHVK0CGKzBPu/SAxrC1aPQQI= +git.eugenetriguba.com/checkmate v0.6.0 h1:zoVgja0E/QC+sE8rHTQHQxXQJERF0KN2m51EZv6oWi0= +git.eugenetriguba.com/checkmate v0.6.0/go.mod h1:EHRoN/2R48KUxNvgQcvsMdRme+1e/2IcW6PUBXsJhF4= +git.eugenetriguba.com/envelope v0.3.0 h1:ZLtA/SKN4xgc/zopO48nn6BkazEgGbdmeWqremDmOqM= +git.eugenetriguba.com/envelope v0.3.0/go.mod h1:4ikUUUdxmS6e6tmp1OKGmEkKMhYiUsP0Q2YLRRkwymo= +git.eugenetriguba.com/subcmd v0.6.0 h1:VUKFdPmpdl7fIqv3iUsJ4ZW4lbrJz4GzKbCvioFKTes= +git.eugenetriguba.com/subcmd v0.6.0/go.mod h1:Mrmr3PxLJJJGlna9Jc6amIldMUWmXS+CN/g8IrvjXDQ= github.com/Azure/azure-sdk-for-go/sdk/azcore v1.18.0 h1:Gt0j3wceWMwPmiazCa8MzMA0MfhmPIz0Qp0FJ6qcM0U= github.com/Azure/azure-sdk-for-go/sdk/azcore v1.18.0/go.mod h1:Ot/6aikWnKWi4l9QB7qVSwa8iMphQNqkWALMoNT3rzM= github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.10.1 h1:B+blDbyVIG3WaikNxPnhPiJ1MThR03b3vKGtER95TP4= diff --git a/internal/bolttest/db.go b/internal/bolttest/db.go index cd2c4dc..6159cac 100644 --- a/internal/bolttest/db.go +++ b/internal/bolttest/db.go @@ -6,9 +6,9 @@ import ( "os" "testing" - "git.sr.ht/~eugenetriguba/bolt/internal/configloader" - "git.sr.ht/~eugenetriguba/bolt/internal/storage" - "git.sr.ht/~eugenetriguba/checkmate/assert" + "git.eugenetriguba.com/bolt/cli/internal/configloader" + "git.eugenetriguba.com/bolt/cli/internal/storage" + "git.eugenetriguba.com/checkmate/assert" ) func NewTestDB(t *testing.T) storage.DB { diff --git a/internal/bolttest/env.go b/internal/bolttest/env.go index 7295158..f896183 100644 --- a/internal/bolttest/env.go +++ b/internal/bolttest/env.go @@ -4,7 +4,7 @@ import ( "os" "testing" - "git.sr.ht/~eugenetriguba/checkmate/assert" + "git.eugenetriguba.com/checkmate/assert" ) func UnsetEnv(t *testing.T, key string) { diff --git a/internal/bolttest/fs.go b/internal/bolttest/fs.go index 9b027bc..66c615e 100644 --- a/internal/bolttest/fs.go +++ b/internal/bolttest/fs.go @@ -4,8 +4,8 @@ import ( "os" "testing" - "git.sr.ht/~eugenetriguba/bolt/internal/configloader" - "git.sr.ht/~eugenetriguba/checkmate/assert" + "git.eugenetriguba.com/bolt/cli/internal/configloader" + "git.eugenetriguba.com/checkmate/assert" "github.com/BurntSushi/toml" ) diff --git a/internal/bolttest/mock_migration_db_repo.go b/internal/bolttest/mock_migration_db_repo.go index 94f529a..1016334 100644 --- a/internal/bolttest/mock_migration_db_repo.go +++ b/internal/bolttest/mock_migration_db_repo.go @@ -1,6 +1,6 @@ package bolttest -import "git.sr.ht/~eugenetriguba/bolt/internal/models" +import "git.eugenetriguba.com/bolt/cli/internal/models" type MockMigrationDBRepo struct { ListReturnValue ListReturnValue diff --git a/internal/bolttest/mock_migration_fs_repo.go b/internal/bolttest/mock_migration_fs_repo.go index 7c8ecd3..7610cea 100644 --- a/internal/bolttest/mock_migration_fs_repo.go +++ b/internal/bolttest/mock_migration_fs_repo.go @@ -1,8 +1,8 @@ package bolttest import ( - "git.sr.ht/~eugenetriguba/bolt/internal/models" - "git.sr.ht/~eugenetriguba/bolt/internal/sqlparse" + "git.eugenetriguba.com/bolt/cli/internal/models" + "git.eugenetriguba.com/bolt/cli/internal/sqlparse" ) type MockMigrationFsRepo struct { diff --git a/internal/cli/cli.go b/internal/cli/cli.go index 1561da4..896bb5e 100644 --- a/internal/cli/cli.go +++ b/internal/cli/cli.go @@ -3,8 +3,8 @@ package cli import ( "context" - "git.sr.ht/~eugenetriguba/bolt/internal/commands" - "git.sr.ht/~eugenetriguba/subcmd" + "git.eugenetriguba.com/bolt/cli/internal/commands" + "git.eugenetriguba.com/subcmd" ) // Run runs the Bolt CLI and returns the exit code. diff --git a/internal/commands/down.go b/internal/commands/down.go index 3dc537b..b52a860 100644 --- a/internal/commands/down.go +++ b/internal/commands/down.go @@ -5,12 +5,12 @@ import ( "flag" "fmt" - "git.sr.ht/~eugenetriguba/bolt/internal/configloader" - "git.sr.ht/~eugenetriguba/bolt/internal/output" - "git.sr.ht/~eugenetriguba/bolt/internal/repositories" - "git.sr.ht/~eugenetriguba/bolt/internal/services" - "git.sr.ht/~eugenetriguba/bolt/internal/storage" - "git.sr.ht/~eugenetriguba/subcmd" + "git.eugenetriguba.com/bolt/cli/internal/configloader" + "git.eugenetriguba.com/bolt/cli/internal/output" + "git.eugenetriguba.com/bolt/cli/internal/repositories" + "git.eugenetriguba.com/bolt/cli/internal/services" + "git.eugenetriguba.com/bolt/cli/internal/storage" + "git.eugenetriguba.com/subcmd" ) type DownCmd struct { diff --git a/internal/commands/new.go b/internal/commands/new.go index 762ca4d..54dac55 100644 --- a/internal/commands/new.go +++ b/internal/commands/new.go @@ -5,11 +5,11 @@ import ( "flag" "fmt" - "git.sr.ht/~eugenetriguba/bolt/internal/configloader" - "git.sr.ht/~eugenetriguba/bolt/internal/output" - "git.sr.ht/~eugenetriguba/bolt/internal/repositories" - "git.sr.ht/~eugenetriguba/bolt/internal/services" - "git.sr.ht/~eugenetriguba/subcmd" + "git.eugenetriguba.com/bolt/cli/internal/configloader" + "git.eugenetriguba.com/bolt/cli/internal/output" + "git.eugenetriguba.com/bolt/cli/internal/repositories" + "git.eugenetriguba.com/bolt/cli/internal/services" + "git.eugenetriguba.com/subcmd" ) type NewCmd struct { diff --git a/internal/commands/status.go b/internal/commands/status.go index 5146d92..8490dfb 100644 --- a/internal/commands/status.go +++ b/internal/commands/status.go @@ -5,12 +5,12 @@ import ( "flag" "fmt" - "git.sr.ht/~eugenetriguba/bolt/internal/configloader" - "git.sr.ht/~eugenetriguba/bolt/internal/output" - "git.sr.ht/~eugenetriguba/bolt/internal/repositories" - "git.sr.ht/~eugenetriguba/bolt/internal/services" - "git.sr.ht/~eugenetriguba/bolt/internal/storage" - "git.sr.ht/~eugenetriguba/subcmd" + "git.eugenetriguba.com/bolt/cli/internal/configloader" + "git.eugenetriguba.com/bolt/cli/internal/output" + "git.eugenetriguba.com/bolt/cli/internal/repositories" + "git.eugenetriguba.com/bolt/cli/internal/services" + "git.eugenetriguba.com/bolt/cli/internal/storage" + "git.eugenetriguba.com/subcmd" ) type StatusCmd struct{} diff --git a/internal/commands/up.go b/internal/commands/up.go index 5bb4e18..ce4488d 100644 --- a/internal/commands/up.go +++ b/internal/commands/up.go @@ -5,12 +5,12 @@ import ( "flag" "fmt" - "git.sr.ht/~eugenetriguba/bolt/internal/configloader" - "git.sr.ht/~eugenetriguba/bolt/internal/output" - "git.sr.ht/~eugenetriguba/bolt/internal/repositories" - "git.sr.ht/~eugenetriguba/bolt/internal/services" - "git.sr.ht/~eugenetriguba/bolt/internal/storage" - "git.sr.ht/~eugenetriguba/subcmd" + "git.eugenetriguba.com/bolt/cli/internal/configloader" + "git.eugenetriguba.com/bolt/cli/internal/output" + "git.eugenetriguba.com/bolt/cli/internal/repositories" + "git.eugenetriguba.com/bolt/cli/internal/services" + "git.eugenetriguba.com/bolt/cli/internal/storage" + "git.eugenetriguba.com/subcmd" ) type UpCmd struct { diff --git a/internal/commands/version.go b/internal/commands/version.go index 66dee90..f003646 100644 --- a/internal/commands/version.go +++ b/internal/commands/version.go @@ -4,8 +4,8 @@ import ( "context" "flag" - "git.sr.ht/~eugenetriguba/bolt/internal/output" - "git.sr.ht/~eugenetriguba/subcmd" + "git.eugenetriguba.com/bolt/cli/internal/output" + "git.eugenetriguba.com/subcmd" ) type VersionCmd struct{} diff --git a/internal/configloader/configloader.go b/internal/configloader/configloader.go index 1d36ae8..6ac4d82 100644 --- a/internal/configloader/configloader.go +++ b/internal/configloader/configloader.go @@ -14,7 +14,7 @@ import ( "path/filepath" "runtime" - "git.sr.ht/~eugenetriguba/envelope" + "git.eugenetriguba.com/envelope" "github.com/BurntSushi/toml" ) diff --git a/internal/configloader/configloader_test.go b/internal/configloader/configloader_test.go index 4112580..7fe28e2 100644 --- a/internal/configloader/configloader_test.go +++ b/internal/configloader/configloader_test.go @@ -5,10 +5,10 @@ import ( "path/filepath" "testing" - "git.sr.ht/~eugenetriguba/bolt/internal/bolttest" - "git.sr.ht/~eugenetriguba/bolt/internal/configloader" - "git.sr.ht/~eugenetriguba/checkmate/assert" - "git.sr.ht/~eugenetriguba/checkmate/check" + "git.eugenetriguba.com/bolt/cli/internal/bolttest" + "git.eugenetriguba.com/bolt/cli/internal/configloader" + "git.eugenetriguba.com/checkmate/assert" + "git.eugenetriguba.com/checkmate/check" ) func TestNewConfigDefaults(t *testing.T) { diff --git a/internal/models/migration_test.go b/internal/models/migration_test.go index 91aed2e..7331dc5 100644 --- a/internal/models/migration_test.go +++ b/internal/models/migration_test.go @@ -3,8 +3,8 @@ package models_test import ( "testing" - "git.sr.ht/~eugenetriguba/bolt/internal/models" - "git.sr.ht/~eugenetriguba/checkmate/check" + "git.eugenetriguba.com/bolt/cli/internal/models" + "git.eugenetriguba.com/checkmate/check" ) func TestNewMigration(t *testing.T) { diff --git a/internal/output/console_test.go b/internal/output/console_test.go index ea551da..3c13243 100644 --- a/internal/output/console_test.go +++ b/internal/output/console_test.go @@ -6,7 +6,7 @@ import ( "io" "testing" - "git.sr.ht/~eugenetriguba/checkmate/check" + "git.eugenetriguba.com/checkmate/check" ) func NewConsoleOutputterWithWriters(stdout io.Writer, stderr io.Writer) ConsoleOutputter { diff --git a/internal/repositories/migration_db_repo.go b/internal/repositories/migration_db_repo.go index 9fe06f8..88aa30c 100644 --- a/internal/repositories/migration_db_repo.go +++ b/internal/repositories/migration_db_repo.go @@ -7,8 +7,8 @@ import ( "regexp" "strings" - "git.sr.ht/~eugenetriguba/bolt/internal/models" - "git.sr.ht/~eugenetriguba/bolt/internal/storage" + "git.eugenetriguba.com/bolt/cli/internal/models" + "git.eugenetriguba.com/bolt/cli/internal/storage" ) type MigrationDBRepo interface { diff --git a/internal/repositories/migration_db_repo_mssql_test.go b/internal/repositories/migration_db_repo_mssql_test.go index 215c587..a46cc69 100644 --- a/internal/repositories/migration_db_repo_mssql_test.go +++ b/internal/repositories/migration_db_repo_mssql_test.go @@ -5,9 +5,9 @@ package repositories_test import ( "testing" - "git.sr.ht/~eugenetriguba/bolt/internal/bolttest" - "git.sr.ht/~eugenetriguba/bolt/internal/repositories" - "git.sr.ht/~eugenetriguba/checkmate/assert" + "git.eugenetriguba.com/bolt/cli/internal/bolttest" + "git.eugenetriguba.com/bolt/cli/internal/repositories" + "git.eugenetriguba.com/checkmate/assert" ) func TestNewMigrationDBRepo_CreatesTableInSchema_MSSQL(t *testing.T) { diff --git a/internal/repositories/migration_db_repo_postgresql_test.go b/internal/repositories/migration_db_repo_postgresql_test.go index a4fe576..243370c 100644 --- a/internal/repositories/migration_db_repo_postgresql_test.go +++ b/internal/repositories/migration_db_repo_postgresql_test.go @@ -5,9 +5,9 @@ package repositories_test import ( "testing" - "git.sr.ht/~eugenetriguba/bolt/internal/bolttest" - "git.sr.ht/~eugenetriguba/bolt/internal/repositories" - "git.sr.ht/~eugenetriguba/checkmate/assert" + "git.eugenetriguba.com/bolt/cli/internal/bolttest" + "git.eugenetriguba.com/bolt/cli/internal/repositories" + "git.eugenetriguba.com/checkmate/assert" ) func TestNewMigrationDBRepo_CreatesTableInSchema_Postgresql(t *testing.T) { diff --git a/internal/repositories/migration_db_repo_test.go b/internal/repositories/migration_db_repo_test.go index 6787d3d..f24b15d 100644 --- a/internal/repositories/migration_db_repo_test.go +++ b/internal/repositories/migration_db_repo_test.go @@ -5,10 +5,10 @@ import ( "errors" "testing" - "git.sr.ht/~eugenetriguba/bolt/internal/bolttest" - "git.sr.ht/~eugenetriguba/bolt/internal/models" - "git.sr.ht/~eugenetriguba/bolt/internal/repositories" - "git.sr.ht/~eugenetriguba/checkmate/assert" + "git.eugenetriguba.com/bolt/cli/internal/bolttest" + "git.eugenetriguba.com/bolt/cli/internal/models" + "git.eugenetriguba.com/bolt/cli/internal/repositories" + "git.eugenetriguba.com/checkmate/assert" ) func TestNewMigrationDBRepo_CreatesTable(t *testing.T) { diff --git a/internal/repositories/migration_fs_repo.go b/internal/repositories/migration_fs_repo.go index b328c90..9402afb 100644 --- a/internal/repositories/migration_fs_repo.go +++ b/internal/repositories/migration_fs_repo.go @@ -8,9 +8,9 @@ import ( "path/filepath" "strings" - "git.sr.ht/~eugenetriguba/bolt/internal/configloader" - "git.sr.ht/~eugenetriguba/bolt/internal/models" - "git.sr.ht/~eugenetriguba/bolt/internal/sqlparse" + "git.eugenetriguba.com/bolt/cli/internal/configloader" + "git.eugenetriguba.com/bolt/cli/internal/models" + "git.eugenetriguba.com/bolt/cli/internal/sqlparse" ) var ErrMigrationVersionConflict = errors.New("migration version conflict") diff --git a/internal/repositories/migration_fs_repo_test.go b/internal/repositories/migration_fs_repo_test.go index 4e0936d..a0ee8d6 100644 --- a/internal/repositories/migration_fs_repo_test.go +++ b/internal/repositories/migration_fs_repo_test.go @@ -6,10 +6,10 @@ import ( "path/filepath" "testing" - "git.sr.ht/~eugenetriguba/bolt/internal/configloader" - "git.sr.ht/~eugenetriguba/bolt/internal/models" - "git.sr.ht/~eugenetriguba/bolt/internal/repositories" - "git.sr.ht/~eugenetriguba/checkmate/assert" + "git.eugenetriguba.com/bolt/cli/internal/configloader" + "git.eugenetriguba.com/bolt/cli/internal/models" + "git.eugenetriguba.com/bolt/cli/internal/repositories" + "git.eugenetriguba.com/checkmate/assert" ) func assertFileExists(t *testing.T, path string) { diff --git a/internal/services/migration.go b/internal/services/migration.go index a861176..12bcee6 100644 --- a/internal/services/migration.go +++ b/internal/services/migration.go @@ -6,9 +6,9 @@ import ( "strconv" "time" - "git.sr.ht/~eugenetriguba/bolt/internal/models" - "git.sr.ht/~eugenetriguba/bolt/internal/output" - "git.sr.ht/~eugenetriguba/bolt/internal/repositories" + "git.eugenetriguba.com/bolt/cli/internal/models" + "git.eugenetriguba.com/bolt/cli/internal/output" + "git.eugenetriguba.com/bolt/cli/internal/repositories" ) type MigrationService struct { diff --git a/internal/services/migration_test.go b/internal/services/migration_test.go index 4b5bdf0..415e3b9 100644 --- a/internal/services/migration_test.go +++ b/internal/services/migration_test.go @@ -4,12 +4,12 @@ import ( "errors" "testing" - "git.sr.ht/~eugenetriguba/bolt/internal/bolttest" + "git.eugenetriguba.com/bolt/cli/internal/bolttest" - "git.sr.ht/~eugenetriguba/bolt/internal/models" - "git.sr.ht/~eugenetriguba/bolt/internal/sqlparse" - "git.sr.ht/~eugenetriguba/checkmate/assert" - "git.sr.ht/~eugenetriguba/checkmate/check" + "git.eugenetriguba.com/bolt/cli/internal/models" + "git.eugenetriguba.com/bolt/cli/internal/sqlparse" + "git.eugenetriguba.com/checkmate/assert" + "git.eugenetriguba.com/checkmate/check" ) func TestListMigrations(t *testing.T) { diff --git a/internal/sqlparse/sqlparse_test.go b/internal/sqlparse/sqlparse_test.go index 5cbbc07..f93c435 100644 --- a/internal/sqlparse/sqlparse_test.go +++ b/internal/sqlparse/sqlparse_test.go @@ -7,9 +7,9 @@ import ( "strings" "testing" - "git.sr.ht/~eugenetriguba/bolt/internal/sqlparse" - "git.sr.ht/~eugenetriguba/checkmate/assert" - "git.sr.ht/~eugenetriguba/checkmate/check" + "git.eugenetriguba.com/bolt/cli/internal/sqlparse" + "git.eugenetriguba.com/checkmate/assert" + "git.eugenetriguba.com/checkmate/check" ) func TestSqlParser_Parse(t *testing.T) { diff --git a/internal/storage/db.go b/internal/storage/db.go index a2461e6..80eb0a2 100644 --- a/internal/storage/db.go +++ b/internal/storage/db.go @@ -5,7 +5,7 @@ import ( "errors" "fmt" - "git.sr.ht/~eugenetriguba/bolt/internal/configloader" + "git.eugenetriguba.com/bolt/cli/internal/configloader" _ "github.com/go-sql-driver/mysql" _ "github.com/jackc/pgx/v5/stdlib" _ "github.com/mattn/go-sqlite3" diff --git a/internal/storage/db_test.go b/internal/storage/db_test.go index 83a6355..cf99b65 100644 --- a/internal/storage/db_test.go +++ b/internal/storage/db_test.go @@ -6,9 +6,9 @@ import ( "os" "testing" - "git.sr.ht/~eugenetriguba/bolt/internal/bolttest" - "git.sr.ht/~eugenetriguba/bolt/internal/storage" - "git.sr.ht/~eugenetriguba/checkmate/assert" + "git.eugenetriguba.com/bolt/cli/internal/bolttest" + "git.eugenetriguba.com/bolt/cli/internal/storage" + "git.eugenetriguba.com/checkmate/assert" ) func TestNewDB_Success(t *testing.T) { diff --git a/internal/storage/mssql_test.go b/internal/storage/mssql_test.go index a0c2543..8cbc418 100644 --- a/internal/storage/mssql_test.go +++ b/internal/storage/mssql_test.go @@ -6,9 +6,9 @@ import ( "database/sql" "testing" - "git.sr.ht/~eugenetriguba/bolt/internal/bolttest" - "git.sr.ht/~eugenetriguba/bolt/internal/storage" - "git.sr.ht/~eugenetriguba/checkmate/assert" + "git.eugenetriguba.com/bolt/cli/internal/bolttest" + "git.eugenetriguba.com/bolt/cli/internal/storage" + "git.eugenetriguba.com/checkmate/assert" ) func TestMSSQL_ConvertGenericPlaceholders(t *testing.T) { diff --git a/internal/storage/mysql_test.go b/internal/storage/mysql_test.go index 67dde22..70758a7 100644 --- a/internal/storage/mysql_test.go +++ b/internal/storage/mysql_test.go @@ -6,9 +6,9 @@ import ( "database/sql" "testing" - "git.sr.ht/~eugenetriguba/bolt/internal/bolttest" - "git.sr.ht/~eugenetriguba/bolt/internal/storage" - "git.sr.ht/~eugenetriguba/checkmate/assert" + "git.eugenetriguba.com/bolt/cli/internal/bolttest" + "git.eugenetriguba.com/bolt/cli/internal/storage" + "git.eugenetriguba.com/checkmate/assert" ) func TestMySQL_ConvertGenericPlaceholders(t *testing.T) { diff --git a/internal/storage/postgresql_test.go b/internal/storage/postgresql_test.go index 685d0fe..4268fb7 100644 --- a/internal/storage/postgresql_test.go +++ b/internal/storage/postgresql_test.go @@ -6,9 +6,9 @@ import ( "database/sql" "testing" - "git.sr.ht/~eugenetriguba/bolt/internal/bolttest" - "git.sr.ht/~eugenetriguba/bolt/internal/storage" - "git.sr.ht/~eugenetriguba/checkmate/assert" + "git.eugenetriguba.com/bolt/cli/internal/bolttest" + "git.eugenetriguba.com/bolt/cli/internal/storage" + "git.eugenetriguba.com/checkmate/assert" ) func TestPostgresql_ConvertGenericPlaceholders(t *testing.T) { diff --git a/internal/storage/sqlite3_test.go b/internal/storage/sqlite3_test.go index d79328a..7c15b3f 100644 --- a/internal/storage/sqlite3_test.go +++ b/internal/storage/sqlite3_test.go @@ -6,9 +6,9 @@ import ( "database/sql" "testing" - "git.sr.ht/~eugenetriguba/bolt/internal/bolttest" - "git.sr.ht/~eugenetriguba/bolt/internal/storage" - "git.sr.ht/~eugenetriguba/checkmate/assert" + "git.eugenetriguba.com/bolt/cli/internal/bolttest" + "git.eugenetriguba.com/bolt/cli/internal/storage" + "git.eugenetriguba.com/checkmate/assert" ) func TestSqlite3_ConvertGenericPlaceholders(t *testing.T) { @@ -64,6 +64,6 @@ is maintained by .Mt hello@eugenetriguba.com . .Pp Up-to-date sources can be found at -.Lk https://git.sr.ht/~eugenetriguba/bolt +.Lk https://git.eugenetriguba.com/bolt/cli and bugs/patches can be submitted by email to -.Mt ~eugenetriguba/public-inbox@lists.sr.ht . +.Mt hello@eugenetriguba.com . diff --git a/scripts/update-homebrew.sh b/scripts/update-homebrew.sh index 59ffdfb..c80d234 100755 --- a/scripts/update-homebrew.sh +++ b/scripts/update-homebrew.sh @@ -4,10 +4,10 @@ set -eou pipefail source "$(dirname "${BASH_SOURCE[0]}")/lib/log.sh" source "$(dirname "${BASH_SOURCE[0]}")/lib/path.sh" -readonly HOMEBREW_TAP_REPO="git@git.sr.ht:~eugenetriguba/homebrew-bolt" +readonly HOMEBREW_TAP_REPO="ssh://git@git.eugenetriguba.com:/var/www/git/public/bolt/homebrew-tap.git" readonly HOMEBREW_TAP_DIR="/tmp/homebrew-bolt-update-$$" readonly FORMULA_FILE="Formula/bolt.rb" -readonly ARCHIVE_DOWNLOAD_PATH="/tmp/bolt-archive-$$.tar.gz" +readonly ARCHIVE_DOWNLOAD_PATH="/tmp/bolt-archive-$$.zip" trap cleanup EXIT @@ -40,7 +40,7 @@ main() { commit_sha=$(get_commit_sha_for_version "$version") local archive_url - archive_url="https://git.sr.ht/~eugenetriguba/bolt/archive/${commit_sha}.tar.gz" + archive_url="https://git.eugenetriguba.com/bolt/cli/snapshot/cli-${commit_sha}.zip" log_info "Version: $version" log_info "Commit SHA: $commit_sha" @@ -54,7 +54,7 @@ main() { log_newline clone_homebrew_tap - update_formula "$version" "$commit_sha" "$sha256" + update_formula "$version" "$sha256" "$archive_url" commit_and_push_formula "$version" log_success "Homebrew formula updated successfully!" @@ -113,8 +113,8 @@ clone_homebrew_tap() { update_formula() { local version="$1" - local commit_sha="$2" - local sha256="$3" + local sha256="$2" + local archive_url="$3" log_step "Updating formula file" @@ -126,7 +126,8 @@ update_formula() { local temp_file="$formula_path.tmp" sed -E \ - -e "s|url \"https://git.sr.ht/~eugenetriguba/bolt/archive/[^\"]+\"|url \"https://git.sr.ht/~eugenetriguba/bolt/archive/${commit_sha}.tar.gz\"|" \ + -e "s|^ url \"[^\"]+\"| url \"${archive_url}\"|" \ + -e "s|^ homepage \"[^\"]+\"| homepage \"https://git.eugenetriguba.com/bolt/cli\"|" \ -e "s|version \"[^\"]+\"|version \"${version}\"|" \ -e "s|sha256 \"[^\"]+\"|sha256 \"${sha256}\"|" \ "$formula_path" >"$temp_file" |