Clean up code generation and CI process

.gitignore

@@ -3,6 +3,9 @@
 *.a
 *.so
 
+# Binaries
+codegen
+
 # Folders
 _obj
 _test

.travis.gofmt.sh

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+echo ".travis.gofmt.sh"
+
 if [ -n "$(gofmt -l .)" ]; then
   echo "Go code is not formatted:"
   gofmt -d .

.travis.gogenerate.sh

@@ -1,13 +1,15 @@
 #!/bin/bash
 
-if [[ "$TRAVIS_GO_VERSION" =~ ^1\.[45](\..*)?$ ]]; then
-  exit 0
-fi
+echo ".travis.gogenerate.sh"
 
+go build -o codegen ./_codegen
 go get github.com/ernesto-jimenez/gogen/imports
 go generate ./...
-if [ -n "$(git diff)" ]; then
+if [ -n "$(git diff assert/ mock/ require/ suite/)" ]; then
   echo "Go generate had not been run"
   git diff
   exit 1
+else
+  echo "Go generate had been run"
 fi
+

.travis.govet.sh

@@ -1,10 +1,13 @@
 #!/bin/bash
 
+echo ".travis.govet.sh"
+
 cd "$(dirname $0)"
-DIRS=". assert require mock _codegen"
+DIRS=". assert require mock suite _codegen"
 set -e
 for subdir in $DIRS; do
   pushd $subdir
   go vet
   popd
 done
+

.travis.yml

@@ -11,9 +11,16 @@ matrix:
       env: GO111MODULE=off
     - go: "1.11.x"
       env: GO111MODULE=on
+    - go: "1.12.x"
+      env: GO111MODULE=off
+    - go: "1.12.x"
+      env: GO111MODULE=on
     - go: tip
-  script:
-    - ./.travis.gogenerate.sh
-    - ./.travis.gofmt.sh
-    - ./.travis.govet.sh
-    - go test -v -race $(go list ./... | grep -v vendor)
+      env: GO111MODULE=off
+    - go: tip
+      env: GO111MODULE=on
+script:
+  - ./.travis.gogenerate.sh
+  - ./.travis.gofmt.sh
+  - ./.travis.govet.sh
+  - go test -v -race $(go list ./... | grep -v vendor)

_codegen/importer_new.go

@@ -0,0 +1,5 @@
+// +build go1.9
+
+package main
+
+const SOURCE_IMPORTER = true

_codegen/importer_old.go

@@ -0,0 +1,5 @@
+// +build !go1.9
+
+package main
+
+const SOURCE_IMPORTER = false

_codegen/main.go

@@ -21,14 +21,15 @@ import (
 	"os"
 	"path"
 	"regexp"
+	"runtime/debug"
 	"strings"
 	"text/template"
 
 	"github.com/ernesto-jimenez/gogen/imports"
 )
 
 var (
-	pkg       = flag.String("assert-path", "github.com/stretchr/testify/assert", "Path to the assert package")
+	pkg       = flag.String("assert-path", ".", "Path to the assert package")
 	includeF  = flag.Bool("include-format-funcs", false, "include format functions such as Errorf and Equalf")
 	outputPkg = flag.String("output-package", "", "package for the resulting code")
 	tmplFile  = flag.String("template", "", "What file to load the function template from")
@@ -43,12 +44,12 @@ func main() {
 		log.Fatal(err)
 	}
 
-	importer, funcs, err := analyzeCode(scope, docs)
+	imp, funcs, err := analyzeCode(scope, docs)
 	if err != nil {
 		log.Fatal(err)
 	}
 
-	if err := generateCode(importer, funcs); err != nil {
+	if err := generateCode(imp, funcs); err != nil {
 		log.Fatal(err)
 	}
 }
@@ -193,14 +194,22 @@ func parsePackageSource(pkg string) (*types.Scope, *doc.Package, error) {
 		fileList[i] = f
 	}
 
+	var imp types.Importer
+	if SOURCE_IMPORTER {
+		imp = importer.For("source", nil)
+	} else {
+		imp = importer.Default()
+	}
+
 	cfg := types.Config{
-		Importer: importer.Default(),
+		Importer: imp,
 	}
 	info := types.Info{
 		Defs: make(map[*ast.Ident]types.Object),
 	}
 	tp, err := cfg.Check(pkg, fset, fileList, &info)
 	if err != nil {
+		log.Print(string(debug.Stack()))
 		return nil, nil, err
 	}
 

assert/assertions.go

@@ -20,7 +20,7 @@ import (
 	"github.com/pmezard/go-difflib/difflib"
 )
 
-//go:generate go run ../_codegen/main.go -output-package=assert -template=assertion_format.go.tmpl
+//go:generate ../codegen -output-package=assert -template=assertion_format.go.tmpl
 
 // TestingT is an interface wrapper around *testing.T
 type TestingT interface {

assert/forward_assertions.go

@@ -13,4 +13,4 @@ func New(t TestingT) *Assertions {
 	}
 }
 
-//go:generate go run ../_codegen/main.go -output-package=assert -template=assertion_forward.go.tmpl -include-format-funcs
+//go:generate ../codegen -output-package=assert -template=assertion_forward.go.tmpl -include-format-funcs

require/forward_requirements.go

@@ -13,4 +13,4 @@ func New(t TestingT) *Assertions {
 	}
 }
 
-//go:generate go run ../_codegen/main.go -output-package=require -template=require_forward.go.tmpl -include-format-funcs
+//go:generate ../codegen -output-package=require -template=require_forward.go.tmpl -include-format-funcs

require/requirements.go

@@ -26,4 +26,4 @@ type BoolAssertionFunc func(TestingT, bool, ...interface{})
 // for table driven tests.
 type ErrorAssertionFunc func(TestingT, error, ...interface{})
 
-//go:generate go run ../_codegen/main.go -output-package=require -template=require.go.tmpl -include-format-funcs
+//go:generate ../codegen -output-package=require -template=require.go.tmpl -include-format-funcs

suite/suite.go

@@ -84,7 +84,7 @@ func Run(t *testing.T, suite TestingSuite) {
 	defer failOnPanic(t)
 
 	suiteSetupDone := false
-	
+
 	methodFinder := reflect.TypeOf(suite)
 	tests := []testing.InternalTest{}
 	for index := 0; index < methodFinder.NumMethod(); index++ {

suite/suite_test.go

@@ -350,7 +350,7 @@ func TestRunSuite(t *testing.T) {
 type SuiteSetupSkipTester struct {
 	Suite
 
-	setUp bool
+	setUp    bool
 	toreDown bool
 }