Fixed linter warnings

cmaglie · cmaglie · commit 4bb4c5938a0e · 2019-05-28T13:46:10.000+02:00
diff --git a/cli/board/attach.go b/cli/board/attach.go
@@ -57,7 +57,7 @@ func runAttachCommand(cmd *cobra.Command, args []string) {
 	if len(args) > 0 {
 		path = args[1]
 	}
-	_, err := board.BoardAttach(context.Background(), &rpc.BoardAttachReq{
+	_, err := board.Attach(context.Background(), &rpc.BoardAttachReq{
 		Instance:      instance,
 		BoardUri:      args[0],
 		SketchPath:    path,
diff --git a/cli/board/details.go b/cli/board/details.go
@@ -45,7 +45,7 @@ func initDetailsCommand() *cobra.Command {
 func runDetailsCommand(cmd *cobra.Command, args []string) {
 	instance := cli.CreateInstance()
 
-	res, err := board.BoardDetails(context.Background(), &rpc.BoardDetailsReq{
+	res, err := board.Details(context.Background(), &rpc.BoardDetailsReq{
 		Instance: instance,
 		Fqbn:     args[0],
 	})
diff --git a/cli/board/list.go b/cli/board/list.go
@@ -62,7 +62,7 @@ func runListCommand(cmd *cobra.Command, args []string) {
 		time.Sleep(timeout)
 	}
 
-	resp, err := board.BoardList(context.Background(), &rpc.BoardListReq{Instance: instance})
+	resp, err := board.List(context.Background(), &rpc.BoardListReq{Instance: instance})
 	if err != nil {
 		formatter.PrintError(err, "Error detecting boards")
 		os.Exit(cli.ErrNetwork)
diff --git a/cli/board/listall.go b/cli/board/listall.go
@@ -51,7 +51,7 @@ func initListAllCommand() *cobra.Command {
 func runListAllCommand(cmd *cobra.Command, args []string) {
 	instance := cli.CreateInstance()
 
-	list, err := board.BoardListAll(context.Background(), &rpc.BoardListAllReq{
+	list, err := board.ListAll(context.Background(), &rpc.BoardListAllReq{
 		Instance:   instance,
 		SearchArgs: args,
 	})
diff --git a/cli/cli_test.go b/cli/cli_test.go
@@ -576,11 +576,11 @@ board_manager:
 	require.NoError(t, err, "Writing empty json index file")
 
 	// Empty cores list
-	exitCode, d := executeWithArgs(t, "--config-file", configFile.String(), "core", "list")
+	exitCode, _ := executeWithArgs(t, "--config-file", configFile.String(), "core", "list")
 	require.Zero(t, exitCode, "exit code")
 
 	// Dump config with cmd-line specific file
-	exitCode, d = executeWithArgs(t, "--config-file", configFile.String(), "config", "dump")
+	exitCode, d := executeWithArgs(t, "--config-file", configFile.String(), "config", "dump")
 	require.Zero(t, exitCode, "exit code")
 	require.Contains(t, string(d), "- http://www.invalid-domain-asjkdakdhadjkh.com/package_example_index.json")
 
diff --git a/cli/daemon/daemon.go b/cli/daemon/daemon.go
@@ -29,7 +29,7 @@ import (
 	"google.golang.org/grpc"
 )
 
-// InitCommand initalize the command
+// InitCommand initialize the command
 func InitCommand() *cobra.Command {
 	cmd := &cobra.Command{
 		Use:     "daemon",
diff --git a/cli/root/root.go b/cli/root/root.go
@@ -29,10 +29,10 @@ import (
 	"github.com/arduino/arduino-cli/cli/daemon"
 	"github.com/arduino/arduino-cli/cli/lib"
 	"github.com/arduino/arduino-cli/cli/upload"
+	"github.com/arduino/arduino-cli/cli/version"
 	"github.com/arduino/arduino-cli/commands/config"
 	"github.com/arduino/arduino-cli/commands/generatedocs"
 	"github.com/arduino/arduino-cli/commands/sketch"
-	"github.com/arduino/arduino-cli/cli/version"
 	"github.com/arduino/arduino-cli/common/formatter"
 	"github.com/arduino/arduino-cli/configs"
 	paths "github.com/arduino/go-paths-helper"
@@ -42,7 +42,7 @@ import (
 	"golang.org/x/crypto/ssh/terminal"
 )
 
-// Init prepares the cobra root command. 
+// Init prepares the cobra root command.
 func Init() *cobra.Command {
 	command := &cobra.Command{
 		Use:              "arduino-cli",
diff --git a/commands/board/attach.go b/commands/board/attach.go
@@ -34,7 +34,7 @@ import (
 	paths "github.com/arduino/go-paths-helper"
 )
 
-func BoardAttach(ctx context.Context, req *rpc.BoardAttachReq, taskCB commands.TaskProgressCB) (*rpc.BoardAttachResp, error) {
+func Attach(ctx context.Context, req *rpc.BoardAttachReq, taskCB commands.TaskProgressCB) (*rpc.BoardAttachResp, error) {
 
 	pm := commands.GetPackageManager(req)
 	if pm == nil {
diff --git a/commands/board/details.go b/commands/board/details.go
@@ -27,7 +27,7 @@ import (
 	"github.com/arduino/arduino-cli/rpc"
 )
 
-func BoardDetails(ctx context.Context, req *rpc.BoardDetailsReq) (*rpc.BoardDetailsResp, error) {
+func Details(ctx context.Context, req *rpc.BoardDetailsReq) (*rpc.BoardDetailsResp, error) {
 	pm := commands.GetPackageManager(req)
 	if pm == nil {
 		return nil, errors.New("invalid instance")
diff --git a/commands/board/list.go b/commands/board/list.go
@@ -26,7 +26,7 @@ import (
 	"github.com/arduino/arduino-cli/rpc"
 )
 
-func BoardList(ctx context.Context, req *rpc.BoardListReq) (*rpc.BoardListResp, error) {
+func List(ctx context.Context, req *rpc.BoardListReq) (*rpc.BoardListResp, error) {
 	pm := commands.GetPackageManager(req)
 	if pm == nil {
 		return nil, errors.New("invalid instance")
diff --git a/commands/board/listall.go b/commands/board/listall.go
@@ -26,7 +26,7 @@ import (
 	"github.com/arduino/arduino-cli/rpc"
 )
 
-func BoardListAll(ctx context.Context, req *rpc.BoardListAllReq) (*rpc.BoardListAllResp, error) {
+func ListAll(ctx context.Context, req *rpc.BoardListAllReq) (*rpc.BoardListAllResp, error) {
 	pm := commands.GetPackageManager(req)
 	if pm == nil {
 		return nil, errors.New("invalid instance")
diff --git a/commands/core/download.go b/commands/core/download.go
@@ -80,4 +80,3 @@ func downloadTool(pm *packagemanager.PackageManager, tool *cores.ToolRelease, do
 
 	return commands.DownloadToolRelease(pm, tool, downloadCB)
 }
-
diff --git a/commands/instances.go b/commands/instances.go
@@ -305,7 +305,8 @@ func Rescan(ctx context.Context, req *rpc.RescanReq) (*rpc.RescanResp, error) {
 	}, nil
 }
 
-func createInstance(ctx context.Context, config *configs.Configuration, getLibOnly bool) (*packagemanager.PackageManager, *librariesmanager.LibrariesManager, []string, string, error) {
+func createInstance(ctx context.Context, config *configs.Configuration, getLibOnly bool) (
+	*packagemanager.PackageManager, *librariesmanager.LibrariesManager, []string, string, error) {
 	var pm *packagemanager.PackageManager
 	platformIndexErrors := []string{}
 	if !getLibOnly {
diff --git a/commands/upload/upload.go b/commands/upload/upload.go
@@ -55,15 +55,15 @@ func Upload(ctx context.Context, req *rpc.UploadReq, outStream io.Writer, errStr
 	// FIXME: make a specification on how a port is specified via command line
 	port := req.GetPort()
 	if port == "" {
-		return nil, fmt.Errorf("No port provided")
+		return nil, fmt.Errorf("no upload port provided")
 	}
 
 	fqbnIn := req.GetFqbn()
 	if fqbnIn == "" && sketch != nil && sketch.Metadata != nil {
 		fqbnIn = sketch.Metadata.CPU.Fqbn
 	}
 	if fqbnIn == "" {
-		return nil, fmt.Errorf("No Fully Qualified Board Name provided")
+		return nil, fmt.Errorf("no Fully Qualified Board Name provided")
 	}
 	fqbn, err := cores.ParseFQBN(fqbnIn)
 	if err != nil {
@@ -170,9 +170,8 @@ func Upload(ctx context.Context, req *rpc.UploadReq, outStream io.Writer, errStr
 	if _, err := uploadFile.Stat(); err != nil {
 		if os.IsNotExist(err) {
 			return nil, fmt.Errorf("compiled sketch %s not found", uploadFile.String())
-		} else {
-			return nil, fmt.Errorf("cannot open sketch: %s", err)
 		}
+		return nil, fmt.Errorf("cannot open sketch: %s", err)
 	}
 
 	// Perform reset via 1200bps touch if requested
diff --git a/daemon/daemon.go b/daemon/daemon.go
@@ -58,20 +58,20 @@ func runDaemonCommand(cmd *cobra.Command, args []string) {
 type ArduinoCoreServerImpl struct{}
 
 func (s *ArduinoCoreServerImpl) BoardDetails(ctx context.Context, req *rpc.BoardDetailsReq) (*rpc.BoardDetailsResp, error) {
-	return board.BoardDetails(ctx, req)
+	return board.Details(ctx, req)
 }
 
 func (s *ArduinoCoreServerImpl) BoardList(ctx context.Context, req *rpc.BoardListReq) (*rpc.BoardListResp, error) {
-	return board.BoardList(ctx, req)
+	return board.List(ctx, req)
 }
 
 func (s *ArduinoCoreServerImpl) BoardListAll(ctx context.Context, req *rpc.BoardListAllReq) (*rpc.BoardListAllResp, error) {
-	return board.BoardListAll(ctx, req)
+	return board.ListAll(ctx, req)
 }
 
 func (s *ArduinoCoreServerImpl) BoardAttach(req *rpc.BoardAttachReq, stream rpc.ArduinoCore_BoardAttachServer) error {
 
-	resp, err := board.BoardAttach(stream.Context(), req,
+	resp, err := board.Attach(stream.Context(), req,
 		func(p *rpc.TaskProgress) { stream.Send(&rpc.BoardAttachResp{TaskProgress: p}) },
 	)
 	if err != nil {
@@ -207,10 +207,10 @@ func feedStream(streamer func(data []byte)) io.Writer {
 	go func() {
 		data := make([]byte, 1024)
 		for {
-			if n, err := r.Read(data); err != nil {
-				return
-			} else {
+			if n, err := r.Read(data); err == nil {
 				streamer(data[:n])
+			} else {
+				return
 			}
 		}
 	}()
diff --git a/output/output.go b/output/output.go
@@ -21,4 +21,5 @@ import (
 	colorable "github.com/mattn/go-colorable"
 )
 
-var colorStdout = colorable.NewColorableStdout()
+// TODO: Feed text output into colorable stdOut
+var _ = colorable.NewColorableStdout()

Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ func runAttachCommand(cmd *cobra.Command, args []string) {`
`57`	`57`	`if len(args) > 0 {`
`58`	`58`	`path = args[1]`
`59`	`59`	`}`
`60`		`- _, err := board.BoardAttach(context.Background(), &rpc.BoardAttachReq{`
	`60`	`+ _, err := board.Attach(context.Background(), &rpc.BoardAttachReq{`
`61`	`61`	`Instance: instance,`
`62`	`62`	`BoardUri: args[0],`
`63`	`63`	`SketchPath: path,`
Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ func runListCommand(cmd *cobra.Command, args []string) {`
`62`	`62`	`time.Sleep(timeout)`
`63`	`63`	`}`
`64`	`64`
`65`		`- resp, err := board.BoardList(context.Background(), &rpc.BoardListReq{Instance: instance})`
	`65`	`+ resp, err := board.List(context.Background(), &rpc.BoardListReq{Instance: instance})`
`66`	`66`	`if err != nil {`
`67`	`67`	`formatter.PrintError(err, "Error detecting boards")`
`68`	`68`	`os.Exit(cli.ErrNetwork)`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ import (`
`29`	`29`	`"google.golang.org/grpc"`
`30`	`30`	`)`
`31`	`31`
`32`		`-// InitCommand initalize the command`
	`32`	`+// InitCommand initialize the command`
`33`	`33`	`func InitCommand() *cobra.Command {`
`34`	`34`	`cmd := &cobra.Command{`
`35`	`35`	`Use: "daemon",`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ import (`
`34`	`34`	`paths "github.com/arduino/go-paths-helper"`
`35`	`35`	`)`
`36`	`36`
`37`		`-func BoardAttach(ctx context.Context, req rpc.BoardAttachReq, taskCB commands.TaskProgressCB) (rpc.BoardAttachResp, error) {`
	`37`	`+func Attach(ctx context.Context, req rpc.BoardAttachReq, taskCB commands.TaskProgressCB) (rpc.BoardAttachResp, error) {`
`38`	`38`
`39`	`39`	`pm := commands.GetPackageManager(req)`
`40`	`40`	`if pm == nil {`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ import (`
`27`	`27`	`"github.com/arduino/arduino-cli/rpc"`
`28`	`28`	`)`
`29`	`29`
`30`		`-func BoardDetails(ctx context.Context, req rpc.BoardDetailsReq) (rpc.BoardDetailsResp, error) {`
	`30`	`+func Details(ctx context.Context, req rpc.BoardDetailsReq) (rpc.BoardDetailsResp, error) {`
`31`	`31`	`pm := commands.GetPackageManager(req)`
`32`	`32`	`if pm == nil {`
`33`	`33`	`return nil, errors.New("invalid instance")`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ import (`
`26`	`26`	`"github.com/arduino/arduino-cli/rpc"`
`27`	`27`	`)`
`28`	`28`
`29`		`-func BoardList(ctx context.Context, req rpc.BoardListReq) (rpc.BoardListResp, error) {`
	`29`	`+func List(ctx context.Context, req rpc.BoardListReq) (rpc.BoardListResp, error) {`
`30`	`30`	`pm := commands.GetPackageManager(req)`
`31`	`31`	`if pm == nil {`
`32`	`32`	`return nil, errors.New("invalid instance")`
Original file line number	Diff line number	Diff line change
`@@ -80,4 +80,3 @@ func downloadTool(pm packagemanager.PackageManager, tool cores.ToolRelease, do`
`80`	`80`
`81`	`81`	`return commands.DownloadToolRelease(pm, tool, downloadCB)`
`82`	`82`	`}`
`83`		`-`
Original file line number	Diff line number	Diff line change
`@@ -305,7 +305,8 @@ func Rescan(ctx context.Context, req rpc.RescanReq) (rpc.RescanResp, error) {`
`305`	`305`	`}, nil`
`306`	`306`	`}`
`307`	`307`
`308`		`-func createInstance(ctx context.Context, config configs.Configuration, getLibOnly bool) (packagemanager.PackageManager, *librariesmanager.LibrariesManager, []string, string, error) {`
	`308`	`+func createInstance(ctx context.Context, config *configs.Configuration, getLibOnly bool) (`
	`309`	`+ packagemanager.PackageManager, librariesmanager.LibrariesManager, []string, string, error) {`
`309`	`310`	`var pm *packagemanager.PackageManager`
`310`	`311`	`platformIndexErrors := []string{}`
`311`	`312`	`if !getLibOnly {`
Original file line number	Diff line number	Diff line change
`@@ -55,15 +55,15 @@ func Upload(ctx context.Context, req *rpc.UploadReq, outStream io.Writer, errStr`
`55`	`55`	`// FIXME: make a specification on how a port is specified via command line`
`56`	`56`	`port := req.GetPort()`
`57`	`57`	`if port == "" {`
`58`		`- return nil, fmt.Errorf("No port provided")`
	`58`	`+ return nil, fmt.Errorf("no upload port provided")`
`59`	`59`	`}`
`60`	`60`
`61`	`61`	`fqbnIn := req.GetFqbn()`
`62`	`62`	`if fqbnIn == "" && sketch != nil && sketch.Metadata != nil {`
`63`	`63`	`fqbnIn = sketch.Metadata.CPU.Fqbn`
`64`	`64`	`}`
`65`	`65`	`if fqbnIn == "" {`
`66`		`- return nil, fmt.Errorf("No Fully Qualified Board Name provided")`
	`66`	`+ return nil, fmt.Errorf("no Fully Qualified Board Name provided")`
`67`	`67`	`}`
`68`	`68`	`fqbn, err := cores.ParseFQBN(fqbnIn)`
`69`	`69`	`if err != nil {`
`@@ -170,9 +170,8 @@ func Upload(ctx context.Context, req *rpc.UploadReq, outStream io.Writer, errStr`
`170`	`170`	`if _, err := uploadFile.Stat(); err != nil {`
`171`	`171`	`if os.IsNotExist(err) {`
`172`	`172`	`return nil, fmt.Errorf("compiled sketch %s not found", uploadFile.String())`
`173`		`- } else {`
`174`		`- return nil, fmt.Errorf("cannot open sketch: %s", err)`
`175`	`173`	`}`
	`174`	`+ return nil, fmt.Errorf("cannot open sketch: %s", err)`
`176`	`175`	`}`
`177`	`176`
`178`	`177`	`// Perform reset via 1200bps touch if requested`
Original file line number	Diff line number	Diff line change
`@@ -58,20 +58,20 @@ func runDaemonCommand(cmd *cobra.Command, args []string) {`
`58`	`58`	`type ArduinoCoreServerImpl struct{}`
`59`	`59`
`60`	`60`	`func (s ArduinoCoreServerImpl) BoardDetails(ctx context.Context, req rpc.BoardDetailsReq) (*rpc.BoardDetailsResp, error) {`
`61`		`- return board.BoardDetails(ctx, req)`
	`61`	`+ return board.Details(ctx, req)`
`62`	`62`	`}`
`63`	`63`
`64`	`64`	`func (s ArduinoCoreServerImpl) BoardList(ctx context.Context, req rpc.BoardListReq) (*rpc.BoardListResp, error) {`
`65`		`- return board.BoardList(ctx, req)`
	`65`	`+ return board.List(ctx, req)`
`66`	`66`	`}`
`67`	`67`
`68`	`68`	`func (s ArduinoCoreServerImpl) BoardListAll(ctx context.Context, req rpc.BoardListAllReq) (*rpc.BoardListAllResp, error) {`
`69`		`- return board.BoardListAll(ctx, req)`
	`69`	`+ return board.ListAll(ctx, req)`
`70`	`70`	`}`
`71`	`71`
`72`	`72`	`func (s ArduinoCoreServerImpl) BoardAttach(req rpc.BoardAttachReq, stream rpc.ArduinoCore_BoardAttachServer) error {`
`73`	`73`
`74`		`- resp, err := board.BoardAttach(stream.Context(), req,`
	`74`	`+ resp, err := board.Attach(stream.Context(), req,`
`75`	`75`	`func(p *rpc.TaskProgress) { stream.Send(&rpc.BoardAttachResp{TaskProgress: p}) },`
`76`	`76`	`)`
`77`	`77`	`if err != nil {`
`@@ -207,10 +207,10 @@ func feedStream(streamer func(data []byte)) io.Writer {`
`207`	`207`	`go func() {`
`208`	`208`	`data := make([]byte, 1024)`
`209`	`209`	`for {`
`210`		`- if n, err := r.Read(data); err != nil {`
`211`		`- return`
`212`		`- } else {`
	`210`	`+ if n, err := r.Read(data); err == nil {`
`213`	`211`	`streamer(data[:n])`
	`212`	`+ } else {`
	`213`	`+ return`
`214`	`214`	`}`
`215`	`215`	`}`
`216`	`216`	`}()`