Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
### Fixes

- Show setup guidance instead of a raw missing-file error when configuration-dependent commands cannot find `config.toml`. Thanks @0xdevalias.
- Report module build metadata for source-installed binaries instead of a stale hard-coded release version.

## 0.11.5 - 2026-07-09

Expand Down
4 changes: 2 additions & 2 deletions internal/cli/cli.go
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ func Run(ctx context.Context, args []string, stdout, stderr io.Writer) error {
return usageErr(err)
}
if global.Version {
_, _ = io.WriteString(stdout, version+"\n")
_, _ = io.WriteString(stdout, currentVersion()+"\n")
return nil
}
rest := global.Args
Expand All @@ -70,7 +70,7 @@ func Run(ctx context.Context, args []string, stdout, stderr io.Writer) error {
return printCommandUsage(stdout, topic)
}
if rest[0] == "version" {
_, _ = io.WriteString(stdout, version+"\n")
_, _ = io.WriteString(stdout, currentVersion()+"\n")
return nil
}
level := slog.LevelInfo
Expand Down
10 changes: 6 additions & 4 deletions internal/cli/cli_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,11 @@ func TestHelpAndVersion(t *testing.T) {
require.NoError(t, Run(context.Background(), []string{"help"}, &out, &bytes.Buffer{}))
require.Contains(t, out.String(), "discrawl")

out.Reset()
require.NoError(t, Run(context.Background(), []string{"--version"}, &out, &bytes.Buffer{}))
require.Contains(t, out.String(), "0.11.2")
for _, args := range [][]string{{"--version"}, {"version"}} {
out.Reset()
require.NoError(t, Run(context.Background(), args, &out, &bytes.Buffer{}))
require.Equal(t, currentVersion()+"\n", out.String())
}

err := Run(context.Background(), []string{"bogus"}, &out, &bytes.Buffer{})
require.Equal(t, 2, ExitCode(err))
Expand Down Expand Up @@ -4136,7 +4138,7 @@ func TestHelpFlagAfterDelimiterReachesCommand(t *testing.T) {
for _, helpFlag := range []string{"-h", "--help"} {
var stdout, stderr bytes.Buffer
require.NoError(t, Run(context.Background(), []string{"version", "--", helpFlag}, &stdout, &stderr))
require.Equal(t, version+"\n", stdout.String())
require.Equal(t, currentVersion()+"\n", stdout.String())
require.Empty(t, stderr.String())
}
}
Expand Down
2 changes: 1 addition & 1 deletion internal/cli/cloud_commands.go
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ func (r *runtime) runCloudPublish(args []string) error {
TokenEnv: firstNonEmpty(*tokenEnv, r.cfg.Remote.TokenEnv, config.DefaultRemoteTokenEnv),
}
client, err := crawlremote.NewClientFromConfig(remoteCfg, crawlremote.Options{
UserAgent: "discrawl/" + version,
UserAgent: discrawlUserAgent(),
HTTPClient: &http.Client{Timeout: 10 * time.Minute},
})
if err != nil {
Expand Down
2 changes: 1 addition & 1 deletion internal/cli/releasecheck.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ func discrawlReleaseCheckOptions(force bool) releasecheck.Options {
AppName: "discrawl",
Owner: owner,
Repo: repo,
CurrentVersion: version,
CurrentVersion: currentVersion(),
CacheDir: cfg.CacheDir,
Force: force,
}
Expand Down
3 changes: 3 additions & 0 deletions internal/cli/releasecheck_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,9 @@ func TestDiscrawlReleaseCheckOptionsUsesModulePath(t *testing.T) {
if opts.AppName != "discrawl" || opts.CurrentVersion == "" || opts.CacheDir == "" {
t.Fatalf("incomplete options = %#v", opts)
}
if opts.CurrentVersion != currentVersion() {
t.Fatalf("CurrentVersion = %q, want %q", opts.CurrentVersion, currentVersion())
}
}

func TestRunCheckUpdateRejectsArgsBeforeNetwork(t *testing.T) {
Expand Down
4 changes: 2 additions & 2 deletions internal/cli/remote_commands.go
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ func (r *runtime) runRemoteLogin(args []string) error {
if strings.TrimSpace(cfg.Remote.Endpoint) == "" {
return usageErr(errors.New("remote login requires --endpoint or remote.endpoint"))
}
client, err := crawlremote.NewClientFromConfig(cfg.Remote, crawlremote.Options{UserAgent: "discrawl/" + version})
client, err := crawlremote.NewClientFromConfig(cfg.Remote, crawlremote.Options{UserAgent: discrawlUserAgent()})
if err != nil {
return configErr(err)
}
Expand Down Expand Up @@ -325,7 +325,7 @@ func (r *runtime) remoteClient(requireArchive bool) (remoteArchiveClient, error)
}
client, err := crawlremote.NewClientFromConfig(r.cfg.Remote, crawlremote.Options{
TokenProvider: tokenProvider,
UserAgent: "discrawl/" + version,
UserAgent: discrawlUserAgent(),
})
if err != nil {
return nil, configErr(err)
Expand Down
29 changes: 28 additions & 1 deletion internal/cli/version.go
Original file line number Diff line number Diff line change
@@ -1,3 +1,30 @@
package cli

var version = "0.11.2"
import (
"runtime/debug"
"strings"
)

var version string

func currentVersion() string {
moduleVersion := ""
if info, ok := debug.ReadBuildInfo(); ok {
moduleVersion = info.Main.Version
}
return resolveVersion(version, moduleVersion)
}

func resolveVersion(linkerVersion, moduleVersion string) string {
if linkerVersion = strings.TrimSpace(linkerVersion); linkerVersion != "" {
return strings.TrimPrefix(linkerVersion, "v")
}
if moduleVersion = strings.TrimSpace(moduleVersion); moduleVersion != "" && moduleVersion != "(devel)" {
return strings.TrimPrefix(moduleVersion, "v")
}
return "devel"
}

func discrawlUserAgent() string {
return "discrawl/" + currentVersion()
}
32 changes: 32 additions & 0 deletions internal/cli/version_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
package cli

import "testing"

func TestResolveVersion(t *testing.T) {
for _, tc := range []struct {
name string
linkerVersion string
moduleVersion string
want string
}{
{name: "release linker override", linkerVersion: "0.12.0", moduleVersion: "v0.11.5", want: "0.12.0"},
{name: "release linker override with prefix", linkerVersion: " v0.12.0 ", moduleVersion: "v0.11.5", want: "0.12.0"},
{name: "installed tagged module", moduleVersion: "v0.11.5", want: "0.11.5"},
{name: "installed pseudo-version", moduleVersion: "v0.11.6-0.20260716120000-deadbeefcafe", want: "0.11.6-0.20260716120000-deadbeefcafe"},
{name: "local build", moduleVersion: "(devel)", want: "devel"},
{name: "missing build info", want: "devel"},
} {
t.Run(tc.name, func(t *testing.T) {
if got := resolveVersion(tc.linkerVersion, tc.moduleVersion); got != tc.want {
t.Fatalf("resolveVersion(%q, %q) = %q, want %q", tc.linkerVersion, tc.moduleVersion, got, tc.want)
}
})
}
}

func TestDiscrawlUserAgentUsesCurrentVersion(t *testing.T) {
want := "discrawl/" + currentVersion()
if got := discrawlUserAgent(); got != want {
t.Fatalf("discrawlUserAgent() = %q, want %q", got, want)
}
}