Merge branch 'main' into changelog

Author: jotaen

.github/workflows/ci.yml

@@ -1,9 +1,9 @@
 name: CI
 on: [push, pull_request]
 env:
-  GO_VERSION: '1.24'
-  STATIC_CHECK_VERSION: '2025.1'
-  COUNT_LOC_DOCKER_IMAGE: 'aldanial/cloc:2.02'
+  GO_VERSION: '1.25'
+  STATIC_CHECK_VERSION: '2025.1.1'
+  COUNT_LOC_DOCKER_IMAGE: 'aldanial/cloc:2.06'
 jobs:
   statistics:
     name: Statistics

.github/workflows/release.yml

@@ -6,7 +6,7 @@ on:
         description: 'Release id (tag name)'
         required: true
 env:
-  GO_VERSION: '1.24'
+  GO_VERSION: '1.25'
 jobs:
   create_release:
     name: Create release draft

README.md

@@ -12,26 +12,26 @@ klog is a plain-text file format and a command line tool for time tracking.
 
 📥 [Install](https://klog.jotaen.net#get-klog) – Get the latest version
 
-📢 [Changelog](https://github.com/jotaen/klog/blob/main/CHANGELOG.md) – See what’s new
+📢 [Changelog](CHANGELOG.md) – See what’s new
+
+💬 [Discussions](https://github.com/jotaen/klog/discussions) – Ask questions and share feedback
 
 💡 [Specification](Specification.md) – Study the file format
 
-## Contribute
+## Participate
 
-If you have questions, feature ideas, or just want to bounce off some feedback,
+If you have questions, feedback, feature ideas, or want to report something that’s not working properly,
 feel invited to [start a discussion](https://github.com/jotaen/klog/discussions).
-In case you run into a bug, please [file an issue](https://github.com/jotaen/klog/issues).
-(When in doubt, just go for an issue.)
 
-This repository contains the sources of the klog command line tool as well as
-the [specification document](Specification.md) of the klog file format.
-Note that both are technically independent of each other, which implies that
-they also have different version numbers.
+If you’d like to contribute code, please discuss your intended change beforehand. Please refrain from submitting pull requests proactively.
 
 ## About
 
 klog was created by [Jan Heuermann](https://www.jotaen.net).
+
 You are free to use it under the following terms:
 
 - Command line tool: [MIT license](LICENSE.txt)
 - File specification: [public domain (CC0/OWFa)](Specification.md#License)
+
+Note that the command line tool and the file format specification have independent version numbering schemes.

go.mod

@@ -1,16 +1,16 @@
 module github.com/jotaen/klog
 
-go 1.24
+go 1.25
 
 require (
-	cloud.google.com/go v0.121.3
-	github.com/alecthomas/kong v1.12.0
-	github.com/jotaen/genie v0.0.1
-	github.com/jotaen/kong-completion v0.0.6
-	github.com/jotaen/safemath v0.0.1
+	cloud.google.com/go v0.121.6
+	github.com/alecthomas/kong v1.12.1
+	github.com/jotaen/genie v0.0.2
+	github.com/jotaen/kong-completion v0.0.7
+	github.com/jotaen/safemath v0.0.2
 	github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51
 	github.com/posener/complete v1.2.3
-	github.com/stretchr/testify v1.10.0
+	github.com/stretchr/testify v1.11.1
 )
 
 require (

go.sum

@@ -1,9 +1,9 @@
-cloud.google.com/go v0.121.3 h1:84RD+hQXNdY5Sw/MWVAx5O9Aui/rd5VQ9HEcdN19afo=
-cloud.google.com/go v0.121.3/go.mod h1:6vWF3nJWRrEUv26mMB3FEIU/o1MQNVPG1iHdisa2SJc=
+cloud.google.com/go v0.121.6 h1:waZiuajrI28iAf40cWgycWNgaXPO06dupuS+sgibK6c=
+cloud.google.com/go v0.121.6/go.mod h1:coChdst4Ea5vUpiALcYKXEpR1S9ZgXbhEzzMcMR66vI=
 github.com/alecthomas/assert/v2 v2.11.0 h1:2Q9r3ki8+JYXvGsDyBXwH3LcJ+WK5D0gc5E8vS6K3D0=
 github.com/alecthomas/assert/v2 v2.11.0/go.mod h1:Bze95FyfUr7x34QZrjL+XP+0qgp/zg8yS+TtBj1WA3k=
-github.com/alecthomas/kong v1.12.0 h1:oKd/0fHSdajj5PfGDd3ScvEvpVJf9mT2mb5r9xYadYM=
-github.com/alecthomas/kong v1.12.0/go.mod h1:p2vqieVMeTAnaC83txKtXe8FLke2X07aruPWXyMPQrU=
+github.com/alecthomas/kong v1.12.1 h1:iq6aMJDcFYP9uFrLdsiZQ2ZMmcshduyGv4Pek0MQPW0=
+github.com/alecthomas/kong v1.12.1/go.mod h1:p2vqieVMeTAnaC83txKtXe8FLke2X07aruPWXyMPQrU=
 github.com/alecthomas/repr v0.4.0 h1:GhI2A8MACjfegCPVq9f1FLvIBS+DrQ2KQBFZP1iFzXc=
 github.com/alecthomas/repr v0.4.0/go.mod h1:Fr0507jx4eOXV7AlPV6AVZLYrLIuIeSOWtW57eE/O/4=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -19,12 +19,12 @@ github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+l
 github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM=
 github.com/hexops/gotextdiff v1.0.3 h1:gitA9+qJrrTCsiCl7+kh75nPqQt1cx4ZkudSTLoUqJM=
 github.com/hexops/gotextdiff v1.0.3/go.mod h1:pSWU5MAI3yDq+fZBTazCSJysOMbxWL1BSow5/V2vxeg=
-github.com/jotaen/genie v0.0.1 h1:gURxhYIpVEJ7SKjjNRDLV5OrgMxCbkAdWhjD86ad9P8=
-github.com/jotaen/genie v0.0.1/go.mod h1:bu+PbJDEJ9915yp4xml7OXoM4iBsSDfgtGVwv5Ag0Gg=
-github.com/jotaen/kong-completion v0.0.6 h1:VP1KGvXPeB7MytYR+zZQoWw1gf/HIV1/EvWC38BHZN4=
-github.com/jotaen/kong-completion v0.0.6/go.mod h1:fuWw9snL6joY5mXbI0Dd5FWEZODaWXAeqaRxo6dAvLk=
-github.com/jotaen/safemath v0.0.1 h1:YcUhSIUtwQY1rUUT3AeP+alzTHUAsM4Pap8ZMn3GOlc=
-github.com/jotaen/safemath v0.0.1/go.mod h1:KlKBnI3qvGcr3+iuvp3vABBZNFRjRcwRUVQa/jM38xQ=
+github.com/jotaen/genie v0.0.2 h1:arXxp5faTubDwRbKr6ZHHMaHSmo5cdMSfTIctbwF50s=
+github.com/jotaen/genie v0.0.2/go.mod h1:5v0pWbZ+yHWL8QIfTq1PSuUuoGQ1enQZ4XTtV/PnJos=
+github.com/jotaen/kong-completion v0.0.7 h1:l2UrG51q0gWD8Ph0CykBvGOb1YlXDc789AQnWkq+U9M=
+github.com/jotaen/kong-completion v0.0.7/go.mod h1:dtitX9zCkffI5AON0IKsqHOFEEaL/S2AudgzJfCVFA4=
+github.com/jotaen/safemath v0.0.2 h1:jH9Bx0c9XmZylZD51Rs0Ojcs0jMcN636E2RgtTCUzOU=
+github.com/jotaen/safemath v0.0.2/go.mod h1:6DmgN+FzJxAYVAdKLR0KZl8i+gpj+7yD/bPdpi7qxfU=
 github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 h1:Z9n2FFNUXsshfwJMBgNA0RU6/i7WVaAegv3PtuIHPMs=
 github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51/go.mod h1:CzGEWj7cYgsdH8dAjBGEr58BoE7ScuLd+fwFZ44+/x8=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
@@ -35,8 +35,8 @@ github.com/riywo/loginshell v0.0.0-20200815045211-7d26008be1ab h1:ZjX6I48eZSFetP
 github.com/riywo/loginshell v0.0.0-20200815045211-7d26008be1ab/go.mod h1:/PfPXh0EntGc3QAAyUaviy4S9tzy4Zp0e2ilq4voC6E=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
-github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
-github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
+github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
+github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=

klog.go

@@ -3,11 +3,12 @@ package main
 import (
 	_ "embed"
 	"fmt"
+	"os"
+	"runtime"
+
 	"github.com/jotaen/klog/klog/app"
 	"github.com/jotaen/klog/klog/app/cli/util"
 	"github.com/jotaen/klog/klog/app/main"
-	"os"
-	"runtime"
 )
 
 //go:embed Specification.md
@@ -41,11 +42,7 @@ func main() {
 	}()
 
 	config := func() app.Config {
-		c, err := app.NewConfig(
-			app.FromDeterminedValues{NumCpus: runtime.NumCPU()},
-			app.FromEnvVars{GetVar: os.Getenv},
-			app.FromConfigFile{FileContents: configFile},
-		)
+		c, err := app.NewConfig(runtime.NumCPU(), os.Getenv, configFile)
 		if err != nil {
 			fail(util.PrettifyAppError(err, false), app.CONFIG_ERROR.ToInt())
 		}

klog/app/cli/config.go

@@ -1,11 +1,12 @@
 package cli
 
 import (
+	"path/filepath"
+	"strings"
+
 	"github.com/jotaen/klog/klog/app"
 	tf "github.com/jotaen/klog/klog/app/cli/terminalformat"
 	"github.com/jotaen/klog/klog/app/cli/util"
-	"path/filepath"
-	"strings"
 )
 
 type Config struct {
@@ -27,7 +28,7 @@ klog relies on file-based configuration to customise some of its default behavio
 
 Run 'klog config --location' to print the path of the folder where klog looks for the configuration.
 The config folder can contain one or both of the following files:
-  - '` + app.CONFIG_FILE_NAME + `': you can create this file manually to override some of klog’s default behaviour. You may use the output of the 'klog config' command as template for setting up this file, as its output is in valid syntax. 
+  - '` + app.CONFIG_FILE_NAME + `': you can create this file manually to override some of klog’s default behaviour. You may use the output of the 'klog config' command as template for setting up this file, as its output is valid .ini syntax. 
   - '` + app.BOOKMARKS_FILE_NAME + `': if you use the bookmarks functionality, then klog uses this file as database. You are not supposed to edit this file by hand! Instead, use the 'klog bookmarks' command to manage your bookmarks.
 
 You can customise the location of the config folder via environment variables. klog uses the following lookup precedence:

klog/app/cli/info.go

@@ -18,7 +18,12 @@ func (opt *Info) Run(ctx app.Context) app.Error {
 	} else if opt.About {
 		ctx.Print(INTRO_SUMMARY)
 	} else {
-		ctx.Print("Use --spec or --license\n")
+		return app.NewErrorWithCode(
+			app.GENERAL_ERROR,
+			"No flag specified",
+			"Run with `--help` for more info",
+			nil,
+		)
 	}
 	return nil
 }

klog/app/cli/testcontext_test.go

@@ -1,14 +1,15 @@
 package cli
 
 import (
+	gotime "time"
+
 	"github.com/jotaen/klog/klog"
 	"github.com/jotaen/klog/klog/app"
 	"github.com/jotaen/klog/klog/app/cli/command"
 	tf "github.com/jotaen/klog/klog/app/cli/terminalformat"
 	"github.com/jotaen/klog/klog/parser"
 	"github.com/jotaen/klog/klog/parser/reconciling"
 	"github.com/jotaen/klog/klog/parser/txt"
-	gotime "time"
 )
 
 func NewTestingContext() TestingContext {
@@ -63,11 +64,11 @@ func (ctx TestingContext) _SetFileExplorers(cs []command.Command) TestingContext
 }
 
 func (ctx TestingContext) _SetFileConfig(configFile string) TestingContext {
-	fileCfg := app.FromConfigFile{FileContents: configFile}
-	err := fileCfg.Apply(ctx.config)
+	cfg, err := app.NewConfig(1, func(_ string) string { return "" }, configFile)
 	if err != nil {
 		panic(err)
 	}
+	ctx.config = &cfg
 	return ctx
 }