From 137fb62e851e7d0b919956a51cd4622b5e690573 Mon Sep 17 00:00:00 2001 From: Brad Rydzewski Date: Sun, 17 May 2015 11:42:56 -0700 Subject: [PATCH] moving queue package --- drone.go | 2 +- {queue => pkg/queue}/builtin/queue.go | 2 +- {queue => pkg/queue}/builtin/queue_test.go | 2 +- {queue => pkg/queue}/plugin/client.go | 2 +- {queue => pkg/queue}/plugin/server.go | 2 +- {queue => pkg/queue}/queue.go | 0 {queue => pkg/queue}/worker.go | 0 runner/builtin/runner.go | 2 +- runner/runner.go | 2 +- server/commits.go | 2 +- server/hooks.go | 2 +- server/server.go | 2 +- 12 files changed, 10 insertions(+), 10 deletions(-) rename {queue => pkg/queue}/builtin/queue.go (98%) rename {queue => pkg/queue}/builtin/queue_test.go (98%) rename {queue => pkg/queue}/plugin/client.go (98%) rename {queue => pkg/queue}/plugin/server.go (98%) rename {queue => pkg/queue}/queue.go (100%) rename {queue => pkg/queue}/worker.go (100%) diff --git a/drone.go b/drone.go index 4d0fe9899..e40b0ffb6 100644 --- a/drone.go +++ b/drone.go @@ -14,8 +14,8 @@ import ( "github.com/elazarl/go-bindata-assetfs" eventbus "github.com/drone/drone/pkg/bus/builtin" + queue "github.com/drone/drone/pkg/queue/builtin" store "github.com/drone/drone/pkg/store/builtin" - queue "github.com/drone/drone/queue/builtin" runner "github.com/drone/drone/runner/builtin" _ "net/http/pprof" diff --git a/queue/builtin/queue.go b/pkg/queue/builtin/queue.go similarity index 98% rename from queue/builtin/queue.go rename to pkg/queue/builtin/queue.go index 3686d36a3..3b39a6e83 100644 --- a/queue/builtin/queue.go +++ b/pkg/queue/builtin/queue.go @@ -4,7 +4,7 @@ import ( "errors" "sync" - "github.com/drone/drone/queue" + "github.com/drone/drone/pkg/queue" ) var ErrNotFound = errors.New("work item not found") diff --git a/queue/builtin/queue_test.go b/pkg/queue/builtin/queue_test.go similarity index 98% rename from queue/builtin/queue_test.go rename to pkg/queue/builtin/queue_test.go index 31151cad5..70d43433e 100644 --- a/queue/builtin/queue_test.go +++ b/pkg/queue/builtin/queue_test.go @@ -4,7 +4,7 @@ import ( "sync" "testing" - "github.com/drone/drone/queue" + "github.com/drone/drone/pkg/queue" . "github.com/franela/goblin" ) diff --git a/queue/plugin/client.go b/pkg/queue/plugin/client.go similarity index 98% rename from queue/plugin/client.go rename to pkg/queue/plugin/client.go index ccdca760a..57728029b 100644 --- a/queue/plugin/client.go +++ b/pkg/queue/plugin/client.go @@ -7,7 +7,7 @@ import ( "net/http" "net/url" - "github.com/drone/drone/queue" + "github.com/drone/drone/pkg/queue" ) type Client struct { diff --git a/queue/plugin/server.go b/pkg/queue/plugin/server.go similarity index 98% rename from queue/plugin/server.go rename to pkg/queue/plugin/server.go index ce3153044..0793dc38b 100644 --- a/queue/plugin/server.go +++ b/pkg/queue/plugin/server.go @@ -3,7 +3,7 @@ package plugin import ( "net/http" - "github.com/drone/drone/queue" + "github.com/drone/drone/pkg/queue" "github.com/gin-gonic/gin" ) diff --git a/queue/queue.go b/pkg/queue/queue.go similarity index 100% rename from queue/queue.go rename to pkg/queue/queue.go diff --git a/queue/worker.go b/pkg/queue/worker.go similarity index 100% rename from queue/worker.go rename to pkg/queue/worker.go diff --git a/runner/builtin/runner.go b/runner/builtin/runner.go index cc1196e24..fcbb132bf 100644 --- a/runner/builtin/runner.go +++ b/runner/builtin/runner.go @@ -10,7 +10,7 @@ import ( "time" "github.com/drone/drone/common" - "github.com/drone/drone/queue" + "github.com/drone/drone/pkg/queue" "github.com/samalba/dockerclient" log "github.com/Sirupsen/logrus" diff --git a/runner/runner.go b/runner/runner.go index ac2fb16ea..c369664ab 100644 --- a/runner/runner.go +++ b/runner/runner.go @@ -4,7 +4,7 @@ import ( "io" "github.com/drone/drone/common" - "github.com/drone/drone/queue" + "github.com/drone/drone/pkg/queue" ) type Runner interface { diff --git a/server/commits.go b/server/commits.go index 4313034e0..e5c62c4bb 100644 --- a/server/commits.go +++ b/server/commits.go @@ -7,8 +7,8 @@ import ( "time" "github.com/drone/drone/common" + "github.com/drone/drone/pkg/queue" "github.com/drone/drone/pkg/yaml/inject" - "github.com/drone/drone/queue" "github.com/gin-gonic/gin" // "github.com/gin-gonic/gin/binding" ) diff --git a/server/hooks.go b/server/hooks.go index c27cd7937..1da4bab23 100644 --- a/server/hooks.go +++ b/server/hooks.go @@ -5,10 +5,10 @@ import ( log "github.com/Sirupsen/logrus" "github.com/drone/drone/common" + "github.com/drone/drone/pkg/queue" "github.com/drone/drone/pkg/yaml" "github.com/drone/drone/pkg/yaml/inject" "github.com/drone/drone/pkg/yaml/matrix" - "github.com/drone/drone/queue" "github.com/gin-gonic/gin" ) diff --git a/server/server.go b/server/server.go index b021d200b..e5db50cca 100644 --- a/server/server.go +++ b/server/server.go @@ -8,8 +8,8 @@ import ( "github.com/drone/drone/common" "github.com/drone/drone/pkg/bus" + "github.com/drone/drone/pkg/queue" "github.com/drone/drone/pkg/store" - "github.com/drone/drone/queue" "github.com/drone/drone/remote" "github.com/drone/drone/runner" "github.com/drone/drone/server/session"