Implement tools.Remove

Author: matteosuppo

v2/pkgs/indexes_test.go

@@ -81,7 +81,4 @@ func TestIndexes(t *testing.T) {
 	if len(list) != 0 {
 		t.Fatalf("expected %d == %d (%s)", len(list), 0, "len(list)")
 	}
-
-	t.Fail()
-
 }

v2/pkgs/tools.go

@@ -11,7 +11,6 @@ import (
 	"io/ioutil"
 	"net/http"
 	"os"
-	"os/user"
 	"path/filepath"
 	"runtime"
 	"strings"
@@ -61,9 +60,7 @@ func (c *Tools) Installed(ctx context.Context) (tools.ToolCollection, error) {
 	res := tools.ToolCollection{}
 
 	// Find packagers
-	usr, _ := user.Current()
-	path := filepath.Join(usr.HomeDir, ".arduino-create")
-	packagers, err := ioutil.ReadDir(path)
+	packagers, err := ioutil.ReadDir(c.Folder)
 	if err != nil {
 		return nil, err
 	}
@@ -73,13 +70,13 @@ func (c *Tools) Installed(ctx context.Context) (tools.ToolCollection, error) {
 			continue
 		}
 		// Find tools
-		toolss, err := ioutil.ReadDir(filepath.Join(path, packager.Name()))
+		toolss, err := ioutil.ReadDir(filepath.Join(c.Folder, packager.Name()))
 		if err != nil {
 			return nil, err
 		}
 		for _, tool := range toolss {
 			// Find versions
-			versions, err := ioutil.ReadDir(filepath.Join(path, packager.Name(), tool.Name()))
+			versions, err := ioutil.ReadDir(filepath.Join(c.Folder, packager.Name(), tool.Name()))
 			if err != nil {
 				return nil, err
 			}
@@ -161,7 +158,9 @@ func (c *Tools) install(ctx context.Context, packager string, tool Tool) error {
 }
 
 func (c *Tools) Remove(ctx context.Context, payload *tools.ToolPayload) error {
-	return nil
+	path := filepath.Join(payload.Packager, payload.Name, payload.Version)
+
+	return os.RemoveAll(filepath.Join(c.Folder, path))
 }
 
 func rename(base string) extract.Renamer {

v2/pkgs/tools_test.go

@@ -64,6 +64,14 @@ func TestTools(t *testing.T) {
 	}
 
 	// Install a tool
+	installed, err := service.Installed(ctx)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if len(installed) != 0 {
+		t.Fatalf("expected %d == %d (%s)", len(installed), 0, "len(installed)")
+	}
+
 	err = service.Install(ctx, &tools.ToolPayload{
 		Packager: "arduino",
 		Name:     "avrdude",
@@ -73,6 +81,29 @@ func TestTools(t *testing.T) {
 		t.Fatal(err)
 	}
 	// List installed tools
+	installed, err = service.Installed(ctx)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if len(installed) != 1 {
+		t.Fatalf("expected %d == %d (%s)", len(installed), 1, "len(installed)")
+	}
 
-	// Uninstall tool
+	// Remove tool
+	err = service.Remove(ctx, &tools.ToolPayload{
+		Packager: "arduino",
+		Name:     "avrdude",
+		Version:  "6.0.1-arduino2",
+	})
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	installed, err = service.Installed(ctx)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if len(installed) != 0 {
+		t.Fatalf("expected %d == %d (%s)", len(installed), 0, "len(installed)")
+	}
 }