From 84efad7693a3058eae67a4f8eccf3215fd2f2a61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1ximo=20Cuadros?= Date: Thu, 19 Mar 2020 17:31:29 +0100 Subject: [PATCH] *: module rename to go-enry/go-enry/v4 --- CODEOWNERS | 1 - CONTRIBUTING.md | 61 ------------------- DCO | 25 -------- LICENSE | 7 ++- MAINTAINERS | 3 - Makefile | 23 ------- README.md | 6 +- benchmark_test.go | 2 +- classifier.go | 2 +- cmd/enry/main.go | 4 +- common.go | 4 +- common_test.go | 2 +- data/alias.go | 2 +- data/colors.go | 2 +- data/commit.go | 2 +- data/content.go | 4 +- data/documentation.go | 2 +- data/extension.go | 2 +- data/filename.go | 2 +- data/frequencies.go | 2 +- data/heuristics.go | 2 +- data/heuristics_test.go | 2 +- data/interpreter.go | 2 +- data/mimeType.go | 2 +- data/type.go | 2 +- data/vendor.go | 2 +- enry.go | 2 +- go.mod | 8 +-- go.sum | 8 +-- .../code-generator/assets/content.go.tmpl | 2 +- internal/code-generator/assets/header.go.tmpl | 2 +- .../code-generator/generator/samplesfreq.go | 2 +- .../generator/test_files/alias.gold | 2 +- .../generator/test_files/colors.gold | 2 +- .../generator/test_files/commit.gold | 2 +- .../generator/test_files/content.gold | 4 +- .../generator/test_files/documentation.gold | 2 +- .../generator/test_files/extension.gold | 2 +- .../generator/test_files/filename.gold | 2 +- .../generator/test_files/frequencies.gold | 2 +- .../generator/test_files/interpreter.gold | 2 +- .../generator/test_files/mimeType.gold | 2 +- .../generator/test_files/type.gold | 2 +- .../generator/test_files/vendor.gold | 2 +- internal/code-generator/main.go | 2 +- internal/tokenizer/tokenize.go | 2 +- internal/tokenizer/tokenize_c.go | 2 +- regex/oniguruma.go | 2 +- shared/enry.go | 2 +- utils.go | 2 +- 50 files changed, 60 insertions(+), 172 deletions(-) delete mode 100644 CODEOWNERS delete mode 100644 CONTRIBUTING.md delete mode 100644 DCO delete mode 100644 MAINTAINERS diff --git a/CODEOWNERS b/CODEOWNERS deleted file mode 100644 index 9bcc1ef..0000000 --- a/CODEOWNERS +++ /dev/null @@ -1 +0,0 @@ -* @src-d/language-analysis diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md deleted file mode 100644 index 6d2bcf9..0000000 --- a/CONTRIBUTING.md +++ /dev/null @@ -1,61 +0,0 @@ -# source{d} Contributing Guidelines - -source{d} projects accept contributions via GitHub pull requests. -This document outlines some of the -conventions on development workflow, commit message formatting, contact points, -and other resources to make it easier to get your contribution accepted. - -## Certificate of Origin - -By contributing to this project, you agree to the [Developer Certificate of -Origin (DCO)](DCO). This document was created by the Linux Kernel community and is a -simple statement that you, as a contributor, have the legal right to make the -contribution. - -In order to show your agreement with the DCO you should include at the end of the commit message, -the following line: `Signed-off-by: John Doe `, using your real name. - -This can be done easily using the [`-s`](https://github.com/git/git/blob/b2c150d3aa82f6583b9aadfecc5f8fa1c74aca09/Documentation/git-commit.txt#L154-L161) flag on the `git commit`. - -If you find yourself pushed a few commits without `Signed-off-by`, you can still add it afterwards. We wrote a manual which can help: [fix-DCO.md](https://github.com/src-d/guide/blob/master/developer-community/fix-DCO.md). - -## Support Channels - -The official support channels, for both users and contributors, are: - -- GitHub issues: each repository has its own list of issues. -- Slack: join the [source{d} Slack](https://join.slack.com/t/sourced-community/shared_invite/enQtMjc4Njk5MzEyNzM2LTFjNzY4NjEwZGEwMzRiNTM4MzRlMzQ4MmIzZjkwZmZlM2NjODUxZmJjNDI1OTcxNDAyMmZlNmFjODZlNTg0YWM) community. - -*Before opening a new issue or submitting a new pull request, it's helpful to -search the project - it's likely that another user has already reported the -issue you're facing, or it's a known issue that we're already aware of. - - -## How to Contribute - -Pull Requests (PRs) are the main and exclusive way to contribute code to source{d} projects. -In order for a PR to be accepted it needs to pass this list of requirements: - -- The contribution must be correctly explained with natural language and providing a minimum working example that reproduces it. -- All PRs must be written idiomaticly: - - for Go: formatted according to [gofmt](https://golang.org/cmd/gofmt/), and without any warnings from [go lint](https://github.com/golang/lint) nor [go vet](https://golang.org/cmd/vet/) - - for other languages, similar constraints apply. -- They should in general include tests, and those shall pass. - - If the PR is a bug fix, it has to include a new unit test that fails before the patch is merged. - - If the PR is a new feature, it has to come with a suite of unit tests, that tests the new functionality. - - In any case, all the PRs have to pass the personal evaluation of at least one of the [maintainers](MAINTAINERS) of the project. - - -### Format of the commit message - -Every commit message should describe what was changed, under which context and, if applicable, the GitHub issue it relates to: - -``` -plumbing: packp, Skip argument validations for unknown capabilities. Fixes #623 -``` - -The format can be described more formally as follows: - -``` -: , . [Fixes #] -``` diff --git a/DCO b/DCO deleted file mode 100644 index 29c1b92..0000000 --- a/DCO +++ /dev/null @@ -1,25 +0,0 @@ - Developer's Certificate of Origin 1.1 - - By making a contribution to this project, I certify that: - - (a) The contribution was created in whole or in part by me and I - have the right to submit it under the open source license - indicated in the file; or - - (b) The contribution is based upon previous work that, to the best - of my knowledge, is covered under an appropriate open source - license and I have the right under that license to submit that - work with modifications, whether created in whole or in part - by me, under the same open source license (unless I am - permitted to submit under a different license), as indicated - in the file; or - - (c) The contribution was provided directly to me by some other - person who certified (a), (b) or (c) and I have not modified - it. - - (d) I understand and agree that this project and the contribution - are public and that a record of the contribution (including all - personal information I submit with it, including my sign-off) is - maintained indefinitely and may be redistributed consistent with - this project or the open source license(s) involved. diff --git a/LICENSE b/LICENSE index 7f5eae0..7a4a3ea 100644 --- a/LICENSE +++ b/LICENSE @@ -1,3 +1,4 @@ + Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -178,7 +179,7 @@ APPENDIX: How to apply the Apache License to your work. To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "{}" + boilerplate notice, with the fields enclosed by brackets "[]" replaced with your own identifying information. (Don't include the brackets!) The text should be enclosed in the appropriate comment syntax for the file format. We also recommend that a @@ -186,7 +187,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2017 Sourced Technologies, S.L. + Copyright [yyyy] [name of copyright owner] Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -198,4 +199,4 @@ distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and - limitations under the License. + limitations under the License. \ No newline at end of file diff --git a/MAINTAINERS b/MAINTAINERS deleted file mode 100644 index 01f2fc5..0000000 --- a/MAINTAINERS +++ /dev/null @@ -1,3 +0,0 @@ -Alexander Bezzubov (@bzz) -Michael Fromberger (@creachadair) -Kuba Podgórski (@kuba--) diff --git a/Makefile b/Makefile index 34c47b9..07bba14 100644 --- a/Makefile +++ b/Makefile @@ -1,26 +1,3 @@ -# Package configuration -PROJECT = enry -COMMANDS = cmd/enry - -# Including ci Makefile -CI_REPOSITORY ?= https://github.com/src-d/ci.git -CI_BRANCH ?= v1 -CI_PATH ?= .ci -MAKEFILE := $(CI_PATH)/Makefile.main -$(MAKEFILE): - git clone --quiet --depth 1 -b $(CI_BRANCH) $(CI_REPOSITORY) $(CI_PATH); --include $(MAKEFILE) - -# Docsrv: configure the languages whose api-doc can be auto generated -LANGUAGES = go -# Docs: do not edit this -DOCS_REPOSITORY := https://github.com/src-d/docs -SHARED_PATH ?= $(shell pwd)/.docsrv-resources -DOCS_PATH ?= $(SHARED_PATH)/.docs -$(DOCS_PATH)/Makefile.inc: - git clone --quiet --depth 1 $(DOCS_REPOSITORY) $(DOCS_PATH); --include $(DOCS_PATH)/Makefile.inc - LINGUIST_PATH = .linguist # shared objects diff --git a/README.md b/README.md index 7d58b0c..051c23f 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ The recommended way to install the `enry` command-line tool is to either [download a release](https://github.com/bzz/enry/releases) or run: ``` -(cd "$(mktemp -d)" && go mod init enry && go get github.com/bzz/enry/v2/cmd/enry) +(cd "$(mktemp -d)" && go mod init enry && go get github.com/go-enry/go-enry/v2/cmd/enry) ``` *enry* CLI accepts similar flags (`--breakdown/--json`) and produce an output, similar to *linguist*: @@ -50,7 +50,7 @@ In a [Go module](https://github.com/golang/go/wiki/Modules), import `enry` to the module by running: ```go -go get github.com/bzz/enry/v2 +go get github.com/go-enry/go-enry/v2 ``` The rest of the examples will assume you have either done this or fetched the @@ -58,7 +58,7 @@ library into your `GOPATH`. ```go // The examples here and below assume you have imported the library. -import "github.com/bzz/enry/v2" +import "github.com/go-enry/go-enry/v2" lang, safe := enry.GetLanguageByExtension("foo.go") fmt.Println(lang, safe) diff --git a/benchmark_test.go b/benchmark_test.go index 0f4e238..1c7b98c 100644 --- a/benchmark_test.go +++ b/benchmark_test.go @@ -10,7 +10,7 @@ import ( "path/filepath" "testing" - "github.com/bzz/enry/v2/data" + "github.com/go-enry/go-enry/v2/data" ) type sample struct { diff --git a/classifier.go b/classifier.go index c02b508..ebc3e3b 100644 --- a/classifier.go +++ b/classifier.go @@ -4,7 +4,7 @@ import ( "math" "sort" - "github.com/bzz/enry/v2/internal/tokenizer" + "github.com/go-enry/go-enry/v2/internal/tokenizer" ) // classifier is the interface in charge to detect the possible languages of the given content based on a set of diff --git a/cmd/enry/main.go b/cmd/enry/main.go index 61986a3..adc31d6 100644 --- a/cmd/enry/main.go +++ b/cmd/enry/main.go @@ -14,8 +14,8 @@ import ( "sort" "strings" - "github.com/bzz/enry/v2" - "github.com/bzz/enry/v2/data" + "github.com/go-enry/go-enry/v2" + "github.com/go-enry/go-enry/v2/data" ) var ( diff --git a/common.go b/common.go index 7473590..a1f3f01 100644 --- a/common.go +++ b/common.go @@ -6,8 +6,8 @@ import ( "path/filepath" "strings" - "github.com/bzz/enry/v2/data" - "github.com/bzz/enry/v2/regex" + "github.com/go-enry/go-enry/v2/data" + "github.com/go-enry/go-enry/v2/regex" ) // OtherLanguage is used as a zero value when a function can not return a specific language. diff --git a/common_test.go b/common_test.go index 9be56e3..bac5c66 100644 --- a/common_test.go +++ b/common_test.go @@ -8,7 +8,7 @@ import ( "path/filepath" "testing" - "github.com/bzz/enry/v2/data" + "github.com/go-enry/go-enry/v2/data" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/data/alias.go b/data/alias.go index 7f53aab..814598a 100644 --- a/data/alias.go +++ b/data/alias.go @@ -1,4 +1,4 @@ -// Code generated by github.com/bzz/enry/v2/internal/code-generator DO NOT EDIT. +// Code generated by github.com/go-enry/go-enry/v2/internal/code-generator DO NOT EDIT. // Extracted from github/linguist commit: 3a1bd3c3d3e741a8aaec4704f782e06f5cd2a00d package data diff --git a/data/colors.go b/data/colors.go index 341d59c..96bf1f8 100644 --- a/data/colors.go +++ b/data/colors.go @@ -1,4 +1,4 @@ -// Code generated by github.com/bzz/enry/v2/internal/code-generator DO NOT EDIT. +// Code generated by github.com/go-enry/go-enry/v2/internal/code-generator DO NOT EDIT. // Extracted from github/linguist commit: 3a1bd3c3d3e741a8aaec4704f782e06f5cd2a00d package data diff --git a/data/commit.go b/data/commit.go index 267f1fc..318eca4 100644 --- a/data/commit.go +++ b/data/commit.go @@ -1,4 +1,4 @@ -// Code generated by github.com/bzz/enry/v2/internal/code-generator DO NOT EDIT. +// Code generated by github.com/go-enry/go-enry/v2/internal/code-generator DO NOT EDIT. // Extracted from github/linguist commit: 3a1bd3c3d3e741a8aaec4704f782e06f5cd2a00d package data diff --git a/data/content.go b/data/content.go index 9abf90d..d7158cd 100644 --- a/data/content.go +++ b/data/content.go @@ -1,4 +1,4 @@ -// Code generated by github.com/bzz/enry/v2/internal/code-generator DO NOT EDIT. +// Code generated by github.com/go-enry/go-enry/v2/internal/code-generator DO NOT EDIT. // Extracted from github/linguist commit: 3a1bd3c3d3e741a8aaec4704f782e06f5cd2a00d package data @@ -6,7 +6,7 @@ package data import ( "regexp" - "github.com/bzz/enry/v2/data/rule" + "github.com/go-enry/go-enry/v2/data/rule" ) var ContentHeuristics = map[string]*Heuristics{ diff --git a/data/documentation.go b/data/documentation.go index 7cfe8e7..e2dd176 100644 --- a/data/documentation.go +++ b/data/documentation.go @@ -1,4 +1,4 @@ -// Code generated by github.com/bzz/enry/v2/internal/code-generator DO NOT EDIT. +// Code generated by github.com/go-enry/go-enry/v2/internal/code-generator DO NOT EDIT. // Extracted from github/linguist commit: 3a1bd3c3d3e741a8aaec4704f782e06f5cd2a00d package data diff --git a/data/extension.go b/data/extension.go index b1ab5ca..6dc26c0 100644 --- a/data/extension.go +++ b/data/extension.go @@ -1,4 +1,4 @@ -// Code generated by github.com/bzz/enry/v2/internal/code-generator DO NOT EDIT. +// Code generated by github.com/go-enry/go-enry/v2/internal/code-generator DO NOT EDIT. // Extracted from github/linguist commit: 3a1bd3c3d3e741a8aaec4704f782e06f5cd2a00d package data diff --git a/data/filename.go b/data/filename.go index 64c393d..e582629 100644 --- a/data/filename.go +++ b/data/filename.go @@ -1,4 +1,4 @@ -// Code generated by github.com/bzz/enry/v2/internal/code-generator DO NOT EDIT. +// Code generated by github.com/go-enry/go-enry/v2/internal/code-generator DO NOT EDIT. // Extracted from github/linguist commit: 3a1bd3c3d3e741a8aaec4704f782e06f5cd2a00d package data diff --git a/data/frequencies.go b/data/frequencies.go index c232060..3a4298a 100644 --- a/data/frequencies.go +++ b/data/frequencies.go @@ -1,4 +1,4 @@ -// Code generated by github.com/bzz/enry/v2/internal/code-generator DO NOT EDIT. +// Code generated by github.com/go-enry/go-enry/v2/internal/code-generator DO NOT EDIT. // Extracted from github/linguist commit: 3a1bd3c3d3e741a8aaec4704f782e06f5cd2a00d package data diff --git a/data/heuristics.go b/data/heuristics.go index 1644fe2..163ebfc 100644 --- a/data/heuristics.go +++ b/data/heuristics.go @@ -1,6 +1,6 @@ package data -import "github.com/bzz/enry/v2/data/rule" +import "github.com/go-enry/go-enry/v2/data/rule" // Heuristics implements a rule-based content matching engine. diff --git a/data/heuristics_test.go b/data/heuristics_test.go index 54ca158..2719494 100644 --- a/data/heuristics_test.go +++ b/data/heuristics_test.go @@ -4,7 +4,7 @@ import ( "regexp" "testing" - "github.com/bzz/enry/v2/data/rule" + "github.com/go-enry/go-enry/v2/data/rule" "github.com/stretchr/testify/assert" ) diff --git a/data/interpreter.go b/data/interpreter.go index 26a6327..eddfba5 100644 --- a/data/interpreter.go +++ b/data/interpreter.go @@ -1,4 +1,4 @@ -// Code generated by github.com/bzz/enry/v2/internal/code-generator DO NOT EDIT. +// Code generated by github.com/go-enry/go-enry/v2/internal/code-generator DO NOT EDIT. // Extracted from github/linguist commit: 3a1bd3c3d3e741a8aaec4704f782e06f5cd2a00d package data diff --git a/data/mimeType.go b/data/mimeType.go index f06c4c7..5e797d3 100644 --- a/data/mimeType.go +++ b/data/mimeType.go @@ -1,4 +1,4 @@ -// Code generated by github.com/bzz/enry/v2/internal/code-generator DO NOT EDIT. +// Code generated by github.com/go-enry/go-enry/v2/internal/code-generator DO NOT EDIT. // Extracted from github/linguist commit: 3a1bd3c3d3e741a8aaec4704f782e06f5cd2a00d package data diff --git a/data/type.go b/data/type.go index 8a4e500..9b60221 100644 --- a/data/type.go +++ b/data/type.go @@ -1,4 +1,4 @@ -// Code generated by github.com/bzz/enry/v2/internal/code-generator DO NOT EDIT. +// Code generated by github.com/go-enry/go-enry/v2/internal/code-generator DO NOT EDIT. // Extracted from github/linguist commit: 3a1bd3c3d3e741a8aaec4704f782e06f5cd2a00d package data diff --git a/data/vendor.go b/data/vendor.go index 908be27..d5f2e8f 100644 --- a/data/vendor.go +++ b/data/vendor.go @@ -1,4 +1,4 @@ -// Code generated by github.com/bzz/enry/v2/internal/code-generator DO NOT EDIT. +// Code generated by github.com/go-enry/go-enry/v2/internal/code-generator DO NOT EDIT. // Extracted from github/linguist commit: 3a1bd3c3d3e741a8aaec4704f782e06f5cd2a00d package data diff --git a/enry.go b/enry.go index 60b3ead..2b84456 100644 --- a/enry.go +++ b/enry.go @@ -11,6 +11,6 @@ Upstream Linguist YAML files are used to generate datastructures for data package. */ -package enry // import "github.com/bzz/enry/v2" +package enry // import "github.com/go-enry/go-enry/v2" //go:generate make code-generate diff --git a/go.mod b/go.mod index 76a3daf..cc75d74 100644 --- a/go.mod +++ b/go.mod @@ -1,11 +1,11 @@ -module github.com/bzz/enry/v2 +module github.com/go-enry/go-enry/v2 -go 1.12 +go 1.14 require ( - github.com/src-d/go-oniguruma v1.1.0 + github.com/go-enry/go-oniguruma v1.2.0 github.com/stretchr/testify v1.3.0 github.com/toqueteos/trie v1.0.0 // indirect gopkg.in/toqueteos/substring.v1 v1.0.2 - gopkg.in/yaml.v2 v2.2.2 + gopkg.in/yaml.v2 v2.2.8 ) diff --git a/go.sum b/go.sum index d3a8b30..de8e3d4 100644 --- a/go.sum +++ b/go.sum @@ -1,9 +1,9 @@ github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/go-enry/go-oniguruma v1.2.0 h1:oBO9XC1IDT9+AoWW5oFsa/7gFeOPacEqDbyXZKWXuDs= +github.com/go-enry/go-oniguruma v1.2.0/go.mod h1:bWDhYP+S6xZQgiRL7wlTScFYBe023B6ilRZbCAD5Hf4= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/src-d/go-oniguruma v1.1.0 h1:EG+Nm5n2JqWUaCjtM0NtutPxU7ZN5Tp50GWrrV8bTww= -github.com/src-d/go-oniguruma v1.1.0/go.mod h1:chVbff8kcVtmrhxtZ3yBVLLquXbzCS6DrxQaAK/CeqM= github.com/stretchr/objx v0.1.0 h1:4G4v2dO3VZwixGIRoQ5Lfboy6nUhCyYzaqnIAPPhYs4= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0Q= @@ -14,5 +14,5 @@ gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+ gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/toqueteos/substring.v1 v1.0.2 h1:urLqCeMm6x/eTuQa1oZerNw8N1KNOIp5hD5kGL7lFsE= gopkg.in/toqueteos/substring.v1 v1.0.2/go.mod h1:Eb2Z1UYehlVK8LYW2WBVR2rwbujsz3aX8XDrM1vbNew= -gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw= -gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10= +gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= diff --git a/internal/code-generator/assets/content.go.tmpl b/internal/code-generator/assets/content.go.tmpl index 905aa08..3be29ab 100644 --- a/internal/code-generator/assets/content.go.tmpl +++ b/internal/code-generator/assets/content.go.tmpl @@ -3,7 +3,7 @@ package data import ( "regexp" - "github.com/bzz/enry/v2/data/rule" + "github.com/go-enry/go-enry/v2/data/rule" ) var ContentHeuristics = map[string]*Heuristics{ diff --git a/internal/code-generator/assets/header.go.tmpl b/internal/code-generator/assets/header.go.tmpl index 053711e..9a3d004 100644 --- a/internal/code-generator/assets/header.go.tmpl +++ b/internal/code-generator/assets/header.go.tmpl @@ -1,3 +1,3 @@ -// Code generated by github.com/bzz/enry/v2/internal/code-generator DO NOT EDIT. +// Code generated by github.com/go-enry/go-enry/v2/internal/code-generator DO NOT EDIT. // Extracted from github/linguist commit: {{ getCommit }} diff --git a/internal/code-generator/generator/samplesfreq.go b/internal/code-generator/generator/samplesfreq.go index 0181058..3dd2142 100644 --- a/internal/code-generator/generator/samplesfreq.go +++ b/internal/code-generator/generator/samplesfreq.go @@ -12,7 +12,7 @@ import ( "strconv" "text/template" - "github.com/bzz/enry/v2/internal/tokenizer" + "github.com/go-enry/go-enry/v2/internal/tokenizer" ) type samplesFrequencies struct { diff --git a/internal/code-generator/generator/test_files/alias.gold b/internal/code-generator/generator/test_files/alias.gold index 7f53aab..814598a 100644 --- a/internal/code-generator/generator/test_files/alias.gold +++ b/internal/code-generator/generator/test_files/alias.gold @@ -1,4 +1,4 @@ -// Code generated by github.com/bzz/enry/v2/internal/code-generator DO NOT EDIT. +// Code generated by github.com/go-enry/go-enry/v2/internal/code-generator DO NOT EDIT. // Extracted from github/linguist commit: 3a1bd3c3d3e741a8aaec4704f782e06f5cd2a00d package data diff --git a/internal/code-generator/generator/test_files/colors.gold b/internal/code-generator/generator/test_files/colors.gold index 341d59c..96bf1f8 100644 --- a/internal/code-generator/generator/test_files/colors.gold +++ b/internal/code-generator/generator/test_files/colors.gold @@ -1,4 +1,4 @@ -// Code generated by github.com/bzz/enry/v2/internal/code-generator DO NOT EDIT. +// Code generated by github.com/go-enry/go-enry/v2/internal/code-generator DO NOT EDIT. // Extracted from github/linguist commit: 3a1bd3c3d3e741a8aaec4704f782e06f5cd2a00d package data diff --git a/internal/code-generator/generator/test_files/commit.gold b/internal/code-generator/generator/test_files/commit.gold index 267f1fc..318eca4 100644 --- a/internal/code-generator/generator/test_files/commit.gold +++ b/internal/code-generator/generator/test_files/commit.gold @@ -1,4 +1,4 @@ -// Code generated by github.com/bzz/enry/v2/internal/code-generator DO NOT EDIT. +// Code generated by github.com/go-enry/go-enry/v2/internal/code-generator DO NOT EDIT. // Extracted from github/linguist commit: 3a1bd3c3d3e741a8aaec4704f782e06f5cd2a00d package data diff --git a/internal/code-generator/generator/test_files/content.gold b/internal/code-generator/generator/test_files/content.gold index 9abf90d..d7158cd 100644 --- a/internal/code-generator/generator/test_files/content.gold +++ b/internal/code-generator/generator/test_files/content.gold @@ -1,4 +1,4 @@ -// Code generated by github.com/bzz/enry/v2/internal/code-generator DO NOT EDIT. +// Code generated by github.com/go-enry/go-enry/v2/internal/code-generator DO NOT EDIT. // Extracted from github/linguist commit: 3a1bd3c3d3e741a8aaec4704f782e06f5cd2a00d package data @@ -6,7 +6,7 @@ package data import ( "regexp" - "github.com/bzz/enry/v2/data/rule" + "github.com/go-enry/go-enry/v2/data/rule" ) var ContentHeuristics = map[string]*Heuristics{ diff --git a/internal/code-generator/generator/test_files/documentation.gold b/internal/code-generator/generator/test_files/documentation.gold index 7cfe8e7..e2dd176 100644 --- a/internal/code-generator/generator/test_files/documentation.gold +++ b/internal/code-generator/generator/test_files/documentation.gold @@ -1,4 +1,4 @@ -// Code generated by github.com/bzz/enry/v2/internal/code-generator DO NOT EDIT. +// Code generated by github.com/go-enry/go-enry/v2/internal/code-generator DO NOT EDIT. // Extracted from github/linguist commit: 3a1bd3c3d3e741a8aaec4704f782e06f5cd2a00d package data diff --git a/internal/code-generator/generator/test_files/extension.gold b/internal/code-generator/generator/test_files/extension.gold index b1ab5ca..6dc26c0 100644 --- a/internal/code-generator/generator/test_files/extension.gold +++ b/internal/code-generator/generator/test_files/extension.gold @@ -1,4 +1,4 @@ -// Code generated by github.com/bzz/enry/v2/internal/code-generator DO NOT EDIT. +// Code generated by github.com/go-enry/go-enry/v2/internal/code-generator DO NOT EDIT. // Extracted from github/linguist commit: 3a1bd3c3d3e741a8aaec4704f782e06f5cd2a00d package data diff --git a/internal/code-generator/generator/test_files/filename.gold b/internal/code-generator/generator/test_files/filename.gold index 64c393d..e582629 100644 --- a/internal/code-generator/generator/test_files/filename.gold +++ b/internal/code-generator/generator/test_files/filename.gold @@ -1,4 +1,4 @@ -// Code generated by github.com/bzz/enry/v2/internal/code-generator DO NOT EDIT. +// Code generated by github.com/go-enry/go-enry/v2/internal/code-generator DO NOT EDIT. // Extracted from github/linguist commit: 3a1bd3c3d3e741a8aaec4704f782e06f5cd2a00d package data diff --git a/internal/code-generator/generator/test_files/frequencies.gold b/internal/code-generator/generator/test_files/frequencies.gold index c232060..3a4298a 100644 --- a/internal/code-generator/generator/test_files/frequencies.gold +++ b/internal/code-generator/generator/test_files/frequencies.gold @@ -1,4 +1,4 @@ -// Code generated by github.com/bzz/enry/v2/internal/code-generator DO NOT EDIT. +// Code generated by github.com/go-enry/go-enry/v2/internal/code-generator DO NOT EDIT. // Extracted from github/linguist commit: 3a1bd3c3d3e741a8aaec4704f782e06f5cd2a00d package data diff --git a/internal/code-generator/generator/test_files/interpreter.gold b/internal/code-generator/generator/test_files/interpreter.gold index 26a6327..eddfba5 100644 --- a/internal/code-generator/generator/test_files/interpreter.gold +++ b/internal/code-generator/generator/test_files/interpreter.gold @@ -1,4 +1,4 @@ -// Code generated by github.com/bzz/enry/v2/internal/code-generator DO NOT EDIT. +// Code generated by github.com/go-enry/go-enry/v2/internal/code-generator DO NOT EDIT. // Extracted from github/linguist commit: 3a1bd3c3d3e741a8aaec4704f782e06f5cd2a00d package data diff --git a/internal/code-generator/generator/test_files/mimeType.gold b/internal/code-generator/generator/test_files/mimeType.gold index f06c4c7..5e797d3 100644 --- a/internal/code-generator/generator/test_files/mimeType.gold +++ b/internal/code-generator/generator/test_files/mimeType.gold @@ -1,4 +1,4 @@ -// Code generated by github.com/bzz/enry/v2/internal/code-generator DO NOT EDIT. +// Code generated by github.com/go-enry/go-enry/v2/internal/code-generator DO NOT EDIT. // Extracted from github/linguist commit: 3a1bd3c3d3e741a8aaec4704f782e06f5cd2a00d package data diff --git a/internal/code-generator/generator/test_files/type.gold b/internal/code-generator/generator/test_files/type.gold index 8a4e500..9b60221 100644 --- a/internal/code-generator/generator/test_files/type.gold +++ b/internal/code-generator/generator/test_files/type.gold @@ -1,4 +1,4 @@ -// Code generated by github.com/bzz/enry/v2/internal/code-generator DO NOT EDIT. +// Code generated by github.com/go-enry/go-enry/v2/internal/code-generator DO NOT EDIT. // Extracted from github/linguist commit: 3a1bd3c3d3e741a8aaec4704f782e06f5cd2a00d package data diff --git a/internal/code-generator/generator/test_files/vendor.gold b/internal/code-generator/generator/test_files/vendor.gold index 908be27..d5f2e8f 100644 --- a/internal/code-generator/generator/test_files/vendor.gold +++ b/internal/code-generator/generator/test_files/vendor.gold @@ -1,4 +1,4 @@ -// Code generated by github.com/bzz/enry/v2/internal/code-generator DO NOT EDIT. +// Code generated by github.com/go-enry/go-enry/v2/internal/code-generator DO NOT EDIT. // Extracted from github/linguist commit: 3a1bd3c3d3e741a8aaec4704f782e06f5cd2a00d package data diff --git a/internal/code-generator/main.go b/internal/code-generator/main.go index 8c6151b..f4d809a 100644 --- a/internal/code-generator/main.go +++ b/internal/code-generator/main.go @@ -4,7 +4,7 @@ import ( "io/ioutil" "log" - "github.com/bzz/enry/v2/internal/code-generator/generator" + "github.com/go-enry/go-enry/v2/internal/code-generator/generator" ) const ( diff --git a/internal/tokenizer/tokenize.go b/internal/tokenizer/tokenize.go index 4990f09..1d46df3 100644 --- a/internal/tokenizer/tokenize.go +++ b/internal/tokenizer/tokenize.go @@ -5,7 +5,7 @@ package tokenizer import ( "bytes" - "github.com/bzz/enry/v2/regex" + "github.com/go-enry/go-enry/v2/regex" ) // Tokenize returns lexical tokens from content. The tokens returned match what diff --git a/internal/tokenizer/tokenize_c.go b/internal/tokenizer/tokenize_c.go index 8f558b1..0fb8d4d 100644 --- a/internal/tokenizer/tokenize_c.go +++ b/internal/tokenizer/tokenize_c.go @@ -2,7 +2,7 @@ package tokenizer -import "github.com/bzz/enry/v2/internal/tokenizer/flex" +import "github.com/go-enry/go-enry/v2/internal/tokenizer/flex" // Tokenize returns lexical tokens from content. The tokens returned match what // the Linguist library returns. At most the first ByteLimit bytes of content are tokenized. diff --git a/regex/oniguruma.go b/regex/oniguruma.go index 8caf644..0c9660e 100644 --- a/regex/oniguruma.go +++ b/regex/oniguruma.go @@ -3,7 +3,7 @@ package regex import ( - rubex "github.com/src-d/go-oniguruma" + rubex "github.com/go-enry/go-oniguruma" ) type EnryRegexp = *rubex.Regexp diff --git a/shared/enry.go b/shared/enry.go index 2b16cf4..949b6b3 100644 --- a/shared/enry.go +++ b/shared/enry.go @@ -4,7 +4,7 @@ package main import "C" -import "github.com/bzz/enry/v2" +import "github.com/go-enry/go-enry/v2" //export GetLanguage func GetLanguage(filename string, content []byte) string { diff --git a/utils.go b/utils.go index 6e2a681..179357e 100644 --- a/utils.go +++ b/utils.go @@ -5,7 +5,7 @@ import ( "path/filepath" "strings" - "github.com/bzz/enry/v2/data" + "github.com/go-enry/go-enry/v2/data" ) const binSniffLen = 8000