Skip to content

Commit

Permalink
Merge pull request #1 from goark/migrated-repos
Browse files Browse the repository at this point in the history
Migrated repository to github.com/goark/gimei-cli
  • Loading branch information
spiegel-im-spiegel committed Mar 14, 2022
2 parents 1541e9c + 7ef84c2 commit e8cb2d9
Show file tree
Hide file tree
Showing 34 changed files with 107 additions and 651 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/vulns.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
with:
go-version: ^1.17
- 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
Expand Down
4 changes: 2 additions & 2 deletions .goreleaser.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
project_name: gimei-cli
release:
github:
owner: spiegel-im-spiegel
owner: goark
name: gimei-cli

builds:
Expand All @@ -20,7 +20,7 @@ builds:
main: ./
flags:
- -trimpath
ldflags: -s -w -X github.com/spiegel-im-spiegel/gimei-cli/facade.Version=v{{ .Version }}
ldflags: -s -w -X github.com/goark/gimei-cli/facade.Version=v{{ .Version }}
binary: gimei-cli

archives:
Expand Down
16 changes: 9 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,21 +1,23 @@
# [gimei-cli] -- 姓名・住所データ生成ツール

[![check vulns](https://github.com/spiegel-im-spiegel/gimei-cli/workflows/vulns/badge.svg)](https://github.com/spiegel-im-spiegel/gimei-cli/actions)
[![lint status](https://github.com/spiegel-im-spiegel/gimei-cli/workflows/lint/badge.svg)](https://github.com/spiegel-im-spiegel/gimei-cli/actions)
[![GitHub license](https://img.shields.io/badge/license-Apache%202-blue.svg)](https://raw.githubusercontent.com/spiegel-im-spiegel/gimei-cli/master/LICENSE)
[![GitHub release](https://img.shields.io/github/release/spiegel-im-spiegel/gimei-cli.svg)](https://github.com/spiegel-im-spiegel/gimei-cli/releases/latest)
[![check vulns](https://github.com/goark/gimei-cli/workflows/vulns/badge.svg)](https://github.com/goark/gimei-cli/actions)
[![lint status](https://github.com/goark/gimei-cli/workflows/lint/badge.svg)](https://github.com/goark/gimei-cli/actions)
[![GitHub license](https://img.shields.io/badge/license-Apache%202-blue.svg)](https://raw.githubusercontent.com/goark/gimei-cli/master/LICENSE)
[![GitHub release](https://img.shields.io/github/release/goark/gimei-cli.svg)](https://github.com/goark/gimei-cli/releases/latest)

[willnet/gimei](https://github.com/willnet/gimei "willnet/gimei: random Japanese name and address generator") および [mattn/go-gimei](https://github.com/mattn/go-gimei) からの fork で,コマンドライン上で姓名や住所名のダミーデータを大量に生成することを目標に作成しています。

**Migrated repository to [github.com/goark/gimei-cli][gimei-cli]**

## ビルド & インストール

```
$ go install github.com/spiegel-im-spiegel/gimei-cli@latest
$ go install github.com/goark/gimei-cli@latest
```

### 実行バイナリ

See [latest release](https://github.com/spiegel-im-spiegel/gimei-cli/releases/latest).
See [latest release](https://github.com/goark/gimei-cli/releases/latest).

## 簡単な使い方

Expand Down Expand Up @@ -470,4 +472,4 @@ $ gimei-cli cities -n 広島市 --json | jq .

[![dependency.png](./dependency.png)](./dependency.png)

[gimei-cli]: https://github.com/spiegel-im-spiegel/gimei-cli "spiegel-im-spiegel/gimei-cli: 姓名・住所データ生成ツール"
[gimei-cli]: https://github.com/goark/gimei-cli "goark/gimei-cli: 姓名・住所データ生成ツール"
4 changes: 2 additions & 2 deletions Taskfile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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.44.2 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'
Expand Down
2 changes: 1 addition & 1 deletion address/address.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"math/rand"
"strings"

"github.com/spiegel-im-spiegel/gimei-cli/name"
"github.com/goark/gimei-cli/name"
)

// Address is pseudo place name information.
Expand Down
4 changes: 2 additions & 2 deletions address/exsample_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"fmt"
"strings"

"github.com/spiegel-im-spiegel/gimei-cli/address"
"github.com/spiegel-im-spiegel/mt/mt19937"
"github.com/goark/gimei-cli/address"
"github.com/goark/mt/mt19937"
)

func ExampleNewAddress() {
Expand Down
6 changes: 3 additions & 3 deletions address/gen/gen.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (
"os"
"text/template"

"github.com/spiegel-im-spiegel/gimei-cli/address"
"github.com/spiegel-im-spiegel/gimei-cli/name"
"github.com/goark/gimei-cli/address"
"github.com/goark/gimei-cli/name"
"gopkg.in/yaml.v3"
)

Expand Down Expand Up @@ -51,7 +51,7 @@ func loadPlaces(path string) (address.Places, address.Places, address.Places, er

const template1 = `package address
import "github.com/spiegel-im-spiegel/gimei-cli/name"
import "github.com/goark/gimei-cli/name"
//Places is list of place names
type Places []*name.Name
Expand Down
2 changes: 1 addition & 1 deletion address/generator.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"math/rand"
"time"

"github.com/spiegel-im-spiegel/gimei-cli/pref"
"github.com/goark/gimei-cli/pref"
)

// Generator is context for gimei generator.
Expand Down
2 changes: 1 addition & 1 deletion address/tables.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package address

import "github.com/spiegel-im-spiegel/gimei-cli/name"
import "github.com/goark/gimei-cli/name"

//Places is list of place names
type Places []*name.Name
Expand Down
4 changes: 2 additions & 2 deletions all/all.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"fmt"
"strings"

"github.com/spiegel-im-spiegel/gimei-cli/address"
"github.com/spiegel-im-spiegel/gimei-cli/gimei"
"github.com/goark/gimei-cli/address"
"github.com/goark/gimei-cli/gimei"
)

// Info is information for Gimei and Address.
Expand Down
4 changes: 2 additions & 2 deletions all/exsample_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package all_test
import (
"fmt"

"github.com/spiegel-im-spiegel/gimei-cli/all"
"github.com/spiegel-im-spiegel/mt/mt19937"
"github.com/goark/gimei-cli/all"
"github.com/goark/mt/mt19937"
)

func ExampleNew() {
Expand Down
4 changes: 2 additions & 2 deletions all/generator.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package all
import (
"math/rand"

"github.com/spiegel-im-spiegel/gimei-cli/address"
"github.com/spiegel-im-spiegel/gimei-cli/gimei"
"github.com/goark/gimei-cli/address"
"github.com/goark/gimei-cli/gimei"
)

// Generator is context for gimei and address generator.
Expand Down
Binary file modified dependency.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 5 additions & 5 deletions facade/address.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ import (
"encoding/json"
"math/rand"

"github.com/goark/errs"
"github.com/goark/gimei-cli/address"
"github.com/goark/gocli/rwi"
"github.com/goark/mt/mt19937"
"github.com/goark/mt/secure"
"github.com/spf13/cobra"
"github.com/spiegel-im-spiegel/errs"
"github.com/spiegel-im-spiegel/gimei-cli/address"
"github.com/spiegel-im-spiegel/gocli/rwi"
"github.com/spiegel-im-spiegel/mt/mt19937"
"github.com/spiegel-im-spiegel/mt/secure"
)

//newVersionCmd returns cobra.Command instance for show sub-command
Expand Down
6 changes: 3 additions & 3 deletions facade/city.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ package facade
import (
"encoding/json"

"github.com/goark/errs"
"github.com/goark/gimei-cli/pref"
"github.com/goark/gocli/rwi"
"github.com/spf13/cobra"
"github.com/spiegel-im-spiegel/errs"
"github.com/spiegel-im-spiegel/gimei-cli/pref"
"github.com/spiegel-im-spiegel/gocli/rwi"
)

//newCityCmd returns cobra.Command instance for show sub-command
Expand Down
12 changes: 6 additions & 6 deletions facade/facade.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@ import (
"math/rand"
"runtime"

"github.com/goark/errs"
"github.com/goark/gimei-cli/all"
"github.com/goark/gocli/exitcode"
"github.com/goark/gocli/rwi"
"github.com/goark/mt/mt19937"
"github.com/goark/mt/secure"
"github.com/spf13/cobra"
"github.com/spiegel-im-spiegel/errs"
"github.com/spiegel-im-spiegel/gimei-cli/all"
"github.com/spiegel-im-spiegel/gocli/exitcode"
"github.com/spiegel-im-spiegel/gocli/rwi"
"github.com/spiegel-im-spiegel/mt/mt19937"
"github.com/spiegel-im-spiegel/mt/secure"
)

var (
Expand Down
10 changes: 5 additions & 5 deletions facade/name.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ import (
"encoding/json"
"math/rand"

"github.com/goark/errs"
"github.com/goark/gimei-cli/gimei"
"github.com/goark/gocli/rwi"
"github.com/goark/mt/mt19937"
"github.com/goark/mt/secure"
"github.com/spf13/cobra"
"github.com/spiegel-im-spiegel/errs"
"github.com/spiegel-im-spiegel/gimei-cli/gimei"
"github.com/spiegel-im-spiegel/gocli/rwi"
"github.com/spiegel-im-spiegel/mt/mt19937"
"github.com/spiegel-im-spiegel/mt/secure"
)

//newNameCmd returns cobra.Command instance for show sub-command
Expand Down
2 changes: 1 addition & 1 deletion facade/output-template.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"io"
"text/template"

"github.com/spiegel-im-spiegel/errs"
"github.com/goark/errs"
)

func outputWithTemplate(w io.Writer, tmplPath string, value interface{}) error {
Expand Down
6 changes: 3 additions & 3 deletions facade/pref.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ package facade
import (
"encoding/json"

"github.com/goark/errs"
"github.com/goark/gimei-cli/pref"
"github.com/goark/gocli/rwi"
"github.com/spf13/cobra"
"github.com/spiegel-im-spiegel/errs"
"github.com/spiegel-im-spiegel/gimei-cli/pref"
"github.com/spiegel-im-spiegel/gocli/rwi"
)

//newPrefCmd returns cobra.Command instance for show sub-command
Expand Down
4 changes: 2 additions & 2 deletions facade/version.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@ package facade
import (
"strings"

"github.com/goark/gocli/rwi"
"github.com/spf13/cobra"
"github.com/spiegel-im-spiegel/gocli/rwi"
)

var (
usage = []string{ //output message of version
Name + " " + Version,
"repository: https://github.com/spiegel-im-spiegel/gimei-cli",
"repository: https://github.com/goark/gimei-cli",
}
)

Expand Down
6 changes: 3 additions & 3 deletions facade/version_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 TestVersionNormal(t *testing.T) {
Expand All @@ -14,7 +14,7 @@ func TestVersionNormal(t *testing.T) {
out string
outErr string
}{
{args: []string{"version"}, out: "", outErr: "gimei-cli developer version\nrepository: https://github.com/spiegel-im-spiegel/gimei-cli\n"},
{args: []string{"version"}, out: "", outErr: "gimei-cli developer version\nrepository: https://github.com/goark/gimei-cli\n"},
}

for _, tc := range testCases {
Expand Down
4 changes: 2 additions & 2 deletions gimei/example_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"fmt"
"strings"

"github.com/spiegel-im-spiegel/gimei-cli/gimei"
"github.com/spiegel-im-spiegel/mt/mt19937"
"github.com/goark/gimei-cli/gimei"
"github.com/goark/mt/mt19937"
)

func ExampleNewGimei() {
Expand Down
6 changes: 3 additions & 3 deletions gimei/gen/gen.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (
"os"
"text/template"

"github.com/spiegel-im-spiegel/gimei-cli/gimei"
"github.com/spiegel-im-spiegel/gimei-cli/name"
"github.com/goark/gimei-cli/gimei"
"github.com/goark/gimei-cli/name"
"gopkg.in/yaml.v3"
)

Expand Down Expand Up @@ -51,7 +51,7 @@ func loadNames(path string) (gimei.Names, gimei.Names, gimei.Names, error) {

const template1 = `package gimei
import "github.com/spiegel-im-spiegel/gimei-cli/name"
import "github.com/goark/gimei-cli/name"
//Names is list of names
type Names []*name.Name
Expand Down
2 changes: 1 addition & 1 deletion gimei/gimei.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"math/rand"
"strings"

"github.com/spiegel-im-spiegel/gimei-cli/name"
"github.com/goark/gimei-cli/name"
)

// DomainExample is "example.com" domain name.
Expand Down
2 changes: 1 addition & 1 deletion gimei/tables.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package gimei

import "github.com/spiegel-im-spiegel/gimei-cli/name"
import "github.com/goark/gimei-cli/name"

//Names is list of names
type Names []*name.Name
Expand Down
18 changes: 9 additions & 9 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
module github.com/spiegel-im-spiegel/gimei-cli
module github.com/goark/gimei-cli

go 1.17

require (
github.com/spf13/cobra v1.2.1
github.com/spiegel-im-spiegel/csvdata v0.3.0
github.com/spiegel-im-spiegel/errs v1.0.5
github.com/spiegel-im-spiegel/gocli v0.11.0
github.com/spiegel-im-spiegel/kkconv v0.2.0
github.com/spiegel-im-spiegel/krconv v0.1.5
github.com/spiegel-im-spiegel/mt v0.3.0
github.com/goark/csvdata v0.5.0
github.com/goark/errs v1.1.0
github.com/goark/gocli v0.12.0
github.com/goark/kkconv v0.3.0
github.com/goark/krconv v0.2.0
github.com/goark/mt v0.4.0
github.com/spf13/cobra v1.4.0
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b
)

Expand All @@ -21,7 +21,7 @@ require (
github.com/rivo/uniseg v0.2.0 // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/xuri/efp v0.0.0-20210322160811-ab561f5b45e3 // indirect
github.com/xuri/excelize/v2 v2.4.1 // indirect
github.com/xuri/excelize/v2 v2.5.0 // indirect
golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97 // indirect
golang.org/x/net v0.0.0-20210726213435-c6fcb2dbf985 // indirect
golang.org/x/text v0.3.7 // indirect
Expand Down
Loading

0 comments on commit e8cb2d9

Please sign in to comment.