Merge pull request #11 from goark/migrate-repos

Migrated repository to github.com/goark/books-data
goark · Mar 20, 2022 · 86267d5 · 86267d5
2 parents 528881e + 43b1dda
commit 86267d5
Show file tree

Hide file tree

Showing 35 changed files with 156 additions and 748 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -15,7 +15,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v2
         with:
-          go-version: 1.17
+          go-version: 1.18
       - name: Run GoReleaser
         uses: goreleaser/goreleaser-action@v2
         with:

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -12,9 +12,9 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-go@v2
         with:
-          go-version: ^1.17
+          go-version: ^1.18
       - name: golangci-lint
-        uses: golangci/golangci-lint-action@v2
+        uses: golangci/golangci-lint-action@v3
         with:
           # Required: the version of golangci-lint is required and must be specified without patch version: we always use the latest patch version.
           version: latest

diff --git a/.github/workflows/vulns.yml b/.github/workflows/vulns.yml
@@ -12,9 +12,9 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-go@v2
         with:
-          go-version: ^1.17
+          go-version: ^1.18
       - name: install depm
-        run: go install github.com/spiegel-im-spiegel/depm@latest
+        run: go install github.com/goark/depm@latest
       - name: WriteGoList
         run: depm list --json > go.list
       - name: Nancy

diff --git a/.goreleaser.yml b/.goreleaser.yml
@@ -1,7 +1,7 @@
 project_name: books-data
 release:
   github:
-    owner: spiegel-im-spiegel
+    owner: goark
     name: books-data
 
 builds:
@@ -20,7 +20,7 @@ builds:
   main: ./
   flags:
   - -trimpath
-  ldflags: -s -w -X github.com/spiegel-im-spiegel/books-data/facade.Version=v{{ .Version }}
+  ldflags: -s -w -X github.com/goark/books-data/facade.Version=v{{ .Version }}
   binary: books-data
 
 archives:

diff --git a/README.md b/README.md
@@ -1,21 +1,23 @@
 # [books-data] -- Search for Books Data
 
-[![check vulns](https://github.com/spiegel-im-spiegel/books-data/workflows/vulns/badge.svg)](https://github.com/spiegel-im-spiegel/books-data/actions)
-[![lint status](https://github.com/spiegel-im-spiegel/books-data/workflows/lint/badge.svg)](https://github.com/spiegel-im-spiegel/books-data/actions)
-[![GitHub license](https://img.shields.io/badge/license-Apache%202-blue.svg)](https://raw.githubusercontent.com/spiegel-im-spiegel/books-data/master/LICENSE)
-[![GitHub release](https://img.shields.io/github/release/spiegel-im-spiegel/books-data.svg)](https://github.com/spiegel-im-spiegel/books-data/releases/latest)
+[![check vulns](https://github.com/goark/books-data/workflows/vulns/badge.svg)](https://github.com/goark/books-data/actions)
+[![lint status](https://github.com/goark/books-data/workflows/lint/badge.svg)](https://github.com/goark/books-data/actions)
+[![GitHub license](https://img.shields.io/badge/license-Apache%202-blue.svg)](https://raw.githubusercontent.com/goark/books-data/master/LICENSE)
+[![GitHub release](https://img.shields.io/github/release/goark/books-data.svg)](https://github.com/goark/books-data/releases/latest)
 
 This package is required Go 1.16 or later.
 
+**Migrated repository to [github.com/goark/books-data][books-data]**
+
 ## Build and Install
 
 ```
-$ go install github.com/spiegel-im-spiegel/books-data@latest
+$ go install github.com/goark/books-data@latest
 ```
 
 ### Binaries
 
-See [latest release](https://github.com/spiegel-im-spiegel/books-data/releases/latest).
+See [latest release](https://github.com/goark/books-data/releases/latest).
 
 ## Usage
 
@@ -414,8 +416,8 @@ $ books-data history -i 9784274069321 -t testdata/review-template/template.html
 - [DDRBoxman/go-amazon-product-api: Wrapper for the Amazon Product Advertising API](https://github.com/DDRBoxman/go-amazon-product-api)
 - [seihmd/openbd: openBD API written by Go](https://github.com/seihmd/openbd)
     - [openBDのAPIライブラリをGoでつくりました - Qiita](https://qiita.com/seihmd/items/d1f8b3b54cbc93346d78)
-- [spiegel-im-spiegel/aozora-api: APIs for Aozora-bunko RESTful Service by Golang](https://github.com/spiegel-im-spiegel/aozora-api)
+- [goark/aozora-api: APIs for Aozora-bunko RESTful Service by Golang](https://github.com/goark/aozora-api)
 
-[books-data]: https://github.com/spiegel-im-spiegel/books-data "spiegel-im-spiegel/books-data: Search for Books Data"
+[books-data]: https://github.com/goark/books-data "goark/books-data: Search for Books Data"
 [openBD]: https://openbd.jp/
 [PA-API]: https://affiliate.amazon.co.jp/assoc_credentials/home
diff --git a/Taskfile.yml b/Taskfile.yml
@@ -18,15 +18,15 @@ tasks:
     cmds:
       - go mod verify
       - go test -shuffle on ./...
-      - docker run --rm -v $(pwd):/app -w /app golangci/golangci-lint:v1.42.1 golangci-lint run --enable gosec --timeout 3m0s ./...
+      - docker run --rm -v $(pwd):/app -w /app golangci/golangci-lint:v1.45.0 golangci-lint run --enable gosec --timeout 3m0s ./...
     sources:
       - ./go.mod
       - '**/*.go'
 
   nancy:
     desc: Check vulnerability of external packages with Nancy.
     cmds:
-      - depm list -j | docker run --rm -i sonatypecommunity/nancy:latest sleuth -n
+      - depm list -j | nancy sleuth -n
     sources:
       - ./go.mod
       - '**/*.go'
@@ -37,7 +37,7 @@ tasks:
       - rm -f ./go.sum
       - go clean -cache
       - go clean -modcache
-      - go mod tidy -v -go=1.17
+      - go mod tidy -v -go=1.18
 
   graph:
     desc: Make grapth of dependency modules.

diff --git a/api/aozoraapi/aozoraapi.go b/api/aozoraapi/aozoraapi.go
@@ -7,11 +7,11 @@ import (
 	"io"
 	"strconv"
 
-	"github.com/spiegel-im-spiegel/aozora-api"
-	"github.com/spiegel-im-spiegel/books-data/api"
-	"github.com/spiegel-im-spiegel/books-data/entity"
-	"github.com/spiegel-im-spiegel/books-data/entity/values"
-	"github.com/spiegel-im-spiegel/errs"
+	"github.com/goark/aozora-api"
+	"github.com/goark/books-data/api"
+	"github.com/goark/books-data/entity"
+	"github.com/goark/books-data/entity/values"
+	"github.com/goark/errs"
 )
 
 //OpenBD is a api.API class for openBD API

diff --git a/api/api.go b/api/api.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"io"
 
-	"github.com/spiegel-im-spiegel/books-data/entity"
+	"github.com/goark/books-data/entity"
 )
 
 //API is interface class  for searching book API

diff --git a/api/openbd/openbd.go b/api/openbd/openbd.go
@@ -7,12 +7,12 @@ import (
 	"fmt"
 	"io"
 
-	"github.com/spiegel-im-spiegel/books-data/api"
-	"github.com/spiegel-im-spiegel/books-data/ecode"
-	"github.com/spiegel-im-spiegel/books-data/entity"
-	"github.com/spiegel-im-spiegel/books-data/entity/values"
-	"github.com/spiegel-im-spiegel/errs"
-	obd "github.com/spiegel-im-spiegel/openbd-api"
+	"github.com/goark/books-data/api"
+	"github.com/goark/books-data/ecode"
+	"github.com/goark/books-data/entity"
+	"github.com/goark/books-data/entity/values"
+	"github.com/goark/errs"
+	obd "github.com/goark/openbd-api"
 )
 
 //OpenBD is a api.API class for openBD API

diff --git a/api/pa/entity.go b/api/pa/entity.go
@@ -5,10 +5,10 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/spiegel-im-spiegel/books-data/ecode"
-	"github.com/spiegel-im-spiegel/books-data/entity"
-	"github.com/spiegel-im-spiegel/books-data/entity/values"
-	"github.com/spiegel-im-spiegel/errs"
+	"github.com/goark/books-data/ecode"
+	"github.com/goark/books-data/entity"
+	"github.com/goark/books-data/entity/values"
+	"github.com/goark/errs"
 )
 
 type GenInfo struct {

diff --git a/api/pa/paapi5.go b/api/pa/paapi5.go
@@ -6,10 +6,10 @@ import (
 	"encoding/json"
 	"io"
 
-	"github.com/spiegel-im-spiegel/books-data/api"
-	"github.com/spiegel-im-spiegel/books-data/entity"
-	"github.com/spiegel-im-spiegel/errs"
-	paapi5 "github.com/spiegel-im-spiegel/pa-api"
+	"github.com/goark/books-data/api"
+	"github.com/goark/books-data/entity"
+	"github.com/goark/errs"
+	paapi5 "github.com/goark/pa-api"
 )
 
 //PAAPI5 is a api.API class for PA-API v5

diff --git a/api/pa/query.go b/api/pa/query.go
@@ -3,8 +3,8 @@ package pa
 import (
 	"encoding/json"
 
-	"github.com/spiegel-im-spiegel/errs"
-	paapi5 "github.com/spiegel-im-spiegel/pa-api"
+	"github.com/goark/errs"
+	paapi5 "github.com/goark/pa-api"
 )
 
 //Query is query data class for PA-API v5

diff --git a/dependency.png b/dependency.png
diff --git a/ecode/ecode.go b/ecode/ecode.go
@@ -1,36 +1,17 @@
 package ecode
 
-import "fmt"
+import "errors"
 
-//ECode is error codes for books-data
-type ECode int
-
-const (
-	ErrNullPointer ECode = iota + 1
-	ErrNoCommand
-	ErrInvalidAPIParameter
-	ErrInvalidAPIResponse
-	ErrNoData
-	ErrUnMatchServiceType
+var (
+	ErrNullPointer         = errors.New("Null reference instance")
+	ErrNoCommand           = errors.New("No command")
+	ErrInvalidAPIParameter = errors.New("Invalid API parameters")
+	ErrInvalidAPIResponse  = errors.New("Invalid response data from API")
+	ErrNoData              = errors.New("No response data")
+	ErrUnMatchServiceType  = errors.New("Unmatch service type")
 )
 
-var errMessages = map[ECode]string{
-	ErrNullPointer:         "Null reference instance",
-	ErrNoCommand:           "No command",
-	ErrInvalidAPIParameter: "Invalid API parameters",
-	ErrInvalidAPIResponse:  "Invalid response data from API",
-	ErrNoData:              "No response data",
-	ErrUnMatchServiceType:  "Unmatch service type",
-}
-
-func (e ECode) Error() string {
-	if s, ok := errMessages[e]; ok {
-		return s
-	}
-	return fmt.Sprintf("unknown error (%d)", int(e))
-}
-
-/* Copyright 2019 Spiegel
+/* Copyright 2019-2022 Spiegel
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.

diff --git a/ecode/ecode_test.go b/ecode/ecode_test.go
diff --git a/entity/book.go b/entity/book.go
@@ -5,10 +5,10 @@ import (
 	"fmt"
 	"io"
 
-	"github.com/spiegel-im-spiegel/books-data/ecode"
-	"github.com/spiegel-im-spiegel/books-data/entity/values"
-	"github.com/spiegel-im-spiegel/books-data/format"
-	"github.com/spiegel-im-spiegel/errs"
+	"github.com/goark/books-data/ecode"
+	"github.com/goark/books-data/entity/values"
+	"github.com/goark/books-data/format"
+	"github.com/goark/errs"
 )
 
 //Code is entity class of book code

diff --git a/entity/book_test.go b/entity/book_test.go
@@ -4,7 +4,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/spiegel-im-spiegel/books-data/entity/values"
+	"github.com/goark/books-data/entity/values"
 )
 
 func TestCode(t *testing.T) {

diff --git a/entity/values/date.go b/entity/values/date.go
@@ -5,7 +5,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/spiegel-im-spiegel/errs"
+	"github.com/goark/errs"
 )
 
 //Time is wrapper class of time.Time

diff --git a/facade/aozora.go b/facade/aozora.go
@@ -5,8 +5,8 @@ import (
 	"context"
 	"io"
 
-	"github.com/spiegel-im-spiegel/books-data/api/aozoraapi"
-	"github.com/spiegel-im-spiegel/books-data/entity"
+	"github.com/goark/books-data/api/aozoraapi"
+	"github.com/goark/books-data/entity"
 )
 
 func searchAozoraAPI(ctx context.Context, id string, rawFlag bool) (io.Reader, error) {

diff --git a/facade/facade.go b/facade/facade.go
@@ -4,13 +4,13 @@ import (
 	"fmt"
 	"runtime"
 
+	"github.com/goark/books-data/ecode"
+	"github.com/goark/errs"
+	"github.com/goark/gocli/config"
+	"github.com/goark/gocli/exitcode"
+	"github.com/goark/gocli/rwi"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
-	"github.com/spiegel-im-spiegel/books-data/ecode"
-	"github.com/spiegel-im-spiegel/errs"
-	"github.com/spiegel-im-spiegel/gocli/config"
-	"github.com/spiegel-im-spiegel/gocli/exitcode"
-	"github.com/spiegel-im-spiegel/gocli/rwi"
 )
 
 var (

diff --git a/facade/history.go b/facade/history.go
@@ -1,14 +1,14 @@
 package facade
 
 import (
+	"github.com/goark/books-data/api"
+	"github.com/goark/books-data/ecode"
+	"github.com/goark/books-data/review"
+	"github.com/goark/books-data/review/logger"
+	"github.com/goark/errs"
+	"github.com/goark/gocli/rwi"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
-	"github.com/spiegel-im-spiegel/books-data/api"
-	"github.com/spiegel-im-spiegel/books-data/ecode"
-	"github.com/spiegel-im-spiegel/books-data/review"
-	"github.com/spiegel-im-spiegel/books-data/review/logger"
-	"github.com/spiegel-im-spiegel/errs"
-	"github.com/spiegel-im-spiegel/gocli/rwi"
 )
 
 //newSearchCmd returns cobra.Command instance for show sub-command

diff --git a/facade/history_test.go b/facade/history_test.go
@@ -4,8 +4,8 @@ import (
 	"bytes"
 	"testing"
 
-	"github.com/spiegel-im-spiegel/gocli/exitcode"
-	"github.com/spiegel-im-spiegel/gocli/rwi"
+	"github.com/goark/gocli/exitcode"
+	"github.com/goark/gocli/rwi"
 )
 
 func TestHistory(t *testing.T) {