Merge pull request #15 from spiegel-im-spiegel/update-packages

Update (g)prompt package

.goreleaser.yml

@@ -42,6 +42,7 @@ archive:
   files:
   - LICENSE*
   - README*
+  - mklink.png
 
 changelog:
   sort: asc

.travis.yml

@@ -1,7 +1,7 @@
 language: go
 
 go:
-- "1.12"
+- "1.12.x"
 
 env:
   global:

README.md

@@ -8,6 +8,8 @@
 
 See [go.mod](https://github.com/spiegel-im-spiegel/mklink/blob/master/go.mod) file. 
 
+![mklink](./mklink.png)
+
 ## Usage
 
 ```go

cli/mklink/facade/interactive.go

@@ -5,21 +5,21 @@ import (
 	"io"
 
 	"github.com/atotto/clipboard"
-	"github.com/spiegel-im-spiegel/gocli/prompt"
 	"github.com/spiegel-im-spiegel/gocli/rwi"
+	"github.com/spiegel-im-spiegel/gprompt"
 	"github.com/spiegel-im-spiegel/mklink/cli/mklink/makelink"
 	"github.com/spiegel-im-spiegel/mklink/errs"
 )
 
 func interactiveMode(ui *rwi.RWI, cxt *makelink.Context) error {
-	p := prompt.New(
+	p := gprompt.New(
 		rwi.New(
 			rwi.WithReader(ui.Reader()),
 			rwi.WithWriter(ui.Writer()),
 		),
 		func(url string) (string, error) {
 			if url == "q" || url == "quit" {
-				return "", prompt.ErrTerminate
+				return "", gprompt.ErrTerminate
 			}
 			r, err := cxt.MakeLink(url)
 			if err != nil {
@@ -32,11 +32,11 @@ func interactiveMode(ui *rwi.RWI, cxt *makelink.Context) error {
 			res := buf.String()
 			return res, errs.Wrap(clipboard.WriteAll(res), "error when output result")
 		},
-		prompt.WithPromptString("mklink> "),
-		prompt.WithHeaderMessage("Input 'q' or 'quit' to stop"),
+		gprompt.WithPromptString("mklink> "),
+		gprompt.WithHeaderMessage("Input 'q' or 'quit' to stop"),
 	)
 	if !p.IsTerminal() {
-		return errs.Wrap(prompt.ErrNotTerminal, "error in interactive mode")
+		return errs.Wrap(gprompt.ErrNotTerminal, "error in interactive mode")
 	}
 	return errs.Wrap(p.Run(), "error in interactive mode")
 }

go.mod

@@ -1,14 +1,15 @@
 module github.com/spiegel-im-spiegel/mklink
 
+go 1.12
+
 require (
 	github.com/PuerkitoBio/goquery v1.5.0
-	github.com/atotto/clipboard v0.1.1
-	github.com/inconshreveable/mousetrap v1.0.0 // indirect
+	github.com/atotto/clipboard v0.1.2
 	github.com/mattn/go-encoding v0.0.2
 	github.com/spf13/cobra v0.0.3
 	github.com/spf13/pflag v1.0.3 // indirect
-	github.com/spiegel-im-spiegel/gocli v0.9.3
-	golang.org/x/net v0.0.0-20190301231341-16b79f2e4e95
-	golang.org/x/text v0.3.0 // indirect
-	golang.org/x/xerrors v0.0.0-20190212162355-a5947ffaace3
+	github.com/spiegel-im-spiegel/gocli v0.9.5
+	github.com/spiegel-im-spiegel/gprompt v0.9.5
+	golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c
+	golang.org/x/xerrors v0.0.0-20190410155217-1f06c39b4373
 )