Version 2.1

Merge pull request #16 from muhammadmuzzammil1998/version-2.1

.dist/build.sh

@@ -27,7 +27,7 @@ cd ..
 rm -rf bin deb
 mkdir bin
 
-version=2.0
+version=2.1
 maintainer="Muhammad Muzzammil <email@muzzammil.xyz>"
 url="https://github.com/muhammadmuzzammil1998/catsay/"
 desc="catsay is a program that generates pictures of a cat holding a sign with a message."
@@ -91,5 +91,6 @@ done
 
 echo -e "\n\nPacking binaries..."
 tar -zcvf .dist/catsay-binaries.tar.gz bin > /dev/null
-
+file .dist/catsay-binaries.tar.gz >> bin/BIN_INFO
+mv bin/BIN_INFO .dist/BIN_INFO
 rm -rf bin

.gitignore

@@ -13,3 +13,5 @@ catsay
 
 # Output of the go coverage tool, specifically when used with LiteIDE
 *.out
+
+.dist/BIN_INFO

.travis.yml

@@ -8,6 +8,7 @@ go:
   - master
 
 before_script:
+  - go get -d
   - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
   - chmod +x ./cc-test-reporter
   - ./cc-test-reporter before-build

README.md

@@ -9,6 +9,7 @@ Requires [git](https://git-scm.com/download/win) to clone and [Go](https://golan
 ```bash
 $ git clone https://github.com/muhammadmuzzammil1998/catsay.git
 $ cd catsay
+$ go get -d
 $ go build
 ```
 
@@ -57,3 +58,6 @@ Start PowerShell as an admin
 ```ps
 $ del C:\Windows\catsay.exe
 ```
+## Contributors
+
+- **[@mattn](https://github.com/mattn)** - Fixed width for multi-byte strings *([#14](https://github.com/muhammadmuzzammil1998/catsay/pull/14))*

app.go

@@ -31,7 +31,8 @@ import (
 	"io"
 	"os"
 	"strings"
-	"unicode/utf8"
+
+	"github.com/mattn/go-runewidth"
 )
 
 //Defining a main cat
@@ -47,7 +48,7 @@ func main() {
 
 	//Checking flags
 	if version {
-		data = buildMessage("CatSay", "\tby Muhammad Muzzammil", "", "Version 2.0", "", "http://bit.ly/CATSAY")
+		data = buildMessage("CatSay", "\tby Muhammad Muzzammil", "", "Version 2.1", "", "http://bit.ly/CATSAY")
 	} else if info, _ := os.Stdin.Stat(); info.Mode()&os.ModeCharDevice != 0 {
 		data = buildMessage("oh hai kittehs!", "use pipez... i doan knoe how 2 werk otherwize.", "example: echo \"y halo thar, im kat\" | catsay", "", "or try \"catsay -help\"", "btw, i hatz dis sign. lulz")
 	} else {
@@ -87,9 +88,9 @@ func readLines(reader *bufio.Reader) []string {
 func getWidth(message []string) int {
 	ret := cat.MinLen
 	for _, l := range message {
-		len := utf8.RuneCountInString(l)
-		if len > ret {
-			ret = len
+		width := runewidth.StringWidth(l)
+		if width > ret {
+			ret = width
 		}
 	}
 	return ret
@@ -131,7 +132,8 @@ func removeTabs(message []string) []string {
 func formatMessage(message []string, width int) []string {
 	var ret []string
 	for _, l := range message {
-		ret = append(ret, l+strings.Repeat(" ", width-utf8.RuneCountInString(l)))
+		w := runewidth.StringWidth(l)
+		ret = append(ret, l+strings.Repeat(" ", width-w))
 	}
 	return ret
 }

app_test.go

@@ -39,19 +39,22 @@ func TestReadLines(t *testing.T) {
 		t.Fatalf("Couldn't parse bufio.Reader")
 	}
 }
+
 func TestGetWidth(t *testing.T) {
 	setup()
 	r := getWidth(message)
 	if r < 9 {
 		t.Fatalf("Expected to be greater or equal to 9 but got %d", r)
 	}
 }
+
 func TestRemoveTabs(t *testing.T) {
 	r := removeTabs(message)
 	if r[4] != "this    one    has    tabs!" {
 		t.Fatalf("Tabs were not replaced with spaces")
 	}
 }
+
 func TestCreateMessage(t *testing.T) {
 	setup()
 	data := removeTabs(message)
@@ -68,6 +71,7 @@ func TestCreateMessage(t *testing.T) {
 		t.Fatalf("Expected\n%s\nbut got\n%s", e, r)
 	}
 }
+
 func TestFormatMessage(t *testing.T) {
 	setup()
 	data := removeTabs(message)
@@ -81,3 +85,15 @@ func TestFormatMessage(t *testing.T) {
 		t.Fatalf("Length of each line should be equal. Expected %d but got %d", eLen, rLen)
 	}
 }
+
+func TestMultiByteString(t *testing.T) {
+	setup()
+	data := removeTabs(buildMessage("こんにちわ世界"))
+	got := createMessage(data, getWidth(data))
+	var want = ` ________________
+< こんにちわ世界 >
+ ----------------`
+	if got != want {
+		t.Fatalf("Expected\n%s\nbut got\n%s", want, got)
+	}
+}