Merge branch '0.2.6'

Author: Philippe Lafoucrière

.goxc.json

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

.travis.yml

@@ -3,4 +3,5 @@ language: go
 go:
   - 1.2
   - 1.3
+  - 1.4
   - tip

CHANGELOG.md

@@ -1,3 +1,9 @@
+0.2.6 / 2015-02-21
+
+* "liveeval" command now returns 1 if runtime status is red
+* Better error logging: error message from API is now displayed
+* Autoupdate command is now split into `run` and `apply`. The command `gemnasium autoupdate` is now `gemnasium autoupdate run`. `apply` will fetch the best set of dependencies from gemnasium (after `run` returned a success).
+
 0.2.5 / 2014-08-05
 
 * Fix dependency files push (gemnasium df push)

README.md

@@ -4,7 +4,7 @@
 
 Gemnasium toolbelt is a CLI for the Gemnasium API.
 
-## How to install it ?
+## How to install it?
 
 ### On Mac OS X
 
@@ -16,10 +16,25 @@ And then
 
     brew install gemnasium-toolbelt
 
-If you don't want to use Homebrew, check out the Binaries section bellow.
-Or you can build it yourself by running:
+### Ubuntu and Debian
 
-    go build -o gemnasium
+#### Configure Gemnasium repository
+
+    sudo sh -c 'echo "deb http://apt.gemnasium.com stable main" > /etc/apt/sources.list.d/gemnasium.list'
+    
+#### Trust Gemnasium GPG key
+
+    sudo apt-key adv --recv-keys --keyserver keyserver.ubuntu.com E5CEAB0AC5F1CA2A
+    
+#### Update package list
+
+    sudo apt-get update
+    
+#### Install Gemnasium toolbelt
+
+    sudo apt-get install gemnasium-toolbelt
+
+The ```gemnasium``` command will be available in ```/usr/bin/gemnasium```
 
 ### From source
 
@@ -31,15 +46,15 @@ Or you can build it yourself by running:
 
 Binaries are available in the [releases](https://github.com/gemnasium/toolbelt/releases) page.
 
-## How to use it ?
+## How to use it?
 
 ### Authentication
 
 Gemnasium Toolbelt stores your Gemnasium API key into your .netrc file.
 
 To be logged in to Gemnasium, you need to run `gemnasium auth login` and enter your Gemnasium credentials.
 
-Alternatively, you can pass directly your API token to all commands with the option `--token` or the env var GEMNASIUM_TOKEN
+Alternatively, you can pass directly your API token to all commands with the option `--token` or the env var ```GEMNASIUM_TOKEN```.
 Your API token is available in your settings page (https://gemnasium.com/settings).
 
 ### Create a new project
@@ -52,11 +67,19 @@ To create a new project on Gemnasium, you need to `cd` into your project directo
 
 If your project is already on Gemnasium, you need to `cd` into your project directory and run
 
-    gemnasium projects configure
+    gemnasium configure [project_slug]
 
 You will need your project's Slug (available in your project page settings).
 A sample configuration file is available here: https://github.com/gemnasium/toolbelt/blob/master/config/gemnasium.yml.example 
 
+### Push dependency files
+
+For projects not automatically synced with Github or Gitlab, you may want to push your files directly to Gemnasium.
+The corresponding project will updated soon after the files have been received. To push your files
+
+    gemnasium dependency_files push -f=Gemfile,Gemfile.lock
+
+
 ### Live Evaluation
 
 If you want to evaluate your project without pushing files or pulling info from Gemnasium, you may use the ```eval``` command:
@@ -119,7 +142,7 @@ To obtain the list of env vars used and set:
 
    gemnasium env
 
-### Need further help ?
+### Need further help?
 
 A full commands documentation is available by running
 

autoupdate/auto_update.go

@@ -54,6 +54,59 @@ type UpdateSetResult struct {
 
 var ErrProjectRevisionEmpty error = fmt.Errorf("The current revision (%s) is unknown on Gemnasium, please push your dependency files before running autoupdate.\nSee `gemnasium df help push`.\n", utils.GetCurrentRevision())
 
+// Apply the best dependency files that have been found so far
+func Apply(projectSlug string, testSuite []string) error {
+	err := checkProject(projectSlug)
+	if err != nil {
+		return err
+	}
+
+	dfiles, err := fetchDependencyFiles(projectSlug)
+	if err != nil {
+		return err
+	}
+
+	err = updateDepFiles(dfiles)
+	if err != nil {
+		fmt.Printf("Error while restoring files: %s\n", err)
+		return err
+	}
+	// No need to try the update, it will fail
+
+	return nil
+}
+
+// Fetch the best dependency files that have been found so far
+func fetchDependencyFiles(projectSlug string) (dfiles []models.DependencyFile, err error) {
+	revision, err := getRevision()
+	if err != nil {
+		return nil, err
+	}
+
+	opts := &gemnasium.APIRequestOptions{
+		Method: "GET",
+		URI:    fmt.Sprintf("/projects/%s/revisions/%s/auto_update_steps/best", projectSlug, revision),
+		Result: &dfiles,
+	}
+	err = gemnasium.APIRequest(opts)
+	return dfiles, err
+}
+
+// Update dependency files with given one (best dependency files)
+// REFACTOR: this is very similar to restoreDepFiles
+func updateDepFiles(dfiles []models.DependencyFile) error {
+	fmt.Printf("%d file(s) to be updated.\n", len(dfiles))
+	for _, df := range dfiles {
+		fmt.Printf("Updating file %s: ", df.Path)
+		err := ioutil.WriteFile(df.Path, df.Content, 0644)
+		if err != nil {
+			return err
+		}
+		fmt.Printf("done\n")
+	}
+	return nil
+}
+
 // Download and loop over update sets, apply changes, run test suite, and finally notify gemnasium
 func Run(projectSlug string, testSuite []string) error {
 	err := checkProject(projectSlug)
@@ -68,7 +121,6 @@ func Run(projectSlug string, testSuite []string) error {
 		return errors.New("Arg [testSuite] can't be empty")
 	}
 
-	fmt.Printf("Executing test script: ")
 	out, err := executeTestSuite(testSuite)
 	if err != nil {
 		fmt.Println("Aborting, initial test suite run is failing:")
@@ -149,23 +201,19 @@ func Run(projectSlug string, testSuite []string) error {
 }
 
 func fetchUpdateSet(projectSlug string) (*UpdateSet, error) {
-	revision := utils.GetCurrentRevision()
-	if revision == "" {
-		return nil, errors.New("Can't determine current revision, please use REVISION env var to specify it")
+	revision, err := getRevision()
+	if err != nil {
+		return nil, err
 	}
+
 	var updateSet *UpdateSet
 	opts := &gemnasium.APIRequestOptions{
 		Method: "POST",
-		URI:    fmt.Sprintf("/projects/%s/branches/%s/update_sets/next", projectSlug, utils.GetCurrentBranch()),
-		Body:   &map[string]string{"revision": revision},
+		URI:    fmt.Sprintf("/projects/%s/revisions/%s/auto_update_steps/next", projectSlug, revision),
 		Result: &updateSet,
 	}
-	err := gemnasium.APIRequest(opts)
-	if err != nil {
-		return nil, err
-	}
-
-	return updateSet, nil
+	err = gemnasium.APIRequest(opts)
+	return updateSet, err
 }
 
 // Patch files if needed, and update packages
@@ -208,12 +256,17 @@ func pushUpdateSetResult(rs *UpdateSetResult) error {
 		return errors.New("Missing updateSet ID and/or State args")
 	}
 
+	revision, err := getRevision()
+	if err != nil {
+		return err
+	}
+
 	opts := &gemnasium.APIRequestOptions{
 		Method: "PATCH",
-		URI:    fmt.Sprintf("/projects/%s/branches/%s/update_sets/%d", rs.ProjectSlug, utils.GetCurrentBranch(), rs.UpdateSetID),
+		URI:    fmt.Sprintf("/projects/%s/revisions/%s/auto_update_steps/%d", rs.ProjectSlug, revision, rs.UpdateSetID),
 		Body:   rs,
 	}
-	err := gemnasium.APIRequest(opts)
+	err = gemnasium.APIRequest(opts)
 	if err != nil {
 		return err
 	}
@@ -246,7 +299,7 @@ func executeTestSuite(ts []string) ([]byte, error) {
 	defer close(done)
 	var out []byte
 	var err error
-	fmt.Printf("Executing test script")
+	fmt.Printf("Executing test script: ")
 	start := time.Now()
 	go func() {
 		result, err := exec.Command(ts[0], ts[1:]...).Output()
@@ -282,3 +335,11 @@ func checkProject(slug string) error {
 	}
 	return nil
 }
+
+func getRevision() (string, error) {
+	revision := utils.GetCurrentRevision()
+	if revision == "" {
+		return revision, errors.New("Can't determine current revision, please use REVISION env var to specify it")
+	}
+	return revision, nil
+}

commands/app.go

@@ -186,14 +186,20 @@ func App() (*cli.App, error) {
 		{
 			Name:      "autoupdate",
 			ShortName: "au",
-			Usage:     "Auto-update will test updates in your project, and notify Gemnasium of the result",
-			Flags: []cli.Flag{
-				cli.StringFlag{
-					Name:  "project, p",
-					Usage: "Project slug (identifier on Gemnasium)",
-				},
-			},
-			Description: `Auto-Update will fetch update sets from Gemnasium and run your test suite against them.
+			Usage:     "Auto-update the dependency files of the project",
+			Before:    auth.AttemptLogin,
+			Subcommands: []cli.Command{
+				{
+					Name:      "run",
+					ShortName: "r",
+					Usage:     "Run the auto-update",
+					Flags: []cli.Flag{
+						cli.StringFlag{
+							Name:  "project, p",
+							Usage: "Project slug (identifier on Gemnasium)",
+						},
+					},
+					Description: `Auto-Update will fetch update sets from Gemnasium and run your test suite against them.
    The test suite can be passed as arguments, or through the env var GEMNASIUM_TESTSUITE.
 
    Arguments:
@@ -215,7 +221,22 @@ func App() (*cli.App, error) {
    - cat script.sh | gemnasium autoupdate -p=your_project_slug
    - gemnasium autoupdate my_project_slug bundle exec rake
   `,
-			Action: AutoUpdate,
+					Action: AutoUpdateRun,
+				},
+				{
+					Name:      "apply",
+					ShortName: "a",
+					Usage:     "Apply the best update",
+					Flags: []cli.Flag{
+						cli.StringFlag{
+							Name:  "project, p",
+							Usage: "Project slug (identifier on Gemnasium)",
+						},
+					},
+					Description: `Update the dependency files to match the best update that has been found so far.`,
+					Action:      AutoUpdateApply,
+				},
+			},
 		},
 		{
 			Name:   "env",

commands/auto-update.go

@@ -8,14 +8,26 @@ import (
 	"github.com/gemnasium/toolbelt/utils"
 )
 
-var auFunc = func(projectSlug string, args []string) error {
+var auRunFunc = func(projectSlug string, args []string) error {
 	return autoupdate.Run(projectSlug, args)
 }
 
-func AutoUpdate(ctx *cli.Context) {
+var auApplyFunc = func(projectSlug string, args []string) error {
+	return autoupdate.Apply(projectSlug, args)
+}
+
+func AutoUpdateRun(ctx *cli.Context) {
+	auth.AttemptLogin(ctx)
+	project, err := models.GetProject(ctx.String("project"))
+	utils.ExitIfErr(err)
+	err = auRunFunc(project.Slug, ctx.Args())
+	utils.ExitIfErr(err)
+}
+
+func AutoUpdateApply(ctx *cli.Context) {
 	auth.AttemptLogin(ctx)
 	project, err := models.GetProject(ctx.String("project"))
 	utils.ExitIfErr(err)
-	err = auFunc(project.Slug, ctx.Args())
+	err = auApplyFunc(project.Slug, ctx.Args())
 	utils.ExitIfErr(err)
 }

commands/auto-update_test.go

@@ -7,12 +7,12 @@ import (
 	"github.com/gemnasium/toolbelt/config"
 )
 
-func TestAutoUpdate(t *testing.T) {
+func TestAutoUpdateRun(t *testing.T) {
 	config.APIKey = "abcdef123"
 	config.ProjectSlug = "projectSlug"
 
 	var project string
-	auFunc = func(slug string, args []string) error {
+	auRunFunc = func(slug string, args []string) error {
 		project = slug
 		return nil
 	}
@@ -22,23 +22,23 @@ func TestAutoUpdate(t *testing.T) {
 	}
 
 	// Call autoupdate command
-	os.Args = []string{"gemnasium", "autoupdate"}
+	os.Args = []string{"gemnasium", "autoupdate", "run"}
 	app.Run(os.Args)
 	if project != "projectSlug" {
 		t.Errorf("Should have called autoupdate func\n")
 	}
 
 	// With alias
 	project = ""
-	os.Args = []string{"gemnasium", "au"}
+	os.Args = []string{"gemnasium", "au", "r"}
 	app.Run(os.Args)
 	if project != "projectSlug" {
 		t.Errorf("Should have called autoupdate func\n")
 	}
 
 	// with Flag
 	project = ""
-	os.Args = []string{"gemnasium", "au", "-p=slug"}
+	os.Args = []string{"gemnasium", "au", "r", "-p=slug"}
 	app.Run(os.Args)
 	if project != "slug" {
 		t.Errorf("Should have called autoupdate func\n")

config/config.go

@@ -18,7 +18,7 @@ var (
 )
 
 const (
-	VERSION          = "0.2.5"
+	VERSION          = "0.2.6"
 	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.6-1) stable; urgency=low
+
+  * Added go 1.4.1 to test matrix
+  * "liveeval" command now returns 1 if runtime status is red
+  * Better error logging: error message from API is now displayed
+  * Autoupdate command is now split into `run` and `apply`. The command `gemnasium autoupdate` is now `gemnasium autoupdate run`. `apply` will fetch the best set of dependencies from gemnasium (after `run` returned a success).
+
+ -- Gemnasium <[email protected]>  Thu, 12 Feb 2015 11:36:18 +0100
+
 gemnasium-toolbelt (0.2.5-2) stable; urgency=low
 
   * Allows for i386 packages.