vendor: update dependencies with github.com/kardianos/govendor

vendor/github.com/gizak/termui/.gitignore

@@ -1,26 +0,0 @@
-# Compiled Object files, Static and Dynamic libs (Shared Objects)
-*.o
-*.a
-*.so
-
-# Folders
-_obj
-_test
-
-# Architecture specific extensions/prefixes
-*.[568vq]
-[568vq].out
-
-*.cgo1.go
-*.cgo2.c
-_cgo_defun.c
-_cgo_gotypes.go
-_cgo_export.*
-
-_testmain.go
-
-*.exe
-*.test
-*.prof
-.DS_Store
-/vendor

vendor/github.com/gizak/termui/.travis.yml

@@ -1,6 +0,0 @@
-language: go
-
-go:
-  - tip
-
-script: go test -v ./

vendor/github.com/gizak/termui/README.md

@@ -131,6 +131,7 @@ Click image to see the corresponding demo codes.
 [<img src="./_example/barchart.png" alt="barchart" type="image/png" width="45%">](https://github.com/gizak/termui/blob/master/_example/barchart.go)
 [<img src="./_example/mbarchart.png" alt="barchart" type="image/png" width="45%">](https://github.com/gizak/termui/blob/master/_example/mbarchart.go)
 [<img src="./_example/sparklines.png" alt="sparklines" type="image/png" width="45%">](https://github.com/gizak/termui/blob/master/_example/sparklines.go)
+[<img src="./_example/table.png" alt="table" type="image/png" width="45%">](https://github.com/gizak/termui/blob/master/_example/table.go)
 
 ## GoDoc
 

vendor/github.com/gizak/termui/barchart.go

@@ -1,4 +1,4 @@
-// Copyright 2016 Zack Guo <zack.y.guo@gmail.com>. All rights reserved.
+// Copyright 2017 Zack Guo <zack.y.guo@gmail.com>. All rights reserved.
 // Use of this source code is governed by a MIT license that can
 // be found in the LICENSE file.
 

vendor/github.com/gizak/termui/block.go

@@ -1,4 +1,4 @@
-// Copyright 2016 Zack Guo <zack.y.guo@gmail.com>. All rights reserved.
+// Copyright 2017 Zack Guo <zack.y.guo@gmail.com>. All rights reserved.
 // Use of this source code is governed by a MIT license that can
 // be found in the LICENSE file.
 

vendor/github.com/gizak/termui/block_common.go

@@ -1,4 +1,4 @@
-// Copyright 2016 Zack Guo <zack.y.guo@gmail.com>. All rights reserved.
+// Copyright 2017 Zack Guo <zack.y.guo@gmail.com>. All rights reserved.
 // Use of this source code is governed by a MIT license that can
 // be found in the LICENSE file.
 

vendor/github.com/gizak/termui/block_windows.go

@@ -1,4 +1,4 @@
-// Copyright 2016 Zack Guo <zack.y.guo@gmail.com>. All rights reserved.
+// Copyright 2017 Zack Guo <zack.y.guo@gmail.com>. All rights reserved.
 // Use of this source code is governed by a MIT license that can
 // be found in the LICENSE file.
 

vendor/github.com/gizak/termui/buffer.go

@@ -1,4 +1,4 @@
-// Copyright 2016 Zack Guo <zack.y.guo@gmail.com>. All rights reserved.
+// Copyright 2017 Zack Guo <zack.y.guo@gmail.com>. All rights reserved.
 // Use of this source code is governed by a MIT license that can
 // be found in the LICENSE file.
 

vendor/github.com/gizak/termui/canvas.go

@@ -1,4 +1,4 @@
-// Copyright 2016 Zack Guo <zack.y.guo@gmail.com>. All rights reserved.
+// Copyright 2017 Zack Guo <zack.y.guo@gmail.com>. All rights reserved.
 // Use of this source code is governed by a MIT license that can
 // be found in the LICENSE file.
 

vendor/github.com/gizak/termui/config.py

@@ -1,35 +1,10 @@
 #!/usr/bin/env python3
 
-# use v6;
-#
-# my $copyright = '// Copyright 2016 Zack Guo <gizak@icloud.com>. All rights reserved.
-# // Use of this source code is governed by a MIT license that can
-# // be found in the LICENSE file.
-#
-# ';
-#
-# sub MAIN('update-docstr', Str $srcp) {
-#     if $srcp.IO.f {
-#         $_ = $srcp.IO.slurp;
-#         if m/^ \/\/\s Copyright .+? \n\n/ {
-#             unless ~$/ eq $copyright {
-#                 s/^ \/\/\s Copyright .+? \n\n /$copyright/;
-#                 spurt $srcp, $_;
-#                 say "[updated] doc string for:"~$srcp;
-#             }
-#         } else {
-#             say "[added] doc string for "~$srcp~" (no match found)";
-#             $_ = $copyright ~ $_;
-#             spurt $srcp, $_;
-#         }
-#     }
-# }
-
 import re
 import os
 import io
 
-copyright = """// Copyright 2016 Zack Guo <zack.y.guo@gmail.com>. All rights reserved.
+copyright = """// Copyright 2017 Zack Guo <zack.y.guo@gmail.com>. All rights reserved.
 // Use of this source code is governed by a MIT license that can
 // be found in the LICENSE file.
 

vendor/github.com/gizak/termui/doc.go

@@ -1,4 +1,4 @@
-// Copyright 2016 Zack Guo <zack.y.guo@gmail.com>. All rights reserved.
+// Copyright 2017 Zack Guo <zack.y.guo@gmail.com>. All rights reserved.
 // Use of this source code is governed by a MIT license that can
 // be found in the LICENSE file.
 

vendor/github.com/gizak/termui/events.go

@@ -1,4 +1,4 @@
-// Copyright 2016 Zack Guo <zack.y.guo@gmail.com>. All rights reserved.
+// Copyright 2017 Zack Guo <zack.y.guo@gmail.com>. All rights reserved.
 // Use of this source code is governed by a MIT license that can
 // be found in the LICENSE file.
 
@@ -221,6 +221,7 @@ func findMatch(mux map[string]func(Event), path string) string {
 	return pattern
 
 }
+
 // Remove all existing defined Handlers from the map
 func (es *EvtStream) ResetHandlers() {
 	for Path, _ := range es.Handlers {
@@ -309,7 +310,7 @@ func NewTimerCh(du time.Duration) chan Event {
 	return t
 }
 
-var DefualtHandler = func(e Event) {
+var DefaultHandler = func(e Event) {
 }
 
 var usrEvtCh = make(chan Event)

vendor/github.com/gizak/termui/gauge.go

@@ -1,4 +1,4 @@
-// Copyright 2016 Zack Guo <zack.y.guo@gmail.com>. All rights reserved.
+// Copyright 2017 Zack Guo <zack.y.guo@gmail.com>. All rights reserved.
 // Use of this source code is governed by a MIT license that can
 // be found in the LICENSE file.
 

vendor/github.com/gizak/termui/grid.go

@@ -1,4 +1,4 @@
-// Copyright 2016 Zack Guo <zack.y.guo@gmail.com>. All rights reserved.
+// Copyright 2017 Zack Guo <zack.y.guo@gmail.com>. All rights reserved.
 // Use of this source code is governed by a MIT license that can
 // be found in the LICENSE file.
 

vendor/github.com/gizak/termui/helper.go

@@ -1,4 +1,4 @@
-// Copyright 2016 Zack Guo <zack.y.guo@gmail.com>. All rights reserved.
+// Copyright 2017 Zack Guo <zack.y.guo@gmail.com>. All rights reserved.
 // Use of this source code is governed by a MIT license that can
 // be found in the LICENSE file.
 

vendor/github.com/gizak/termui/linechart.go

@@ -1,4 +1,4 @@
-// Copyright 2016 Zack Guo <zack.y.guo@gmail.com>. All rights reserved.
+// Copyright 2017 Zack Guo <zack.y.guo@gmail.com>. All rights reserved.
 // Use of this source code is governed by a MIT license that can
 // be found in the LICENSE file.
 

vendor/github.com/gizak/termui/linechart_others.go

@@ -1,4 +1,4 @@
-// Copyright 2016 Zack Guo <zack.y.guo@gmail.com>. All rights reserved.
+// Copyright 2017 Zack Guo <zack.y.guo@gmail.com>. All rights reserved.
 // Use of this source code is governed by a MIT license that can
 // be found in the LICENSE file.
 

vendor/github.com/gizak/termui/linechart_windows.go

@@ -1,4 +1,4 @@
-// Copyright 2016 Zack Guo <zack.y.guo@gmail.com>. All rights reserved.
+// Copyright 2017 Zack Guo <zack.y.guo@gmail.com>. All rights reserved.
 // Use of this source code is governed by a MIT license that can
 // be found in the LICENSE file.
 

vendor/github.com/gizak/termui/list.go

@@ -1,4 +1,4 @@
-// Copyright 2016 Zack Guo <zack.y.guo@gmail.com>. All rights reserved.
+// Copyright 2017 Zack Guo <zack.y.guo@gmail.com>. All rights reserved.
 // Use of this source code is governed by a MIT license that can
 // be found in the LICENSE file.
 

vendor/github.com/gizak/termui/mbarchart.go

@@ -1,4 +1,4 @@
-// Copyright 2016 Zack Guo <zack.y.guo@gmail.com>. All rights reserved.
+// Copyright 2017 Zack Guo <zack.y.guo@gmail.com>. All rights reserved.
 // Use of this source code is governed by a MIT license that can
 // be found in the LICENSE file.
 

vendor/github.com/gizak/termui/par.go

@@ -1,4 +1,4 @@
-// Copyright 2016 Zack Guo <zack.y.guo@gmail.com>. All rights reserved.
+// Copyright 2017 Zack Guo <zack.y.guo@gmail.com>. All rights reserved.
 // Use of this source code is governed by a MIT license that can
 // be found in the LICENSE file.
 

vendor/github.com/gizak/termui/pos.go

@@ -1,4 +1,4 @@
-// Copyright 2016 Zack Guo <zack.y.guo@gmail.com>. All rights reserved.
+// Copyright 2017 Zack Guo <zack.y.guo@gmail.com>. All rights reserved.
 // Use of this source code is governed by a MIT license that can
 // be found in the LICENSE file.
 

vendor/github.com/gizak/termui/render.go

@@ -1,4 +1,4 @@
-// Copyright 2016 Zack Guo <zack.y.guo@gmail.com>. All rights reserved.
+// Copyright 2017 Zack Guo <zack.y.guo@gmail.com>. All rights reserved.
 // Use of this source code is governed by a MIT license that can
 // be found in the LICENSE file.
 
@@ -51,7 +51,7 @@ func Init() error {
 	DefaultEvtStream.Merge("timer", NewTimerCh(time.Second))
 	DefaultEvtStream.Merge("custom", usrEvtCh)
 
-	DefaultEvtStream.Handle("/", DefualtHandler)
+	DefaultEvtStream.Handle("/", DefaultHandler)
 	DefaultEvtStream.Handle("/sys/wnd/resize", func(e Event) {
 		w := e.Data.(EvtWnd)
 		Body.Width = w.Width

vendor/github.com/gizak/termui/sparkline.go

@@ -1,4 +1,4 @@
-// Copyright 2016 Zack Guo <zack.y.guo@gmail.com>. All rights reserved.
+// Copyright 2017 Zack Guo <zack.y.guo@gmail.com>. All rights reserved.
 // Use of this source code is governed by a MIT license that can
 // be found in the LICENSE file.
 

vendor/github.com/gizak/termui/table.go

@@ -1,10 +1,32 @@
+// Copyright 2017 Zack Guo <zack.y.guo@gmail.com>. All rights reserved.
+// Use of this source code is governed by a MIT license that can
+// be found in the LICENSE file.
+
 package termui
 
 import "strings"
 
-/*
+/* Table is like:
+
+┌Awesome Table ────────────────────────────────────────────────┐
+│  Col0          | Col1 | Col2 | Col3  | Col4  | Col5  | Col6  |
+│──────────────────────────────────────────────────────────────│
+│  Some Item #1  | AAA  | 123  | CCCCC | EEEEE | GGGGG | IIIII |
+│──────────────────────────────────────────────────────────────│
+│  Some Item #2  | BBB  | 456  | DDDDD | FFFFF | HHHHH | JJJJJ |
+└──────────────────────────────────────────────────────────────┘
+
+Datapoints are a two dimensional array of strings: [][]string
+
+Example:
+	data := [][]string{
+		{"Col0", "Col1", "Col3", "Col4", "Col5", "Col6"},
+		{"Some Item #1", "AAA", "123", "CCCCC", "EEEEE", "GGGGG", "IIIII"},
+		{"Some Item #2", "BBB", "456", "DDDDD", "FFFFF", "HHHHH", "JJJJJ"},
+	}
+
 	table := termui.NewTable()
-	table.Rows = rows
+	table.Rows = data  // type [][]string
 	table.FgColor = termui.ColorWhite
 	table.BgColor = termui.ColorDefault
 	table.Height = 7
@@ -14,6 +36,7 @@ import "strings"
 	table.Border = true
 */
 
+// Table tracks all the attributes of a Table instance
 type Table struct {
 	Block
 	Rows      [][]string
@@ -22,22 +45,34 @@ type Table struct {
 	BgColor   Attribute
 	FgColors  []Attribute
 	BgColors  []Attribute
-	Seperator bool
+	Separator bool
 	TextAlign Align
 }
 
+// NewTable returns a new Table instance
 func NewTable() *Table {
 	table := &Table{Block: *NewBlock()}
 	table.FgColor = ColorWhite
 	table.BgColor = ColorDefault
-	table.Seperator = true
+	table.Separator = true
 	return table
 }
 
-func (table *Table) Analysis() {
+// CellsWidth calculates the width of a cell array and returns an int
+func cellsWidth(cells []Cell) int {
+	width := 0
+	for _, c := range cells {
+		width += c.Width()
+	}
+	return width
+}
+
+// Analysis generates and returns an array of []Cell that represent all columns in the Table
+func (table *Table) Analysis() [][]Cell {
+	var rowCells [][]Cell
 	length := len(table.Rows)
 	if length < 1 {
-		return
+		return rowCells
 	}
 
 	if len(table.FgColors) == 0 {
@@ -47,121 +82,101 @@ func (table *Table) Analysis() {
 		table.BgColors = make([]Attribute, len(table.Rows))
 	}
 
-	row_width := len(table.Rows[0])
-	cellWidthes := make([]int, row_width)
+	cellWidths := make([]int, len(table.Rows[0]))
 
-	for index, row := range table.Rows {
-		for i, str := range row {
-			if cellWidthes[i] < len(str) {
-				cellWidthes[i] = len(str)
+	for y, row := range table.Rows {
+		if table.FgColors[y] == 0 {
+			table.FgColors[y] = table.FgColor
+		}
+		if table.BgColors[y] == 0 {
+			table.BgColors[y] = table.BgColor
+		}
+		for x, str := range row {
+			cells := DefaultTxBuilder.Build(str, table.FgColors[y], table.BgColors[y])
+			cw := cellsWidth(cells)
+			if cellWidths[x] < cw {
+				cellWidths[x] = cw
 			}
-		}
-
-		if table.FgColors[index] == 0 {
-			table.FgColors[index] = table.FgColor
-		}
-
-		if table.BgColors[index] == 0 {
-			table.BgColors[index] = table.BgColor
+			rowCells = append(rowCells, cells)
 		}
 	}
-
-	table.CellWidth = cellWidthes
-
-	//width_sum := 2
-	//for i, width := range cellWidthes {
-	//	width_sum += (width + 2)
-	//	for u, row := range table.Rows {
-	//		switch table.TextAlign {
-	//		case "right":
-	//			row[i] = fmt.Sprintf(" %*s ", width, table.Rows[u][i])
-	//		case "center":
-	//			word_width := len(table.Rows[u][i])
-	//			offset := (width - word_width) / 2
-	//			row[i] = fmt.Sprintf(" %*s ", width, fmt.Sprintf("%-*s", offset+word_width, table.Rows[u][i]))
-	//		default: // left
-	//			row[i] = fmt.Sprintf(" %-*s ", width, table.Rows[u][i])
-	//		}
-	//	}
-	//}
-
-	//if table.Width == 0 {
-	//	table.Width = width_sum
-	//}
+	table.CellWidth = cellWidths
+	return rowCells
 }
 
+// SetSize calculates the table size and sets the internal value
 func (table *Table) SetSize() {
 	length := len(table.Rows)
-	if table.Seperator {
+	if table.Separator {
 		table.Height = length*2 + 1
 	} else {
 		table.Height = length + 2
 	}
 	table.Width = 2
 	if length != 0 {
-		for _, cell_width := range table.CellWidth {
-			table.Width += cell_width + 3
+		for _, cellWidth := range table.CellWidth {
+			table.Width += cellWidth + 3
 		}
 	}
 }
 
-func (table *Table) CalculatePosition(x int, y int, x_coordinate *int, y_coordibate *int, cell_beginning *int) {
-	if table.Seperator {
-		*y_coordibate = table.innerArea.Min.Y + y*2
+// CalculatePosition ...
+func (table *Table) CalculatePosition(x int, y int, coordinateX *int, coordinateY *int, cellStart *int) {
+	if table.Separator {
+		*coordinateY = table.innerArea.Min.Y + y*2
 	} else {
-		*y_coordibate = table.innerArea.Min.Y + y
+		*coordinateY = table.innerArea.Min.Y + y
 	}
 	if x == 0 {
-		*cell_beginning = table.innerArea.Min.X
+		*cellStart = table.innerArea.Min.X
 	} else {
-		*cell_beginning += table.CellWidth[x-1] + 3
+		*cellStart += table.CellWidth[x-1] + 3
 	}
 
 	switch table.TextAlign {
 	case AlignRight:
-		*x_coordinate = *cell_beginning + (table.CellWidth[x] - len(table.Rows[y][x])) + 2
+		*coordinateX = *cellStart + (table.CellWidth[x] - len(table.Rows[y][x])) + 2
 	case AlignCenter:
-		*x_coordinate = *cell_beginning + (table.CellWidth[x]-len(table.Rows[y][x]))/2 + 2
+		*coordinateX = *cellStart + (table.CellWidth[x]-len(table.Rows[y][x]))/2 + 2
 	default:
-		*x_coordinate = *cell_beginning + 2
+		*coordinateX = *cellStart + 2
 	}
 }
 
+// Buffer ...
 func (table *Table) Buffer() Buffer {
 	buffer := table.Block.Buffer()
-	table.Analysis()
-
-	pointer_x := table.innerArea.Min.X + 2
-	pointer_y := table.innerArea.Min.Y
-	border_pointer_x := table.innerArea.Min.X
+	rowCells := table.Analysis()
+	pointerX := table.innerArea.Min.X + 2
+	pointerY := table.innerArea.Min.Y
+	borderPointerX := table.innerArea.Min.X
 	for y, row := range table.Rows {
-		for x, cell := range row {
-			table.CalculatePosition(x, y, &pointer_x, &pointer_y, &border_pointer_x)
-			backgraound := DefaultTxBuilder.Build(strings.Repeat(" ", table.CellWidth[x]+3), table.BgColors[y], table.BgColors[y])
-			cells := DefaultTxBuilder.Build(cell, table.FgColors[y], table.BgColors[y])
-
-			for i, back := range backgraound {
-				buffer.Set(border_pointer_x+i, pointer_y, back)
+		for x := range row {
+			table.CalculatePosition(x, y, &pointerX, &pointerY, &borderPointerX)
+			background := DefaultTxBuilder.Build(strings.Repeat(" ", table.CellWidth[x]+3), table.BgColors[y], table.BgColors[y])
+			cells := rowCells[y*len(row)+x]
+			for i, back := range background {
+				buffer.Set(borderPointerX+i, pointerY, back)
 			}
 
-			coordinate_x := pointer_x
+			coordinateX := pointerX
 			for _, printer := range cells {
-				buffer.Set(coordinate_x, pointer_y, printer)
-				coordinate_x += printer.Width()
+				buffer.Set(coordinateX, pointerY, printer)
+				coordinateX += printer.Width()
 			}
 
 			if x != 0 {
-				devidors := DefaultTxBuilder.Build("|", table.FgColors[y], table.BgColors[y])
-				for _, devidor := range devidors {
-					buffer.Set(border_pointer_x, pointer_y, devidor)
+				dividors := DefaultTxBuilder.Build("|", table.FgColors[y], table.BgColors[y])
+				for _, dividor := range dividors {
+					buffer.Set(borderPointerX, pointerY, dividor)
 				}
 			}
 		}
 
-		if table.Seperator {
+		if table.Separator {
 			border := DefaultTxBuilder.Build(strings.Repeat("─", table.Width-2), table.FgColor, table.BgColor)
 			for i, cell := range border {
-				buffer.Set(i+1, pointer_y+1, cell)
+				buffer.Set(i+1, pointerY+1, cell)
 			}
 		}
 	}

vendor/github.com/gizak/termui/textbuilder.go

@@ -1,4 +1,4 @@
-// Copyright 2016 Zack Guo <zack.y.guo@gmail.com>. All rights reserved.
+// Copyright 2017 Zack Guo <zack.y.guo@gmail.com>. All rights reserved.
 // Use of this source code is governed by a MIT license that can
 // be found in the LICENSE file.
 

vendor/github.com/gizak/termui/theme.go

@@ -1,4 +1,4 @@
-// Copyright 2016 Zack Guo <zack.y.guo@gmail.com>. All rights reserved.
+// Copyright 2017 Zack Guo <zack.y.guo@gmail.com>. All rights reserved.
 // Use of this source code is governed by a MIT license that can
 // be found in the LICENSE file.
 

vendor/github.com/gizak/termui/widget.go

@@ -1,4 +1,4 @@
-// Copyright 2016 Zack Guo <zack.y.guo@gmail.com>. All rights reserved.
+// Copyright 2017 Zack Guo <zack.y.guo@gmail.com>. All rights reserved.
 // Use of this source code is governed by a MIT license that can
 // be found in the LICENSE file.