From 3f2248084ebf7428524f2a378c9250ec3441b37b Mon Sep 17 00:00:00 2001 From: David Paz Date: Wed, 28 Jun 2017 10:58:58 +0200 Subject: [PATCH] Moved commit.go to data directory --- common_test.go | 4 +++- commit.go => data/commit.go | 6 +++--- internal/code-generator/assets/commit.go.tmpl | 4 ++-- internal/code-generator/generator/test_files/commit.gold | 4 ++-- internal/code-generator/main.go | 2 +- 5 files changed, 11 insertions(+), 9 deletions(-) rename commit.go => data/commit.go (53%) diff --git a/common_test.go b/common_test.go index 8be53a8..ca83e09 100644 --- a/common_test.go +++ b/common_test.go @@ -8,6 +8,8 @@ import ( "path/filepath" "testing" + "gopkg.in/src-d/enry.v1/data" + "github.com/stretchr/testify/assert" "github.com/stretchr/testify/suite" ) @@ -38,7 +40,7 @@ func (s *EnryTestSuite) SetupSuite() { err = os.Chdir(s.repoLinguist) assert.NoError(s.T(), err) - cmd = exec.Command("git", "checkout", linguistCommit) + cmd = exec.Command("git", "checkout", data.LinguistCommit) err = cmd.Run() assert.NoError(s.T(), err) diff --git a/commit.go b/data/commit.go similarity index 53% rename from commit.go rename to data/commit.go index 5aea131..eca459f 100644 --- a/commit.go +++ b/data/commit.go @@ -1,8 +1,8 @@ -package enry +package data // CODE GENERATED AUTOMATICALLY WITH gopkg.in/src-d/enry.v1/internal/code-generator // THIS FILE SHOULD NOT BE EDITED BY HAND -// Extracted from github/linguist commit: b6460f8ed6b249281ada099ca28bd8f1230b8892 +// Extracted from github/linguist commit: d5c8db3fb91963c4b2762ca2ea2ff7cfac109f68 // linguist's commit from which files were generated. -var linguistCommit = "b6460f8ed6b249281ada099ca28bd8f1230b8892" +var LinguistCommit = "d5c8db3fb91963c4b2762ca2ea2ff7cfac109f68" diff --git a/internal/code-generator/assets/commit.go.tmpl b/internal/code-generator/assets/commit.go.tmpl index d670c7e..1256181 100644 --- a/internal/code-generator/assets/commit.go.tmpl +++ b/internal/code-generator/assets/commit.go.tmpl @@ -1,8 +1,8 @@ -package enry +package data // CODE GENERATED AUTOMATICALLY WITH gopkg.in/src-d/enry.v1/internal/code-generator // THIS FILE SHOULD NOT BE EDITED BY HAND // Extracted from github/linguist commit: {{ . }} // linguist's commit from which files were generated. -var linguistCommit = "{{- . -}}" +var LinguistCommit = "{{- . -}}" diff --git a/internal/code-generator/generator/test_files/commit.gold b/internal/code-generator/generator/test_files/commit.gold index 5aea131..332fb00 100644 --- a/internal/code-generator/generator/test_files/commit.gold +++ b/internal/code-generator/generator/test_files/commit.gold @@ -1,8 +1,8 @@ -package enry +package data // CODE GENERATED AUTOMATICALLY WITH gopkg.in/src-d/enry.v1/internal/code-generator // THIS FILE SHOULD NOT BE EDITED BY HAND // Extracted from github/linguist commit: b6460f8ed6b249281ada099ca28bd8f1230b8892 // linguist's commit from which files were generated. -var linguistCommit = "b6460f8ed6b249281ada099ca28bd8f1230b8892" +var LinguistCommit = "b6460f8ed6b249281ada099ca28bd8f1230b8892" diff --git a/internal/code-generator/main.go b/internal/code-generator/main.go index 313e492..3b65bb1 100644 --- a/internal/code-generator/main.go +++ b/internal/code-generator/main.go @@ -63,7 +63,7 @@ const ( frequenciesTmpl = "frequencies.go.tmpl" // commit.go generation - commitFile = "commit.go" + commitFile = "data/commit.go" commitTmplPath = "internal/code-generator/assets/commit.go.tmpl" commitTmpl = "commit.go.tmpl"