From bd5ee90324bef56ab71d784271de880e5fc81ad9 Mon Sep 17 00:00:00 2001 From: "T. von Dein" Date: Mon, 3 Nov 2025 22:06:11 +0100 Subject: [PATCH] move to codeberg (#45) --- .github/workflows/ci.yaml | 38 --------------- .github/workflows/release.yaml | 87 ---------------------------------- .goreleaser.yaml | 69 +++++++++++++++++++++++++++ .woodpecker/build.yaml | 36 ++++++++++++++ .woodpecker/image.yaml | 32 +++++++++++++ .woodpecker/release.yaml | 15 ++++++ CHANGELOG.md | 62 ++++++++++++------------ Makefile | 4 +- Makefile.dist | 20 ++++++++ README.md | 16 +++---- cmd/root.go | 4 +- cmd/tablizer.go | 2 +- go.mod | 2 +- lib/filter.go | 2 +- lib/filter_test.go | 2 +- lib/helpers.go | 2 +- lib/helpers_test.go | 2 +- lib/io.go | 2 +- lib/parser.go | 2 +- lib/parser_test.go | 2 +- lib/printer.go | 7 ++- lib/printer_test.go | 2 +- lib/sort.go | 2 +- lib/sort_test.go | 2 +- lib/tableeditor.go | 2 +- lib/yank.go | 2 +- lib/yank_test.go | 2 +- main.go | 2 +- mkrel.sh | 2 +- tablizer.1 | 2 +- tablizer.pod | 2 +- 31 files changed, 239 insertions(+), 189 deletions(-) delete mode 100644 .github/workflows/ci.yaml delete mode 100644 .github/workflows/release.yaml create mode 100644 .goreleaser.yaml create mode 100644 .woodpecker/build.yaml create mode 100644 .woodpecker/image.yaml create mode 100644 .woodpecker/release.yaml create mode 100644 Makefile.dist diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml deleted file mode 100644 index bebde40..0000000 --- a/.github/workflows/ci.yaml +++ /dev/null @@ -1,38 +0,0 @@ -name: build-and-test-tablizer -on: [push] -jobs: - build: - strategy: - matrix: - version: ['1.24'] - os: [ubuntu-latest, macos-latest, windows-latest] - name: Build - runs-on: ${{ matrix.os }} - steps: - - name: Set up Go ${{ matrix.version }} - uses: actions/setup-go@v6 - with: - go-version: '${{ matrix.version }}' - id: go - - - name: checkout - uses: actions/checkout@v5 - - - name: build - run: make - - - name: test - run: make test - - golangci: - name: lint - runs-on: ubuntu-latest - steps: - - uses: actions/setup-go@v6 - with: - go-version: 1.24 - - uses: actions/checkout@v5 - - name: golangci-lint - uses: golangci/golangci-lint-action@v6 - with: - skip-cache: true diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml deleted file mode 100644 index 56a972f..0000000 --- a/.github/workflows/release.yaml +++ /dev/null @@ -1,87 +0,0 @@ -name: build-release -on: - push: - tags: - - "v*.*.*" - -jobs: - release: - name: Build Release Assets - runs-on: ubuntu-latest - steps: - - name: Checkout code - uses: actions/checkout@v5 - - - name: Set up Go - uses: actions/setup-go@v6 - with: - go-version: 1.24.0 - - - name: Build the executables - run: ./mkrel.sh tablizer ${{ github.ref_name}} - - - name: List the executables - run: ls -l ./releases - - - name: Upload the binaries - uses: svenstaro/upload-release-action@v2 - with: - repo_token: ${{ secrets.GITHUB_TOKEN }} - tag: ${{ github.ref_name }} - file: ./releases/* - file_glob: true - - - name: Build Changelog - id: github_release - uses: mikepenz/release-changelog-builder-action@v5 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - mode: "PR" - configurationJson: | - { - "template": "#{{CHANGELOG}}\n\n**Full Changelog**: #{{RELEASE_DIFF}}", - "pr_template": "- #{{TITLE}} (##{{NUMBER}}) by #{{AUTHOR}}\n#{{BODY}}", - "empty_template": "- no changes", - "categories": [ - { - "title": "## New Features", - "labels": ["add", "feature"] - }, - { - "title": "## Bug Fixes", - "labels": ["fix", "bug", "revert"] - }, - { - "title": "## Documentation Enhancements", - "labels": ["doc"] - }, - { - "title": "## Refactoring Efforts", - "labels": ["refactor"] - }, - { - "title": "## Miscellaneus Changes", - "labels": [] - } - ], - "ignore_labels": [ - "duplicate", "good first issue", "help wanted", "invalid", "question", "wontfix" - ], - "label_extractor": [ - { - "pattern": "(.) (.+)", - "target": "$1" - }, - { - "pattern": "(.) (.+)", - "target": "$1", - "on_property": "title" - } - ] - } - - - name: Create Release - uses: softprops/action-gh-release@v2 - with: - body: ${{steps.github_release.outputs.changelog}} diff --git a/.goreleaser.yaml b/.goreleaser.yaml new file mode 100644 index 0000000..0e35092 --- /dev/null +++ b/.goreleaser.yaml @@ -0,0 +1,69 @@ +# vim: set ts=2 sw=2 tw=0 fo=cnqoj + +version: 2 + +before: + hooks: + - go mod tidy + +gitea_urls: + api: https://codeberg.org/api/v1 + download: https://codeberg.org + +builds: + - env: + - CGO_ENABLED=0 + goos: + - linux + - windows + - darwin + - freebsd + +archives: + - formats: [tar.gz] + # this name template makes the OS and Arch compatible with the results of `uname`. + name_template: >- + {{ .ProjectName }}_ + {{- title .Os }}_ + {{- if eq .Arch "amd64" }}x86_64 + {{- else if eq .Arch "386" }}i386 + {{- else }}{{ .Arch }}{{ end }} + {{- if .Arm }}v{{ .Arm }}{{ end }}_{{ .Tag }} + # use zip for windows archives + format_overrides: + - goos: windows + formats: [zip] + - goos: linux + formats: [tar.gz,binary] + files: + - src: "*.md" + strip_parent: true + - src: "docs/*" + strip_parent: true + - src: Makefile.dist + dst: Makefile + wrap_in_directory: true + +changelog: + sort: asc + filters: + exclude: + - "^docs:" + - "^test:" + groups: + - title: Improved + regexp: '^.*?(feat|add|new)(\([[:word:]]+\))??!?:.+$' + order: 0 + - title: Fixed + regexp: '^.*?(bug|fix)(\([[:word:]]+\))??!?:.+$' + order: 1 + - title: Changed + order: 999 + +release: + header: "# Release Notes" + footer: >- + + --- + + Full Changelog: [{{ .PreviousTag }}...{{ .Tag }}](https://codeberg.org/scip/epuppy/compare/{{ .PreviousTag }}...{{ .Tag }}) diff --git a/.woodpecker/build.yaml b/.woodpecker/build.yaml new file mode 100644 index 0000000..e20cc6f --- /dev/null +++ b/.woodpecker/build.yaml @@ -0,0 +1,36 @@ +matrix: + platform: + - linux/amd64 + goversion: + - 1.24 + +labels: + platform: ${platform} + +steps: + build: + when: + event: [push] + image: golang:${goversion} + commands: + - go get + - go build + + linter: + when: + event: [push] + image: golang:${goversion} + commands: + - curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/HEAD/install.sh | sh -s -- -b $(go env GOPATH)/bin v2.5.0 + - golangci-lint --version + - golangci-lint run ./... + depends_on: [build] + + test: + when: + event: [push] + image: golang:${goversion} + commands: + - go get + - go test -v -cover + depends_on: [build,linter] diff --git a/.woodpecker/image.yaml b/.woodpecker/image.yaml new file mode 100644 index 0000000..687796c --- /dev/null +++ b/.woodpecker/image.yaml @@ -0,0 +1,32 @@ +# https://woodpecker-ci.org/plugins/docker-buildx +# enable Package unit and go to /scip/-/packages after building to link to proj + +variables: + - &repo codeberg.org/${CI_REPO_OWNER}/tablizer + +steps: + dryrun: + image: docker.io/woodpeckerci/plugin-docker-buildx:latest + settings: + dockerfile: Dockerfile + platforms: linux/amd64 + dry_run: true + repo: *repo + tags: latest + when: + event: [pull_request] + + publish: + image: docker.io/woodpeckerci/plugin-docker-buildx:latest + settings: + dockerfile: Dockerfile + platforms: linux/amd64 + repo: *repo + registry: codeberg.org + tags: latest,${CI_COMMIT_SHA:0:8},${CI_COMMIT_TAG} + username: ${CI_REPO_OWNER} + password: + from_secret: REGISTRY_TOKEN + when: + event: [tag] + branch: main diff --git a/.woodpecker/release.yaml b/.woodpecker/release.yaml new file mode 100644 index 0000000..916c008 --- /dev/null +++ b/.woodpecker/release.yaml @@ -0,0 +1,15 @@ +# build release + +labels: + platform: linux/amd64 + +steps: + goreleaser: + image: goreleaser/goreleaser + when: + event: [tag] + environment: + GITEA_TOKEN: + from_secret: DEPLOY_TOKEN + commands: + - goreleaser release --clean --verbose diff --git a/CHANGELOG.md b/CHANGELOG.md index 75f2ed9..749a318 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,9 +4,9 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org). -## [v1.0.14](https://github.com/TLINDEN/tablizer/tree/v1.0.14) - 2023-01-23 +## [v1.0.14](https://codeberg.org/scip/tablizer/tree/v1.0.14) - 2023-01-23 -[Full Changelog](https://github.com/TLINDEN/tablizer/compare/v1.0.13...v1.0.14) +[Full Changelog](https://codeberg.org/scip/tablizer/compare/v1.0.13...v1.0.14) ### Fixed @@ -28,9 +28,9 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a - updated dependencies (go module versions) -## [v1.0.13](https://github.com/TLINDEN/tablizer/tree/v1.0.13) - 2022-11-03 +## [v1.0.13](https://codeberg.org/scip/tablizer/tree/v1.0.13) - 2022-11-03 -[Full Changelog](https://github.com/TLINDEN/tablizer/compare/v1.0.12...v1.0.13) +[Full Changelog](https://codeberg.org/scip/tablizer/compare/v1.0.12...v1.0.13) ### Added @@ -47,9 +47,9 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a manpage. -## [v1.0.12](https://github.com/TLINDEN/tablizer/tree/v1.0.12) - 2022-10-25 +## [v1.0.12](https://codeberg.org/scip/tablizer/tree/v1.0.12) - 2022-10-25 -[Full Changelog](https://github.com/TLINDEN/tablizer/compare/v1.0.11...v1.0.12) +[Full Changelog](https://codeberg.org/scip/tablizer/compare/v1.0.11...v1.0.12) ### Added @@ -72,14 +72,14 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a ### Fixed -- Fixed [Bug #5](https://github.com/TLINDEN/tablizer/issues/5), where +- Fixed [Bug #5](https://codeberg.org/scip/tablizer/issues/5), where matches have not been highlighted correctly in some rare cases. -## [v1.0.11](https://github.com/TLINDEN/tablizer/tree/v1.0.11) - 2022-10-19 +## [v1.0.11](https://codeberg.org/scip/tablizer/tree/v1.0.11) - 2022-10-19 -[Full Changelog](https://github.com/TLINDEN/tablizer/compare/v1.0.10...v1.0.11) +[Full Changelog](https://codeberg.org/scip/tablizer/compare/v1.0.10...v1.0.11) ### Added @@ -101,9 +101,9 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a -## [v1.0.10](https://github.com/TLINDEN/tablizer/tree/v1.0.10) - 2022-10-15 +## [v1.0.10](https://codeberg.org/scip/tablizer/tree/v1.0.10) - 2022-10-15 -[Full Changelog](https://github.com/TLINDEN/tablizer/compare/v1.0.9...v1.0.10) +[Full Changelog](https://codeberg.org/scip/tablizer/compare/v1.0.9...v1.0.10) ### Added @@ -123,9 +123,9 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a -## [v1.0.9](https://github.com/TLINDEN/tablizer/tree/v1.0.9) - 2022-10-14 +## [v1.0.9](https://codeberg.org/scip/tablizer/tree/v1.0.9) - 2022-10-14 -[Full Changelog](https://github.com/TLINDEN/tablizer/compare/v1.0.8...v1.0.9) +[Full Changelog](https://codeberg.org/scip/tablizer/compare/v1.0.8...v1.0.9) ### Added @@ -137,9 +137,9 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a -## [v1.0.8](https://github.com/TLINDEN/tablizer/tree/v1.0.8) - 2022-10-13 +## [v1.0.8](https://codeberg.org/scip/tablizer/tree/v1.0.8) - 2022-10-13 -[Full Changelog](https://github.com/TLINDEN/tablizer/compare/v1.0.7...v1.0.8) +[Full Changelog](https://codeberg.org/scip/tablizer/compare/v1.0.7...v1.0.8) ### Added @@ -147,9 +147,9 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a -## [v1.0.7](https://github.com/TLINDEN/tablizer/tree/v1.0.7) - 2022-10-11 +## [v1.0.7](https://codeberg.org/scip/tablizer/tree/v1.0.7) - 2022-10-11 -[Full Changelog](https://github.com/TLINDEN/tablizer/compare/v1.0.6...v1.0.7) +[Full Changelog](https://codeberg.org/scip/tablizer/compare/v1.0.6...v1.0.7) ### Added @@ -165,9 +165,9 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a -## [v1.0.6](https://github.com/TLINDEN/tablizer/tree/v1.0.6) - 2022-10-05 +## [v1.0.6](https://codeberg.org/scip/tablizer/tree/v1.0.6) - 2022-10-05 -[Full Changelog](https://github.com/TLINDEN/tablizer/compare/v1.0.5...v1.0.6) +[Full Changelog](https://codeberg.org/scip/tablizer/compare/v1.0.5...v1.0.6) ### Added @@ -183,9 +183,9 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a -## [v1.0.5](https://github.com/TLINDEN/tablizer/tree/v1.0.5) - 2022-10-05 +## [v1.0.5](https://codeberg.org/scip/tablizer/tree/v1.0.5) - 2022-10-05 -[Full Changelog](https://github.com/TLINDEN/tablizer/compare/v1.0.4...v1.0.5) +[Full Changelog](https://codeberg.org/scip/tablizer/compare/v1.0.4...v1.0.5) ### Added @@ -203,9 +203,9 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a -## [v1.0.4](https://github.com/TLINDEN/tablizer/tree/v1.0.4) - 2022-10-04 +## [v1.0.4](https://codeberg.org/scip/tablizer/tree/v1.0.4) - 2022-10-04 -[Full Changelog](https://github.com/TLINDEN/tablizer/compare/v1.0.3...v1.0.4) +[Full Changelog](https://codeberg.org/scip/tablizer/compare/v1.0.3...v1.0.4) ### Added @@ -221,9 +221,9 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a -## [v1.0.3](https://github.com/TLINDEN/tablizer/tree/v1.0.3) - 2022-10-03 +## [v1.0.3](https://codeberg.org/scip/tablizer/tree/v1.0.3) - 2022-10-03 -[Full Changelog](https://github.com/TLINDEN/tablizer/compare/v1.0.2...v1.0.3) +[Full Changelog](https://codeberg.org/scip/tablizer/compare/v1.0.2...v1.0.3) ### Added @@ -237,9 +237,9 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a -## [v1.0.2](https://github.com/TLINDEN/tablizer/tree/v1.0.2) - 2022-10-02 +## [v1.0.2](https://codeberg.org/scip/tablizer/tree/v1.0.2) - 2022-10-02 -[Full Changelog](https://github.com/TLINDEN/tablizer/compare/v1.0.1...v1.0.2) +[Full Changelog](https://codeberg.org/scip/tablizer/compare/v1.0.1...v1.0.2) ### Added @@ -255,9 +255,9 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a -## [v1.0.1](https://github.com/TLINDEN/tablizer/tree/v1.0.1) - 2022-09-30 +## [v1.0.1](https://codeberg.org/scip/tablizer/tree/v1.0.1) - 2022-09-30 -[Full Changelog](https://github.com/TLINDEN/tablizer/compare/v1.0.0...v1.0.1) +[Full Changelog](https://codeberg.org/scip/tablizer/compare/v1.0.0...v1.0.1) ### Added @@ -271,8 +271,8 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a -## [v1.0.0](https://github.com/TLINDEN/tablizer/tree/v1.0.0) - 2022-09-28 +## [v1.0.0](https://codeberg.org/scip/tablizer/tree/v1.0.0) - 2022-09-28 -[Full Changelog](https://github.com/TLINDEN/tablizer/compare/02a64a5c3fe4220df2c791ff1421d16ebd428c19...v1.0.0) +[Full Changelog](https://codeberg.org/scip/tablizer/compare/02a64a5c3fe4220df2c791ff1421d16ebd428c19...v1.0.0) Initial release. diff --git a/Makefile b/Makefile index 25c346c..beb723d 100644 --- a/Makefile +++ b/Makefile @@ -50,7 +50,7 @@ ifdef HAVE_POD endif buildlocal: - go build -ldflags "-X 'github.com/tlinden/tablizer/cfg.VERSION=$(VERSION)'" + go build -ldflags "-X 'codeberg.org/scip/tablizer/cfg.VERSION=$(VERSION)'" release: gh release create $(version) --generate-notes @@ -69,7 +69,7 @@ test: clean singletest: @echo "Call like this: 'make singletest TEST=TestPrepareColumns MOD=lib'" - go test -run $(TEST) github.com/tlinden/tablizer/$(MOD) $(OPTS) + go test -run $(TEST) codeberg.org/scip/tablizer/$(MOD) $(OPTS) cover-report: go test ./... -cover -coverprofile=coverage.out diff --git a/Makefile.dist b/Makefile.dist new file mode 100644 index 0000000..cb76bca --- /dev/null +++ b/Makefile.dist @@ -0,0 +1,20 @@ +# -*-make-*- + +.PHONY: install all + +tool = rpn +PREFIX = /usr/local +UID = root +GID = 0 + +all: + @echo "Type 'sudo make install' to install the tool." + @echo "To change prefix, type 'sudo make install PREFIX=/opt'" + +install: + install -d -o $(UID) -g $(GID) $(PREFIX)/bin + install -d -o $(UID) -g $(GID) $(PREFIX)/man/man1 + install -d -o $(UID) -g $(GID) $(PREFIX)/share/doc + install -o $(UID) -g $(GID) -m 555 $(tool) $(PREFIX)/sbin/ + install -o $(UID) -g $(GID) -m 444 $(tool).1 $(PREFIX)/man/man1/ + install -o $(UID) -g $(GID) -m 444 *.md $(PREFIX)/share/doc/ diff --git a/README.md b/README.md index 0480165..ec47053 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ -[![Actions](https://github.com/tlinden/tablizer/actions/workflows/ci.yaml/badge.svg)](https://github.com/tlinden/tablizer/actions) -[![License](https://img.shields.io/badge/license-GPL-blue.svg)](https://github.com/tlinden/tablizer/blob/master/LICENSE) -[![Go Report Card](https://goreportcard.com/badge/github.com/tlinden/tablizer)](https://goreportcard.com/report/github.com/tlinden/tablizer) +[![status-badge](https://ci.codeberg.org/api/badges/15519/status.svg)](https://ci.codeberg.org/repos/15519) +[![License](https://img.shields.io/badge/license-GPL-blue.svg)](https://codeberg.org/scip/tablizer/blob/master/LICENSE) +[![Go Report Card](https://goreportcard.com/badge/codeberg.org/scip/tablizer)](https://goreportcard.com/report/codeberg.org/scip/tablizer) ## tablizer - Manipulate tabular output of other programs @@ -192,7 +192,7 @@ There are multiple ways to install **tablizer**: stew install tlinden/tablizer ``` -- Go to the [latest release page](https://github.com/tlinden/tablizer/releases/latest), +- Go to the [latest release page](https://codeberg.org/scip/tablizer/releases), locate the binary for your operating system and platform. Download it and put it into some directory within your `$PATH` variable. @@ -205,7 +205,7 @@ There are multiple ways to install **tablizer**: - You can also install from source. Issue the following commands in your shell: ``` - git clone https://github.com/TLINDEN/tablizer.git + git clone https://codeberg.org/scip/tablizer.git cd tablizer make sudo make install @@ -219,7 +219,7 @@ hesitate to ask me about it, I'll add it. The documentation is provided as a unix man-page. It will be automatically installed if you install from source. -[However, you can read the man-page online](https://github.com/TLINDEN/tablizer/blob/main/tablizer.pod). +[However, you can read the man-page online](https://codeberg.org/scip/tablizer/raw/branch/tablizer.pod). Or if you cloned the repository you can read it this way (perl needs to be installed though): `perldoc tablizer.pod`. @@ -236,7 +236,7 @@ that's the best way for me to forget to do something. In order to report a bug, unexpected behavior, feature requests or to submit a patch, please open an issue on github: -https://github.com/TLINDEN/tablizer/issues. +https://codeberg.org/scip/tablizer/issues. ## Prior Art @@ -283,4 +283,4 @@ T.v.Dein ## Project homepage -https://github.com/TLINDEN/tablizer +https://codeberg.org/scip/tablizer diff --git a/cmd/root.go b/cmd/root.go index 8532abe..6086305 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -24,8 +24,8 @@ import ( "strings" "github.com/spf13/cobra" - "github.com/tlinden/tablizer/cfg" - "github.com/tlinden/tablizer/lib" + "codeberg.org/scip/tablizer/cfg" + "codeberg.org/scip/tablizer/lib" ) func completion(cmd *cobra.Command, mode string) error { diff --git a/cmd/tablizer.go b/cmd/tablizer.go index f732afa..9a4e851 100644 --- a/cmd/tablizer.go +++ b/cmd/tablizer.go @@ -464,7 +464,7 @@ CONFIGURATION AND COLORS BUGS In order to report a bug, unexpected behavior, feature requests or to submit a patch, please open an issue on github: - . + . LICENSE This software is licensed under the GNU GENERAL PUBLIC LICENSE version diff --git a/go.mod b/go.mod index 5d76c67..fcc1c38 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/tlinden/tablizer +module codeberg.org/scip/tablizer go 1.24.0 diff --git a/lib/filter.go b/lib/filter.go index 8b6271e..f603c8b 100644 --- a/lib/filter.go +++ b/lib/filter.go @@ -23,7 +23,7 @@ import ( "strings" "github.com/lithammer/fuzzysearch/fuzzy" - "github.com/tlinden/tablizer/cfg" + "codeberg.org/scip/tablizer/cfg" ) /* diff --git a/lib/filter_test.go b/lib/filter_test.go index 4bf19e4..1cf4032 100644 --- a/lib/filter_test.go +++ b/lib/filter_test.go @@ -22,7 +22,7 @@ import ( "testing" "github.com/stretchr/testify/assert" - "github.com/tlinden/tablizer/cfg" + "codeberg.org/scip/tablizer/cfg" ) func TestMatchPattern(t *testing.T) { diff --git a/lib/helpers.go b/lib/helpers.go index 5367505..cd63cd8 100644 --- a/lib/helpers.go +++ b/lib/helpers.go @@ -27,7 +27,7 @@ import ( "strings" "github.com/gookit/color" - "github.com/tlinden/tablizer/cfg" + "codeberg.org/scip/tablizer/cfg" ) func findindex(s []int, e int) (int, bool) { diff --git a/lib/helpers_test.go b/lib/helpers_test.go index 65dabdd..8df6379 100644 --- a/lib/helpers_test.go +++ b/lib/helpers_test.go @@ -23,7 +23,7 @@ import ( "testing" "github.com/stretchr/testify/assert" - "github.com/tlinden/tablizer/cfg" + "codeberg.org/scip/tablizer/cfg" ) func TestContains(t *testing.T) { diff --git a/lib/io.go b/lib/io.go index 8c40079..6d3b98f 100644 --- a/lib/io.go +++ b/lib/io.go @@ -23,7 +23,7 @@ import ( "io" "os" - "github.com/tlinden/tablizer/cfg" + "codeberg.org/scip/tablizer/cfg" ) const RWRR = 0755 diff --git a/lib/parser.go b/lib/parser.go index 195babd..872e9a4 100644 --- a/lib/parser.go +++ b/lib/parser.go @@ -30,7 +30,7 @@ import ( "strings" "github.com/alecthomas/repr" - "github.com/tlinden/tablizer/cfg" + "codeberg.org/scip/tablizer/cfg" ) /* diff --git a/lib/parser_test.go b/lib/parser_test.go index 5d7ad63..209ec8b 100644 --- a/lib/parser_test.go +++ b/lib/parser_test.go @@ -24,7 +24,7 @@ import ( "testing" "github.com/stretchr/testify/assert" - "github.com/tlinden/tablizer/cfg" + "codeberg.org/scip/tablizer/cfg" ) var input = []struct { diff --git a/lib/printer.go b/lib/printer.go index 2805712..2aa6463 100644 --- a/lib/printer.go +++ b/lib/printer.go @@ -26,11 +26,11 @@ import ( "strconv" "strings" + "codeberg.org/scip/tablizer/cfg" "github.com/gookit/color" "github.com/olekukonko/tablewriter" "github.com/olekukonko/tablewriter/renderer" "github.com/olekukonko/tablewriter/tw" - "github.com/tlinden/tablizer/cfg" "gopkg.in/yaml.v3" ) @@ -72,7 +72,10 @@ func printData(writer io.Writer, conf cfg.Config, data *Tabdata) { } func output(writer io.Writer, str string) { - fmt.Fprint(writer, str) + _, err := fmt.Fprint(writer, str) + if err != nil { + log.Fatalf("failed to print output: %s", err) + } } /* diff --git a/lib/printer_test.go b/lib/printer_test.go index 50db4aa..0d82c88 100644 --- a/lib/printer_test.go +++ b/lib/printer_test.go @@ -24,7 +24,7 @@ import ( "testing" "github.com/stretchr/testify/assert" - "github.com/tlinden/tablizer/cfg" + "codeberg.org/scip/tablizer/cfg" ) func newData() Tabdata { diff --git a/lib/sort.go b/lib/sort.go index 5d65e3f..bbf5431 100644 --- a/lib/sort.go +++ b/lib/sort.go @@ -24,7 +24,7 @@ import ( "strconv" "github.com/araddon/dateparse" - "github.com/tlinden/tablizer/cfg" + "codeberg.org/scip/tablizer/cfg" ) func sortTable(conf cfg.Config, data *Tabdata) { diff --git a/lib/sort_test.go b/lib/sort_test.go index 708d2fc..f547f74 100644 --- a/lib/sort_test.go +++ b/lib/sort_test.go @@ -22,7 +22,7 @@ import ( "testing" "github.com/stretchr/testify/assert" - "github.com/tlinden/tablizer/cfg" + "codeberg.org/scip/tablizer/cfg" ) func TestDuration2Seconds(t *testing.T) { diff --git a/lib/tableeditor.go b/lib/tableeditor.go index a6d2f19..a9b9b5f 100644 --- a/lib/tableeditor.go +++ b/lib/tableeditor.go @@ -26,7 +26,7 @@ import ( "github.com/charmbracelet/lipgloss" "github.com/evertras/bubble-table/table" "github.com/mattn/go-isatty" - "github.com/tlinden/tablizer/cfg" + "codeberg.org/scip/tablizer/cfg" ) // The context exists outside of the bubble loop, and is being used as diff --git a/lib/yank.go b/lib/yank.go index 39265d3..18f7c13 100644 --- a/lib/yank.go +++ b/lib/yank.go @@ -22,7 +22,7 @@ import ( "strings" "github.com/tiagomelo/go-clipboard/clipboard" - "github.com/tlinden/tablizer/cfg" + "codeberg.org/scip/tablizer/cfg" ) func yankColumns(conf cfg.Config, data *Tabdata) { diff --git a/lib/yank_test.go b/lib/yank_test.go index 62e91f6..32aec62 100644 --- a/lib/yank_test.go +++ b/lib/yank_test.go @@ -24,7 +24,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/tiagomelo/go-clipboard/clipboard" - "github.com/tlinden/tablizer/cfg" + "codeberg.org/scip/tablizer/cfg" ) var yanktests = []struct { diff --git a/main.go b/main.go index 9c173c4..ea695a3 100644 --- a/main.go +++ b/main.go @@ -20,7 +20,7 @@ package main import ( "os" - "github.com/tlinden/tablizer/cmd" + "codeberg.org/scip/tablizer/cmd" ) func main() { diff --git a/mkrel.sh b/mkrel.sh index ec20ca1..c48ac96 100755 --- a/mkrel.sh +++ b/mkrel.sh @@ -49,7 +49,7 @@ for D in $DIST; do fi set -x - GOOS=${os} GOARCH=${arch} go build -tags osusergo,netgo -ldflags "-extldflags=-static -w -X 'github.com/tlinden/tablizer/cfg.VERSION=${version}'" --trimpath $pie -o ${binfile} + GOOS=${os} GOARCH=${arch} go build -tags osusergo,netgo -ldflags "-extldflags=-static -w -X 'codeberg.org/scip/tablizer/cfg.VERSION=${version}'" --trimpath $pie -o ${binfile} strip --strip-all ${binfile} mkdir -p ${tardir} cp ${binfile} README.md LICENSE ${tardir}/ diff --git a/tablizer.1 b/tablizer.1 index 13c54f7..a6c1799 100644 --- a/tablizer.1 +++ b/tablizer.1 @@ -677,7 +677,7 @@ parameter \f(CW\*(C`\-N\*(C'\fR or the environment variable \fB\s-1NO_COLOR\s0\f .IX Header "BUGS" In order to report a bug, unexpected behavior, feature requests or to submit a patch, please open an issue on github: -. +. .SH "LICENSE" .IX Header "LICENSE" This software is licensed under the \s-1GNU GENERAL PUBLIC LICENSE\s0 version 3. diff --git a/tablizer.pod b/tablizer.pod index d43a227..f616fec 100644 --- a/tablizer.pod +++ b/tablizer.pod @@ -513,7 +513,7 @@ parameter C<-N> or the environment variable B to a true value. In order to report a bug, unexpected behavior, feature requests or to submit a patch, please open an issue on github: -L. +L. =head1 LICENSE