Merge pull request #13 from goark/debug-and-refactoring

Move koyomi.DateJp to koyomi/value.DateJp
goark · Feb 25, 2023 · b2b12f5 · b2b12f5
2 parents e3f2835 + 35bddb5
commit b2b12f5
Show file tree

Hide file tree

Showing 21 changed files with 101 additions and 90 deletions.
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -14,10 +14,10 @@ jobs:
     name: lint
     runs-on: ubuntu-latest
     steps:
+      - uses: actions/checkout@v3
       - uses: actions/setup-go@v3
         with:
-          go-version: ^1.19
-      - uses: actions/checkout@v3
+          go-version-file: 'go.mod'
       - name: golangci-lint
         uses: golangci/golangci-lint-action@v3
         with:
@@ -44,3 +44,7 @@ jobs:
           # skip-build-cache: true
       - name: testing
         run: go test -shuffle on ./...
+      - name: install govulncheck
+        run: go install golang.org/x/vuln/cmd/govulncheck@latest
+      - name: running govulncheck
+        run: govulncheck ./...
diff --git a/.github/workflows/vulns.yml b/.github/workflows/vulns.yml
@@ -12,7 +12,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-go@v3
         with:
-          go-version: ^1.19
+          go-version-file: 'go.mod'
       - name: install depm
         run: go install github.com/goark/depm@latest
       - name: WriteGoList

diff --git a/README.md b/README.md
@@ -24,8 +24,8 @@ const (
 ## 簡単な使い方
 
 ```go
-start, _ := koyomi.DateFrom("2019-05-01")
-end := koyomi.NewDate(time.Date(2019, time.May, 31, 0, 0, 0, 0, koyomi.JST))
+start, _ := value.DateFrom("2019-05-01")
+end := value.NewDate(time.Date(2019, time.May, 31, 0, 0, 0, 0, koyomi.JST))
 k, err := koyomi.NewSource(
     koyomi.WithCalendarID(koyomi.Holiday, koyomi.SolarTerm),
     koyomi.WithStartDate(start),
@@ -83,7 +83,7 @@ import (
     "strconv"
     "time"
 
-    "github.com/goark/koyomi"
+    "github.com/goark/koyomi/value"
 )
 
 func main() {
@@ -106,7 +106,7 @@ func main() {
         }
         tm = time.Date(args[0], time.Month(args[1]), args[2], 0, 0, 0, 0, time.Local)
     }
-    te := koyomi.NewDate(tm)
+    te := value.NewDate(tm)
     n, y := te.YearEraString()
     if len(n) == 0 {
         fmt.Fprintln(os.Stderr, "正しい年月日を指定してください")
@@ -141,7 +141,7 @@ import (
     "strconv"
     "time"
 
-    "github.com/goark/koyomi"
+    "github.com/goark/koyomi/value"
 )
 
 func main() {
@@ -162,7 +162,7 @@ func main() {
         }
         args[i] = num
     }
-    te := koyomi.NewDateEra(koyomi.EraName(name), args[0], time.Month(args[1]), args[2], 0, 0, 0, 0, time.Local)
+    te := value.NewDateEra(value.EraName(name), args[0], time.Month(args[1]), args[2])
     fmt.Println(te.Format("西暦2006年1月2日"))
 }
 ```
@@ -190,7 +190,7 @@ import (
     "fmt"
     "os"
 
-    "github.com/goark/koyomi"
+    "github.com/goark/koyomi/value"
     "github.com/goark/koyomi/zodiac"
 )
 
@@ -202,7 +202,7 @@ func main() {
         return
     }
     for _, s := range args {
-        t, err := koyomi.DateFrom(s)
+        t, err := value.DateFrom(s)
         if err != nil {
             fmt.Fprintln(os.Stderr, err)
             continue
@@ -236,8 +236,8 @@ import (
     "fmt"
     "os"
 
-    "github.com/goark/koyomi"
     "github.com/goark/koyomi/jdn"
+    "github.com/goark/koyomi/value"
 )
 
 func main() {
@@ -248,7 +248,7 @@ func main() {
         return
     }
     for _, s := range args {
-        t, err := koyomi.DateFrom(s)
+        t, err := value.DateFrom(s)
         if err != nil {
             fmt.Fprintln(os.Stderr, err)
             continue

diff --git a/Taskfile.yml b/Taskfile.yml
@@ -3,7 +3,7 @@ version: '3'
 tasks:
   default:
     cmds:
-      - task: clean
+      - task: prepare
       - task: test
       - task: nancy
       - task: graph
@@ -13,7 +13,8 @@ tasks:
     cmds:
       - go mod verify
       - go test -shuffle on ./...
-      - docker run --rm -v $(pwd):/app -w /app golangci/golangci-lint:v1.50.1 golangci-lint run --enable gosec --timeout 3m0s ./...
+      - govulncheck ./...
+      - docker run --rm -v $(pwd):/app -w /app golangci/golangci-lint:v1.51.2 golangci-lint run --enable gosec --timeout 3m0s ./...
     sources:
       - ./go.mod
       - '**/*.go'
@@ -26,13 +27,15 @@ tasks:
       - ./go.mod
       - '**/*.go'
 
+  prepare:
+      - go mod tidy -v -go=1.20
+
   clean:
     desc: Initialize module and build cache, and remake go.sum file.
     cmds:
       - rm -f ./go.sum
       - go clean -cache
       - go clean -modcache
-      - go mod tidy -v -go=1.19
 
   graph:
     desc: Make grapth of dependency modules.

diff --git a/dependency.png b/dependency.png
diff --git a/events.go b/events.go
@@ -8,33 +8,34 @@ import (
 	"strconv"
 
 	"github.com/goark/errs"
+	"github.com/goark/koyomi/value"
 )
 
-//Event is koyomi event data
+// Event is koyomi event data
 type Event struct {
-	Date  DateJp
+	Date  value.DateJp
 	Title string
 }
 
-//Koyomi is array of Event
+// Koyomi is array of Event
 type Koyomi struct {
 	events []Event
 }
 
-//newKoyomi createw Koyomi instance
+// newKoyomi createw Koyomi instance
 func newKoyomi() *Koyomi {
 	return &Koyomi{events: make([]Event, 0)}
 }
 
-//Events returns event array
+// Events returns event array
 func (k *Koyomi) Events() []Event {
 	if k == nil {
 		return []Event{}
 	}
 	return k.events
 }
 
-//SortByDate sorts event data by date
+// SortByDate sorts event data by date
 func (k *Koyomi) SortByDate() {
 	if k == nil || len(k.events) <= 1 {
 		return
@@ -44,7 +45,7 @@ func (k *Koyomi) SortByDate() {
 	})
 }
 
-//Add adds other Kyomoi instance
+// Add adds other Kyomoi instance
 func (k *Koyomi) Add(kk *Koyomi) {
 	if kk == nil {
 		return

diff --git a/example_test.go b/example_test.go
@@ -8,11 +8,12 @@ import (
 	"time"
 
 	"github.com/goark/koyomi"
+	"github.com/goark/koyomi/value"
 )
 
 func ExampleKoyomi() {
-	start, _ := koyomi.DateFrom("2019-05-01")
-	end := koyomi.NewDate(time.Date(2019, time.May, 31, 0, 0, 0, 0, koyomi.JST))
+	start, _ := value.DateFrom("2019-05-01")
+	end := value.NewDate(time.Date(2019, time.May, 31, 0, 0, 0, 0, value.JST))
 	k, err := koyomi.NewSource(
 		koyomi.WithCalendarID(koyomi.Holiday, koyomi.SolarTerm),
 		koyomi.WithStartDate(start),
@@ -43,7 +44,7 @@ func ExampleKoyomi() {
 	//"2019-05-21","小満"
 }
 
-/* Copyright 2020 Spiegel
+/* Copyright 2020-2023 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/go.mod b/go.mod
@@ -1,9 +1,9 @@
 module github.com/goark/koyomi
 
-go 1.19
+go 1.20
 
 require (
-	github.com/goark/errs v1.1.0
+	github.com/goark/errs v1.2.2
 	github.com/spiegel-im-spiegel/ics-golang v0.1.0
 )
 

diff --git a/go.sum b/go.sum
@@ -1,6 +1,6 @@
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
-github.com/goark/errs v1.1.0 h1:FKnyw4LVyRADIjM8Nj0Up6r0/y5cfADvZAd1E+tthXE=
-github.com/goark/errs v1.1.0/go.mod h1:TtaPEoadm2mzqzfXdkkfpN2xuniCFm2q4JH+c1qzaqw=
+github.com/goark/errs v1.2.2 h1:UrMZZJL0WaOzaO+ErSV+nz/k/+bmW2wUiFe5V7pUeEo=
+github.com/goark/errs v1.2.2/go.mod h1:ZsQucxaDFVfSB8I99j4bxkDRfNOrlKINwg72QMuRWKw=
 github.com/goark/fetch v0.3.0 h1:2m32EGOLBi99RzI5urFfmv5++CMqfenVw7NH8z/lbX8=
 github.com/goark/fetch v0.3.0/go.mod h1:sqDdPbbHeIjDVeHrgvzhHpkUr8X9pVC9DgJoVwU02x0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=

diff --git a/sample/sample0.go b/sample/sample0.go
@@ -10,11 +10,12 @@ import (
 	"time"
 
 	"github.com/goark/koyomi"
+	"github.com/goark/koyomi/value"
 )
 
 func main() {
-	start, _ := koyomi.DateFrom("2019-05-01")
-	end := koyomi.NewDate(time.Date(2019, time.May, 31, 0, 0, 0, 0, koyomi.JST))
+	start, _ := value.DateFrom("2019-05-01")
+	end := value.NewDate(time.Date(2019, time.May, 31, 0, 0, 0, 0, value.JST))
 	k, err := koyomi.NewSource(
 		koyomi.WithCalendarID(koyomi.Holiday, koyomi.SolarTerm),
 		koyomi.WithStartDate(start),
@@ -31,7 +32,7 @@ func main() {
 	io.Copy(os.Stdout, bytes.NewReader(csv))
 }
 
-/* Copyright 2022 Spiegel
+/* Copyright 2023 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/sample/sample1.go b/sample/sample1.go
@@ -10,7 +10,7 @@ import (
 	"strconv"
 	"time"
 
-	"github.com/goark/koyomi"
+	"github.com/goark/koyomi/value"
 )
 
 func main() {
@@ -33,7 +33,7 @@ func main() {
 		}
 		tm = time.Date(args[0], time.Month(args[1]), args[2], 0, 0, 0, 0, time.Local)
 	}
-	te := koyomi.NewDate(tm)
+	te := value.NewDate(tm)
 	n, y := te.YearEraString()
 	if len(n) == 0 {
 		fmt.Fprintln(os.Stderr, "正しい年月日を指定してください")
@@ -42,7 +42,7 @@ func main() {
 	fmt.Printf("%s%s%d月%d日\n", n, y, te.Month(), te.Day())
 }
 
-/* Copyright 2019-2022 Spiegel
+/* Copyright 2019-2023 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/sample/sample2.go b/sample/sample2.go
@@ -10,7 +10,7 @@ import (
 	"strconv"
 	"time"
 
-	"github.com/goark/koyomi"
+	"github.com/goark/koyomi/value"
 )
 
 func main() {
@@ -31,11 +31,11 @@ func main() {
 		}
 		args[i] = num
 	}
-	te := koyomi.NewDateEra(koyomi.EraName(name), args[0], time.Month(args[1]), args[2])
+	te := value.NewDateEra(value.EraName(name), args[0], time.Month(args[1]), args[2])
 	fmt.Println(te.Format("西暦2006年1月2日"))
 }
 
-/* Copyright 2019-2022 Spiegel
+/* Copyright 2019-2023 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/sample/sample3.go b/sample/sample3.go
@@ -8,7 +8,7 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/goark/koyomi"
+	"github.com/goark/koyomi/value"
 	"github.com/goark/koyomi/zodiac"
 )
 
@@ -20,7 +20,7 @@ func main() {
 		return
 	}
 	for _, s := range args {
-		t, err := koyomi.DateFrom(s)
+		t, err := value.DateFrom(s)
 		if err != nil {
 			fmt.Fprintln(os.Stderr, err)
 			continue

diff --git a/sample/sample4.go b/sample/sample4.go
@@ -8,8 +8,8 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/goark/koyomi"
 	"github.com/goark/koyomi/jdn"
+	"github.com/goark/koyomi/value"
 )
 
 func main() {
@@ -20,7 +20,7 @@ func main() {
 		return
 	}
 	for _, s := range args {
-		t, err := koyomi.DateFrom(s)
+		t, err := value.DateFrom(s)
 		if err != nil {
 			fmt.Fprintln(os.Stderr, err)
 			continue