use dep tool to manage dependencies & add the ability to kill -9 cmd

.gitignore

@@ -1,2 +1,3 @@
 *.swp
 *.out
+**/.idea

Gopkg.toml

@@ -0,0 +1,26 @@
+
+# Gopkg.toml example
+#
+# Refer to https://github.com/golang/dep/blob/master/docs/Gopkg.toml.md
+# for detailed Gopkg.toml documentation.
+#
+# required = ["github.com/user/thing/cmd/thing"]
+# ignored = ["github.com/user/project/pkgX", "bitbucket.org/user/project/pkgA/pkgY"]
+#
+# [[constraint]]
+#   name = "github.com/user/project"
+#   version = "1.0.0"
+#
+# [[constraint]]
+#   name = "github.com/user/project2"
+#   branch = "dev"
+#   source = "github.com/myfork/project2"
+#
+# [[override]]
+#  name = "github.com/x/y"
+#  version = "2.4.0"
+
+
+[[constraint]]
+  branch = "master"
+  name = "github.com/go-test/deep"

cmd.go

@@ -103,7 +103,7 @@ func (c *Cmd) Start() <-chan Status {
 // Stop is idempotent. An error should only be returned in the rare case that
 // Stop is called immediately after the command ends but before Start can
 // update its internal state.
-func (c *Cmd) Stop() error {
+func (c *Cmd) Stop(waitTime time.Duration) error {
 	c.Lock()
 	defer c.Unlock()
 
@@ -120,7 +120,23 @@ func (c *Cmd) Stop() error {
 	// Signal the process group (-pid), not just the process, so that the process
 	// and all its children are signaled. Else, child procs can keep running and
 	// keep the stdout/stderr fd open and cause cmd.Wait to hang.
-	return syscall.Kill(-c.status.PID, syscall.SIGTERM)
+	stoppedChannel := make(chan error)
+	timeoutChannel := time.After(waitTime)
+	// the process might ignore sigterm, so we make a best effort request for the process
+	// to terminate. If it does not terminate in waitTime, we'll kill it
+	go func() {
+		err := syscall.Kill(-c.status.PID, syscall.SIGTERM)
+		stoppedChannel <- err
+	}()
+	for {
+		select {
+		case err := <- stoppedChannel:
+			return err
+		case <-timeoutChannel:
+			return syscall.Kill(-c.status.PID, syscall.SIGKILL)
+		}
+	}
+	return nil
 }
 
 // Status returns the Status of the command at any time. It is safe to call

cmd_test.go

@@ -9,8 +9,9 @@ import (
 	"testing"
 	"time"
 
-	"github.com/go-cmd/cmd"
+
 	"github.com/go-test/deep"
+	"github.com/go-cmd/cmd"
 )
 
 func TestCmdOK(t *testing.T) {
@@ -87,7 +88,7 @@ func TestCmdStop(t *testing.T) {
 	time.Sleep(1 * time.Second)
 
 	// Kill the process
-	err := p.Stop()
+	err := p.Stop(500 * time.Millisecond)
 	if err != nil {
 		t.Error(err)
 	}
@@ -131,7 +132,7 @@ func TestCmdStop(t *testing.T) {
 	}
 
 	// Stop should be idempotent
-	err = p.Stop()
+	err = p.Stop(500 * time.Millisecond)
 	if err != nil {
 		t.Error(err)
 	}
@@ -162,7 +163,7 @@ func TestCmdNotStarted(t *testing.T) {
 		t.Error(diffs)
 	}
 
-	err := p.Stop()
+	err := p.Stop(500 * time.Millisecond)
 	if err != nil {
 		t.Error(err)
 	}
@@ -226,7 +227,7 @@ func TestCmdOutput(t *testing.T) {
 	}
 
 	// Kill the process
-	if err := p.Stop(); err != nil {
+	if err := p.Stop(500 * time.Millisecond); err != nil {
 		t.Error(err)
 	}
 }