ref(deisctl): change go package to deis/deis/deisctl

Author: mboersma

README.md

@@ -51,7 +51,7 @@ $ ssh-add ~/.vagrant.d/insecure_private_key
 
 ## Provision Deis
 
-Install the [deisctl utility](https://github.com/deis/deisctl#installation) used to provision and operate Deis.
+Install the [deisctl utility](https://github.com/deis/deis/deisctl#installation) used to provision and operate Deis.
 
 ```console
 $ curl -sSL http://deis.io/deisctl/install.sh | sudo sh

contrib/gce/README.md

@@ -6,7 +6,7 @@ Let's build a Deis cluster in Google's Compute Engine!
 
 This assumes you have a couple of items installed already:
 
-* [deisctl](https://github.com/deis/deisctl)
+* [deisctl](https://github.com/deis/deis/deisctl)
 * `git` (Available via Homebrew or Xcode Command Line Tools)
 * A clone of the Deis repository (`git clone https://github.com/deis/deis.git`)
 * You are running commands from the a cloned `deis` folder (`cd deis` after cloning)

deisctl/CHANGELOG.md

@@ -4,13 +4,13 @@ ADD https://storage.googleapis.com/golang/go1.3.linux-amd64.tar.gz /tmp/
 RUN tar -C /usr/local -xzf /tmp/go1.3.linux-amd64.tar.gz
 RUN apt-get update && apt-get install -yq git mercurial
 ENV PATH /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/local/go/bin:/go/bin
-ADD . /go/src/github.com/deis/deisctl
+ADD . /go/src/github.com/deis/deis/deisctl
 ADD systemd /tmp/package/etc/systemd/system
 ADD units /tmp/package/var/lib/deis/units
 ADD hooks /tmp/package/var/lib/deis/hooks
 ADD deis-version /tmp/package/etc/deis-version
-ENV GOPATH /go:/go/src/github.com/deis/deisctl/Godeps/_workspace
-WORKDIR /go/src/github.com/deis/deisctl
+ENV GOPATH /go:/go/src/github.com/deis/deis/deisctl/Godeps/_workspace
+WORKDIR /go/src/github.com/deis/deis/deisctl
 RUN go get github.com/tools/godep
 RUN godep go install -v -a -ldflags '-s' ./...
 RUN mkdir -p /tmp/package/opt/bin && cp /go/bin/deisctl /tmp/package/opt/bin/deisctl

deisctl/Dockerfile

@@ -31,7 +31,7 @@ test: test-style
 
 package:
 	rm -f package
-	docker build -t deis/deisctl .
+	docker build -t deis/deis/deisctl .
 	mkdir -p package
-	-docker cp `docker run -d deis/deisctl`:/tmp/deisctl.tar.gz package/
+	-docker cp `docker run -d deis/deis/deisctl`:/tmp/deisctl.tar.gz package/
 	mv package/deisctl.tar.gz package/deisctl-v`cat deis-version`.tar.gz

deisctl/Godeps/Godeps.json

@@ -9,7 +9,7 @@ import (
 
 	"github.com/coreos/fleet/machine"
 	"github.com/coreos/fleet/schema"
-	"github.com/deis/deisctl/utils"
+	"github.com/deis/deis/deisctl/utils"
 )
 
 // initialize tabwriter on stdout

deisctl/Makefile

@@ -3,9 +3,9 @@ package client
 import (
 	"errors"
 
-	"github.com/deis/deisctl/backend"
-	"github.com/deis/deisctl/backend/fleet"
-	"github.com/deis/deisctl/cmd"
+	"github.com/deis/deis/deisctl/backend"
+	"github.com/deis/deis/deisctl/backend/fleet"
+	"github.com/deis/deis/deisctl/cmd"
 )
 
 type DeisCtlClient interface {

deisctl/backend/fleet/list_units.go

@@ -11,11 +11,11 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/deis/deisctl/backend"
-	"github.com/deis/deisctl/config"
-	"github.com/deis/deisctl/constant"
-	"github.com/deis/deisctl/update"
-	"github.com/deis/deisctl/utils"
+	"github.com/deis/deis/deisctl/backend"
+	"github.com/deis/deis/deisctl/config"
+	"github.com/deis/deis/deisctl/constant"
+	"github.com/deis/deis/deisctl/update"
+	"github.com/deis/deis/deisctl/utils"
 	"github.com/docopt/docopt-go"
 )
 
@@ -296,7 +296,7 @@ Options:
 		return err
 	}
 	// download and save the unit files to the specified path
-	rootURL := "https://raw.githubusercontent.com/deis/deisctl/"
+	rootURL := "https://raw.githubusercontent.com/deis/deis/deisctl/"
 	tag := args["--tag"].(string)
 	units := []string{
 		"deis-builder.service",

deisctl/client/client.go

@@ -10,7 +10,7 @@ import (
 	fleetEtcd "github.com/coreos/fleet/etcd"
 	"github.com/coreos/fleet/ssh"
 	"github.com/coreos/go-etcd/etcd"
-	"github.com/deis/deisctl/backend/fleet"
+	"github.com/deis/deis/deisctl/backend/fleet"
 )
 
 func getTunnelFlag() string {