Merge pull request #118 from maximilien/chore/move-project-package

refactor(#1): moved source files into separate folder
maximilien · Nov 27, 2023 · 74bbc47 · 74bbc47
2 parents 26f7822 + 551b856
commit 74bbc47
Show file tree

Hide file tree

Showing 28 changed files with 23 additions and 26 deletions.
diff --git a/bin/test b/bin/test
@@ -34,5 +34,5 @@
   go fmt ./...
 
   echo -e "\n Integration Testing packages:"
-  go test ./integration/... -parallel 4 $@
+  go test -count=1 ./integration/... -parallel 4 $@
 )
diff --git a/examples/demo1-i18n/i18n_init.go b/examples/demo1-i18n/i18n_init.go
@@ -10,7 +10,7 @@ import (
 
 	"github.com/pivotal-cf-experimental/jibber_jabber"
 
-	goi18n "github.com/maximilien/i18n4go/i18n"
+	goi18n "github.com/maximilien/i18n4go/i18n4go/i18n"
 )
 
 type Detector interface {

diff --git a/examples/i18n_init/cf_cli_i18n_init.go.template b/examples/i18n_init/cf_cli_i18n_init.go.template
@@ -10,7 +10,7 @@ import (
 
 	"github.com/pivotal-cf-experimental/jibber_jabber"
 
-	goi18n "github.com/maximilien/i18n4go/i18n"
+	goi18n "github.com/maximilien/i18n4go/i18n4go/i18n"
 )
 
 type Detector interface {

diff --git a/cmds/checkup.go → i18n4go/cmds/checkup.go b/cmds/checkup.go → i18n4go/cmds/checkup.go
@@ -29,7 +29,7 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"github.com/maximilien/i18n4go/common"
+	"github.com/maximilien/i18n4go/i18n4go/common"
 )
 
 type Checkup struct {

diff --git a/cmds/cmd_interface.go → i18n4go/cmds/cmd_interface.go b/cmds/cmd_interface.go → i18n4go/cmds/cmd_interface.go
@@ -15,7 +15,7 @@
 package cmds
 
 import (
-	"github.com/maximilien/i18n4go/common"
+	"github.com/maximilien/i18n4go/i18n4go/common"
 )
 
 type CommandInterface interface {

diff --git a/cmds/create_translations.go → i18n4go/cmds/create_translations.go b/cmds/create_translations.go → i18n4go/cmds/create_translations.go
@@ -27,7 +27,7 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"github.com/maximilien/i18n4go/common"
+	"github.com/maximilien/i18n4go/i18n4go/common"
 )
 
 type createTranslations struct {

diff --git a/cmds/extract_strings.go → i18n4go/cmds/extract_strings.go b/cmds/extract_strings.go → i18n4go/cmds/extract_strings.go
@@ -33,7 +33,7 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"github.com/maximilien/i18n4go/common"
+	"github.com/maximilien/i18n4go/i18n4go/common"
 )
 
 type extractStrings struct {

diff --git a/cmds/fixup.go → i18n4go/cmds/fixup.go b/cmds/fixup.go → i18n4go/cmds/fixup.go
@@ -29,9 +29,8 @@ import (
 	"go/parser"
 	"go/token"
 
+	"github.com/maximilien/i18n4go/i18n4go/common"
 	"github.com/spf13/cobra"
-
-	"github.com/maximilien/i18n4go/common"
 )
 
 type fixup struct {

diff --git a/cmds/merge_string.go → i18n4go/cmds/merge_string.go b/cmds/merge_string.go → i18n4go/cmds/merge_string.go
@@ -21,9 +21,8 @@ import (
 	"sort"
 	"strings"
 
+	"github.com/maximilien/i18n4go/i18n4go/common"
 	"github.com/spf13/cobra"
-
-	"github.com/maximilien/i18n4go/common"
 )
 
 type mergeStrings struct {

diff --git a/cmds/rewrite_package.go → i18n4go/cmds/rewrite_package.go b/cmds/rewrite_package.go → i18n4go/cmds/rewrite_package.go
@@ -27,7 +27,7 @@ import (
 	"go/token"
 	"io/ioutil"
 
-	"github.com/maximilien/i18n4go/common"
+	"github.com/maximilien/i18n4go/i18n4go/common"
 
 	"github.com/spf13/cobra"
 
@@ -42,7 +42,7 @@ const (
 import (
 	"path/filepath"
 
-	i18n "github.com/maximilien/i18n4go/i18n"
+	i18n "github.com/maximilien/i18n4go/i18n4go/i18n"
 )
 
 var T i18n.TranslateFunc

diff --git a/cmds/show_missing_strings.go → i18n4go/cmds/show_missing_strings.go b/cmds/show_missing_strings.go → i18n4go/cmds/show_missing_strings.go
@@ -28,7 +28,7 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"github.com/maximilien/i18n4go/common"
+	"github.com/maximilien/i18n4go/i18n4go/common"
 )
 
 type showMissingStrings struct {

diff --git a/cmds/types.go → i18n4go/cmds/types.go b/cmds/types.go → i18n4go/cmds/types.go
diff --git a/cmds/verify_strings.go → i18n4go/cmds/verify_strings.go b/cmds/verify_strings.go → i18n4go/cmds/verify_strings.go
@@ -19,9 +19,8 @@ import (
 	"path/filepath"
 	"strings"
 
+	"github.com/maximilien/i18n4go/i18n4go/common"
 	"github.com/spf13/cobra"
-
-	"github.com/maximilien/i18n4go/common"
 )
 
 type verifyStrings struct {

diff --git a/cmds/version.go → i18n4go/cmds/version.go b/cmds/version.go → i18n4go/cmds/version.go
diff --git a/common/ast.go → i18n4go/common/ast.go b/common/ast.go → i18n4go/common/ast.go
diff --git a/common/cmd.go → i18n4go/common/cmd.go b/common/cmd.go → i18n4go/common/cmd.go
diff --git a/common/common.go → i18n4go/common/common.go b/common/common.go → i18n4go/common/common.go
diff --git a/i18n/i18n_init.go.template → i18n4go/i18n/i18n_init.go.template b/i18n/i18n_init.go.template → i18n4go/i18n/i18n_init.go.template
diff --git a/i18n/init.go → i18n4go/i18n/init.go b/i18n/init.go → i18n4go/i18n/init.go
diff --git a/i18n4go/i18n4go.go b/i18n4go/i18n4go.go
@@ -23,8 +23,8 @@ import (
 
 	"runtime/debug"
 
-	"github.com/maximilien/i18n4go/cmds"
-	"github.com/maximilien/i18n4go/common"
+	"github.com/maximilien/i18n4go/i18n4go/cmds"
+	"github.com/maximilien/i18n4go/i18n4go/common"
 	"github.com/spf13/cobra"
 )
 

diff --git a/integration/extract_strings/s_option_test.go b/integration/extract_strings/s_option_test.go
@@ -20,7 +20,7 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/maximilien/i18n4go/common"
+	"github.com/maximilien/i18n4go/i18n4go/common"
 	. "github.com/maximilien/i18n4go/integration/test_helpers"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"

diff --git a/integration/fixup/fixup_test.go b/integration/fixup/fixup_test.go
@@ -24,7 +24,7 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/maximilien/i18n4go/common"
+	"github.com/maximilien/i18n4go/i18n4go/common"
 
 	. "github.com/maximilien/i18n4go/integration/test_helpers"
 	. "github.com/onsi/ginkgo"

diff --git a/integration/rewrite_package/init_code_snippet_filename_test.go b/integration/rewrite_package/init_code_snippet_filename_test.go
@@ -232,7 +232,7 @@ var _ = Describe("rewrite-package [...] --init-code-snippet-filename some-file",
 				Ω(session.ExitCode()).Should(Equal(0))
 			})
 
-			It("rewrites the source go file wrapping strings with T() and generates a i18n_init.go using teamplate file", func() {
+			It("rewrites the source go file wrapping strings with T() and generates a i18n_init.go using template file", func() {
 				expectedOutputFile := filepath.Join(expectedFilesPath, "issue14.go")
 				bytes, err := ioutil.ReadFile(expectedOutputFile)
 				Ω(err).ShouldNot(HaveOccurred())

diff --git a/test_fixtures/rewrite_package/f_option/expected_output/i18n_init.go b/test_fixtures/rewrite_package/f_option/expected_output/i18n_init.go
@@ -3,7 +3,7 @@ package input_files
 import (
 	"path/filepath"
 
-	i18n "github.com/maximilien/i18n4go/i18n"
+	i18n "github.com/maximilien/i18n4go/i18n4go/i18n"
 )
 
 var T i18n.TranslateFunc

diff --git a/test_fixtures/rewrite_package/f_option/expected_output/nested_dir/i18n_init.go b/test_fixtures/rewrite_package/f_option/expected_output/nested_dir/i18n_init.go
@@ -3,7 +3,7 @@ package nested_dir
 import (
 	"path/filepath"
 
-	i18n "github.com/maximilien/i18n4go/i18n"
+	i18n "github.com/maximilien/i18n4go/i18n4go/i18n"
 )
 
 var T i18n.TranslateFunc

diff --git a/..._fixtures/rewrite_package/init_code_snippet_filename/expected_output/i18n_init_default.go b/..._fixtures/rewrite_package/init_code_snippet_filename/expected_output/i18n_init_default.go
@@ -3,7 +3,7 @@ package input_files
 import (
 	"path/filepath"
 
-	i18n "github.com/maximilien/i18n4go/i18n"
+	i18n "github.com/maximilien/i18n4go/i18n4go/i18n"
 )
 
 var T i18n.TranslateFunc

diff --git a/...res/rewrite_package/init_code_snippet_filename/expected_output/i18n_init_from_template.go b/...res/rewrite_package/init_code_snippet_filename/expected_output/i18n_init_from_template.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"path/filepath"
 
-	"github.com/maximilien/i18n4go/i18n"
+	i18n "github.com/maximilien/i18n4go/i18n4go/i18n"
 )
 
 var T i18n.TranslateFunc

diff --git a/...ures/rewrite_package/init_code_snippet_filename/input_files/init_code_snippet.go.template b/...ures/rewrite_package/init_code_snippet_filename/input_files/init_code_snippet.go.template
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"path/filepath"
 
-	"github.com/maximilien/i18n4go/i18n"
+	i18n "github.com/maximilien/i18n4go/i18n4go/i18n"
 )
 
 var T i18n.TranslateFunc