Merge pull request #48 from jkawamoto/hotfix/v0.7.2

Hotfix/v0.7.2

Author: jkawamoto

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.7.1
+current_version = 0.7.2
 commit = True
 
 [bumpversion:file:README.md]

.github/workflows/test.yaml .github/workflows/ci.yaml.github/workflows/test.yaml renamed to .github/workflows/ci.yaml

@@ -10,27 +10,21 @@ jobs:
   test:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-go@v4
+      - uses: actions/checkout@v4
+      - uses: actions/setup-go@v5
         with:
           go-version: ">=1.20"
-      - name: Install pre-commit
-        run: pip install pre-commit
+      - name: Run pre-commit hook
+        uses: pre-commit/[email protected]
       - name: Run tests
         run: go test -race -coverprofile=coverage.out -covermode=atomic -v ./...
       - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@v3
-      - name: Run lints
-        run: pre-commit run --all-files
-      - name: Run golangci-lint
-        uses: golangci/golangci-lint-action@v3
-        with:
-          version: latest
-  windows:
+        uses: codecov/codecov-action@v4
+  test-windows:
     runs-on: windows-latest
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-go@v4
+      - uses: actions/checkout@v4
+      - uses: actions/setup-go@v5
         with:
           go-version: ">=1.20"
       - name: Run tests

.github/workflows/release.yaml

@@ -12,16 +12,32 @@ jobs:
   release:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-go@v4
+      - uses: actions/checkout@v4
+      - uses: actions/setup-go@v5
         with:
           go-version: ">=1.20"
       - name: Run tests
         run: go test -v ./...
-      - uses: goreleaser/goreleaser-action@v4
+      - uses: goreleaser/goreleaser-action@v5
         with:
           version: latest
           args: release --clean
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           HOMEBREW_TAP_GITHUB_TOKEN: ${{ secrets.HOMEBREW_TAP_GITHUB_TOKEN }}
+
+  merge:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          ref: develop
+      - name: Merge the new version into develop
+        run: |
+          git config user.name github-actions
+          git config user.email [email protected]
+          git fetch --tags origin
+          git merge ${REF##*/}
+          git push
+        env:
+          REF: ${{ github.event.push.ref }}

.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.4.0
+    rev: v4.6.0
     hooks:
       - id: check-merge-conflict
       - id: check-json
@@ -12,6 +12,6 @@ repos:
       - id: trailing-whitespace
       - id: detect-private-key
   - repo: https://github.com/golangci/golangci-lint
-    rev: v1.52.2
+    rev: v1.57.2
     hooks:
       - id: golangci-lint

README.md

@@ -1,9 +1,9 @@
 # A Pixeldrain client
 [![MIT License](https://img.shields.io/badge/license-MIT-blue.svg?style=flat)](LICENSE)
-[![Go application](https://github.com/jkawamoto/go-pixeldrain/actions/workflows/test.yaml/badge.svg)](https://github.com/jkawamoto/go-pixeldrain/actions/workflows/test.yaml)
+[![Go application](https://github.com/jkawamoto/go-pixeldrain/actions/workflows/ci.yaml/badge.svg)](https://github.com/jkawamoto/go-pixeldrain/actions/workflows/ci.yaml)
 [![Go Reference](https://pkg.go.dev/badge/github.com/jkawamoto/go-pixeldrain.svg)](https://pkg.go.dev/github.com/jkawamoto/go-pixeldrain)
 [![codecov](https://codecov.io/gh/jkawamoto/go-pixeldrain/branch/master/graph/badge.svg?token=ppX3MVIqWA)](https://codecov.io/gh/jkawamoto/go-pixeldrain)
-[![Release](https://img.shields.io/badge/release-0.7.1-brightgreen.svg)](https://github.com/jkawamoto/go-pixeldrain/releases/tag/v0.7.1)
+[![Release](https://img.shields.io/badge/release-0.7.2-brightgreen.svg)](https://github.com/jkawamoto/go-pixeldrain/releases/tag/v0.7.2)
 
 
 ## Usage
@@ -95,7 +95,7 @@ To build the newest version, use go get command:
 $ go get github.com/jkawamoto/go-pixeldrain
 ```
 
-Otherwise, compiled binaries are also available in [Github](https://github.com/jkawamoto/go-pixeldrain/releases).
+Otherwise, compiled binaries are also available in [GitHub](https://github.com/jkawamoto/go-pixeldrain/releases).
 
 
 ## License

client/user/list_file_lists_responses.go

@@ -1,6 +1,6 @@
 // download_test.go
 //
-// Copyright (c) 2018-2023 Junpei Kawamoto
+// Copyright (c) 2018-2024 Junpei Kawamoto
 //
 // This software is released under the MIT License.
 //
@@ -11,6 +11,7 @@ package command
 import (
 	"bytes"
 	"context"
+	"errors"
 	"flag"
 	"io"
 	"os"
@@ -276,7 +277,8 @@ func TestCmdDownload(t *testing.T) {
 
 			err = CmdDownload(c)
 			if err != nil || tc.exit != 0 {
-				if e, ok := err.(cli.ExitCoder); !ok {
+				var e cli.ExitCoder
+				if !errors.As(err, &e) {
 					t.Errorf("expect an ExitCoder, got %v", err)
 				} else if e.ExitCode() != tc.exit {
 					t.Errorf("expect %v, got %v", tc.exit, e.ExitCode())

client/user/list_files_responses.go

@@ -1,6 +1,6 @@
 // upload.go
 //
-// Copyright (c) 2018-2023 Junpei Kawamoto
+// Copyright (c) 2018-2024 Junpei Kawamoto
 //
 // This software is released under the MIT License.
 //
@@ -189,6 +189,14 @@ func parseRecipientFile(name string) (_ []age.Recipient, err error) {
 }
 
 func parseArgument(arg string) (path string, name string, _ error) {
+	if strings.HasPrefix(arg, "-:") {
+		name = strings.TrimPrefix(arg, "-:")
+		if strings.HasPrefix(name, "\"") && strings.HasSuffix(name, "\"") {
+			name = name[1 : len(name)-1]
+		}
+		return "-", name, nil
+	}
+
 	volume := filepath.VolumeName(arg)
 	arg = strings.TrimPrefix(arg, volume)