Merge pull request #46 from johejo/wrap_error

Use fmt.Errorf to be able to unwrap error

Author: mattn

.github/workflows/ci.yml

@@ -0,0 +1,23 @@
+name: ci
+on:
+  pull_request:
+    branches:
+      - master
+  push:
+    branches:
+      - master
+jobs:
+  test:
+    strategy:
+      matrix:
+        os: [ubuntu-latest, macos-latest, windows-latest]
+        go: ["1.14", "1.15"]
+    runs-on: ${{ matrix.os }}
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-go@v2
+        with:
+          go-version: ${{ matrix.go }}
+      - run: |
+          go test -cover -coverprofile coverage.txt -race -v ./...
+      - uses: codecov/codecov-action@v1

README.md

@@ -2,7 +2,8 @@
 
 [![codecov](https://codecov.io/gh/mattn/go-shellwords/branch/master/graph/badge.svg)](https://codecov.io/gh/mattn/go-shellwords)
 [![Build Status](https://travis-ci.org/mattn/go-shellwords.svg?branch=master)](https://travis-ci.org/mattn/go-shellwords)
-[![GoDoc](https://godoc.org/github.com/mattn/go-shellwords?status.svg)](http://godoc.org/github.com/mattn/go-shellwords)
+[![PkgGoDev](https://pkg.go.dev/badge/github.com/mattn/go-shellwords)](https://pkg.go.dev/github.com/mattn/go-shellwords)
+[![ci](https://github.com/mattn/go-shellwords/ci/badge.svg)](https://github.com/mattn/go-shellwords/actions)
 
 Parse line as shell words.
 

shellwords.go

@@ -4,7 +4,6 @@ import (
 	"bytes"
 	"errors"
 	"os"
-	"regexp"
 	"strings"
 	"unicode"
 )
@@ -14,8 +13,6 @@ var (
 	ParseBacktick bool = false
 )
 
-var envRe = regexp.MustCompile(`\$({[a-zA-Z0-9_]+}|[a-zA-Z0-9_]+)`)
-
 func isSpace(r rune) bool {
 	switch r {
 	case ' ', '\t', '\r', '\n':
@@ -166,9 +163,7 @@ loop:
 						if err != nil {
 							return nil, err
 						}
-						for _, str := range strs {
-							args = append(args, str)
-						}
+						args = append(args, strs...)
 					} else {
 						args = append(args, replaceEnv(p.Getenv, buf))
 					}
@@ -270,9 +265,7 @@ loop:
 				if err != nil {
 					return nil, err
 				}
-				for _, str := range strs {
-					args = append(args, str)
-				}
+				args = append(args, strs...)
 			} else {
 				args = append(args, replaceEnv(p.Getenv, buf))
 			}

shellwords_test.go

@@ -1,8 +1,10 @@
 package shellwords
 
 import (
+	"errors"
 	"go/build"
 	"os"
+	"os/exec"
 	"path"
 	"reflect"
 	"testing"
@@ -149,6 +151,9 @@ func TestBacktick(t *testing.T) {
 
 	parser.ParseBacktick = false
 	args, err = parser.Parse(`echo $(echo "foo")`)
+	if err != nil {
+		t.Fatal(err)
+	}
 	expected = []string{"echo", `$(echo "foo")`}
 	if !reflect.DeepEqual(args, expected) {
 		t.Fatalf("Expected %#v, but %#v:", expected, args)
@@ -183,9 +188,9 @@ func TestBacktickError(t *testing.T) {
 	if err == nil {
 		t.Fatal("Should be an error")
 	}
-	expected := "exit status 2:go Version: unknown command\nRun 'go help' for usage.\n"
-	if expected != err.Error() {
-		t.Fatalf("Expected %q, but %q", expected, err.Error())
+	var eerr *exec.ExitError
+	if !errors.As(err, &eerr) {
+		t.Fatal("Should be able to unwrap to *exec.ExitError")
 	}
 	_, err = parser.Parse(`echo $(echo1)`)
 	if err == nil {

util_posix.go

@@ -3,7 +3,7 @@
 package shellwords
 
 import (
-	"errors"
+	"fmt"
 	"os"
 	"os/exec"
 	"strings"
@@ -23,7 +23,7 @@ func shellRun(line, dir string) (string, error) {
 		if eerr, ok := err.(*exec.ExitError); ok {
 			b = eerr.Stderr
 		}
-		return "", errors.New(err.Error() + ":" + string(b))
+		return "", fmt.Errorf("%s: %w", string(b), err)
 	}
 	return strings.TrimSpace(string(b)), nil
 }

util_windows.go

@@ -3,7 +3,7 @@
 package shellwords
 
 import (
-	"errors"
+	"fmt"
 	"os"
 	"os/exec"
 	"strings"
@@ -23,7 +23,7 @@ func shellRun(line, dir string) (string, error) {
 		if eerr, ok := err.(*exec.ExitError); ok {
 			b = eerr.Stderr
 		}
-		return "", errors.New(err.Error() + ":" + string(b))
+		return "", fmt.Errorf("%s: %w", string(b), err)
 	}
 	return strings.TrimSpace(string(b)), nil
 }