wrap column at some commands

hico-horiuchi · Feb 24, 2016 · 41d15f8 · 41d15f8
1 parent 59d5b23
commit 41d15f8
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 13 deletions.
diff --git a/ohgi/aggregates.go b/ohgi/aggregates.go
@@ -72,11 +72,11 @@ func GetAggregatesCheckIssued(api *sensu.API, check string, issued string, summa
 	aggregate, err := api.GetAggregatesCheckIssued(check, i, summarize, results)
 	checkError(err)
 
-	table := newUitable()
-	if summarize != "" {
+	table := newUitable(true)
+	if summarize == "output" {
 		for output, j := range aggregate.Outputs {
 			table.AddRow(
-				bold(strings.Replace(output, "\n", " ", -1)),
+				bold(formatOutput(output)+":"),
 				strconv.Itoa(j),
 			)
 		}

diff --git a/ohgi/checks.go b/ohgi/checks.go
@@ -68,7 +68,7 @@ func GetChecksCheck(api *sensu.API, name string) string {
 	check, err := api.GetChecksCheck(name)
 	checkError(err)
 
-	table := newUitable()
+	table := newUitable(true)
 	table.AddRow(bold("NAME:"), check.Name)
 	table.AddRow(bold("COMMAND:"), check.Command)
 	table.AddRow(bold("SUBSCRIBERS:"), strings.Join(check.Subscribers, ", "))

diff --git a/ohgi/clients.go b/ohgi/clients.go
@@ -67,7 +67,7 @@ func GetClientsClient(api *sensu.API, name string) string {
 	client, err := api.GetClientsClient(name)
 	checkError(err)
 
-	table := newUitable()
+	table := newUitable(true)
 	table.AddRow(bold("NAME:"), client.Name)
 	table.AddRow(bold("ADDRESS:"), client.Address)
 	table.AddRow(bold("SUBSCRIPTIONS:"), strings.Join(client.Subscriptions, ", "))

diff --git a/ohgi/events.go b/ohgi/events.go
@@ -82,7 +82,7 @@ func GetEventsClient(api *sensu.API, client string) string {
 		table.AddRow(
 			indicateStatus(event.Check.Status),
 			event.Check.Name,
-			strings.Replace(event.Check.Output, "\n", " ", -1),
+			formatOutput(event.Check.Output),
 			utoa(event.Check.Executed),
 		)
 	}
@@ -94,7 +94,7 @@ func GetEventsClientCheck(api *sensu.API, client string, check string) string {
 	event, err := api.GetEventsClientCheck(client, check)
 	checkError(err)
 
-	table := newUitable()
+	table := newUitable(true)
 	table.AddRow(bold("CLIENT:"), event.Client.Name)
 	table.AddRow(bold("ADDRESS:"), event.Client.Address)
 	table.AddRow(bold("SUBSCRIPTIONS:"), strings.Join(event.Client.Subscriptions, ", "))
@@ -106,7 +106,7 @@ func GetEventsClientCheck(api *sensu.API, client string, check string) string {
 	table.AddRow(bold("HANDLERS:"), strings.Join(event.Check.Handlers, ", "))
 	table.AddRow(bold("ISSUED:"), utoa(event.Check.Issued))
 	table.AddRow(bold("EXECUTED:"), utoa(event.Check.Executed))
-	table.AddRow(bold("OUTPUT:"), strings.Replace(event.Check.Output, "\n", " ", -1))
+	table.AddRow(bold("OUTPUT:"), formatOutput(event.Check.Output))
 	table.AddRow(bold("STATUS:"), colorStatus(event.Check.Status))
 	table.AddRow(bold("DURATION:"), strconv.FormatFloat(event.Check.Duration, 'f', 3, 64))
 	table.AddRow(bold("HISTORY:"), colorHistory(strings.Join(event.Check.History, ", ")))

diff --git a/ohgi/info.go b/ohgi/info.go
@@ -11,7 +11,7 @@ func GetInfo(api *sensu.API) string {
 	info, err := api.GetInfo()
 	checkError(err)
 
-	table := newUitable()
+	table := newUitable(true)
 	table.AddRow(bold("VERSION:"), info.Sensu.Version)
 	table.AddRow(bold("TRANSPORT:"), strconv.FormatBool(info.Transport.Connected))
 	table.AddRow(bold("REDIS:"), strconv.FormatBool(info.Redis.Connected))

diff --git a/ohgi/results.go b/ohgi/results.go
@@ -80,7 +80,7 @@ func GetResultsClient(api *sensu.API, client string) string {
 		table.AddRow(
 			indicateStatus(result.Check.Status),
 			result.Check.Name,
-			strings.Replace(result.Check.Output, "\n", " ", -1),
+			formatOutput(result.Check.Output),
 			utoa(result.Check.Executed),
 		)
 	}
@@ -92,7 +92,7 @@ func GetResultsClientCheck(api *sensu.API, client string, check string) string {
 	result, err := api.GetResultsClientCheck(client, check)
 	checkError(err)
 
-	table := newUitable()
+	table := newUitable(true)
 	table.AddRow(bold("CLIENT:"), result.Client)
 	table.AddRow(bold("CHECK:"), result.Check.Name)
 	table.AddRow(bold("COMMAND:"), result.Check.Command)
@@ -101,7 +101,7 @@ func GetResultsClientCheck(api *sensu.API, client string, check string) string {
 	table.AddRow(bold("HANDLERS:"), strings.Join(result.Check.Handlers, ", "))
 	table.AddRow(bold("ISSUED:"), utoa(result.Check.Issued))
 	table.AddRow(bold("EXECUTED:"), utoa(result.Check.Executed))
-	table.AddRow(bold("OUTPUT:"), strings.Replace(result.Check.Output, "\n", " ", -1))
+	table.AddRow(bold("OUTPUT:"), formatOutput(result.Check.Output))
 	table.AddRow(bold("STATUS:"), colorStatus(result.Check.Status))
 	table.AddRow(bold("DURATION:"), strconv.FormatFloat(result.Check.Duration, 'f', 3, 64))
 

diff --git a/ohgi/utilities.go b/ohgi/utilities.go
@@ -5,6 +5,7 @@ import (
 	"os"
 	"regexp"
 	"strconv"
+	"strings"
 
 	"github.com/hico-horiuchi/uitable"
 )
@@ -16,13 +17,20 @@ func checkError(err error) {
 	}
 }
 
-func newUitable() *uitable.Table {
+func newUitable(wrap ...bool) *uitable.Table {
 	table := uitable.New()
 	table.MaxColWidth = uint(terminalWidth / 2)
+	if wrap != nil && len(wrap) > 0 && wrap[0] {
+		table.Wrap = true
+	}
 
 	return table
 }
 
+func formatOutput(output string) string {
+	return strings.TrimSpace(strings.Replace(output, "\n", " ", -1))
+}
+
 func indicateStatus(status int) string {
 	if !escapeSequence {
 		return strconv.Itoa(status)