Merge branch '2-fix-new-lines-must-use-rn-on-windows'

eleven-sh · Nov 1, 2022 · d243fb0 · d243fb0
2 parents ebcb32f + e09ebea
commit d243fb0
Show file tree

Hide file tree

Showing 21 changed files with 129 additions and 50 deletions.
diff --git a/internal/dependencies/aws_edit.go b/internal/dependencies/aws_edit.go
@@ -44,6 +44,8 @@ func provideAWSEditFeature(
 			awsServiceBuilderSet,
 			awsViewableErrorBuilder,
 
+			loggerSet,
+
 			stepperSet,
 
 			vscodeProcessManagerSet,

diff --git a/internal/dependencies/aws_remove.go b/internal/dependencies/aws_remove.go
@@ -44,6 +44,8 @@ func provideAWSRemoveFeature(
 			awsServiceBuilderSet,
 			awsViewableErrorBuilder,
 
+			loggerSet,
+
 			stepperSet,
 
 			wire.Bind(new(features.RemoveOutputHandler), new(featuresCLI.RemoveOutputHandler)),

diff --git a/internal/dependencies/aws_serve.go b/internal/dependencies/aws_serve.go
@@ -44,6 +44,8 @@ func provideAWSServeFeature(
 			awsServiceBuilderSet,
 			awsViewableErrorBuilder,
 
+			loggerSet,
+
 			stepperSet,
 
 			agentSet,

diff --git a/internal/dependencies/aws_uninstall.go b/internal/dependencies/aws_uninstall.go
@@ -44,6 +44,8 @@ func provideAWSUninstallFeature(
 			awsServiceBuilderSet,
 			awsViewableErrorBuilder,
 
+			loggerSet,
+
 			stepperSet,
 
 			wire.Bind(new(features.UninstallOutputHandler), new(featuresCLI.UninstallOutputHandler)),

diff --git a/internal/dependencies/aws_unserve.go b/internal/dependencies/aws_unserve.go
@@ -44,6 +44,8 @@ func provideAWSUnserveFeature(
 			awsServiceBuilderSet,
 			awsViewableErrorBuilder,
 
+			loggerSet,
+
 			stepperSet,
 
 			agentSet,

diff --git a/internal/dependencies/hetzner_edit.go b/internal/dependencies/hetzner_edit.go
@@ -48,6 +48,8 @@ func provideHetznerEditFeature(
 			hetznerServiceBuilderSet,
 			hetznerViewableErrorBuilder,
 
+			loggerSet,
+
 			stepperSet,
 
 			vscodeProcessManagerSet,

diff --git a/internal/dependencies/hetzner_remove.go b/internal/dependencies/hetzner_remove.go
@@ -48,6 +48,8 @@ func provideHetznerRemoveFeature(
 			hetznerServiceBuilderSet,
 			hetznerViewableErrorBuilder,
 
+			loggerSet,
+
 			stepperSet,
 
 			wire.Bind(new(features.RemoveOutputHandler), new(featuresCLI.RemoveOutputHandler)),

diff --git a/internal/dependencies/hetzner_serve.go b/internal/dependencies/hetzner_serve.go
@@ -48,6 +48,8 @@ func provideHetznerServeFeature(
 			hetznerServiceBuilderSet,
 			hetznerViewableErrorBuilder,
 
+			loggerSet,
+
 			stepperSet,
 
 			agentSet,

diff --git a/internal/dependencies/hetzner_uninstall.go b/internal/dependencies/hetzner_uninstall.go
@@ -48,6 +48,8 @@ func provideHetznerUninstallFeature(
 			hetznerServiceBuilderSet,
 			hetznerViewableErrorBuilder,
 
+			loggerSet,
+
 			stepperSet,
 
 			wire.Bind(new(features.UninstallOutputHandler), new(featuresCLI.UninstallOutputHandler)),

diff --git a/internal/dependencies/hetzner_unserve.go b/internal/dependencies/hetzner_unserve.go
@@ -48,6 +48,8 @@ func provideHetznerUnserveFeature(
 			hetznerServiceBuilderSet,
 			hetznerViewableErrorBuilder,
 
+			loggerSet,
+
 			stepperSet,
 
 			agentSet,

diff --git a/internal/dependencies/wire_gen.go b/internal/dependencies/wire_gen.go
diff --git a/internal/exceptions/cmd.go b/internal/exceptions/cmd.go
@@ -21,3 +21,12 @@ type ErrMissingRequirements struct {
 func (ErrMissingRequirements) Error() string {
 	return "ErrMissingRequirements"
 }
+
+type ErrVSCodeError struct {
+	Logs         string
+	ErrorMessage string
+}
+
+func (ErrVSCodeError) Error() string {
+	return "ErrVSCodeError"
+}
diff --git a/internal/features/init.go b/internal/features/init.go
@@ -2,7 +2,6 @@ package features
 
 import (
 	"encoding/json"
-	"fmt"
 	"io"
 	"strconv"
 
@@ -218,7 +217,8 @@ func (i InitOutputHandler) HandleOutput(output features.InitOutput) error {
 
 					if err != nil {
 						stepper.StopCurrentStep()
-						return fmt.Errorf(logs + "\n\n" + err.Error())
+						i.logger.Log(logs)
+						return err
 					}
 
 					if len(reply.LogLineHeader) > 0 {

diff --git a/internal/features/login.go b/internal/features/login.go
@@ -165,17 +165,17 @@ func (l LoginFeature) Execute(input LoginInput) error {
 	l.logger.Log(bold("\nYou will be taken to your browser to connect your GitHub account...\n"))
 
 	l.logger.Info("If your browser doesn't open automatically, go to the following link:\n")
-	l.logger.Log("%s", gitHubOAuthAuthorizeURL)
+	l.logger.Log("%s\n", gitHubOAuthAuthorizeURL)
 
 	l.sleeper.Sleep(4 * time.Second)
 
 	if err := l.browser.OpenURL(gitHubOAuthAuthorizeURL); err != nil {
 		l.logger.Error(
-			"\nCannot open browser! Please visit above URL ↑",
+			"Cannot open browser! Please visit above URL ↑\n",
 		)
 	}
 
-	l.logger.Warning("\nWaiting for GitHub authorization... (Press Ctrl-C to quit)\n")
+	l.logger.Warning("Waiting for GitHub authorization... (Press Ctrl-C to quit)\n")
 
 	select {
 	case httpServerServeError := <-httpServerServeErrorChan:

diff --git a/internal/presenters/errors.go b/internal/presenters/errors.go
@@ -260,6 +260,14 @@ func (ElevenViewableErrorBuilder) Build(err error) (viewableError *views.Viewabl
 		return
 	}
 
+	if typedError, ok := err.(exceptions.ErrVSCodeError); ok {
+		viewableError.Title = "Visual Studio Code CLI error"
+		viewableError.Logs = typedError.Logs
+		viewableError.Message = typedError.ErrorMessage
+
+		return
+	}
+
 	if typedError, ok := err.(entities.ErrUnresolvableDomain); ok {
 		viewableError.Title = "Unresolvable domain name"
 		viewableError.Message = fmt.Sprintf(

diff --git a/internal/stepper/step.go b/internal/stepper/step.go
@@ -1,12 +1,12 @@
 package stepper
 
 import (
-	"fmt"
-
 	"github.com/briandowns/spinner"
+	"github.com/eleven-sh/cli/internal/interfaces"
 )
 
 type Step struct {
+	logger          interfaces.Logger
 	spin            *spinner.Spinner
 	removeAfterDone bool
 }
@@ -15,6 +15,6 @@ func (s *Step) Done() {
 	s.spin.Stop()
 
 	if !s.removeAfterDone {
-		fmt.Println(s.spin.Prefix + "... done")
+		s.logger.Log(s.spin.Prefix + "... done")
 	}
 }
diff --git a/internal/stepper/stepper.go b/internal/stepper/stepper.go
@@ -1,20 +1,27 @@
 package stepper
 
 import (
-	"fmt"
 	"time"
 
 	"github.com/briandowns/spinner"
 	"github.com/eleven-sh/cli/internal/config"
+	"github.com/eleven-sh/cli/internal/interfaces"
 	"github.com/eleven-sh/eleven/stepper"
 )
 
 var currentStep *Step
 
-type Stepper struct{}
+type Stepper struct {
+	logger interfaces.Logger
+}
+
+func NewStepper(
+	logger interfaces.Logger,
+) Stepper {
 
-func NewStepper() Stepper {
-	return Stepper{}
+	return Stepper{
+		logger: logger,
+	}
 }
 
 func (s Stepper) startStep(
@@ -24,7 +31,7 @@ func (s Stepper) startStep(
 ) stepper.Step {
 
 	if currentStep == nil && !noNewLineAtStart {
-		fmt.Println("")
+		s.logger.Log("")
 	}
 
 	if currentStep != nil {
@@ -39,6 +46,7 @@ func (s Stepper) startStep(
 	spin.Start()
 
 	currentStep = &Step{
+		logger:          s.logger,
 		spin:            spin,
 		removeAfterDone: removeAfterDone,
 	}

diff --git a/internal/system/displayer.go b/internal/system/displayer.go
@@ -12,5 +12,9 @@ func NewDisplayer() Displayer {
 }
 
 func (Displayer) Display(w io.Writer, format string, args ...interface{}) {
-	fmt.Fprintf(w, format, args...)
+	toDisplay := replaceNewLinesForOS(
+		fmt.Sprintf(format, args...),
+	)
+
+	fmt.Fprint(w, toDisplay)
 }