Skip to content

Commit 5b13199

Browse files
authored
Merge pull request #16 from codeGROOVE-dev/fake-user
cleanup, lint
2 parents a38c165 + 089dfe1 commit 5b13199

File tree

6 files changed

+270
-234
lines changed

6 files changed

+270
-234
lines changed

.golangci.yml

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -152,10 +152,10 @@ linters:
152152

153153
nakedret:
154154
# Default: 30
155-
max-func-lines: 4
155+
max-func-lines: 7
156156

157157
nestif:
158-
min-complexity: 12
158+
min-complexity: 15
159159

160160
nolintlint:
161161
# Exclude following linters from requiring an explanation.
@@ -171,17 +171,13 @@ linters:
171171
rules:
172172
- name: add-constant
173173
severity: warning
174-
disabled: false
175-
exclude: [""]
176-
arguments:
177-
- max-lit-count: "5"
178-
allow-strs: '"","\n"'
179-
allow-ints: "0,1,2,3,24,30,60,100,365,0o600,0o700,0o750,0o755"
180-
allow-floats: "0.0,0.,1.0,1.,2.0,2."
174+
disabled: true
175+
- name: argument-limit
176+
arguments: [9]
181177
- name: cognitive-complexity
182-
arguments: [55]
178+
disabled: true # prefer maintidx
183179
- name: cyclomatic
184-
arguments: [60]
180+
disabled: true # prefer maintidx
185181
- name: function-length
186182
arguments: [150, 225]
187183
- name: line-length-limit
@@ -213,8 +209,14 @@ linters:
213209
os-temp-dir: true
214210

215211
varnamelen:
216-
max-distance: 40
212+
max-distance: 75
217213
min-name-length: 2
214+
check-receivers: false
215+
ignore-names:
216+
- r
217+
- w
218+
- f
219+
- err
218220

219221
exclusions:
220222
# Default: []

Makefile

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
1-
2-
# BEGIN: lint-install .
3-
# http://github.com/codeGROOVE-dev/lint-install
4-
51
.PHONY: lint test build
62
test:
73
go test -race ./...
@@ -10,6 +6,10 @@ build:
106
mkdir -p out
117
go build -o out/prs .
128

9+
# BEGIN: lint-install .
10+
# http://github.com/codeGROOVE-dev/lint-install
11+
12+
.PHONY: lint
1313
lint: _lint
1414

1515
LINT_ARCH := $(shell uname -m)
@@ -28,7 +28,7 @@ LINTERS :=
2828
FIXERS :=
2929

3030
GOLANGCI_LINT_CONFIG := $(LINT_ROOT)/.golangci.yml
31-
GOLANGCI_LINT_VERSION ?= v2.4.0
31+
GOLANGCI_LINT_VERSION ?= v2.5.0
3232
GOLANGCI_LINT_BIN := $(LINT_ROOT)/out/linters/golangci-lint-$(GOLANGCI_LINT_VERSION)-$(LINT_ARCH)
3333
$(GOLANGCI_LINT_BIN):
3434
mkdir -p $(LINT_ROOT)/out/linters
@@ -58,9 +58,19 @@ yamllint-lint: $(YAMLLINT_BIN)
5858
PYTHONPATH=$(YAMLLINT_ROOT)/dist $(YAMLLINT_ROOT)/dist/bin/yamllint .
5959

6060
.PHONY: _lint $(LINTERS)
61-
_lint: $(LINTERS)
61+
_lint:
62+
@exit_code=0; \
63+
for target in $(LINTERS); do \
64+
$(MAKE) $$target || exit_code=1; \
65+
done; \
66+
exit $$exit_code
6267

6368
.PHONY: fix $(FIXERS)
64-
fix: $(FIXERS)
69+
fix:
70+
@exit_code=0; \
71+
for target in $(FIXERS); do \
72+
$(MAKE) $$target || exit_code=1; \
73+
done; \
74+
exit $$exit_code
6575

6676
# END: lint-install .

go.mod

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ go 1.25.1
55
require (
66
github.com/avast/retry-go/v4 v4.6.1
77
github.com/charmbracelet/lipgloss v1.1.0
8-
github.com/codeGROOVE-dev/sprinkler v0.0.0-20251001125233-5fa6f0ff4582
9-
github.com/codeGROOVE-dev/turnclient v0.0.0-20250929203714-61cf2f094fb1
8+
github.com/codeGROOVE-dev/sprinkler v0.0.0-20251001144140-ed20651ca4e9
9+
github.com/codeGROOVE-dev/turnclient v0.0.0-20251001151440-a58eb9b17826
1010
golang.org/x/term v0.35.0
1111
)
1212

@@ -17,7 +17,7 @@ require (
1717
github.com/charmbracelet/x/cellbuf v0.0.13 // indirect
1818
github.com/charmbracelet/x/term v0.2.1 // indirect
1919
github.com/clipperhouse/uax29/v2 v2.2.0 // indirect
20-
github.com/codeGROOVE-dev/prx v0.0.0-20250923100916-d2b60be50274 // indirect
20+
github.com/codeGROOVE-dev/prx v0.0.0-20251001143458-17e6b58fb46c // indirect
2121
github.com/codeGROOVE-dev/retry v1.2.0 // indirect
2222
github.com/lucasb-eyer/go-colorful v1.3.0 // indirect
2323
github.com/mattn/go-isatty v0.0.20 // indirect

go.sum

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,18 @@ github.com/clipperhouse/uax29/v2 v2.2.0 h1:ChwIKnQN3kcZteTXMgb1wztSgaU+ZemkgWdoh
1616
github.com/clipperhouse/uax29/v2 v2.2.0/go.mod h1:EFJ2TJMRUaplDxHKj1qAEhCtQPW2tJSwu5BF98AuoVM=
1717
github.com/codeGROOVE-dev/prx v0.0.0-20250923100916-d2b60be50274 h1:9eLzQdOaQEn30279ai3YjNdJOM/efbcYanWC9juAJ+M=
1818
github.com/codeGROOVE-dev/prx v0.0.0-20250923100916-d2b60be50274/go.mod h1:7qLbi18baOyS8yO/6/64SBIqtyzSzLFdsDST15NPH3w=
19+
github.com/codeGROOVE-dev/prx v0.0.0-20251001143458-17e6b58fb46c h1:/rrjFoqwFqKNzc1f14vQt6QJ9U5tQ4Uh6U8hgixkSqw=
20+
github.com/codeGROOVE-dev/prx v0.0.0-20251001143458-17e6b58fb46c/go.mod h1:7qLbi18baOyS8yO/6/64SBIqtyzSzLFdsDST15NPH3w=
1921
github.com/codeGROOVE-dev/retry v1.2.0 h1:xYpYPX2PQZmdHwuiQAGGzsBm392xIMl4nfMEFApQnu8=
2022
github.com/codeGROOVE-dev/retry v1.2.0/go.mod h1:8OgefgV1XP7lzX2PdKlCXILsYKuz6b4ZpHa/20iLi8E=
2123
github.com/codeGROOVE-dev/sprinkler v0.0.0-20251001125233-5fa6f0ff4582 h1:IPCaNGRWdyMZKyjnjv+wdSmPmOZtKFD6SVaha5DuCqk=
2224
github.com/codeGROOVE-dev/sprinkler v0.0.0-20251001125233-5fa6f0ff4582/go.mod h1:RZ/Te7HkY5upHQlnmf3kV4GHVM0R8AK3U+yPItCZAoQ=
25+
github.com/codeGROOVE-dev/sprinkler v0.0.0-20251001144140-ed20651ca4e9 h1:Nuyy0vMl6YD96N6WwZeqClPa/VlaILJYZoG50ezOAHw=
26+
github.com/codeGROOVE-dev/sprinkler v0.0.0-20251001144140-ed20651ca4e9/go.mod h1:RZ/Te7HkY5upHQlnmf3kV4GHVM0R8AK3U+yPItCZAoQ=
2327
github.com/codeGROOVE-dev/turnclient v0.0.0-20250929203714-61cf2f094fb1 h1:lQZoQN9Vo+AzGHGRMAoFewJ07vS24cNIEx2GrL5FX/g=
2428
github.com/codeGROOVE-dev/turnclient v0.0.0-20250929203714-61cf2f094fb1/go.mod h1:7lBF4vS6T+D1rNjmJ+CNVrXALQvdwNfBVEy7vhIQtYk=
29+
github.com/codeGROOVE-dev/turnclient v0.0.0-20251001151440-a58eb9b17826 h1:ly6n4spiC6r0IOMl8QfZjv+qUnMHLvo/qErGPVMV3IE=
30+
github.com/codeGROOVE-dev/turnclient v0.0.0-20251001151440-a58eb9b17826/go.mod h1:JXk9gT6Qb496lnTcgpk9h917XaREGa+t6Kvg0YHAQJY=
2531
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
2632
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
2733
github.com/lucasb-eyer/go-colorful v1.3.0 h1:2/yBRLdWBZKrf7gB40FoiKfAWYQ0lqNcbuQwVHXptag=

0 commit comments

Comments
 (0)