From 54a9fbc85995667adcd250354a1889db70837250 Mon Sep 17 00:00:00 2001
From: Adrian Macneil <adrian.macneil@gmail.com>
Date: Sun, 7 Jan 2018 20:12:56 -0800
Subject: [PATCH] Move code into pkg directory (#22)

---
 Makefile                                        | 2 +-
 cmd/dbmate/main.go                              | 2 +-
 db.go => pkg/dbmate/db.go                       | 0
 db_test.go => pkg/dbmate/db_test.go             | 2 +-
 driver.go => pkg/dbmate/driver.go               | 0
 driver_test.go => pkg/dbmate/driver_test.go     | 0
 mysql.go => pkg/dbmate/mysql.go                 | 0
 mysql_test.go => pkg/dbmate/mysql_test.go       | 0
 postgres.go => pkg/dbmate/postgres.go           | 0
 postgres_test.go => pkg/dbmate/postgres_test.go | 0
 sqlite.go => pkg/dbmate/sqlite.go               | 0
 sqlite_test.go => pkg/dbmate/sqlite_test.go     | 0
 utils.go => pkg/dbmate/utils.go                 | 0
 utils_test.go => pkg/dbmate/utils_test.go       | 0
 version.go => pkg/dbmate/version.go             | 0
 15 files changed, 3 insertions(+), 3 deletions(-)
 rename db.go => pkg/dbmate/db.go (100%)
 rename db_test.go => pkg/dbmate/db_test.go (98%)
 rename driver.go => pkg/dbmate/driver.go (100%)
 rename driver_test.go => pkg/dbmate/driver_test.go (100%)
 rename mysql.go => pkg/dbmate/mysql.go (100%)
 rename mysql_test.go => pkg/dbmate/mysql_test.go (100%)
 rename postgres.go => pkg/dbmate/postgres.go (100%)
 rename postgres_test.go => pkg/dbmate/postgres_test.go (100%)
 rename sqlite.go => pkg/dbmate/sqlite.go (100%)
 rename sqlite_test.go => pkg/dbmate/sqlite_test.go (100%)
 rename utils.go => pkg/dbmate/utils.go (100%)
 rename utils_test.go => pkg/dbmate/utils_test.go (100%)
 rename version.go => pkg/dbmate/version.go (100%)

diff --git a/Makefile b/Makefile
index 8d1dc7d..964742c 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 DC := docker-compose
 BUILD_FLAGS := -ldflags '-s'
-PACKAGES := . ./cmd/dbmate
+PACKAGES := ./cmd/... ./pkg/...
 
 all: clean container test lint build
 
diff --git a/cmd/dbmate/main.go b/cmd/dbmate/main.go
index 8efeb41..1b34e12 100644
--- a/cmd/dbmate/main.go
+++ b/cmd/dbmate/main.go
@@ -6,7 +6,7 @@ import (
 	"net/url"
 	"os"
 
-	"github.com/amacneil/dbmate"
+	"github.com/amacneil/dbmate/pkg/dbmate"
 	"github.com/joho/godotenv"
 	"github.com/urfave/cli"
 )
diff --git a/db.go b/pkg/dbmate/db.go
similarity index 100%
rename from db.go
rename to pkg/dbmate/db.go
diff --git a/db_test.go b/pkg/dbmate/db_test.go
similarity index 98%
rename from db_test.go
rename to pkg/dbmate/db_test.go
index d4c4dd9..2f0d195 100644
--- a/db_test.go
+++ b/pkg/dbmate/db_test.go
@@ -16,7 +16,7 @@ func newTestDB(t *testing.T, u *url.URL) *DB {
 
 	// only chdir once, because testdata is relative to current directory
 	if testdataDir == "" {
-		testdataDir, err = filepath.Abs("./testdata")
+		testdataDir, err = filepath.Abs("../../testdata")
 		require.Nil(t, err)
 
 		err = os.Chdir(testdataDir)
diff --git a/driver.go b/pkg/dbmate/driver.go
similarity index 100%
rename from driver.go
rename to pkg/dbmate/driver.go
diff --git a/driver_test.go b/pkg/dbmate/driver_test.go
similarity index 100%
rename from driver_test.go
rename to pkg/dbmate/driver_test.go
diff --git a/mysql.go b/pkg/dbmate/mysql.go
similarity index 100%
rename from mysql.go
rename to pkg/dbmate/mysql.go
diff --git a/mysql_test.go b/pkg/dbmate/mysql_test.go
similarity index 100%
rename from mysql_test.go
rename to pkg/dbmate/mysql_test.go
diff --git a/postgres.go b/pkg/dbmate/postgres.go
similarity index 100%
rename from postgres.go
rename to pkg/dbmate/postgres.go
diff --git a/postgres_test.go b/pkg/dbmate/postgres_test.go
similarity index 100%
rename from postgres_test.go
rename to pkg/dbmate/postgres_test.go
diff --git a/sqlite.go b/pkg/dbmate/sqlite.go
similarity index 100%
rename from sqlite.go
rename to pkg/dbmate/sqlite.go
diff --git a/sqlite_test.go b/pkg/dbmate/sqlite_test.go
similarity index 100%
rename from sqlite_test.go
rename to pkg/dbmate/sqlite_test.go
diff --git a/utils.go b/pkg/dbmate/utils.go
similarity index 100%
rename from utils.go
rename to pkg/dbmate/utils.go
diff --git a/utils_test.go b/pkg/dbmate/utils_test.go
similarity index 100%
rename from utils_test.go
rename to pkg/dbmate/utils_test.go
diff --git a/version.go b/pkg/dbmate/version.go
similarity index 100%
rename from version.go
rename to pkg/dbmate/version.go