spinner stop

Author: chandrareddyp

pkg/command/plugin.go

@@ -279,6 +279,7 @@ func newInstallPluginCmd() *cobra.Command {
 			pluginmanager.SetTotalPluginsToInstall(1)
 			pluginVersion := version
 			err = pluginmanager.InstallStandalonePlugin(pluginName, pluginVersion, getTarget())
+			pluginmanager.StopSpinner()
 			if err != nil {
 				return err
 			}

pkg/pluginmanager/manager.go

@@ -11,6 +11,7 @@ import (
 	"os"
 	"os/exec"
 	"path/filepath"
+	"runtime"
 	"strings"
 
 	"github.com/Masterminds/semver"
@@ -59,6 +60,23 @@ const (
 var totalPluginsToInstall = 0
 var pluginsInstalledCount = 0
 var execCommand = exec.Command
+var spinner component.OutputWriterSpinner
+
+func init() {
+	// Initialize global spinner
+	spinner = component.NewOutputWriterSpinner(component.WithOutputStream(os.Stderr))
+	runtime.SetFinalizer(spinner, func(s component.OutputWriterSpinner) {
+		if s != nil {
+			s.StopSpinner()
+		}
+	})
+}
+
+func StopSpinner() {
+	if spinner != nil {
+		spinner.StopSpinner()
+	}
+}
 
 type DeletePluginOptions struct {
 	Target      configtypes.Target
@@ -609,7 +627,6 @@ func InstallPluginsFromGroup(pluginName, groupIDAndVersion string, options ...Pl
 	// from the database
 	groupIDAndVersion = fmt.Sprintf("%s-%s/%s:%s", pg.Vendor, pg.Publisher, pg.Name, pg.RecommendedVersion)
 	log.Infof("Installing plugins from plugin group '%s'", groupIDAndVersion)
-
 	return InstallPluginsFromGivenPluginGroup(pluginName, groupIDAndVersion, pg)
 }
 
@@ -662,6 +679,7 @@ func InstallPluginsFromGivenPluginGroup(pluginName, groupIDAndVersion string, pg
 	}
 	SetTotalPluginsToInstall(0)
 	SetPluginsInstalledCount(0)
+	defer StopSpinner()
 
 	return groupIDAndVersion, nil
 }
@@ -767,16 +785,12 @@ func installOrUpgradePlugin(p *discovery.Discovered, version string, installTest
 	numPluginsInstalled := fmt.Sprintf("%d plugins installed out of %d", pluginsInstalledCount, totalPluginsToInstall)
 	numPluginsInstalledWithLog := fmt.Sprintf("%s%s", log.GetLogTypeIndicator(log.LogTypeERROR), numPluginsInstalled)
 	errMsg = fmt.Sprintf("%s\n%s", errMsg, numPluginsInstalledWithLog)
-	var spinner component.OutputWriterSpinner
 
 	// Initialize the spinner if the spinner is allowed
-	if component.IsTTYEnabled() {
-		// Initialize the spinner
-		spinner = component.NewOutputWriterSpinner(component.WithOutputStream(os.Stderr),
-			component.WithSpinnerText(installingMsg),
-			component.WithSpinnerStarted())
+	if component.IsTTYEnabled() && spinner != nil {
+		spinner.SetText(installingMsg)
 		spinner.SetFinalText(errMsg, log.LogTypeERROR)
-		defer spinner.StopSpinner()
+		spinner.StartSpinner()
 	} else {
 		log.Info(installingMsg)
 	}