Merge branch '0.2.9'

.goxc.json

@@ -2,5 +2,5 @@
 	"AppName": "gemnasium",
 	"BuildConstraints": "linux darwin windows",
 	"ConfigVersion": "0.9",
-	"PackageVersion": "0.2.8"
+	"PackageVersion": "0.2.9"
 }

CHANGELOG.md

@@ -1,3 +1,8 @@
+0.2.9 / 2016-07-09
+
+* Fix debian packages
+* Code cleaning
+
 0.2.8 / 2016-07-07
 
 * Add a Dockerfile, to build `gemnasium/toolbelt` image

commands/auth.go

@@ -12,10 +12,7 @@ var login = func() error {
 // auth.Login wrapper with a cli.Content
 func Login(ctx *cli.Context) error {
 	err := login()
-	if err != nil {
-		return cli.NewExitError(err.Error(), 1)
-	}
-	return nil
+	return err
 }
 
 var logout = func() error {
@@ -25,8 +22,5 @@ var logout = func() error {
 // auth.Logout wrapper with a cli.Content
 func Logout(ctx *cli.Context) error {
 	err := logout()
-	if err != nil {
-		return cli.NewExitError(err.Error(), 1)
-	}
-	return nil
+	return err
 }

commands/auto-update.go

@@ -19,24 +19,18 @@ func AutoUpdateRun(ctx *cli.Context) error {
 	auth.AttemptLogin(ctx)
 	project, err := models.GetProject(ctx.String("project"))
 	if err != nil {
-		return cli.NewExitError(err.Error(), 1)
+		return err
 	}
 	err = auRunFunc(project.Slug, ctx.Args())
-	if err != nil {
-		return cli.NewExitError(err.Error(), 1)
-	}
-	return nil
+	return err
 }
 
 func AutoUpdateApply(ctx *cli.Context) error {
 	auth.AttemptLogin(ctx)
 	project, err := models.GetProject(ctx.String("project"))
 	if err != nil {
-		return cli.NewExitError(err.Error(), 1)
+		return err
 	}
 	err = auApplyFunc(project.Slug, ctx.Args())
-	if err != nil {
-		return cli.NewExitError(err.Error(), 1)
-	}
-	return nil
+	return err
 }

commands/configure.go

@@ -10,26 +10,20 @@ import (
 var confFunc = func(project *models.Project) error {
 	f, err := os.Create(".gemnasium.yml")
 	if err != nil {
-		return cli.NewExitError(err.Error(), 1)
+		return err
 	}
 	defer f.Close()
 	err = project.Configure(project.Slug, os.Stdin, f)
-	if err != nil {
-		return cli.NewExitError(err.Error(), 1)
-	}
-	return nil
+	return err
 }
 
 func Configure(ctx *cli.Context) error {
 	slug := ctx.Args().First()
 	project, err := models.GetProject(slug)
 	if err != nil {
-		return cli.NewExitError(err.Error(), 1)
+		return err
 	}
 
 	err = confFunc(project)
-	if err != nil {
-		return cli.NewExitError(err.Error(), 1)
-	}
-	return nil
+	return err
 }

commands/dependencies.go

@@ -8,11 +8,8 @@ import (
 func DependenciesList(ctx *cli.Context) error {
 	project, err := models.GetProject(ctx.Args().First())
 	if err != nil {
-		return cli.NewExitError(err.Error(), 1)
+		return err
 	}
 	err = models.ListDependencies(project)
-	if err != nil {
-		return cli.NewExitError(err.Error(), 1)
-	}
-	return nil
+	return err
 }

commands/dependency_alerts.go

@@ -8,12 +8,9 @@ import (
 func DependencyAlertsList(ctx *cli.Context) error {
 	project, err := models.GetProject(ctx.Args().First())
 	if err != nil {
-		return cli.NewExitError(err.Error(), 1)
+		return err
 	}
 
 	err = models.ListDependencyAlerts(project)
-	if err != nil {
-		return cli.NewExitError(err.Error(), 1)
-	}
-	return nil
+	return err
 }

commands/dependency_files.go

@@ -10,28 +10,22 @@ import (
 func DependencyFilesList(ctx *cli.Context) error {
 	project, err := models.GetProject()
 	if err != nil {
-		return cli.NewExitError(err.Error(), 1)
+		return err
 	}
 	err = models.ListDependencyFiles(project)
-	if err != nil {
-		return cli.NewExitError(err.Error(), 1)
-	}
-	return nil
+	return err
 }
 
 func DependenciesPush(ctx *cli.Context) error {
 	project, err := models.GetProject()
 	if err != nil {
-		return cli.NewExitError(err.Error(), 1)
+		return err
 	}
 	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)
-	if err != nil {
-		return cli.NewExitError(err.Error(), 1)
-	}
-	return nil
+	return err
 }

commands/live_evaluation.go

@@ -12,8 +12,5 @@ func LiveEvaluation(ctx *cli.Context) error {
 	auth.AttemptLogin(ctx)
 	files := strings.Split(ctx.String("files"), ",")
 	err := liveeval.LiveEvaluation(files)
-	if err != nil {
-		return cli.NewExitError(err.Error(), 1)
-	}
-	return nil
+	return err
 }

commands/projects.go

@@ -9,29 +9,23 @@ import (
 
 func ProjectsList(ctx *cli.Context) error {
 	err := models.ListProjects(ctx.Bool("private"))
-	if err != nil {
-		return cli.NewExitError(err.Error(), 1)
-	}
-	return nil
+	return err
 }
 
 func ProjectsShow(ctx *cli.Context) error {
 	project, err := models.GetProject(ctx.Args().First())
 	if err != nil {
-		return cli.NewExitError(err.Error(), 1)
+		return err
 	}
 
 	err = project.Show()
-	if err != nil {
-		return cli.NewExitError(err.Error(), 1)
-	}
-	return nil
+	return err
 }
 
 func ProjectsUpdate(ctx *cli.Context) error {
 	project, err := models.GetProject(ctx.Args().First())
 	if err != nil {
-		return cli.NewExitError(err.Error(), 1)
+		return err
 	}
 	var name, desc *string
 	var monitored *bool
@@ -48,31 +42,22 @@ func ProjectsUpdate(ctx *cli.Context) error {
 		monitored = &mon
 	}
 	err = project.Update(name, desc, monitored)
-	if err != nil {
-		return cli.NewExitError(err.Error(), 1)
-	}
-	return nil
+	return err
 }
 
 func ProjectsCreate(ctx *cli.Context) error {
 	projectName := ctx.Args().First()
 	// will scan from os.Stding if projectName is empty
 	err := models.CreateProject(projectName, os.Stdin)
-	if err != nil {
-		return cli.NewExitError(err.Error(), 1)
-	}
-	return nil
+	return err
 }
 
 func ProjectsSync(ctx *cli.Context) error {
 	project, err := models.GetProject(ctx.Args().First())
 	if err != nil {
-		return cli.NewExitError(err.Error(), 1)
+		return err
 	}
 
 	err = project.Sync()
-	if err != nil {
-		return cli.NewExitError(err.Error(), 1)
-	}
-	return nil
+	return err
 }

config/config.go

@@ -18,7 +18,7 @@ var (
 )
 
 const (
-	VERSION          = "0.2.8"
+	VERSION          = "0.2.9"
 	CONFIG_FILE_PATH = ".gemnasium.yml"
 
 	// Don't forget to update DisplayEnvVars func bellow when updating vars

debian/changelog

@@ -1,3 +1,12 @@
+gemnasium-toolbelt (0.2.9-1) stable; urgency=low
+
+  * Fix debian packages
+  * Code cleaning
+
+gemnasium-toolbelt (0.2.8-1) stable; urgency=low
+
+  * Add a Dockerfile, to build `gemnasium/toolbelt` image
+  * Remove deprecation warnings when running commands
 gemnasium-toolbelt (0.2.8-1) stable; urgency=low
 
   * Add a Dockerfile, to build `gemnasium/toolbelt` image

debian/control

@@ -1,14 +1,14 @@
 Source: gemnasium-toolbelt
 Section: devel
 Priority: extra
-Maintainer: Gemnasium <info@gemnasium.com>
-Build-Depends: debhelper (>= 8.0.0) 
-Standards-Version: 3.9.3
+Maintainer: Gemnasium <support@gemnasium.com>
+Build-Depends: debhelper (>= 9.1.0), golang-go
+Standards-Version: 3.9.4
+
 Homepage: https://github.com/gemnasium/toolbelt
 Vcs-Git: https://github.com/gemnasium/toolbelt.git
 Vcs-Browser: https://github.com/gemnasium/toolbelt
 
 Package: gemnasium-toolbelt
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: Gemnasium toolbelt

main.go

@@ -4,9 +4,14 @@ import (
 	"os"
 
 	"github.com/gemnasium/toolbelt/commands"
+	"github.com/wsxiaoys/terminal/color"
 )
 
 func main() {
 	app := commands.App()
-	app.Run(os.Args)
+	err := app.Run(os.Args)
+	if err != nil {
+		color.Printf("@{r!}%s", err.Error())
+		os.Exit(1)
+	}
 }