Revert "Using internal vendoring"

moul · moul · commit 2238290c93bb · 2015-07-20T14:38:06.000+02:00
This reverts commit 4a42ac3.
diff --git a/api/api.go b/api/api.go
@@ -18,7 +18,7 @@ import (
 	"text/tabwriter"
 	"text/template"
 
-	log "github.com/scaleway/scaleway-cli/vendor/github.com/Sirupsen/logrus"
+	log "github.com/Sirupsen/logrus"
 )
 
 // ScalewayAPI is the interface used to communicate with the Scaleway API
diff --git a/api/helpers.go b/api/helpers.go
@@ -11,10 +11,9 @@ import (
 	"sync"
 	"time"
 
-	log "github.com/scaleway/scaleway-cli/vendor/github.com/Sirupsen/logrus"
-	"github.com/scaleway/scaleway-cli/vendor/github.com/docker/docker/pkg/namesgenerator"
-	"github.com/scaleway/scaleway-cli/vendor/github.com/dustin/go-humanize"
-
+	log "github.com/Sirupsen/logrus"
+	"github.com/docker/docker/pkg/namesgenerator"
+	"github.com/dustin/go-humanize"
 	"github.com/scaleway/scaleway-cli/utils"
 )
 
diff --git a/commands/attach.go b/commands/attach.go
@@ -5,7 +5,7 @@
 package commands
 
 import (
-	log "github.com/scaleway/scaleway-cli/vendor/github.com/Sirupsen/logrus"
+	log "github.com/Sirupsen/logrus"
 
 	types "github.com/scaleway/scaleway-cli/commands/types"
 	"github.com/scaleway/scaleway-cli/utils"
diff --git a/commands/commit.go b/commands/commit.go
@@ -7,7 +7,7 @@ package commands
 import (
 	"fmt"
 
-	log "github.com/scaleway/scaleway-cli/vendor/github.com/Sirupsen/logrus"
+	log "github.com/Sirupsen/logrus"
 
 	types "github.com/scaleway/scaleway-cli/commands/types"
 )
diff --git a/commands/cp.go b/commands/cp.go
@@ -12,8 +12,8 @@ import (
 	"path/filepath"
 	"strings"
 
-	log "github.com/scaleway/scaleway-cli/vendor/github.com/Sirupsen/logrus"
-	"github.com/scaleway/scaleway-cli/vendor/github.com/docker/docker/pkg/archive"
+	log "github.com/Sirupsen/logrus"
+	"github.com/docker/docker/pkg/archive"
 
 	"github.com/scaleway/scaleway-cli/api"
 	types "github.com/scaleway/scaleway-cli/commands/types"
diff --git a/commands/create.go b/commands/create.go
@@ -7,7 +7,7 @@ package commands
 import (
 	"fmt"
 
-	log "github.com/scaleway/scaleway-cli/vendor/github.com/Sirupsen/logrus"
+	log "github.com/Sirupsen/logrus"
 
 	"github.com/scaleway/scaleway-cli/api"
 	types "github.com/scaleway/scaleway-cli/commands/types"
diff --git a/commands/events.go b/commands/events.go
@@ -8,8 +8,8 @@ import (
 	"fmt"
 	"time"
 
-	log "github.com/scaleway/scaleway-cli/vendor/github.com/Sirupsen/logrus"
-	"github.com/scaleway/scaleway-cli/vendor/github.com/docker/docker/pkg/units"
+	log "github.com/Sirupsen/logrus"
+	"github.com/docker/docker/pkg/units"
 
 	types "github.com/scaleway/scaleway-cli/commands/types"
 )
diff --git a/commands/exec.go b/commands/exec.go
@@ -8,7 +8,7 @@ import (
 	"os"
 	"time"
 
-	log "github.com/scaleway/scaleway-cli/vendor/github.com/Sirupsen/logrus"
+	log "github.com/Sirupsen/logrus"
 
 	"github.com/scaleway/scaleway-cli/api"
 	types "github.com/scaleway/scaleway-cli/commands/types"
diff --git a/commands/history.go b/commands/history.go
@@ -10,8 +10,8 @@ import (
 	"text/tabwriter"
 	"time"
 
-	log "github.com/scaleway/scaleway-cli/vendor/github.com/Sirupsen/logrus"
-	"github.com/scaleway/scaleway-cli/vendor/github.com/docker/docker/pkg/units"
+	log "github.com/Sirupsen/logrus"
+	"github.com/docker/docker/pkg/units"
 
 	types "github.com/scaleway/scaleway-cli/commands/types"
 	utils "github.com/scaleway/scaleway-cli/utils"
diff --git a/commands/images.go b/commands/images.go
@@ -12,8 +12,8 @@ import (
 	"text/tabwriter"
 	"time"
 
-	log "github.com/scaleway/scaleway-cli/vendor/github.com/Sirupsen/logrus"
-	"github.com/scaleway/scaleway-cli/vendor/github.com/docker/docker/pkg/units"
+	log "github.com/Sirupsen/logrus"
+	"github.com/docker/docker/pkg/units"
 
 	"github.com/scaleway/scaleway-cli/api"
 	types "github.com/scaleway/scaleway-cli/commands/types"
diff --git a/commands/info.go b/commands/info.go
@@ -9,7 +9,7 @@ import (
 	"os"
 	"runtime"
 
-	"github.com/scaleway/scaleway-cli/vendor/github.com/kardianos/osext"
+	"github.com/kardianos/osext"
 
 	types "github.com/scaleway/scaleway-cli/commands/types"
 	"github.com/scaleway/scaleway-cli/utils"
diff --git a/commands/inspect.go b/commands/inspect.go
@@ -10,7 +10,7 @@ import (
 	"os"
 	"text/template"
 
-	log "github.com/scaleway/scaleway-cli/vendor/github.com/Sirupsen/logrus"
+	log "github.com/Sirupsen/logrus"
 
 	"github.com/scaleway/scaleway-cli/api"
 	types "github.com/scaleway/scaleway-cli/commands/types"
diff --git a/commands/kill.go b/commands/kill.go
@@ -9,7 +9,7 @@ import (
 	"os/exec"
 	"strings"
 
-	log "github.com/scaleway/scaleway-cli/vendor/github.com/Sirupsen/logrus"
+	log "github.com/Sirupsen/logrus"
 
 	"github.com/scaleway/scaleway-cli/api"
 	types "github.com/scaleway/scaleway-cli/commands/types"
diff --git a/commands/login.go b/commands/login.go
@@ -11,8 +11,8 @@ import (
 	"os"
 	"strings"
 
-	log "github.com/scaleway/scaleway-cli/vendor/github.com/Sirupsen/logrus"
-	"github.com/scaleway/scaleway-cli/vendor/golang.org/x/crypto/ssh/terminal"
+	log "github.com/Sirupsen/logrus"
+	"golang.org/x/crypto/ssh/terminal"
 
 	"github.com/scaleway/scaleway-cli/api"
 	types "github.com/scaleway/scaleway-cli/commands/types"
diff --git a/commands/logout.go b/commands/logout.go
@@ -7,7 +7,7 @@ package commands
 import (
 	"os"
 
-	log "github.com/scaleway/scaleway-cli/vendor/github.com/Sirupsen/logrus"
+	log "github.com/Sirupsen/logrus"
 
 	types "github.com/scaleway/scaleway-cli/commands/types"
 	"github.com/scaleway/scaleway-cli/utils"
diff --git a/commands/logs.go b/commands/logs.go
@@ -7,7 +7,7 @@ package commands
 import (
 	"os"
 
-	log "github.com/scaleway/scaleway-cli/vendor/github.com/Sirupsen/logrus"
+	log "github.com/Sirupsen/logrus"
 
 	"github.com/scaleway/scaleway-cli/api"
 	types "github.com/scaleway/scaleway-cli/commands/types"
diff --git a/commands/port.go b/commands/port.go
@@ -7,7 +7,7 @@ package commands
 import (
 	"os"
 
-	log "github.com/scaleway/scaleway-cli/vendor/github.com/Sirupsen/logrus"
+	log "github.com/Sirupsen/logrus"
 
 	"github.com/scaleway/scaleway-cli/api"
 	types "github.com/scaleway/scaleway-cli/commands/types"
diff --git a/commands/ps.go b/commands/ps.go
@@ -10,8 +10,8 @@ import (
 	"text/tabwriter"
 	"time"
 
-	log "github.com/scaleway/scaleway-cli/vendor/github.com/Sirupsen/logrus"
-	"github.com/scaleway/scaleway-cli/vendor/github.com/docker/docker/pkg/units"
+	log "github.com/Sirupsen/logrus"
+	"github.com/docker/docker/pkg/units"
 
 	types "github.com/scaleway/scaleway-cli/commands/types"
 	"github.com/scaleway/scaleway-cli/utils"
diff --git a/commands/rename.go b/commands/rename.go
@@ -5,7 +5,7 @@
 package commands
 
 import (
-	log "github.com/scaleway/scaleway-cli/vendor/github.com/Sirupsen/logrus"
+	log "github.com/Sirupsen/logrus"
 
 	"github.com/scaleway/scaleway-cli/api"
 	types "github.com/scaleway/scaleway-cli/commands/types"
diff --git a/commands/restart.go b/commands/restart.go
@@ -8,7 +8,7 @@ import (
 	"fmt"
 	"os"
 
-	log "github.com/scaleway/scaleway-cli/vendor/github.com/Sirupsen/logrus"
+	log "github.com/Sirupsen/logrus"
 
 	types "github.com/scaleway/scaleway-cli/commands/types"
 )
diff --git a/commands/rm.go b/commands/rm.go
@@ -8,7 +8,7 @@ import (
 	"fmt"
 	"os"
 
-	log "github.com/scaleway/scaleway-cli/vendor/github.com/Sirupsen/logrus"
+	log "github.com/Sirupsen/logrus"
 
 	types "github.com/scaleway/scaleway-cli/commands/types"
 )
diff --git a/commands/rmi.go b/commands/rmi.go
@@ -8,7 +8,7 @@ import (
 	"fmt"
 	"os"
 
-	log "github.com/scaleway/scaleway-cli/vendor/github.com/Sirupsen/logrus"
+	log "github.com/Sirupsen/logrus"
 
 	types "github.com/scaleway/scaleway-cli/commands/types"
 )
diff --git a/commands/run.go b/commands/run.go
@@ -9,7 +9,7 @@ import (
 	"os"
 	"time"
 
-	log "github.com/scaleway/scaleway-cli/vendor/github.com/Sirupsen/logrus"
+	log "github.com/Sirupsen/logrus"
 
 	api "github.com/scaleway/scaleway-cli/api"
 	types "github.com/scaleway/scaleway-cli/commands/types"
diff --git a/commands/search.go b/commands/search.go
@@ -9,7 +9,7 @@ import (
 	"os"
 	"text/tabwriter"
 
-	log "github.com/scaleway/scaleway-cli/vendor/github.com/Sirupsen/logrus"
+	log "github.com/Sirupsen/logrus"
 
 	"github.com/scaleway/scaleway-cli/api"
 	types "github.com/scaleway/scaleway-cli/commands/types"
diff --git a/commands/start.go b/commands/start.go
@@ -9,7 +9,7 @@ import (
 	"os"
 	"time"
 
-	log "github.com/scaleway/scaleway-cli/vendor/github.com/Sirupsen/logrus"
+	log "github.com/Sirupsen/logrus"
 
 	"github.com/scaleway/scaleway-cli/api"
 	types "github.com/scaleway/scaleway-cli/commands/types"
diff --git a/commands/stop.go b/commands/stop.go
@@ -9,7 +9,7 @@ import (
 	"os"
 	"time"
 
-	log "github.com/scaleway/scaleway-cli/vendor/github.com/Sirupsen/logrus"
+	log "github.com/Sirupsen/logrus"
 
 	"github.com/scaleway/scaleway-cli/api"
 	types "github.com/scaleway/scaleway-cli/commands/types"
diff --git a/commands/tag.go b/commands/tag.go
@@ -7,7 +7,7 @@ package commands
 import (
 	"fmt"
 
-	log "github.com/scaleway/scaleway-cli/vendor/github.com/Sirupsen/logrus"
+	log "github.com/Sirupsen/logrus"
 
 	types "github.com/scaleway/scaleway-cli/commands/types"
 )
diff --git a/commands/top.go b/commands/top.go
@@ -10,7 +10,7 @@ import (
 	"os/exec"
 	"strings"
 
-	log "github.com/scaleway/scaleway-cli/vendor/github.com/Sirupsen/logrus"
+	log "github.com/Sirupsen/logrus"
 
 	"github.com/scaleway/scaleway-cli/api"
 	types "github.com/scaleway/scaleway-cli/commands/types"
diff --git a/commands/types/command.go b/commands/types/command.go
@@ -13,7 +13,7 @@ import (
 	"strings"
 	"text/template"
 
-	flag "github.com/scaleway/scaleway-cli/vendor/github.com/docker/docker/pkg/mflag"
+	flag "github.com/docker/docker/pkg/mflag"
 
 	"github.com/scaleway/scaleway-cli/api"
 )
diff --git a/commands/version.go b/commands/version.go
@@ -8,8 +8,9 @@ import (
 	"fmt"
 	"runtime"
 
-	types "github.com/scaleway/scaleway-cli/commands/types"
 	"github.com/scaleway/scaleway-cli/scwversion"
+
+	types "github.com/scaleway/scaleway-cli/commands/types"
 )
 
 var cmdVersion = &types.Command{
diff --git a/commands/wait.go b/commands/wait.go
@@ -7,7 +7,7 @@ package commands
 import (
 	"os"
 
-	log "github.com/scaleway/scaleway-cli/vendor/github.com/Sirupsen/logrus"
+	log "github.com/Sirupsen/logrus"
 
 	"github.com/scaleway/scaleway-cli/api"
 	types "github.com/scaleway/scaleway-cli/commands/types"
diff --git a/commands/x_patch.go b/commands/x_patch.go
@@ -8,7 +8,7 @@ import (
 	"fmt"
 	"strings"
 
-	log "github.com/scaleway/scaleway-cli/vendor/github.com/Sirupsen/logrus"
+	log "github.com/Sirupsen/logrus"
 
 	api "github.com/scaleway/scaleway-cli/api"
 	types "github.com/scaleway/scaleway-cli/commands/types"
diff --git a/main.go b/main.go
@@ -11,8 +11,8 @@ import (
 	"io/ioutil"
 	"os"
 
-	log "github.com/scaleway/scaleway-cli/vendor/github.com/Sirupsen/logrus"
-	flag "github.com/scaleway/scaleway-cli/vendor/github.com/docker/docker/pkg/mflag"
+	log "github.com/Sirupsen/logrus"
+	flag "github.com/docker/docker/pkg/mflag"
 
 	"github.com/scaleway/scaleway-cli/api"
 	cmds "github.com/scaleway/scaleway-cli/commands"
diff --git a/utils/utils.go b/utils/utils.go
@@ -19,7 +19,7 @@ import (
 	"strings"
 	"time"
 
-	log "github.com/scaleway/scaleway-cli/vendor/github.com/Sirupsen/logrus"
+	log "github.com/Sirupsen/logrus"
 )
 
 // SSHExec executes a command over SSH and redirects file-descriptors
diff --git a/vendor b/vendor

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ import (`
`18`	`18`	`"text/tabwriter"`
`19`	`19`	`"text/template"`
`20`	`20`
`21`		`- log "github.com/scaleway/scaleway-cli/vendor/github.com/Sirupsen/logrus"`
	`21`	`+ log "github.com/Sirupsen/logrus"`
`22`	`22`	`)`
`23`	`23`
`24`	`24`	`// ScalewayAPI is the interface used to communicate with the Scaleway API`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ package commands`
`7`	`7`	`import (`
`8`	`8`	`"fmt"`
`9`	`9`
`10`		`- log "github.com/scaleway/scaleway-cli/vendor/github.com/Sirupsen/logrus"`
	`10`	`+ log "github.com/Sirupsen/logrus"`
`11`	`11`
`12`	`12`	`types "github.com/scaleway/scaleway-cli/commands/types"`
`13`	`13`	`)`
Original file line number	Diff line number	Diff line change
`@@ -8,8 +8,8 @@ import (`
`8`	`8`	`"fmt"`
`9`	`9`	`"time"`
`10`	`10`
`11`		`- log "github.com/scaleway/scaleway-cli/vendor/github.com/Sirupsen/logrus"`
`12`		`- "github.com/scaleway/scaleway-cli/vendor/github.com/docker/docker/pkg/units"`
	`11`	`+ log "github.com/Sirupsen/logrus"`
	`12`	`+ "github.com/docker/docker/pkg/units"`
`13`	`13`
`14`	`14`	`types "github.com/scaleway/scaleway-cli/commands/types"`
`15`	`15`	`)`