address comments

This commit is contained in:
Janet Kuo
2015-10-13 18:48:06 -07:00
parent f39fe2056d
commit b9c8b76b6b
2 changed files with 13 additions and 8 deletions

View File

@@ -19,7 +19,6 @@ package cmd
import (
"fmt"
"io"
"text/tabwriter"
"github.com/spf13/cobra"
"k8s.io/kubernetes/pkg/api/meta"
@@ -224,7 +223,7 @@ func RunGet(f *cmdutil.Factory, out io.Writer, cmd *cobra.Command, args []string
// use the default printer for each object
printer = nil
var lastMapping *meta.RESTMapping
w := tabwriter.NewWriter(out, kubectl.TabwriterMinWidth, kubectl.TabwriterWidth, kubectl.TabwriterPadding, kubectl.TabwriterPadChar, kubectl.TabwriterFlags)
w := kubectl.GetNewTabWriter(out)
defer w.Flush()
return b.Flatten().Do().Visit(func(r *resource.Info, err error) error {
if err != nil {

View File

@@ -46,11 +46,11 @@ import (
)
const (
TabwriterMinWidth = 10
TabwriterWidth = 4
TabwriterPadding = 3
TabwriterPadChar = ' '
TabwriterFlags = 0
tabwriterMinWidth = 10
tabwriterWidth = 4
tabwriterPadding = 3
tabwriterPadChar = ' '
tabwriterFlags = 0
)
// GetPrinter takes a format type, an optional format argument. It will return true
@@ -1475,11 +1475,17 @@ func formatWideHeaders(wide bool, t reflect.Type) []string {
return nil
}
// GetNewTabWriter returns a tabwriter that translates tabbed columns in input into properly aligned text.
func GetNewTabWriter(output io.Writer) *tabwriter.Writer {
return tabwriter.NewWriter(output, tabwriterMinWidth, tabwriterWidth, tabwriterPadding, tabwriterPadChar, tabwriterFlags)
}
// PrintObj prints the obj in a human-friendly format according to the type of the obj.
func (h *HumanReadablePrinter) PrintObj(obj runtime.Object, output io.Writer) error {
// if output is a tabwriter (when it's called by kubectl get), we use it; create a new tabwriter otherwise
w, found := output.(*tabwriter.Writer)
if !found {
w = tabwriter.NewWriter(output, TabwriterMinWidth, TabwriterWidth, TabwriterPadding, TabwriterPadChar, TabwriterFlags)
w = GetNewTabWriter(output)
defer w.Flush()
}
t := reflect.TypeOf(obj)