Fix cli table not properly aligned (#516)

Co-authored-by: Luca Rinaldi <lucarin@protonmail.com>

Author: alessio-perugini

.licenses/arduino-app-cli/NOTICE

@@ -114300,6 +114300,56 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 
+*****
+github.com/jedib0t/go-pretty/v6/table@v6.6.8
+
+MIT License
+
+Copyright (c) 2018 jedib0t
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+*****
+github.com/jedib0t/go-pretty/v6/text@v6.6.8
+
+MIT License
+
+Copyright (c) 2018 jedib0t
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
 *****
 github.com/jonboulle/clockwork@v0.5.0
 
@@ -140597,7 +140647,7 @@ Apache License
    limitations under the License.
 
 *****
-github.com/rivo/uniseg@v0.4.4
+github.com/rivo/uniseg@v0.4.7
 
 MIT License
 
@@ -239012,37 +239062,6 @@ Apache License
    See the License for the specific language governing permissions and
    limitations under the License.
 
-*****
-mkuznets.com/go/tabwriter@v0.1.2
-
-Copyright (c) 2009 The Go Authors. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-* Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-* Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-* Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
 *****
 sigs.k8s.io/json@v0.0.0-20241010143419-9aa6b5e7a4b3
 

.licenses/arduino-app-cli/go/github.com/jedib0t/go-pretty/v6/table.dep.yml

@@ -0,0 +1,32 @@
+---
+name: github.com/jedib0t/go-pretty/v6/table
+version: v6.6.8
+type: go
+summary:
+homepage: https://pkg.go.dev/github.com/jedib0t/go-pretty/v6/table
+license: mit
+licenses:
+- sources: v6@v6.6.8/LICENSE
+  text: |
+    MIT License
+
+    Copyright (c) 2018 jedib0t
+
+    Permission is hereby granted, free of charge, to any person obtaining a copy
+    of this software and associated documentation files (the "Software"), to deal
+    in the Software without restriction, including without limitation the rights
+    to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+    copies of the Software, and to permit persons to whom the Software is
+    furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be included in all
+    copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+    SOFTWARE.
+notices: []

.licenses/arduino-app-cli/go/github.com/jedib0t/go-pretty/v6/text.dep.yml

@@ -0,0 +1,32 @@
+---
+name: github.com/jedib0t/go-pretty/v6/text
+version: v6.6.8
+type: go
+summary:
+homepage: https://pkg.go.dev/github.com/jedib0t/go-pretty/v6/text
+license: mit
+licenses:
+- sources: v6@v6.6.8/LICENSE
+  text: |
+    MIT License
+
+    Copyright (c) 2018 jedib0t
+
+    Permission is hereby granted, free of charge, to any person obtaining a copy
+    of this software and associated documentation files (the "Software"), to deal
+    in the Software without restriction, including without limitation the rights
+    to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+    copies of the Software, and to permit persons to whom the Software is
+    furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be included in all
+    copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+    SOFTWARE.
+notices: []

.licenses/arduino-app-cli/go/github.com/rivo/uniseg.dep.yml

@@ -1,6 +1,6 @@
 ---
 name: github.com/rivo/uniseg
-version: v0.4.4
+version: v0.4.7
 type: go
 summary: Package uniseg implements Unicode Text Segmentation, Unicode Line Breaking,
   and string width calculation for monospace fonts.

.licenses/arduino-app-cli/go/mkuznets.com/go/tabwriter.dep.yml

@@ -2,31 +2,34 @@ package app
 
 import (
 	"context"
+	"strings"
 
+	"github.com/jedib0t/go-pretty/v6/table"
 	"github.com/spf13/cobra"
 
+	"github.com/bcmi-labs/orchestrator/cmd/arduino-app-cli/internal/cmdutil"
 	"github.com/bcmi-labs/orchestrator/cmd/arduino-app-cli/internal/servicelocator"
-	"github.com/bcmi-labs/orchestrator/cmd/arduino-app-cli/results"
 	"github.com/bcmi-labs/orchestrator/cmd/feedback"
 	"github.com/bcmi-labs/orchestrator/internal/orchestrator"
+	"github.com/bcmi-labs/orchestrator/pkg/tablestyle"
 )
 
 func newListCmd() *cobra.Command {
-	var jsonFormat bool
+	var showBrokenApps bool
 
 	cmd := &cobra.Command{
 		Use:   "list",
 		Short: "List all running Python apps",
 		Run: func(cmd *cobra.Command, args []string) {
-			listHandler(cmd.Context())
+			listHandler(cmd.Context(), showBrokenApps)
 		},
 	}
 
-	cmd.Flags().BoolVarP(&jsonFormat, "json", "", false, "Output the list in json format")
+	cmd.Flags().BoolVarP(&showBrokenApps, "show-broken-apps", "", false, "Output a list of broken apps")
 	return cmd
 }
 
-func listHandler(ctx context.Context) {
+func listHandler(ctx context.Context, showBrokenApps bool) {
 	res, err := orchestrator.ListApps(ctx,
 		servicelocator.GetDockerClient(),
 		orchestrator.ListAppRequest{
@@ -39,8 +42,44 @@ func listHandler(ctx context.Context) {
 		feedback.Fatal(err.Error(), feedback.ErrGeneric)
 	}
 
-	feedback.PrintResult(results.AppListResult{
-		Apps:       res.Apps,
-		BrokenApps: res.BrokenApps,
+	feedback.PrintResult(appListResult{
+		Apps:           res.Apps,
+		BrokenApps:     res.BrokenApps,
+		showBrokenApps: showBrokenApps,
 	})
 }
+
+type appListResult struct {
+	Apps           []orchestrator.AppInfo       `json:"apps"`
+	BrokenApps     []orchestrator.BrokenAppInfo `json:"brokenApps"`
+	showBrokenApps bool
+}
+
+func (r appListResult) String() string {
+	t := table.NewWriter()
+	t.SetStyle(tablestyle.CustomCleanStyle)
+	t.AppendHeader(table.Row{"ID", "NAME", "ICON", "STATUS", "EXAMPLE"})
+
+	for _, app := range r.Apps {
+		t.AppendRow(table.Row{
+			cmdutil.IDToAlias(app.ID),
+			app.Name,
+			app.Icon,
+			app.Status,
+			app.Example,
+		})
+	}
+	if r.showBrokenApps && len(r.BrokenApps) > 0 {
+		var b strings.Builder
+		_, _ = b.WriteString("\nBROKEN APPS\n")
+		for _, app := range r.BrokenApps {
+			b.WriteString(app.Name + ": " + app.Error + "\n")
+		}
+		return t.Render() + "\n" + b.String()
+	}
+	return t.Render()
+}
+
+func (r appListResult) Data() interface{} {
+	return r
+}

cmd/arduino-app-cli/app/list.go

@@ -2,10 +2,10 @@ package app
 
 import (
 	"context"
+	"fmt"
 
 	"github.com/spf13/cobra"
 
-	"github.com/bcmi-labs/orchestrator/cmd/arduino-app-cli/results"
 	"github.com/bcmi-labs/orchestrator/cmd/feedback"
 	"github.com/bcmi-labs/orchestrator/internal/orchestrator"
 )
@@ -58,7 +58,7 @@ func createHandler(ctx context.Context, name string, icon string, noPython, noSk
 		}
 		dst := resp.ID.ToPath()
 
-		feedback.PrintResult(results.CreateAppResult{
+		feedback.PrintResult(createAppResult{
 			Result:  "ok",
 			Message: "App created successfully",
 			Path:    dst.String(),
@@ -75,11 +75,25 @@ func createHandler(ctx context.Context, name string, icon string, noPython, noSk
 			feedback.Fatal(err.Error(), feedback.ErrGeneric)
 			return nil
 		}
-		feedback.PrintResult(results.CreateAppResult{
+		feedback.PrintResult(createAppResult{
 			Result:  "ok",
 			Message: "App created successfully",
 			Path:    resp.ID.ToPath().String(),
 		})
 	}
 	return nil
 }
+
+type createAppResult struct {
+	Path    string `json:"path"`
+	Message string `json:"message"`
+	Result  string `json:"result"`
+}
+
+func (r createAppResult) String() string {
+	return fmt.Sprintf("%s: %s (%s)", r.Message, r.Path, r.Result)
+}
+
+func (r createAppResult) Data() interface{} {
+	return r
+}

cmd/arduino-app-cli/app/new.go

@@ -8,7 +8,6 @@ import (
 
 	"github.com/bcmi-labs/orchestrator/cmd/arduino-app-cli/completion"
 	"github.com/bcmi-labs/orchestrator/cmd/arduino-app-cli/internal/servicelocator"
-	"github.com/bcmi-labs/orchestrator/cmd/arduino-app-cli/results"
 	"github.com/bcmi-labs/orchestrator/cmd/feedback"
 	"github.com/bcmi-labs/orchestrator/internal/orchestrator"
 	"github.com/bcmi-labs/orchestrator/internal/orchestrator/app"
@@ -56,11 +55,25 @@ func startHandler(ctx context.Context, app app.ArduinoApp) error {
 		}
 	}
 	outputResult := getResult()
-	feedback.PrintResult(results.StartAppResult{
+	feedback.PrintResult(startAppResult{
 		AppName: app.Name,
 		Status:  "started",
 		Output:  outputResult,
 	})
 
 	return nil
 }
+
+type startAppResult struct {
+	AppName string                        `json:"appName"`
+	Status  string                        `json:"status"`
+	Output  *feedback.OutputStreamsResult `json:"output,omitempty"`
+}
+
+func (r startAppResult) String() string {
+	return fmt.Sprintf("✓ App %q started successfully", r.AppName)
+}
+
+func (r startAppResult) Data() interface{} {
+	return r
+}