Remove dependency on github.com/remind101/pkg/timex

Author: ejholmes

apps.go

@@ -10,7 +10,7 @@ import (
 	"time"
 
 	"github.com/jinzhu/gorm"
-	"github.com/remind101/pkg/timex"
+	"github.com/remind101/empire/pkg/timex"
 	"golang.org/x/net/context"
 )
 

domains.go

@@ -6,7 +6,7 @@ import (
 	"time"
 
 	"github.com/jinzhu/gorm"
-	"github.com/remind101/pkg/timex"
+	"github.com/remind101/empire/pkg/timex"
 )
 
 type Domain struct {

pkg/timex/timex.go

@@ -0,0 +1,10 @@
+package timex
+
+import "time"
+
+// Now is a function that returns the current time, but can easily be stubbed
+// out by setting it to a function that returns a mock value. The default is to
+// call time.Now().
+var Now = func() time.Time {
+	return time.Now().UTC()
+}

releases.go

@@ -6,9 +6,9 @@ import (
 
 	"github.com/jinzhu/gorm"
 	"github.com/remind101/empire/pkg/headerutil"
+	"github.com/remind101/empire/pkg/timex"
 	"github.com/remind101/empire/procfile"
 	"github.com/remind101/empire/twelvefactor"
-	"github.com/remind101/pkg/timex"
 	"golang.org/x/net/context"
 )
 

scheduler.go

@@ -5,8 +5,8 @@ import (
 	"io"
 	"sync"
 
+	"github.com/remind101/empire/pkg/timex"
 	"github.com/remind101/empire/twelvefactor"
-	"github.com/remind101/pkg/timex"
 	"golang.org/x/net/context"
 )
 

server/heroku/processes.go

@@ -9,9 +9,9 @@ import (
 	"github.com/remind101/empire/pkg/heroku"
 	"github.com/remind101/empire/pkg/hijack"
 	streamhttp "github.com/remind101/empire/pkg/stream/http"
+	"github.com/remind101/empire/pkg/timex"
 	"github.com/remind101/empire/server/auth"
 	"github.com/remind101/pkg/httpx"
-	"github.com/remind101/pkg/timex"
 	"golang.org/x/net/context"
 )
 

tests/cli/cli_test.go

@@ -12,9 +12,9 @@ import (
 	"github.com/remind101/empire"
 	"github.com/remind101/empire/empiretest"
 	"github.com/remind101/empire/empiretest/cli"
+	"github.com/remind101/empire/pkg/timex"
 	"github.com/remind101/empire/server/auth"
 	"github.com/remind101/empire/server/heroku"
-	"github.com/remind101/pkg/timex"
 )
 
 // empPath can be used to change what binary is used to run the tests.

tests/empire/empire_test.go

@@ -13,9 +13,9 @@ import (
 	"github.com/remind101/empire"
 	"github.com/remind101/empire/empiretest"
 	"github.com/remind101/empire/pkg/image"
+	"github.com/remind101/empire/pkg/timex"
 	"github.com/remind101/empire/procfile"
 	"github.com/remind101/empire/twelvefactor"
-	"github.com/remind101/pkg/timex"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
 )