Skip to content

Commit

Permalink
Bump up go1.11.x
Browse files Browse the repository at this point in the history
- Update version of other packages
  • Loading branch information
spiegel-im-spiegel committed Feb 5, 2019
1 parent 7b02d3f commit 37bf14a
Show file tree
Hide file tree
Showing 10 changed files with 73 additions and 162 deletions.
5 changes: 4 additions & 1 deletion .goreleaser.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,10 @@ release:
name: mklink

builds:
- goos:
-
env:
- GO111MODULE=on
goos:
- linux
- darwin
- windows
Expand Down
24 changes: 12 additions & 12 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
language: go

go:
- 1.9.x
- "1.11.x"

env:
- DEP_VERSION="0.3.2"

before_install:
# Download the binary to bin folder in $GOPATH
- curl -L -s https://github.com/golang/dep/releases/download/v${DEP_VERSION}/dep-linux-amd64 -o $GOPATH/bin/dep
# Make the binary executable
- chmod +x $GOPATH/bin/dep
global:
- GO111MODULE=on

install:
- $GOPATH/bin/dep ensure -v
- go mod download

script:
- go test -v ./...
- go test ./...

after_success:
- test -n "$TRAVIS_TAG" && curl -sL https://git.io/goreleaser | bash
deploy:
- provider: script
skip_cleanup: true
script: curl -sL https://git.io/goreleaser | bash
on:
tags: true
condition: $TRAVIS_OS_NAME = linux
87 changes: 0 additions & 87 deletions Gopkg.lock

This file was deleted.

45 changes: 0 additions & 45 deletions Gopkg.toml

This file was deleted.

10 changes: 3 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,13 @@

[![Build Status](https://travis-ci.org/spiegel-im-spiegel/mklink.svg?branch=master)](https://travis-ci.org/spiegel-im-spiegel/mklink)
[![GitHub license](https://img.shields.io/badge/license-Apache%202-blue.svg)](https://raw.githubusercontent.com/spiegel-im-spiegel/mklink/master/LICENSE)
[![GitHub release](http://img.shields.io/github/release/spiegel-im-spiegel/mklink.svg)](https://github.com/spiegel-im-spiegel/mklink/releases/latest)

## Install

```
$ go get github.com/spiegel-im-spiegel/mklink
```

Installing by [dep].

```
$ dep ensure -add github.com/spiegel-im-spiegel/mklink
$ export GO111MODULE=on
$ go get github.com/spiegel-im-spiegel/mklink@latest
```

## Usage
Expand Down
10 changes: 5 additions & 5 deletions cli/mklink/facade/facade_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
func TestStyleMarkdown(t *testing.T) {
outBuf := new(bytes.Buffer)
outErrBuf := new(bytes.Buffer)
ui := rwi.New(rwi.Writer(outBuf), rwi.ErrorWriter(outErrBuf))
ui := rwi.New(rwi.WithWriter(outBuf), rwi.WithErrorWriter(outErrBuf))
args := []string{"http://text.baldanders.info"}

exit := Execute(ui, args)
Expand All @@ -32,7 +32,7 @@ func TestStyleMarkdown(t *testing.T) {
func TestUrlErr(t *testing.T) {
outBuf := new(bytes.Buffer)
outErrBuf := new(bytes.Buffer)
ui := rwi.New(rwi.Writer(outBuf), rwi.ErrorWriter(outErrBuf))
ui := rwi.New(rwi.WithWriter(outBuf), rwi.WithErrorWriter(outErrBuf))
args := []string{"http://foo.bar"}

exit := Execute(ui, args)
Expand All @@ -44,7 +44,7 @@ func TestUrlErr(t *testing.T) {
func TestStyleWiki(t *testing.T) {
outBuf := new(bytes.Buffer)
outErrBuf := new(bytes.Buffer)
ui := rwi.New(rwi.Writer(outBuf), rwi.ErrorWriter(outErrBuf))
ui := rwi.New(rwi.WithWriter(outBuf), rwi.WithErrorWriter(outErrBuf))
args := []string{"-s", "wiki", "http://text.baldanders.info"}

exit := Execute(ui, args)
Expand All @@ -66,7 +66,7 @@ func TestPipe(t *testing.T) {
inData := bytes.NewBufferString("http://text.baldanders.info")
outBuf := new(bytes.Buffer)
outErrBuf := new(bytes.Buffer)
ui := rwi.New(rwi.Reader(inData), rwi.Writer(outBuf), rwi.ErrorWriter(outErrBuf))
ui := rwi.New(rwi.WithReader(inData), rwi.WithWriter(outBuf), rwi.WithErrorWriter(outErrBuf))
args := []string{}

exit := Execute(ui, args)
Expand All @@ -88,7 +88,7 @@ func TestPipeUrlErr(t *testing.T) {
inData := bytes.NewBufferString("http://foo.bar")
outBuf := new(bytes.Buffer)
outErrBuf := new(bytes.Buffer)
ui := rwi.New(rwi.Reader(inData), rwi.Writer(outBuf), rwi.ErrorWriter(outErrBuf))
ui := rwi.New(rwi.WithReader(inData), rwi.WithWriter(outBuf), rwi.WithErrorWriter(outErrBuf))
args := []string{}

exit := Execute(ui, args)
Expand Down
4 changes: 2 additions & 2 deletions cli/mklink/facade/version_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ func TestVersionMin(t *testing.T) {

outBuf := new(bytes.Buffer)
outErrBuf := new(bytes.Buffer)
ui := rwi.New(rwi.Writer(outBuf), rwi.ErrorWriter(outErrBuf))
ui := rwi.New(rwi.WithWriter(outBuf), rwi.WithErrorWriter(outErrBuf))
args := []string{"-v"}

exit := Execute(ui, args)
Expand All @@ -36,7 +36,7 @@ func TestVersionNum(t *testing.T) {

outBuf := new(bytes.Buffer)
outErrBuf := new(bytes.Buffer)
ui := rwi.New(rwi.Writer(outBuf), rwi.ErrorWriter(outErrBuf))
ui := rwi.New(rwi.WithWriter(outBuf), rwi.WithErrorWriter(outErrBuf))
args := []string{"-v"}

exit := Execute(ui, args)
Expand Down
6 changes: 3 additions & 3 deletions cli/mklink/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ import (
func main() {
facade.Execute(
rwi.New(
rwi.Reader(os.Stdin),
rwi.Writer(os.Stdout),
rwi.ErrorWriter(os.Stderr),
rwi.WithReader(os.Stdin),
rwi.WithWriter(os.Stdout),
rwi.WithErrorWriter(os.Stderr),
),
os.Args[1:],
).Exit()
Expand Down
17 changes: 17 additions & 0 deletions go.mod
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
module github.com/spiegel-im-spiegel/mklink

require (
github.com/PuerkitoBio/goquery v1.5.0
github.com/andybalholm/cascadia v1.0.0
github.com/atotto/clipboard v0.1.1
github.com/inconshreveable/mousetrap v1.0.0
github.com/mattn/go-encoding v0.0.2
github.com/mattn/go-isatty v0.0.4
github.com/pkg/errors v0.8.1
github.com/spf13/cobra v0.0.3
github.com/spf13/pflag v1.0.3
github.com/spiegel-im-spiegel/gocli v0.8.1
golang.org/x/net v0.0.0-20190125091013-d26f9f9a57f3
golang.org/x/sys v0.0.0-20190204203706-41f3e6584952
golang.org/x/text v0.3.0
)
27 changes: 27 additions & 0 deletions go.sum
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
github.com/PuerkitoBio/goquery v1.5.0 h1:uGvmFXOA73IKluu/F84Xd1tt/z07GYm8X49XKHP7EJk=
github.com/PuerkitoBio/goquery v1.5.0/go.mod h1:qD2PgZ9lccMbQlc7eEOjaeRlFQON7xY8kdmcsrnKqMg=
github.com/andybalholm/cascadia v1.0.0 h1:hOCXnnZ5A+3eVDX8pvgl4kofXv2ELss0bKcqRySc45o=
github.com/andybalholm/cascadia v1.0.0/go.mod h1:GsXiBklL0woXo1j/WYWtSYYC4ouU9PqHO0sqidkEA4Y=
github.com/atotto/clipboard v0.1.1 h1:WSoEbAS70E5gw8FbiqFlp69MGsB6dUb4l+0AGGLiVGw=
github.com/atotto/clipboard v0.1.1/go.mod h1:ZY9tmq7sm5xIbd9bOK4onWV4S6X0u6GY7Vn0Yu86PYI=
github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM=
github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
github.com/mattn/go-encoding v0.0.2 h1:OC1L+QXLJge9n7yIE3R5Os/UNasUeFvK3Sa4NjbDi6c=
github.com/mattn/go-encoding v0.0.2/go.mod h1:WUNsdPQLK4JYRzkn8IAdmYKFYGGJ4/9YPxdPoMumPgY=
github.com/mattn/go-isatty v0.0.4 h1:bnP0vzxcAdeI1zdubAl5PjU6zsERjGZb7raWodagDYs=
github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I=
github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
github.com/spf13/cobra v0.0.3 h1:ZlrZ4XsMRm04Fr5pSFxBgfND2EBVa1nLpiy1stUsX/8=
github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ=
github.com/spf13/pflag v1.0.3 h1:zPAT6CGy6wXeQ7NtTnaTerfKOsV6V6F8agHXFiazDkg=
github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
github.com/spiegel-im-spiegel/gocli v0.8.1 h1:Yv0/ohht9I3CFgTclf/d1ohsq4QJW5ABXoznBqCkdiY=
github.com/spiegel-im-spiegel/gocli v0.8.1/go.mod h1:begB6B5rKPaPUr0ecaQp1kAcneZysuXdvdRoL7qtG8c=
golang.org/x/net v0.0.0-20180218175443-cbe0f9307d01/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
golang.org/x/net v0.0.0-20190125091013-d26f9f9a57f3 h1:ulvT7fqt0yHWzpJwI57MezWnYDVpCAYBVuYst/L+fAY=
golang.org/x/net v0.0.0-20190125091013-d26f9f9a57f3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
golang.org/x/sys v0.0.0-20190204203706-41f3e6584952/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=

0 comments on commit 37bf14a

Please sign in to comment.