Thanks to visit codestin.com
Credit goes to github.com

Skip to content

refactor(spinner): hide ... after spinner has stopped #840

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Integralist merged 3 commits into from
Feb 22, 2023
Merged

refactor(spinner): hide ... after spinner has stopped #840

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e1633a1
refactor(spinner): replace concrete type with interface
Integralist Feb 22, 2023
f9900eb
refactor(spinner): hide ... after spinner has stopped
Integralist Feb 22, 2023
569eca4
test(spinner): fix tests
Integralist Feb 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions pkg/commands/compute/build.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,8 @@ func (c *BuildCommand) Exec(in io.Reader, out io.Writer) (err error) {
if err != nil {
return err
}
msg := "Verifying package manifest..."
spinner.Message(msg)
msg := "Verifying package manifest"
spinner.Message(msg + "...")

err = c.Manifest.File.ReadError()
if err != nil {
Expand Down Expand Up @@ -115,8 +115,8 @@ func (c *BuildCommand) Exec(in io.Reader, out io.Writer) (err error) {
if err != nil {
return err
}
msg = "Identifying package name..."
spinner.Message(msg)
msg = "Identifying package name"
spinner.Message(msg + "...")

packageName, err := packageName(c)
if err != nil {
Expand All @@ -138,8 +138,8 @@ func (c *BuildCommand) Exec(in io.Reader, out io.Writer) (err error) {
if err != nil {
return err
}
msg = "Identifying toolchain..."
spinner.Message(msg)
msg = "Identifying toolchain"
spinner.Message(msg + "...")

toolchain, err := toolchain(c)
if err != nil {
Expand Down Expand Up @@ -188,8 +188,8 @@ func (c *BuildCommand) Exec(in io.Reader, out io.Writer) (err error) {
if err != nil {
return err
}
msg = "Creating package archive..."
spinner.Message(msg)
msg = "Creating package archive"
spinner.Message(msg + "...")

dest := filepath.Join("pkg", fmt.Sprintf("%s.tar.gz", packageName))

Expand Down
27 changes: 13 additions & 14 deletions pkg/commands/compute/deploy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ import (
"github.com/fastly/go-fastly/v7/fastly"
"github.com/kennygrant/sanitize"
"github.com/mholt/archiver/v3"
"github.com/theckman/yacspin"
)

const (
Expand Down Expand Up @@ -418,7 +417,7 @@ func serviceManagement(
in io.Reader,
out io.Writer,
fnActivateTrial activator,
spinner *yacspin.Spinner,
spinner text.Spinner,
) (newService bool, updatedServiceID string, serviceVersion *fastly.Version, cont bool, err error) {
if source == manifest.SourceUndefined {
newService = true
Expand Down Expand Up @@ -453,7 +452,7 @@ func manageNoServiceIDFlow(
errLog fsterr.LogInterface,
manifestFile *manifest.File,
fnActivateTrial activator,
spinner *yacspin.Spinner,
spinner text.Spinner,
) (serviceID string, serviceVersion *fastly.Version, err error) {
if !f.AutoYes && !f.NonInteractive {
text.Break(out)
Expand Down Expand Up @@ -522,7 +521,7 @@ func createService(
serviceName string,
apiClient api.Interface,
fnActivateTrial activator,
spinner *yacspin.Spinner,
spinner text.Spinner,
errLog fsterr.LogInterface,
out io.Writer,
) (serviceID string, serviceVersion *fastly.Version, err error) {
Expand All @@ -531,8 +530,8 @@ func createService(
if err != nil {
return "", nil, err
}
msg := "Creating service..."
spinner.Message(msg)
msg := "Creating service"
spinner.Message(msg + "...")

service, err := apiClient.CreateService(&fastly.CreateServiceInput{
Name: &serviceName,
Expand Down Expand Up @@ -759,13 +758,13 @@ func getHashSum(contents map[string]*bytes.Buffer) (hash string, err error) {
}

// pkgUpload uploads the package to the specified service and version.
func pkgUpload(spinner *yacspin.Spinner, client api.Interface, serviceID string, version int, path string) error {
func pkgUpload(spinner text.Spinner, client api.Interface, serviceID string, version int, path string) error {
err := spinner.Start()
if err != nil {
return err
}
msg := "Uploading package..."
spinner.Message(msg)
msg := "Uploading package"
spinner.Message(msg + "...")

_, err = client.UpdatePackage(&fastly.UpdatePackageInput{
ServiceID: serviceID,
Expand Down Expand Up @@ -976,7 +975,7 @@ func processSetupCreation(
backends *setup.Backends,
dictionaries *setup.Dictionaries,
objectStores *setup.ObjectStores,
spinner *yacspin.Spinner,
spinner text.Spinner,
c *DeployCommand,
serviceID string,
serviceVersion int,
Expand Down Expand Up @@ -1051,7 +1050,7 @@ func processPackage(
c *DeployCommand,
hashSum, pkgPath, serviceID string,
serviceVersion int,
spinner *yacspin.Spinner,
spinner text.Spinner,
out io.Writer,
) (cont bool, err error) {
cont, err = pkgCompare(c.Globals.APIClient, serviceID, serviceVersion, hashSum, out)
Expand Down Expand Up @@ -1080,7 +1079,7 @@ func processPackage(
return true, nil
}

func processService(c *DeployCommand, serviceID string, serviceVersion int, spinner *yacspin.Spinner) error {
func processService(c *DeployCommand, serviceID string, serviceVersion int, spinner text.Spinner) error {
if c.Comment.WasSet {
_, err := c.Globals.APIClient.UpdateVersion(&fastly.UpdateVersionInput{
ServiceID: serviceID,
Expand All @@ -1096,8 +1095,8 @@ func processService(c *DeployCommand, serviceID string, serviceVersion int, spin
if err != nil {
return err
}
msg := "Activating version..."
spinner.Message(msg)
msg := "Activating version"
spinner.Message(msg + "...")

_, err = c.Globals.APIClient.ActivateVersion(&fastly.ActivateVersionInput{
ServiceID: serviceID,
Expand Down
Loading