tidy go mod and reorganize imports and tidy long lines

Roberto Sora · Roberto Sora · commit 3d55de064639 · 2019-06-11T12:37:28.000+02:00
diff --git a/cli/cli.go b/cli/cli.go
@@ -55,7 +55,7 @@ const (
 // appName is the command line name of the Arduino CLI executable on the user system (users may change it)
 var appName = filepath.Base(os.Args[0])
 
-// func NewInfo(application string, versionString string, commit string) *Info {
+// VersionInfo contains all info injected during build
 var VersionInfo = version.NewInfo(appName)
 
 // ErrLogrus represents the logrus instance, which has the role to
diff --git a/cli/version/version.go b/cli/version/version.go
@@ -19,7 +19,6 @@ package version
 
 import (
 	"fmt"
-	"github.com/arduino/arduino-cli/global"
 
 	"github.com/arduino/arduino-cli/cli"
 	"github.com/spf13/cobra"
diff --git a/commands/bundled_tools.go b/commands/bundled_tools.go
@@ -27,7 +27,8 @@ import (
 )
 
 // DownloadToolRelease downloads a ToolRelease
-func DownloadToolRelease(pm *packagemanager.PackageManager, toolRelease *cores.ToolRelease, downloadCB DownloadProgressCB, downloaderHeaders http.Header) error {
+func DownloadToolRelease(pm *packagemanager.PackageManager, toolRelease *cores.ToolRelease,
+	downloadCB DownloadProgressCB, downloaderHeaders http.Header) error {
 	resp, err := pm.DownloadToolRelease(toolRelease, downloaderHeaders)
 	if err != nil {
 		return err
diff --git a/commands/core/download.go b/commands/core/download.go
@@ -29,7 +29,8 @@ import (
 	"github.com/arduino/arduino-cli/rpc"
 )
 
-func PlatformDownload(ctx context.Context, req *rpc.PlatformDownloadReq, downloadCB commands.DownloadProgressCB, downloaderHeaders http.Header) (*rpc.PlatformDownloadResp, error) {
+func PlatformDownload(ctx context.Context, req *rpc.PlatformDownloadReq, downloadCB commands.DownloadProgressCB,
+	downloaderHeaders http.Header) (*rpc.PlatformDownloadResp, error) {
 	pm := commands.GetPackageManager(req)
 	if pm == nil {
 		return nil, errors.New("invalid instance")
@@ -64,7 +65,8 @@ func PlatformDownload(ctx context.Context, req *rpc.PlatformDownloadReq, downloa
 	return &rpc.PlatformDownloadResp{}, nil
 }
 
-func downloadPlatform(pm *packagemanager.PackageManager, platformRelease *cores.PlatformRelease, downloadCB commands.DownloadProgressCB, downloaderHeaders http.Header) error {
+func downloadPlatform(pm *packagemanager.PackageManager, platformRelease *cores.PlatformRelease,
+	downloadCB commands.DownloadProgressCB, downloaderHeaders http.Header) error {
 	// Download platform
 	resp, err := pm.DownloadPlatformRelease(platformRelease, downloaderHeaders)
 	if err != nil {
@@ -73,7 +75,8 @@ func downloadPlatform(pm *packagemanager.PackageManager, platformRelease *cores.
 	return commands.Download(resp, platformRelease.String(), downloadCB)
 }
 
-func downloadTool(pm *packagemanager.PackageManager, tool *cores.ToolRelease, downloadCB commands.DownloadProgressCB, downloaderHeaders http.Header) error {
+func downloadTool(pm *packagemanager.PackageManager, tool *cores.ToolRelease, downloadCB commands.DownloadProgressCB,
+	downloaderHeaders http.Header) error {
 	// Check if tool has a flavor available for the current OS
 	if tool.GetCompatibleFlavour() == nil {
 		return fmt.Errorf("tool %s not available for the current OS", tool)
diff --git a/commands/instances.go b/commands/instances.go
@@ -83,7 +83,8 @@ func GetDiscoveries(req InstanceContainer) []*discovery.Discovery {
 	return i.discoveries
 }
 
-func (instance *CoreInstance) installToolIfMissing(tool *cores.ToolRelease, downloadCB DownloadProgressCB, taskCB TaskProgressCB, downloaderHeaders http.Header) (bool, error) {
+func (instance *CoreInstance) installToolIfMissing(tool *cores.ToolRelease, downloadCB DownloadProgressCB,
+	taskCB TaskProgressCB, downloaderHeaders http.Header) (bool, error) {
 	if tool.IsInstalled() {
 		return false, nil
 	}
@@ -98,7 +99,8 @@ func (instance *CoreInstance) installToolIfMissing(tool *cores.ToolRelease, down
 	return true, nil
 }
 
-func (instance *CoreInstance) checkForBuiltinTools(downloadCB DownloadProgressCB, taskCB TaskProgressCB, downloaderHeaders http.Header) error {
+func (instance *CoreInstance) checkForBuiltinTools(downloadCB DownloadProgressCB, taskCB TaskProgressCB,
+	downloaderHeaders http.Header) error {
 	// Check for ctags tool
 	ctags, _ := getBuiltinCtagsTool(instance.pm)
 	ctagsInstalled, err := instance.installToolIfMissing(ctags, downloadCB, taskCB, downloaderHeaders)
diff --git a/commands/lib/download.go b/commands/lib/download.go
@@ -29,7 +29,8 @@ import (
 	"github.com/sirupsen/logrus"
 )
 
-func LibraryDownload(ctx context.Context, req *rpc.LibraryDownloadReq, downloadCB commands.DownloadProgressCB, downloaderHeaders http.Header) (*rpc.LibraryDownloadResp, error) {
+func LibraryDownload(ctx context.Context, req *rpc.LibraryDownloadReq, downloadCB commands.DownloadProgressCB,
+	downloaderHeaders http.Header) (*rpc.LibraryDownloadResp, error) {
 	logrus.Info("Executing `arduino lib download`")
 
 	lm := commands.GetLibraryManager(req)
diff --git a/commands/lib/upgrade.go b/commands/lib/upgrade.go
@@ -26,7 +26,8 @@ import (
 	"github.com/arduino/arduino-cli/rpc"
 )
 
-func LibraryUpgradeAll(ctx context.Context, req *rpc.LibraryUpgradeAllReq, downloadCB commands.DownloadProgressCB, taskCB commands.TaskProgressCB, downloaderHeaders http.Header) error {
+func LibraryUpgradeAll(ctx context.Context, req *rpc.LibraryUpgradeAllReq, downloadCB commands.DownloadProgressCB,
+	taskCB commands.TaskProgressCB, downloaderHeaders http.Header) error {
 	lm := commands.GetLibraryManager(req)
 
 	// Obtain the list of upgradable libraries
diff --git a/go.mod b/go.mod
@@ -43,8 +43,7 @@ require (
 	go.bug.st/serial.v1 v0.0.0-20180827123349-5f7892a7bb45
 	golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2
 	golang.org/x/net v0.0.0-20190311183353-d8887717615a
-	golang.org/x/text v0.3.2
-	google.golang.org/appengine v1.4.0 // indirect
+	golang.org/x/text v0.3.0
 	google.golang.org/genproto v0.0.0-20190327125643-d831d65fe17d // indirect
 	google.golang.org/grpc v1.21.1
 	gopkg.in/mgo.v2 v2.0.0-20180705113604-9856a29383ce // indirect
diff --git a/go.sum b/go.sum
@@ -131,28 +131,21 @@ golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvx
 golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20190213061140-3a22650c66bd h1:HuTn7WObtcDo9uEEU7rEqL0jYthdXAmZ6PP+meazmaU=
 golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190311183353-d8887717615a h1:oWX7TPOiFAMXLq8o0ikBYfCJVlRHBcsciT5bXOrH628=
 golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sys v0.0.0-20180830151530-49385e6e1522 h1:Ve1ORMCxvRmSXBwJK+t3Oy+V2vRW2OetUQBq4rJIkZE=
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a h1:1BGLXjeY4akVXGgbC9HugT3Jv3hCI0z56oJR5vAMgBU=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223 h1:DH4skfRX4EBpamg7iV4ZlCpblAHI6s6TDM39bFZumv8=
 golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190422165155-953cdadca894 h1:Cz4ceDQGXuKRnVBDTS23GTn/pU5OE2C0WrNTOYK1Uuc=
 golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs=
-golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
-golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
 golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
diff --git a/version/version.go b/version/version.go
@@ -49,6 +49,7 @@ func (i *Info) String() string {
 	return fmt.Sprintf("%s Version: %s Commit: %s BuildDate: %s", i.Application, i.VersionString, i.Commit, i.BuildDate)
 }
 
+//nolint:gochecknoinits
 func init() {
 	if versionString == "" {
 		versionString = defaultVersionString
diff --git a/version/version_test.go b/version/version_test.go
@@ -26,7 +26,9 @@ import (
 
 // TestIntegrationBuildInjectedInfo is an integration test that aims to test the Info strings passed to the binary at build time
 // in order to have this test green launch your testing using the provided task (see /Taskfile.yml) or use:
-// go test -run Integration -v ./... -ldflags '-X github.com/arduino/arduino-cli/version.versionString=0.0.0-test.preview -X github.com/arduino/arduino-cli/version.commit=deadbeef'
+//     go test -run Integration -v ./... -ldflags '
+//       -X github.com/arduino/arduino-cli/version.versionString=0.0.0-test.preview
+//       -X github.com/arduino/arduino-cli/version.commit=deadbeef'
 func TestIntegrationBuildInjectedInfo(t *testing.T) {
 	if testing.Short() {
 		t.Skip("skip integration test")

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,8 @@ import (`
`27`	`27`	`)`
`28`	`28`
`29`	`29`	`// DownloadToolRelease downloads a ToolRelease`
`30`		`-func DownloadToolRelease(pm packagemanager.PackageManager, toolRelease cores.ToolRelease, downloadCB DownloadProgressCB, downloaderHeaders http.Header) error {`
	`30`	`+func DownloadToolRelease(pm packagemanager.PackageManager, toolRelease cores.ToolRelease,`
	`31`	`+ downloadCB DownloadProgressCB, downloaderHeaders http.Header) error {`
`31`	`32`	`resp, err := pm.DownloadToolRelease(toolRelease, downloaderHeaders)`
`32`	`33`	`if err != nil {`
`33`	`34`	`return err`
Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,8 @@ func GetDiscoveries(req InstanceContainer) []*discovery.Discovery {`
`83`	`83`	`return i.discoveries`
`84`	`84`	`}`
`85`	`85`
`86`		`-func (instance CoreInstance) installToolIfMissing(tool cores.ToolRelease, downloadCB DownloadProgressCB, taskCB TaskProgressCB, downloaderHeaders http.Header) (bool, error) {`
	`86`	`+func (instance CoreInstance) installToolIfMissing(tool cores.ToolRelease, downloadCB DownloadProgressCB,`
	`87`	`+ taskCB TaskProgressCB, downloaderHeaders http.Header) (bool, error) {`
`87`	`88`	`if tool.IsInstalled() {`
`88`	`89`	`return false, nil`
`89`	`90`	`}`
`@@ -98,7 +99,8 @@ func (instance CoreInstance) installToolIfMissing(tool cores.ToolRelease, down`
`98`	`99`	`return true, nil`
`99`	`100`	`}`
`100`	`101`
`101`		`-func (instance *CoreInstance) checkForBuiltinTools(downloadCB DownloadProgressCB, taskCB TaskProgressCB, downloaderHeaders http.Header) error {`
	`102`	`+func (instance *CoreInstance) checkForBuiltinTools(downloadCB DownloadProgressCB, taskCB TaskProgressCB,`
	`103`	`+ downloaderHeaders http.Header) error {`
`102`	`104`	`// Check for ctags tool`
`103`	`105`	`ctags, _ := getBuiltinCtagsTool(instance.pm)`
`104`	`106`	`ctagsInstalled, err := instance.installToolIfMissing(ctags, downloadCB, taskCB, downloaderHeaders)`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,8 @@ import (`
`29`	`29`	`"github.com/sirupsen/logrus"`
`30`	`30`	`)`
`31`	`31`
`32`		`-func LibraryDownload(ctx context.Context, req rpc.LibraryDownloadReq, downloadCB commands.DownloadProgressCB, downloaderHeaders http.Header) (rpc.LibraryDownloadResp, error) {`
	`32`	`+func LibraryDownload(ctx context.Context, req *rpc.LibraryDownloadReq, downloadCB commands.DownloadProgressCB,`
	`33`	`+ downloaderHeaders http.Header) (*rpc.LibraryDownloadResp, error) {`
`33`	`34`	logrus.Info("Executing `arduino lib download`")
`34`	`35`
`35`	`36`	`lm := commands.GetLibraryManager(req)`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,8 @@ import (`
`26`	`26`	`"github.com/arduino/arduino-cli/rpc"`
`27`	`27`	`)`
`28`	`28`
`29`		`-func LibraryUpgradeAll(ctx context.Context, req *rpc.LibraryUpgradeAllReq, downloadCB commands.DownloadProgressCB, taskCB commands.TaskProgressCB, downloaderHeaders http.Header) error {`
	`29`	`+func LibraryUpgradeAll(ctx context.Context, req *rpc.LibraryUpgradeAllReq, downloadCB commands.DownloadProgressCB,`
	`30`	`+ taskCB commands.TaskProgressCB, downloaderHeaders http.Header) error {`
`30`	`31`	`lm := commands.GetLibraryManager(req)`
`31`	`32`
`32`	`33`	`// Obtain the list of upgradable libraries`
Original file line number	Diff line number	Diff line change
`@@ -49,6 +49,7 @@ func (i *Info) String() string {`
`49`	`49`	`return fmt.Sprintf("%s Version: %s Commit: %s BuildDate: %s", i.Application, i.VersionString, i.Commit, i.BuildDate)`
`50`	`50`	`}`
`51`	`51`
	`52`	`+//nolint:gochecknoinits`
`52`	`53`	`func init() {`
`53`	`54`	`if versionString == "" {`
`54`	`55`	`versionString = defaultVersionString`