Merge pull request #284 from pquerna/pq/update_deps_fix_vbundle

Update Dependencies and fix vbundle

Makefile

@@ -30,9 +30,8 @@ test-package-with-etcd: clean
 	${ETCD_FLAGS} go test -v ./$(p)
 
 update:
-	rm -rf Godeps/
-	find . -iregex .*go | xargs sed -i 's:".*Godeps/_workspace/src/:":g'
-	godep save -r ./...
+	rm -rf Godeps/ vendor/
+	godep save ./...
 
 test-grep-etcdng: clean
 	${ETCD_FLAGS} go test -v ./engine/etcdng -check.f=$(e)

api/api_test.go

@@ -39,7 +39,7 @@ func (s *ApiSuite) SetUpTest(c *C) {
 
 	sv := supervisor.New(newProxy, s.ng, make(chan error), supervisor.Options{})
 
-	app := scroll.NewApp()
+	app, _ := scroll.NewApp()
 	InitProxyController(s.ng, sv, app)
 	s.testServer = httptest.NewServer(app.GetHandler())
 	s.client = NewClient(s.testServer.URL, registry.GetRegistry())

service/service.go

@@ -366,7 +366,11 @@ func (s *Service) newProxy(id int) (proxy.Proxy, error) {
 }
 
 func (s *Service) initApi() error {
-	s.apiApp = scroll.NewApp()
+	var err error
+	s.apiApp, err = scroll.NewApp()
+	if err != nil {
+		return err
+	}
 	api.InitProxyController(s.ng, s.supervisor, s.apiApp)
 	return nil
 }

vbundle/templates.go

@@ -54,7 +54,7 @@ func GetRegistry() (*plugin.Registry, error) {
 const vulcanctlTemplate = `package main
 
 import (
-    log "github.com/vulcand/vulcand/Godeps/_workspace/src/github.com/Sirupsen/logrus"
+    log "github.com/Sirupsen/logrus"
 	"github.com/vulcand/vulcand/vctl/command"
 	"{{.PackagePath}}/registry"
 	"os"

vctl/command/command_test.go

@@ -48,7 +48,7 @@ func (s *CmdSuite) SetUpTest(c *C) {
 	sv.Start()
 	s.sv = sv
 
-	app := scroll.NewApp()
+	app, _ := scroll.NewApp()
 	api.InitProxyController(s.ng, sv, app)
 	s.testServer = httptest.NewServer(app.GetHandler())