Upgrade enry to v2.0.0 (#872)

ajnavarro · web-flow · commit 5b7438d380f3 · 2019-06-17T16:27:33.000+02:00
Upgrade enry to v2.0.0
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -15,6 +15,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - internal/function: gracefully handle errors in commit_stats.
 - Removed vendor folder.
+- Upgrade `enry` to version `v2.0.0`.
 
 ### Fixed
 
@@ -41,7 +42,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [0.20.0] - 2019-05-30
 ### Known Issues
-- After updating Vitess MySQL server, we are having some problems connecting from JDBC MariaDB drivers (https://github.com/src-d/gitbase/issues/807) (https://github.com/vitessio/vitess/issues/4603) 
+- After updating Vitess MySQL server, we are having some problems connecting from JDBC MariaDB drivers (https://github.com/src-d/gitbase/issues/807) (https://github.com/vitessio/vitess/issues/4603)
 
 ### Added
 - function: implement is_vendor function (#830)
diff --git a/go.mod b/go.mod
@@ -13,6 +13,8 @@ require (
 	github.com/miekg/dns v1.1.1 // indirect
 	github.com/opentracing/opentracing-go v1.1.0
 	github.com/sirupsen/logrus v1.3.0
+	github.com/src-d/enry/v2 v2.0.0
+	github.com/src-d/go-git v4.7.0+incompatible
 	github.com/src-d/go-git-fixtures v3.5.1-0.20190605154830-57f3972b0248+incompatible
 	github.com/src-d/go-mysql-server v0.4.1-0.20190607090451-cf9bb2a992da
 	github.com/stretchr/testify v1.3.0
@@ -21,7 +23,6 @@ require (
 	github.com/uber/jaeger-lib v2.0.0+incompatible // indirect
 	go.uber.org/atomic v1.4.0 // indirect
 	google.golang.org/grpc v1.20.1
-	gopkg.in/src-d/enry.v1 v1.7.2
 	gopkg.in/src-d/go-billy-siva.v4 v4.2.2
 	gopkg.in/src-d/go-billy.v4 v4.3.0
 	gopkg.in/src-d/go-errors.v1 v1.0.0
diff --git a/go.sum b/go.sum
@@ -196,6 +196,8 @@ github.com/src-d/enry/v2 v2.0.0 h1:2ADqfDHhroFwL1RGhMS9e15NkEwln8P4AABwVvIdAlo=
 github.com/src-d/enry/v2 v2.0.0/go.mod h1:qQeCMRwzMF3ckeGr+h0tJLdxXnq+NVZsIDMELj0t028=
 github.com/src-d/gcfg v1.4.0 h1:xXbNR5AlLSA315x2UO+fTSSAXCDf+Ar38/6oyGbDKQ4=
 github.com/src-d/gcfg v1.4.0/go.mod h1:p/UMsR43ujA89BJY9duynAwIpvqEujIH/jFlfL7jWoI=
+github.com/src-d/go-git v4.7.0+incompatible h1:IYSSnbAHeKmsfbQFi9ozbid+KNh0bKjlorMfQehQbcE=
+github.com/src-d/go-git v4.7.0+incompatible/go.mod h1:1bQciz+hn0jzPQNsYj0hDFZHLJBdV7gXE2mWhC7EkFk=
 github.com/src-d/go-git-fixtures v3.5.1-0.20190605154830-57f3972b0248+incompatible h1:A5bKevhs9C//Nh8QV0J+1KphEaIa25cDe1DTs/yPxDI=
 github.com/src-d/go-git-fixtures v3.5.1-0.20190605154830-57f3972b0248+incompatible/go.mod h1:XcIQp7L+k0pgfTqfbaTKj3kxlBv8kYOKZ/tKNXbZFLg=
 github.com/src-d/go-mysql-server v0.4.1-0.20190607090451-cf9bb2a992da h1:k98uJPIP1kysgYtidyDRgYXIXKj0HZ4d7jf9d+ztSmg=
@@ -304,8 +306,6 @@ gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8
 gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
 gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
 gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2/go.mod h1:Xk6kEKp8OKb+X14hQBKWaSkCsqBpgog8nAV2xsGOxlo=
-gopkg.in/src-d/enry.v1 v1.7.2 h1:f0eHdxIHq2Ox30Vfiqqpmi4ZcXzKKiYAD6PA4got+jA=
-gopkg.in/src-d/enry.v1 v1.7.2/go.mod h1:lDDelHa5/fOO+o8klI8JOOoMszXxhqCYOgqFS2mnxQA=
 gopkg.in/src-d/go-billy-siva.v4 v4.2.2 h1:HvklDMblrg/Zknu4tAFJayg34QUOvuojXjMQGqA2FtM=
 gopkg.in/src-d/go-billy-siva.v4 v4.2.2/go.mod h1:4wKeCzOCSsdyFeM5+58M6ObU6FM+lZT12p7zm7A+9n0=
 gopkg.in/src-d/go-billy.v4 v4.2.1/go.mod h1:tm33zBoOwxjYHZIE+OV8bxTWFMJLrconzFMd38aARFk=
diff --git a/internal/commitstats/file.go b/internal/commitstats/file.go
@@ -8,8 +8,8 @@ import (
 	"io"
 
 	"github.com/hhatto/gocloc"
+	"github.com/src-d/enry/v2"
 	"github.com/src-d/go-git/utils/binary"
-	"gopkg.in/src-d/enry.v1"
 	"gopkg.in/src-d/go-git.v4"
 	"gopkg.in/src-d/go-git.v4/plumbing/object"
 	"gopkg.in/src-d/go-git.v4/utils/ioutil"
diff --git a/internal/function/is_vendor.go b/internal/function/is_vendor.go
@@ -3,7 +3,7 @@ package function
 import (
 	"fmt"
 
-	enry "gopkg.in/src-d/enry.v1"
+	enry "github.com/src-d/enry/v2"
 	"github.com/src-d/go-mysql-server/sql"
 	"github.com/src-d/go-mysql-server/sql/expression"
 )
diff --git a/internal/function/language.go b/internal/function/language.go
@@ -8,7 +8,7 @@ import (
 	"strconv"
 
 	lru "github.com/hashicorp/golang-lru"
-	enry "gopkg.in/src-d/enry.v1"
+	enry "github.com/src-d/enry/v2"
 	"github.com/src-d/go-mysql-server/sql"
 )
 
diff --git a/internal/function/loc.go b/internal/function/loc.go
@@ -6,7 +6,7 @@ import (
 	"fmt"
 
 	"github.com/hhatto/gocloc"
-	"gopkg.in/src-d/enry.v1"
+	"github.com/src-d/enry/v2"
 	"github.com/src-d/go-mysql-server/sql"
 )
 

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ package function`
`3`	`3`	`import (`
`4`	`4`	`"fmt"`
`5`	`5`
`6`		`- enry "gopkg.in/src-d/enry.v1"`
	`6`	`+ enry "github.com/src-d/enry/v2"`
`7`	`7`	`"github.com/src-d/go-mysql-server/sql"`
`8`	`8`	`"github.com/src-d/go-mysql-server/sql/expression"`
`9`	`9`	`)`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ import (`
`8`	`8`	`"strconv"`
`9`	`9`
`10`	`10`	`lru "github.com/hashicorp/golang-lru"`
`11`		`- enry "gopkg.in/src-d/enry.v1"`
	`11`	`+ enry "github.com/src-d/enry/v2"`
`12`	`12`	`"github.com/src-d/go-mysql-server/sql"`
`13`	`13`	`)`
`14`	`14`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ import (`
`6`	`6`	`"fmt"`
`7`	`7`
`8`	`8`	`"github.com/hhatto/gocloc"`
`9`		`- "gopkg.in/src-d/enry.v1"`
	`9`	`+ "github.com/src-d/enry/v2"`
`10`	`10`	`"github.com/src-d/go-mysql-server/sql"`
`11`	`11`	`)`
`12`	`12`