Merge branch '0.2.8'

gemnasium · Jul 7, 2016 · bff1183 · bff1183
2 parents 79b0246 + 794adf1
commit bff1183
Show file tree

Hide file tree

Showing 23 changed files with 4,693 additions and 98 deletions.
diff --git a/.goxc.json b/.goxc.json
@@ -2,5 +2,5 @@
 	"AppName": "gemnasium",
 	"BuildConstraints": "linux darwin windows",
 	"ConfigVersion": "0.9",
-	"PackageVersion": "0.2.7"
+	"PackageVersion": "0.2.8"
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+0.2.8 / 2016-07-07
+
+* Add a Dockerfile, to build `gemnasium/toolbelt` image
+* Remove deprecation warnings when running commands
+
 0.2.7 / 2016-02-04
 
 * Remove hardcoded max duration for autoupdate. CI servers have timeouts anyway. (#33)

diff --git a/Dockerfile b/Dockerfile
@@ -0,0 +1,5 @@
+FROM scratch
+MAINTAINER Gemnasium "[email protected]"
+ADD ca-certificates.crt /etc/ssl/certs/
+ADD toolbelt /toolbelt
+ENTRYPOINT ["/toolbelt"]
diff --git a/auth/auth.go b/auth/auth.go
@@ -8,10 +8,10 @@ import (
 
 	"github.com/bgentry/go-netrc/netrc"
 	"github.com/bgentry/speakeasy"
-	"github.com/codegangsta/cli"
 	"github.com/gemnasium/toolbelt/config"
 	"github.com/gemnasium/toolbelt/utils"
 	"github.com/heroku/hk/term"
+	"github.com/urfave/cli"
 
 	"bytes"
 	"fmt"
@@ -123,7 +123,7 @@ func AttemptLogin(ctx *cli.Context) error {
 		config.APIKey = ctx.GlobalString("token")
 	}
 	if config.APIKey == "" {
-		utils.ExitWithError(ErrEmptyToken)
+		return ErrEmptyToken
 	}
 	return nil
 }

diff --git a/ca-certificates.crt b/ca-certificates.crt
diff --git a/commands/app.go b/commands/app.go
@@ -1,12 +1,12 @@
 package commands
 
 import (
-	"github.com/codegangsta/cli"
 	"github.com/gemnasium/toolbelt/auth"
 	"github.com/gemnasium/toolbelt/config"
+	"github.com/urfave/cli"
 )
 
-func App() (*cli.App, error) {
+func App() *cli.App {
 	app := cli.NewApp()
 	app.Name = "gemnasium"
 	app.Usage = "Gemnasium toolbelt"
@@ -244,5 +244,5 @@ func App() (*cli.App, error) {
 			Action: DisplayEnvVars,
 		},
 	}
-	return app, nil
+	return app
 }
diff --git a/commands/auth.go b/commands/auth.go
@@ -1,27 +1,32 @@
 package commands
 
 import (
-	"github.com/codegangsta/cli"
 	"github.com/gemnasium/toolbelt/auth"
-	"github.com/gemnasium/toolbelt/utils"
+	"github.com/urfave/cli"
 )
 
 var login = func() error {
 	return auth.Login()
 }
 
 // auth.Login wrapper with a cli.Content
-func Login(ctx *cli.Context) {
+func Login(ctx *cli.Context) error {
 	err := login()
-	utils.ExitIfErr(err)
+	if err != nil {
+		return cli.NewExitError(err.Error(), 1)
+	}
+	return nil
 }
 
 var logout = func() error {
 	return auth.Logout()
 }
 
 // auth.Logout wrapper with a cli.Content
-func Logout(ctx *cli.Context) {
+func Logout(ctx *cli.Context) error {
 	err := logout()
-	utils.ExitIfErr(err)
+	if err != nil {
+		return cli.NewExitError(err.Error(), 1)
+	}
+	return nil
 }
diff --git a/commands/auth_test.go b/commands/auth_test.go
@@ -12,10 +12,7 @@ func TestLogin(t *testing.T) {
 		called = true
 		return nil
 	}
-	app, err := App()
-	if err != nil {
-		t.Fatal(err)
-	}
+	app := App()
 	os.Args = []string{"gemnasium", "auth", "login"}
 	app.Run(os.Args)
 	if called != true {
@@ -31,10 +28,7 @@ func TestLogout(t *testing.T) {
 		called = true
 		return nil
 	}
-	app, err := App()
-	if err != nil {
-		t.Fatal(err)
-	}
+	app := App()
 	os.Args = []string{"gemnasium", "auth", "logout"}
 	app.Run(os.Args)
 	if called != true {

diff --git a/commands/auto-update.go b/commands/auto-update.go
@@ -1,11 +1,10 @@
 package commands
 
 import (
-	"github.com/codegangsta/cli"
 	"github.com/gemnasium/toolbelt/auth"
 	"github.com/gemnasium/toolbelt/autoupdate"
 	"github.com/gemnasium/toolbelt/models"
-	"github.com/gemnasium/toolbelt/utils"
+	"github.com/urfave/cli"
 )
 
 var auRunFunc = func(projectSlug string, args []string) error {
@@ -16,18 +15,28 @@ var auApplyFunc = func(projectSlug string, args []string) error {
 	return autoupdate.Apply(projectSlug, args)
 }
 
-func AutoUpdateRun(ctx *cli.Context) {
+func AutoUpdateRun(ctx *cli.Context) error {
 	auth.AttemptLogin(ctx)
 	project, err := models.GetProject(ctx.String("project"))
-	utils.ExitIfErr(err)
+	if err != nil {
+		return cli.NewExitError(err.Error(), 1)
+	}
 	err = auRunFunc(project.Slug, ctx.Args())
-	utils.ExitIfErr(err)
+	if err != nil {
+		return cli.NewExitError(err.Error(), 1)
+	}
+	return nil
 }
 
-func AutoUpdateApply(ctx *cli.Context) {
+func AutoUpdateApply(ctx *cli.Context) error {
 	auth.AttemptLogin(ctx)
 	project, err := models.GetProject(ctx.String("project"))
-	utils.ExitIfErr(err)
+	if err != nil {
+		return cli.NewExitError(err.Error(), 1)
+	}
 	err = auApplyFunc(project.Slug, ctx.Args())
-	utils.ExitIfErr(err)
+	if err != nil {
+		return cli.NewExitError(err.Error(), 1)
+	}
+	return nil
 }
diff --git a/commands/auto-update_test.go b/commands/auto-update_test.go
@@ -16,10 +16,7 @@ func TestAutoUpdateRun(t *testing.T) {
 		project = slug
 		return nil
 	}
-	app, err := App()
-	if err != nil {
-		t.Fatal(err)
-	}
+	app := App()
 
 	// Call autoupdate command
 	os.Args = []string{"gemnasium", "autoupdate", "run"}

diff --git a/commands/configure.go b/commands/configure.go
@@ -3,23 +3,33 @@ package commands
 import (
 	"os"
 
-	"github.com/codegangsta/cli"
 	"github.com/gemnasium/toolbelt/models"
-	"github.com/gemnasium/toolbelt/utils"
+	"github.com/urfave/cli"
 )
 
 var confFunc = func(project *models.Project) error {
 	f, err := os.Create(".gemnasium.yml")
-	utils.ExitIfErr(err)
+	if err != nil {
+		return cli.NewExitError(err.Error(), 1)
+	}
 	defer f.Close()
-	return project.Configure(project.Slug, os.Stdin, f)
+	err = project.Configure(project.Slug, os.Stdin, f)
+	if err != nil {
+		return cli.NewExitError(err.Error(), 1)
+	}
+	return nil
 }
 
-func Configure(ctx *cli.Context) {
+func Configure(ctx *cli.Context) error {
 	slug := ctx.Args().First()
 	project, err := models.GetProject(slug)
-	utils.ExitIfErr(err)
+	if err != nil {
+		return cli.NewExitError(err.Error(), 1)
+	}
 
 	err = confFunc(project)
-	utils.ExitIfErr(err)
+	if err != nil {
+		return cli.NewExitError(err.Error(), 1)
+	}
+	return nil
 }
diff --git a/commands/configure_test.go b/commands/configure_test.go
@@ -17,10 +17,7 @@ func TestConfigue(t *testing.T) {
 	confFunc = func(project *models.Project) error {
 		return project.Configure(project.Slug, os.Stdin, &output)
 	}
-	app, err := App()
-	if err != nil {
-		t.Fatal(err)
-	}
+	app := App()
 
 	// Call autoupdate command
 	os.Args = []string{"gemnasium", "configure", "myProject"}

diff --git a/commands/dependencies.go b/commands/dependencies.go
@@ -1,14 +1,18 @@
 package commands
 
 import (
-	"github.com/codegangsta/cli"
 	"github.com/gemnasium/toolbelt/models"
-	"github.com/gemnasium/toolbelt/utils"
+	"github.com/urfave/cli"
 )
 
-func DependenciesList(ctx *cli.Context) {
+func DependenciesList(ctx *cli.Context) error {
 	project, err := models.GetProject(ctx.Args().First())
-	utils.ExitIfErr(err)
+	if err != nil {
+		return cli.NewExitError(err.Error(), 1)
+	}
 	err = models.ListDependencies(project)
-	utils.ExitIfErr(err)
+	if err != nil {
+		return cli.NewExitError(err.Error(), 1)
+	}
+	return nil
 }
diff --git a/commands/dependency_alerts.go b/commands/dependency_alerts.go
@@ -1,14 +1,19 @@
 package commands
 
 import (
-	"github.com/codegangsta/cli"
 	"github.com/gemnasium/toolbelt/models"
-	"github.com/gemnasium/toolbelt/utils"
+	"github.com/urfave/cli"
 )
 
-func DependencyAlertsList(ctx *cli.Context) {
+func DependencyAlertsList(ctx *cli.Context) error {
 	project, err := models.GetProject(ctx.Args().First())
-	utils.ExitIfErr(err)
+	if err != nil {
+		return cli.NewExitError(err.Error(), 1)
+	}
+
 	err = models.ListDependencyAlerts(project)
-	utils.ExitIfErr(err)
+	if err != nil {
+		return cli.NewExitError(err.Error(), 1)
+	}
+	return nil
 }
diff --git a/commands/dependency_files.go b/commands/dependency_files.go
@@ -3,26 +3,35 @@ package commands
 import (
 	"strings"
 
-	"github.com/codegangsta/cli"
 	"github.com/gemnasium/toolbelt/models"
-	"github.com/gemnasium/toolbelt/utils"
+	"github.com/urfave/cli"
 )
 
-func DependencyFilesList(ctx *cli.Context) {
+func DependencyFilesList(ctx *cli.Context) error {
 	project, err := models.GetProject()
-	utils.ExitIfErr(err)
+	if err != nil {
+		return cli.NewExitError(err.Error(), 1)
+	}
 	err = models.ListDependencyFiles(project)
-	utils.ExitIfErr(err)
+	if err != nil {
+		return cli.NewExitError(err.Error(), 1)
+	}
+	return nil
 }
 
-func DependenciesPush(ctx *cli.Context) {
+func DependenciesPush(ctx *cli.Context) error {
 	project, err := models.GetProject()
-	utils.ExitIfErr(err)
+	if err != nil {
+		return cli.NewExitError(err.Error(), 1)
+	}
 	var files []string
 	if ctx.IsSet("files") {
 		// Only call strings.Split on non-empty strings, otherwise len(strings) will be 1 instead of 0.
 		files = strings.Split(ctx.String("files"), ",")
 	}
 	err = models.PushDependencyFiles(project.Slug, files)
-	utils.ExitIfErr(err)
+	if err != nil {
+		return cli.NewExitError(err.Error(), 1)
+	}
+	return nil
 }
diff --git a/commands/env.go b/commands/env.go
@@ -1,7 +1,7 @@
 package commands
 
 import (
-	"github.com/codegangsta/cli"
+	"github.com/urfave/cli"
 	"github.com/gemnasium/toolbelt/config"
 )
 

diff --git a/commands/live_evaluation.go b/commands/live_evaluation.go
@@ -3,15 +3,17 @@ package commands
 import (
 	"strings"
 
-	"github.com/codegangsta/cli"
 	"github.com/gemnasium/toolbelt/auth"
 	"github.com/gemnasium/toolbelt/live-eval"
-	"github.com/gemnasium/toolbelt/utils"
+	"github.com/urfave/cli"
 )
 
-func LiveEvaluation(ctx *cli.Context) {
+func LiveEvaluation(ctx *cli.Context) error {
 	auth.AttemptLogin(ctx)
 	files := strings.Split(ctx.String("files"), ",")
 	err := liveeval.LiveEvaluation(files)
-	utils.ExitIfErr(err)
+	if err != nil {
+		return cli.NewExitError(err.Error(), 1)
+	}
+	return nil
 }