Merge pull request #6189 from myself659/ipfs-object-stat

align output for the command ipfs object stat
ipfs · Apr 6, 2019 · c91e075 · c91e075
2 parents 8c1d89a + e5ef537
commit c91e075
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 10 deletions.
diff --git a/core/commands/object/object.go b/core/commands/object/object.go
@@ -347,8 +347,10 @@ var ObjectStatCmd = &cmds.Command{
 	Type: ipld.NodeStat{},
 	Encoders: cmds.EncoderMap{
 		cmds.Text: cmds.MakeTypedEncoder(func(req *cmds.Request, w io.Writer, out *ipld.NodeStat) error {
+			wtr := tabwriter.NewWriter(w, 0, 0, 1, ' ', 0)
+			defer wtr.Flush()
 			fw := func(s string, n int) {
-				fmt.Fprintf(w, "%s: %d\n", s, n)
+				fmt.Fprintf(wtr, "%s:\t%d\n", s, n)
 			}
 			fw("NumLinks", out.NumLinks)
 			fw("BlockSize", out.BlockSize)

diff --git a/test/sharness/t0051-object.sh b/test/sharness/t0051-object.sh
@@ -69,10 +69,10 @@ test_object_cmd() {
   '
 
   test_expect_success "'ipfs object get' output looks good" '
-    echo "NumLinks: 0" > expected_stat &&
-    echo "BlockSize: 18" >> expected_stat &&
-    echo "LinksSize: 2" >> expected_stat &&
-    echo "DataSize: 16" >> expected_stat &&
+    echo "NumLinks:       0" > expected_stat &&
+    echo "BlockSize:      18" >> expected_stat &&
+    echo "LinksSize:      2" >> expected_stat &&
+    echo "DataSize:       16" >> expected_stat &&
     echo "CumulativeSize: 18" >> expected_stat &&
     test_cmp expected_stat actual_stat
   '
@@ -276,11 +276,11 @@ test_object_cmd() {
   '
 
   test_expect_success "ipfs object stat output looks good" '
-    echo NumLinks: 1 > obj_stat_exp &&
-    echo BlockSize: 47 >> obj_stat_exp &&
-    echo LinksSize: 45 >> obj_stat_exp &&
-    echo DataSize: 2 >> obj_stat_exp &&
-    echo CumulativeSize: 114 >> obj_stat_exp &&
+    echo "NumLinks:       1" > obj_stat_exp &&
+    echo "BlockSize:      47" >> obj_stat_exp &&
+    echo "LinksSize:      45" >> obj_stat_exp &&
+    echo "DataSize:       2" >> obj_stat_exp &&
+    echo "CumulativeSize: 114" >> obj_stat_exp &&
 
     test_cmp obj_stat_exp obj_stat_out
   '