Merge pull request #7 from spiegel-im-spiegel/debug

Bump up version of csvdata package
goark · Oct 8, 2021 · 253a139 · 253a139
2 parents 8103b71 + 038c9d6
commit 253a139
Show file tree

Hide file tree

Showing 13 changed files with 78 additions and 16 deletions.
diff --git a/README.md b/README.md
@@ -18,6 +18,9 @@ import "github.com/spiegel-im-spiegel/cov19data"
 ### Get COVID-2019 Global Data (raw data) from WHO Web Site
 
 ```go
+//go:build run
+// +build run
+
 package main
 
 import (
@@ -46,6 +49,9 @@ func main() {
 ### Import COVID-2019 Global Data from WHO Web Site to Structured Dataset.
 
 ```go
+//go:build run
+// +build run
+
 package main
 
 import (
@@ -85,12 +91,12 @@ func getData() ([]*entity.GlobalData, error) {
 func main() {
     data, err := getData()
     if err != nil {
-        fmt.Fprintf(os.Stderr, "%+v\n", err)
+        fmt.Printf("%+v\n", err)
         return
     }
     b, err := entity.ExportCSV(data)
     if err != nil {
-        fmt.Fprintf(os.Stderr, "%v\n", err)
+        fmt.Printf("%v\n", err)
         return
     }
     if _, err := io.Copy(os.Stdout, bytes.NewReader(b)); err != nil {
@@ -111,6 +117,9 @@ func main() {
 ### Make Histogram data by COVID-2019 Global Data from WHO Web Site.
 
 ```go
+//go:build run
+// +build run
+
 package main
 
 import (
@@ -169,4 +178,8 @@ func main() {
 }
 ```
 
+## Modules Requirement Graph
+
+[![dependency.png](./dependency.png)](./dependency.png)
+
 [cov19data]: https://github.com/spiegel-im-spiegel/cov19data "spiegel-im-spiegel/cov19data: Importing WHO COVID-2019 Cases Global Data"
diff --git a/Taskfile.yml b/Taskfile.yml
@@ -5,13 +5,23 @@ tasks:
     cmds:
       - task: clean
       - task: test
+      - task: nancy
+      - task: graph
 
   test:
     desc: Test and lint.
     cmds:
       - go mod verify
       - go test -shuffle on ./...
-      - docker run --rm -v $(pwd):/app -w /app golangci/golangci-lint:v1.42.0 golangci-lint run --enable gosec --timeout 3m0s ./...
+      - docker run --rm -v $(pwd):/app -w /app golangci/golangci-lint:v1.42.1 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
     sources:
       - ./go.mod
       - '**/*.go'
@@ -23,3 +33,13 @@ tasks:
       - go clean -cache
       - go clean -modcache
       - go mod tidy -v -go=1.17
+
+  graph:
+    desc: Make grapth of dependency modules.
+    cmds:
+      - depm m --dot --dot-config dot-config.toml | dot -Tpng -o ./dependency.png
+    sources:
+      - ./go.mod
+      - '**/*.go'
+    generates:
+      - ./dependency.png
diff --git a/dependency.png b/dependency.png
diff --git a/dot-config.toml b/dot-config.toml
@@ -0,0 +1,4 @@
+[node]
+  fontname = "Inconsolata"
+[edge]
+  color = "red"
diff --git a/go.mod b/go.mod
@@ -3,7 +3,7 @@ module github.com/spiegel-im-spiegel/cov19data
 go 1.17
 
 require (
-	github.com/spiegel-im-spiegel/csvdata v0.1.2
+	github.com/spiegel-im-spiegel/csvdata v0.3.0
 	github.com/spiegel-im-spiegel/errs v1.0.5
 	github.com/spiegel-im-spiegel/fetch v0.2.5
 )
diff --git a/go.sum b/go.sum
@@ -1,6 +1,30 @@
-github.com/spiegel-im-spiegel/csvdata v0.1.2 h1:XgA2C0DnsbHYfifZFFsqy8sa1oHdMmxbiYnWA/fhjoY=
-github.com/spiegel-im-spiegel/csvdata v0.1.2/go.mod h1:FkzMmIp2RQrtRhFn7mz4bcAG+vaYujYMQZ6ZbAk81Fs=
+github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/knieriem/odf v0.1.0/go.mod h1:jRlg9+5Aya1ajQBX2ltU//o50Kn+cApfrsnkLCBjzJA=
+github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826/go.mod h1:TaXosZuwdSHYgviHp1DAtfrULt5eUgsSMsZf+YrPgl8=
+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/richardlehane/mscfb v1.0.3/go.mod h1:YzVpcZg9czvAuhk9T+a3avCpcFPMUWm7gK3DypaEsUk=
+github.com/richardlehane/msoleps v1.0.1/go.mod h1:BWev5JBpU9Ko2WAgmZEuiz4/u3ZYTKbjLycmwiWUfWg=
+github.com/spiegel-im-spiegel/csvdata v0.3.0 h1:/U9eGc/f10V77RVwlhsUCRsFMQKvAszoV+r0y6un6Uk=
+github.com/spiegel-im-spiegel/csvdata v0.3.0/go.mod h1:30Pt44pBI7C556+zOXOhEXgbUZgbAsB/yt2mgzuWVMQ=
 github.com/spiegel-im-spiegel/errs v1.0.5 h1:5qAUEXPZgF4ZIUmw2vpe7OgDP0C8DIV67BKwjfLidJI=
 github.com/spiegel-im-spiegel/errs v1.0.5/go.mod h1:mOsWcUc9hpRXjwdgJqJ3E2n6ibkYFvhNck1QD0ZVGOM=
 github.com/spiegel-im-spiegel/fetch v0.2.5 h1:S3yMboi2AT8DqubEed3OQfRHLABK+R44ooEHNw5fqTk=
 github.com/spiegel-im-spiegel/fetch v0.2.5/go.mod h1:1O8nwPhJvt5JGBwVPzngcT71Y65us4GCyjuVyvCN4sk=
+github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/xuri/efp v0.0.0-20210322160811-ab561f5b45e3/go.mod h1:ybY/Jr0T0GTCnYjKqmdwxyxn2BQf2RcQIIvex5QldPI=
+github.com/xuri/excelize/v2 v2.4.1/go.mod h1:rSu0C3papjzxQA3sdK8cU544TebhrPUoTOaGPIh0Q1A=
+golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
+golang.org/x/image v0.0.0-20210220032944-ac19c3e999fb/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
+golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
+golang.org/x/net v0.0.0-20210726213435-c6fcb2dbf985/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
+golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
+golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
diff --git a/import.go b/import.go
@@ -18,12 +18,12 @@ import (
 //Import class
 type Import struct {
 	reader io.Reader
-	data   *csvdata.Reader
+	data   *csvdata.Rows
 }
 
 //New returns new Import instance
 func New(r io.Reader) *Import {
-	return &Import{reader: r, data: csvdata.New(r, true).WithFieldsPerRecord(8)}
+	return &Import{reader: r, data: csvdata.NewRows(csvdata.New(r).WithFieldsPerRecord(8), true)}
 }
 
 //NewWeb returns new Import instance
@@ -44,9 +44,7 @@ func (i *Import) Close() {
 	if i == nil {
 		return
 	}
-	if c, ok := i.reader.(io.Closer); ok {
-		c.Close()
-	}
+	i.data.Close()
 }
 
 //RawReader method returns raw data stream

diff --git a/sample/data/data.go b/sample/data/data.go
@@ -1,3 +1,4 @@
+//go:build run
 // +build run
 
 package main

diff --git a/sample/hist/hist.go b/sample/hist/hist.go
@@ -1,3 +1,4 @@
+//go:build run
 // +build run
 
 package main

diff --git a/sample/raw/raw.go b/sample/raw/raw.go
@@ -1,3 +1,4 @@
+//go:build run
 // +build run
 
 package main

diff --git a/sample/tokyodata/data.go b/sample/tokyodata/data.go
@@ -1,3 +1,4 @@
+//go:build run
 // +build run
 
 package main

diff --git a/sample/tokyohist/hist.go b/sample/tokyohist/hist.go
@@ -1,3 +1,4 @@
+//go:build run
 // +build run
 
 package main

diff --git a/tokyo/import.go b/tokyo/import.go
@@ -19,12 +19,12 @@ import (
 //Import class
 type Import struct {
 	reader io.Reader
-	data   *csvdata.Reader
+	data   *csvdata.Rows
 }
 
 //New returns new Import instance
 func New(r io.Reader) *Import {
-	return &Import{reader: r, data: csvdata.New(r, true).WithFieldsPerRecord(17)}
+	return &Import{reader: r, data: csvdata.NewRows(csvdata.New(r).WithFieldsPerRecord(17), true)}
 }
 
 //NewWeb returns new Import instance
@@ -45,9 +45,7 @@ func (i *Import) Close() {
 	if i == nil {
 		return
 	}
-	if c, ok := i.reader.(io.Closer); ok {
-		c.Close()
-	}
+	i.data.Close()
 }
 
 //RawReader method returns raw data stream