cli.Init* funcitons now have a more meaningful name

Author: cmaglie

cli/board/attach.go

@@ -76,7 +76,7 @@ func runAttachCommand(cmd *cobra.Command, args []string) {
 		boardURI = "serial://" + boardURI
 	}
 
-	pm := cli.InitPackageManager()
+	pm, _ := cli.InitPackageAndLibraryManager()
 
 	if fqbn != nil {
 		sketch.Metadata.CPU = sketches.BoardMetadata{

cli/board/list.go

@@ -52,7 +52,7 @@ var listFlags struct {
 // runListCommand detects and lists the connected arduino boards
 // (either via serial or network ports).
 func runListCommand(cmd *cobra.Command, args []string) {
-	pm := cli.InitPackageManager()
+	pm, _ := cli.InitPackageAndLibraryManager()
 
 	monitor := discovery.New(time.Millisecond)
 	monitor.Start()

cli/board/listall.go

@@ -45,7 +45,7 @@ func initListAllCommand() *cobra.Command {
 
 // runListAllCommand list all installed boards
 func runListAllCommand(cmd *cobra.Command, args []string) {
-	pm := cli.InitPackageManager()
+	pm, _ := cli.InitPackageAndLibraryManager()
 
 	match := func(name string) bool {
 		name = strings.ToLower(name)

cli/cli.go

@@ -84,15 +84,15 @@ var AppName = filepath.Base(os.Args[0])
 
 var Config *configs.Configuration
 
-// InitPackageManagerWithoutBundles initializes the PackageManager
-// but ignores bundles and user installed cores
-func InitPackageManagerWithoutBundles() *packagemanager.PackageManager {
+// InitPackageAndLibraryManagerWithoutBundles initializes the PackageManager
+// and the LibraryManager but ignores bundles and user installed cores
+func InitPackageAndLibraryManagerWithoutBundles() (*packagemanager.PackageManager, *librariesmanager.LibrariesManager) {
 	logrus.Info("Package manager will scan only managed hardware folder")
 
 	fakeResult := false
 	Config.IDEBundledCheckResult = &fakeResult
 	Config.SketchbookDir = nil
-	return InitPackageManager()
+	return InitPackageAndLibraryManager()
 }
 
 func packageManagerInitReq() *rpc.InitReq {
@@ -123,25 +123,23 @@ func CreateInstance() *rpc.Instance {
 	return resp.GetInstance()
 }
 
-// InitPackageManager initializes the PackageManager
+// InitPackageAndLibraryManager initializes the PackageManager and the LibaryManager
 // TODO: for the daemon mode, this might be called at startup, but for now only commands needing the PM will call it
-func InitPackageManager() *packagemanager.PackageManager {
+func InitPackageAndLibraryManager() (*packagemanager.PackageManager, *librariesmanager.LibrariesManager) {
 	logrus.Info("Initializing package manager")
 	resp, err := commands.Init(context.Background(), packageManagerInitReq())
 	if err != nil {
 		formatter.PrintError(err, "Error initializing package manager")
 		os.Exit(rpc.ErrGeneric)
 	}
-	return commands.GetPackageManager(resp)
+	return commands.GetPackageManager(resp), commands.GetLibraryManager(resp)
 }
 
 // InitLibraryManager initializes the LibraryManager. If pm is nil, the library manager will not handle core-libraries.
 // TODO: for the daemon mode, this might be called at startup, but for now only commands needing the PM will call it
-func InitLibraryManager(cfg *configs.Configuration, pm *packagemanager.PackageManager) *librariesmanager.LibrariesManager {
+func InitLibraryManager(cfg *configs.Configuration) *librariesmanager.LibrariesManager {
 	req := packageManagerInitReq()
-	if pm == nil {
-		req.LibraryManagerOnly = true
-	}
+	req.LibraryManagerOnly = true
 
 	logrus.Info("Initializing library manager")
 	resp, err := commands.Init(context.Background(), req)

commands/compile/compile.go

@@ -122,7 +122,7 @@ func run(cmd *cobra.Command, args []string) {
 		os.Exit(cli.ErrBadArgument)
 	}
 
-	pm := cli.InitPackageManager()
+	pm, _ := cli.InitPackageAndLibraryManager()
 
 	// Check for ctags tool
 	loadBuiltinCtagsMetadata(pm)

commands/core/download.go

@@ -48,7 +48,7 @@ func runDownloadCommand(cmd *cobra.Command, args []string) {
 	logrus.Info("Executing `arduino core download`")
 
 	platformsRefs := parsePlatformReferenceArgs(args)
-	pm := cli.InitPackageManagerWithoutBundles()
+	pm, _ := cli.InitPackageAndLibraryManagerWithoutBundles()
 	for _, platformRef := range platformsRefs {
 		downloadPlatformByRef(pm, platformRef)
 	}

commands/core/install.go

@@ -47,7 +47,7 @@ func runInstallCommand(cmd *cobra.Command, args []string) {
 	logrus.Info("Executing `arduino core download`")
 
 	platformsRefs := parsePlatformReferenceArgs(args)
-	pm := cli.InitPackageManagerWithoutBundles()
+	pm, _ := cli.InitPackageAndLibraryManagerWithoutBundles()
 
 	for _, platformRef := range platformsRefs {
 		installPlatformByRef(pm, platformRef)

commands/core/list.go

@@ -46,7 +46,7 @@ var listFlags struct {
 func runListCommand(cmd *cobra.Command, args []string) {
 	logrus.Info("Executing `arduino core list`")
 
-	pm := cli.InitPackageManager()
+	pm, _ := cli.InitPackageAndLibraryManager()
 
 	installed := []*output.InstalledPlatform{}
 	for _, targetPackage := range pm.GetPackages().Packages {

commands/core/search.go

@@ -42,7 +42,7 @@ func initSearchCommand() *cobra.Command {
 }
 
 func runSearchCommand(cmd *cobra.Command, args []string) {
-	pm := cli.InitPackageManagerWithoutBundles()
+	pm, _ := cli.InitPackageAndLibraryManagerWithoutBundles()
 
 	search := strings.ToLower(strings.Join(args, " "))
 	formatter.Print("Searching for platforms matching '" + search + "'")

commands/core/uninstall.go

@@ -44,7 +44,7 @@ func runUninstallCommand(cmd *cobra.Command, args []string) {
 	logrus.Info("Executing `arduino core download`")
 
 	platformsRefs := parsePlatformReferenceArgs(args)
-	pm := cli.InitPackageManagerWithoutBundles()
+	pm, _ := cli.InitPackageAndLibraryManagerWithoutBundles()
 
 	for _, platformRef := range platformsRefs {
 		uninstallPlatformByRef(pm, platformRef)

commands/core/upgrade.go

@@ -45,7 +45,7 @@ func initUpgradeCommand() *cobra.Command {
 func runUpgradeCommand(cmd *cobra.Command, args []string) {
 	logrus.Info("Executing `arduino core upgrade`")
 
-	pm := cli.InitPackageManagerWithoutBundles()
+	pm, _ := cli.InitPackageAndLibraryManagerWithoutBundles()
 
 	platformsRefs := parsePlatformReferenceArgs(args)
 	if len(platformsRefs) == 0 {

commands/lib/download.go

@@ -45,7 +45,7 @@ func initDownloadCommand() *cobra.Command {
 func runDownloadCommand(cmd *cobra.Command, args []string) {
 	logrus.Info("Executing `arduino lib download`")
 
-	lm := cli.InitLibraryManager(cli.Config, nil)
+	lm := cli.InitLibraryManager(cli.Config)
 
 	logrus.Info("Preparing download")
 	pairs, err := librariesindex.ParseArgs(args)

commands/lib/install.go

@@ -44,7 +44,7 @@ func initInstallCommand() *cobra.Command {
 
 func runInstallCommand(cmd *cobra.Command, args []string) {
 	logrus.Info("Executing `arduino lib install`")
-	lm := cli.InitLibraryManager(cli.Config, nil)
+	lm := cli.InitLibraryManager(cli.Config)
 
 	refs, err := librariesindex.ParseArgs(args)
 	if err != nil {

commands/lib/list.go

@@ -18,7 +18,6 @@
 package lib
 
 import (
-	"github.com/arduino/arduino-cli/arduino/cores/packagemanager"
 	"github.com/arduino/arduino-cli/arduino/libraries/librariesindex"
 	"github.com/arduino/arduino-cli/arduino/libraries/librariesmanager"
 	"github.com/arduino/arduino-cli/cli"
@@ -49,11 +48,13 @@ var listFlags struct {
 
 func runListCommand(cmd *cobra.Command, args []string) {
 	logrus.Info("Listing")
-	var pm *packagemanager.PackageManager
+
+	var lm *librariesmanager.LibrariesManager
 	if listFlags.all {
-		pm = cli.InitPackageManager()
+		_, lm = cli.InitPackageAndLibraryManager()
+	} else {
+		lm = cli.InitLibraryManager(cli.Config)
 	}
-	lm := cli.InitLibraryManager(cli.Config, pm)
 
 	res := ListLibraries(lm, listFlags.updatable)
 	if len(res.Libraries) > 0 {

commands/lib/search.go

@@ -50,7 +50,7 @@ func runSearchCommand(cmd *cobra.Command, args []string) {
 	logrus.Info("Executing `arduino lib search`")
 	query := strings.ToLower(strings.Join(args, " "))
 
-	lm := cli.InitLibraryManager(cli.Config, nil)
+	lm := cli.InitLibraryManager(cli.Config)
 
 	res := output.LibSearchResults{
 		Libraries: []*librariesindex.Library{},

commands/lib/uninstall.go

@@ -42,7 +42,7 @@ func initUninstallCommand() *cobra.Command {
 func runUninstallCommand(cmd *cobra.Command, args []string) {
 	logrus.Info("Executing `arduino lib uninstall`")
 
-	lm := cli.InitLibraryManager(cli.Config, nil)
+	lm := cli.InitLibraryManager(cli.Config)
 	libRefs, err := librariesindex.ParseArgs(args)
 	if err != nil {
 		formatter.PrintError(err, "Arguments error")

commands/lib/update_index.go

@@ -18,7 +18,10 @@
 package lib
 
 import (
+	"context"
+
 	"github.com/arduino/arduino-cli/cli"
+	"github.com/arduino/arduino-cli/commands"
 	"github.com/spf13/cobra"
 )
 
@@ -30,7 +33,7 @@ func initUpdateIndexCommand() *cobra.Command {
 		Example: "  " + cli.AppName + " lib update-index",
 		Args:    cobra.NoArgs,
 		Run: func(cmd *cobra.Command, args []string) {
-			lm := cli.InitLibraryManager(cli.Config, nil)
+			lm := cli.InitLibraryManager(cli.Config)
 			cli.UpdateLibrariesIndex(lm)
 		},
 	}

commands/lib/upgrade.go

@@ -38,7 +38,7 @@ func initUpgradeCommand() *cobra.Command {
 }
 
 func runUpgradeCommand(cmd *cobra.Command, args []string) {
-	lm := cli.InitLibraryManager(cli.Config, nil)
+	lm := cli.InitLibraryManager(cli.Config)
 	list := ListLibraries(lm, true)
 	libReleases := []*librariesindex.Release{}
 	for _, upgradeDesc := range list.Libraries {

commands/upload/upload.go

@@ -102,7 +102,7 @@ func run(command *cobra.Command, args []string) {
 		os.Exit(cli.ErrBadCall)
 	}
 
-	pm := cli.InitPackageManager()
+	pm, _ := cli.InitPackageAndLibraryManager()
 
 	// Find target board and board properties
 	_, _, board, boardProperties, _, err := pm.ResolveFQBN(fqbn)