Add go modules for v5 (#494)

* Add go modules for v5 * Fix fmt
gobuffalo · Dec 3, 2019 · 75bc832 · 75bc832
1 parent 9c2efc2
commit 75bc832
Show file tree

Hide file tree

Showing 74 changed files with 466 additions and 133 deletions.
diff --git a/.gitignore b/.gitignore
@@ -31,8 +31,6 @@ tsoda
 testdata/migrations/schema.sql
 .grifter/
 vendor/
-go.mod
-go.sum
 
 # test data
 cockroach-data/
diff --git a/associations/association.go b/associations/association.go
@@ -4,7 +4,7 @@ import (
 	"reflect"
 
 	"github.com/gobuffalo/nulls"
-	"github.com/gobuffalo/pop/columns"
+	"github.com/gobuffalo/pop/v5/columns"
 )
 
 // Association represents a definition of a model association

diff --git a/associations/associations_for_struct.go b/associations/associations_for_struct.go
@@ -7,8 +7,8 @@ import (
 	"regexp"
 	"strings"
 
-	"github.com/gobuffalo/pop/columns"
-	"github.com/gobuffalo/pop/internal/oncer"
+	"github.com/gobuffalo/pop/v5/columns"
+	"github.com/gobuffalo/pop/v5/internal/oncer"
 )
 
 // If a field match with the regexp, it will be considered as a valid field definition.

diff --git a/associations/belongs_to_association.go b/associations/belongs_to_association.go
@@ -6,8 +6,8 @@ import (
 
 	"github.com/gobuffalo/flect"
 	"github.com/gobuffalo/nulls"
-	"github.com/gobuffalo/pop/columns"
-	"github.com/gobuffalo/pop/internal/defaults"
+	"github.com/gobuffalo/pop/v5/columns"
+	"github.com/gobuffalo/pop/v5/internal/defaults"
 )
 
 // belongsToAssociation is the implementation for the belongs_to association type in a model.

diff --git a/associations/belongs_to_association_test.go b/associations/belongs_to_association_test.go
@@ -4,7 +4,7 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/gobuffalo/pop/associations"
+	"github.com/gobuffalo/pop/v5/associations"
 	"github.com/gofrs/uuid"
 	"github.com/stretchr/testify/require"
 )

diff --git a/associations/has_many_association_test.go b/associations/has_many_association_test.go
@@ -5,7 +5,7 @@ import (
 	"testing"
 
 	"github.com/gobuffalo/nulls"
-	"github.com/gobuffalo/pop/associations"
+	"github.com/gobuffalo/pop/v5/associations"
 	"github.com/stretchr/testify/require"
 )
 

diff --git a/associations/has_one_association.go b/associations/has_one_association.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/gobuffalo/flect"
 	"github.com/gobuffalo/nulls"
-	"github.com/gobuffalo/pop/internal/defaults"
+	"github.com/gobuffalo/pop/v5/internal/defaults"
 )
 
 // hasOneAssociation is a 1 to 1 kind of association. It's used on

diff --git a/associations/has_one_association_test.go b/associations/has_one_association_test.go
@@ -5,7 +5,7 @@ import (
 	"testing"
 
 	"github.com/gobuffalo/nulls"
-	"github.com/gobuffalo/pop/associations"
+	"github.com/gobuffalo/pop/v5/associations"
 	"github.com/gofrs/uuid"
 	"github.com/stretchr/testify/require"
 )

diff --git a/associations/many_to_many_association.go b/associations/many_to_many_association.go
@@ -6,7 +6,7 @@ import (
 	"time"
 
 	"github.com/gobuffalo/flect"
-	"github.com/gobuffalo/pop/internal/defaults"
+	"github.com/gobuffalo/pop/v5/internal/defaults"
 	"github.com/gofrs/uuid"
 )
 

diff --git a/associations/many_to_many_association_test.go b/associations/many_to_many_association_test.go
@@ -4,7 +4,7 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/gobuffalo/pop/associations"
+	"github.com/gobuffalo/pop/v5/associations"
 	"github.com/gofrs/uuid"
 	"github.com/stretchr/testify/require"
 )

diff --git a/columns/column_test.go b/columns/column_test.go
@@ -3,7 +3,7 @@ package columns_test
 import (
 	"testing"
 
-	"github.com/gobuffalo/pop/columns"
+	"github.com/gobuffalo/pop/v5/columns"
 	"github.com/stretchr/testify/require"
 )
 

diff --git a/columns/columns_for_struct.go b/columns/columns_for_struct.go
@@ -3,7 +3,7 @@ package columns
 import (
 	"reflect"
 
-	"github.com/gobuffalo/pop/internal/oncer"
+	"github.com/gobuffalo/pop/v5/internal/oncer"
 )
 
 // ColumnsForStruct returns a Columns instance for

diff --git a/columns/columns_test.go b/columns/columns_test.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/gobuffalo/pop/columns"
+	"github.com/gobuffalo/pop/v5/columns"
 	"github.com/stretchr/testify/require"
 )
 

diff --git a/columns/readable_columns_test.go b/columns/readable_columns_test.go
@@ -3,7 +3,7 @@ package columns_test
 import (
 	"testing"
 
-	"github.com/gobuffalo/pop/columns"
+	"github.com/gobuffalo/pop/v5/columns"
 	"github.com/stretchr/testify/require"
 )
 

diff --git a/columns/tags_test.go b/columns/tags_test.go
@@ -4,7 +4,7 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/gobuffalo/pop/columns"
+	"github.com/gobuffalo/pop/v5/columns"
 
 	"github.com/stretchr/testify/require"
 )

diff --git a/columns/writeable_columns_test.go b/columns/writeable_columns_test.go
@@ -3,7 +3,7 @@ package columns_test
 import (
 	"testing"
 
-	"github.com/gobuffalo/pop/columns"
+	"github.com/gobuffalo/pop/v5/columns"
 	"github.com/stretchr/testify/require"
 )
 

diff --git a/commands.go b/commands.go
@@ -3,7 +3,7 @@ package pop
 import (
 	"fmt"
 
-	"github.com/gobuffalo/pop/logging"
+	"github.com/gobuffalo/pop/v5/logging"
 	"github.com/pkg/errors"
 )
 

diff --git a/config.go b/config.go
@@ -9,7 +9,7 @@ import (
 	"text/template"
 
 	"github.com/gobuffalo/envy"
-	"github.com/gobuffalo/pop/logging"
+	"github.com/gobuffalo/pop/v5/logging"
 	"github.com/pkg/errors"
 	"gopkg.in/yaml.v2"
 )

diff --git a/connection.go b/connection.go
@@ -4,8 +4,8 @@ import (
 	"sync/atomic"
 	"time"
 
-	"github.com/gobuffalo/pop/internal/defaults"
-	"github.com/gobuffalo/pop/internal/randx"
+	"github.com/gobuffalo/pop/v5/internal/defaults"
+	"github.com/gobuffalo/pop/v5/internal/randx"
 	"github.com/jmoiron/sqlx"
 	"github.com/pkg/errors"
 )

diff --git a/connection_details.go b/connection_details.go
@@ -8,9 +8,9 @@ import (
 	"strings"
 	"time"
 
-	"github.com/gobuffalo/pop/internal/defaults"
-	"github.com/gobuffalo/pop/internal/oncer"
-	"github.com/gobuffalo/pop/logging"
+	"github.com/gobuffalo/pop/v5/internal/defaults"
+	"github.com/gobuffalo/pop/v5/internal/oncer"
+	"github.com/gobuffalo/pop/v5/logging"
 	"github.com/pkg/errors"
 )
 

diff --git a/dialect.go b/dialect.go
@@ -4,7 +4,7 @@ import (
 	"io"
 
 	"github.com/gobuffalo/fizz"
-	"github.com/gobuffalo/pop/columns"
+	"github.com/gobuffalo/pop/v5/columns"
 )
 
 type crudable interface {

diff --git a/dialect_cockroach.go b/dialect_cockroach.go
@@ -13,9 +13,9 @@ import (
 	_ "github.com/cockroachdb/cockroach-go/crdb" // Load CockroachdbQL/postgres Go driver which also loads github.com/lib/pq
 	"github.com/gobuffalo/fizz"
 	"github.com/gobuffalo/fizz/translators"
-	"github.com/gobuffalo/pop/columns"
-	"github.com/gobuffalo/pop/internal/defaults"
-	"github.com/gobuffalo/pop/logging"
+	"github.com/gobuffalo/pop/v5/columns"
+	"github.com/gobuffalo/pop/v5/internal/defaults"
+	"github.com/gobuffalo/pop/v5/logging"
 	"github.com/jmoiron/sqlx"
 	"github.com/pkg/errors"
 )

diff --git a/dialect_common.go b/dialect_common.go
@@ -11,8 +11,8 @@ import (
 	"os/exec"
 	"strings"
 
-	"github.com/gobuffalo/pop/columns"
-	"github.com/gobuffalo/pop/logging"
+	"github.com/gobuffalo/pop/v5/columns"
+	"github.com/gobuffalo/pop/v5/logging"
 	"github.com/gofrs/uuid"
 	"github.com/jmoiron/sqlx"
 	"github.com/pkg/errors"

diff --git a/dialect_mysql.go b/dialect_mysql.go
@@ -12,10 +12,10 @@ import (
 	_mysql "github.com/go-sql-driver/mysql"
 	"github.com/gobuffalo/fizz"
 	"github.com/gobuffalo/fizz/translators"
-	"github.com/gobuffalo/pop/columns"
-	"github.com/gobuffalo/pop/internal/defaults"
-	"github.com/gobuffalo/pop/internal/oncer"
-	"github.com/gobuffalo/pop/logging"
+	"github.com/gobuffalo/pop/v5/columns"
+	"github.com/gobuffalo/pop/v5/internal/defaults"
+	"github.com/gobuffalo/pop/v5/internal/oncer"
+	"github.com/gobuffalo/pop/v5/logging"
 	"github.com/pkg/errors"
 )
 

diff --git a/dialect_postgresql.go b/dialect_postgresql.go
@@ -11,9 +11,9 @@ import (
 
 	"github.com/gobuffalo/fizz"
 	"github.com/gobuffalo/fizz/translators"
-	"github.com/gobuffalo/pop/columns"
-	"github.com/gobuffalo/pop/internal/defaults"
-	"github.com/gobuffalo/pop/logging"
+	"github.com/gobuffalo/pop/v5/columns"
+	"github.com/gobuffalo/pop/v5/internal/defaults"
+	"github.com/gobuffalo/pop/v5/logging"
 	"github.com/jmoiron/sqlx"
 	pg "github.com/lib/pq"
 	"github.com/pkg/errors"

diff --git a/dialect_sqlite.go b/dialect_sqlite.go
@@ -18,9 +18,9 @@ import (
 	_ "github.com/mattn/go-sqlite3" // Load SQLite3 CGo driver
 	"github.com/pkg/errors"
 
-	"github.com/gobuffalo/pop/columns"
-	"github.com/gobuffalo/pop/internal/defaults"
-	"github.com/gobuffalo/pop/logging"
+	"github.com/gobuffalo/pop/v5/columns"
+	"github.com/gobuffalo/pop/v5/internal/defaults"
+	"github.com/gobuffalo/pop/v5/logging"
 )
 
 const nameSQLite3 = "sqlite3"

diff --git a/executors.go b/executors.go
@@ -3,9 +3,9 @@ package pop
 import (
 	"reflect"
 
-	"github.com/gobuffalo/pop/associations"
-	"github.com/gobuffalo/pop/columns"
-	"github.com/gobuffalo/pop/logging"
+	"github.com/gobuffalo/pop/v5/associations"
+	"github.com/gobuffalo/pop/v5/columns"
+	"github.com/gobuffalo/pop/v5/logging"
 	"github.com/gobuffalo/validate"
 	"github.com/gofrs/uuid"
 	"github.com/pkg/errors"

diff --git a/finders.go b/finders.go
@@ -8,8 +8,8 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/gobuffalo/pop/associations"
-	"github.com/gobuffalo/pop/logging"
+	"github.com/gobuffalo/pop/v5/associations"
+	"github.com/gobuffalo/pop/v5/logging"
 	"github.com/gofrs/uuid"
 	"github.com/pkg/errors"
 )

diff --git a/genny/config/config-packr.go b/genny/config/config-packr.go
diff --git a/genny/config/config_test.go b/genny/config/config_test.go
@@ -6,7 +6,7 @@ import (
 	"testing"
 
 	"github.com/gobuffalo/genny"
-	"github.com/gobuffalo/pop"
+	"github.com/gobuffalo/pop/v5"
 	"github.com/stretchr/testify/require"
 )
 

diff --git a/genny/model/_fixtures/models/widget.go b/genny/model/_fixtures/models/widget.go
@@ -5,7 +5,7 @@ import (
 	"time"
 
 	"github.com/gobuffalo/nulls"
-	"github.com/gobuffalo/pop"
+	"github.com/gobuffalo/pop/v5"
 	"github.com/gobuffalo/validate"
 	"github.com/gobuffalo/validate/validators"
 	"github.com/gofrs/uuid"

diff --git a/genny/model/_fixtures/models/widget_empty.go b/genny/model/_fixtures/models/widget_empty.go
@@ -3,7 +3,7 @@ package models
 import (
 	"encoding/json"
 
-	"github.com/gobuffalo/pop"
+	"github.com/gobuffalo/pop/v5"
 	"github.com/gobuffalo/validate"
 )
 

diff --git a/genny/model/_fixtures/models/widget_jsonapi.go b/genny/model/_fixtures/models/widget_jsonapi.go
@@ -5,7 +5,7 @@ import (
 	"time"
 
 	"github.com/gobuffalo/nulls"
-	"github.com/gobuffalo/pop"
+	"github.com/gobuffalo/pop/v5"
 	"github.com/gobuffalo/validate"
 	"github.com/gobuffalo/validate/validators"
 	"github.com/gofrs/uuid"

diff --git a/genny/model/_fixtures/models/widget_xml.go b/genny/model/_fixtures/models/widget_xml.go
@@ -5,7 +5,7 @@ import (
 	"time"
 
 	"github.com/gobuffalo/nulls"
-	"github.com/gobuffalo/pop"
+	"github.com/gobuffalo/pop/v5"
 	"github.com/gobuffalo/validate"
 	"github.com/gobuffalo/validate/validators"
 	"github.com/gofrs/uuid"

diff --git a/genny/model/imports.go b/genny/model/imports.go
@@ -9,7 +9,7 @@ import (
 func buildImports(opts *Options) []string {
 	imps := map[string]bool{
 		"github.com/gobuffalo/validate": true,
-		"github.com/gobuffalo/pop":      true,
+		"github.com/gobuffalo/pop/v5":   true,
 	}
 	if opts.Encoding == "jsonapi" {
 		imps["github.com/google/jsonapi"] = true
@@ -29,7 +29,7 @@ func buildImports(opts *Options) []string {
 				imps["github.com/gobuffalo/nulls"] = true
 			}
 			if strings.HasPrefix(a.GoType(), "slices") {
-				imps["github.com/gobuffalo/pop/slices"] = true
+				imps["github.com/gobuffalo/pop/v5/slices"] = true
 			}
 		}
 	}

diff --git a/genny/model/model-packr.go b/genny/model/model-packr.go
diff --git a/genny/model/model.go b/genny/model/model.go
@@ -18,7 +18,7 @@ func New(opts *Options) (*genny.Generator, error) {
 		return g, err
 	}
 
-	if err := g.Box(packr.New("github.com/gobuffalo/pop/genny/model/templates", "../model/templates")); err != nil {
+	if err := g.Box(packr.New("github.com/gobuffalo/pop/v5/genny/model/templates", "../model/templates")); err != nil {
 		return g, err
 	}