Merge pull request #57 from yyoshiki41/feature/go-mod

build(mod): migrate to go mod

Author: yyoshiki41

.circleci/config.yml

@@ -2,27 +2,15 @@ version: 2
 jobs:
   build:
     docker:
-      - image: circleci/golang:1.10
+      - image: circleci/golang:1.15
 
     working_directory: /go/src/github.com/yyoshiki41/radigo
 
     steps:
       - checkout
-
-      - restore_cache:
-          keys:
-            - v1-pkg-cache
-
-      - restore_cache:
-          keys:
-            - gopkg-{{ .Branch }}-{{ checksum "Gopkg.lock" }}
       - run:
           name: Vendoring
           command: make installdeps
-      - save_cache:
-          key: gopkg-{{ .Branch }}-{{ checksum "Gopkg.lock" }}
-          paths:
-            - "vendor"
 
       - run:
           name: Run go vet
@@ -34,8 +22,3 @@ jobs:
       - run:
           name: Report test coverage
           command: bash <(curl -s https://codecov.io/bash)
-
-      - save_cache:
-          key: v1-pkg-cache
-          paths:
-            - "/go/pkg"

Gopkg.lock

@@ -1,29 +1,21 @@
-.PHONY: all help dep installdeps build build-4-docker vet test test-cover docker-build
+.PHONY: all help installdeps build build-4-docker vet test test-cover docker-build
 
 RADIGOPKG=$(shell go list ./...)
 
 REVISION := $(shell git rev-parse --short HEAD)
-DEP := $(shell which dep)
 
 all: help
 
 help:
 	@echo "Useful targets:"
-	@echo "  make dep           => Install dep command"
-	@echo "  make installdeps   => Run dep ensure"
+	@echo "  make installdeps   => Install dependencies"
 	@echo "  make build         => Build a binary"
 	@echo "  make test          => Run unit tests"
 	@echo "  make vet           => Run go vet"
 	@echo "  make docker-build  => Build a docker image"
 
-dep:
-ifndef DEP
-	@echo "Install dep command"
-	@curl https://raw.githubusercontent.com/golang/dep/master/install.sh | sh
-endif
-
-installdeps: dep
-	dep ensure
+installdeps:
+	go mod download
 
 build:
 	go build ./cmd/radigo/...

Gopkg.toml

@@ -0,0 +1,22 @@
+module github.com/yyoshiki41/radigo
+
+go 1.15
+
+require (
+	github.com/armon/go-radix v0.0.0-20160115234725-4239b77079c7 // indirect
+	github.com/bgentry/speakeasy v0.1.0 // indirect
+	github.com/briandowns/spinner v0.0.0-20161121172928-cd65e8bd7da2
+	github.com/fatih/color v1.1.1-0.20161025120501-bf82308e8c85 // indirect
+	github.com/grafov/m3u8 v0.6.2-0.20161102215704-4c69ce4c839a // indirect
+	github.com/hashicorp/errwrap v0.0.0-20141028054710-7554cd9344ce // indirect
+	github.com/hashicorp/go-multierror v0.0.0-20171204182908-b7773ae21874 // indirect
+	github.com/mattn/go-colorable v0.0.7 // indirect
+	github.com/mattn/go-isatty v0.0.2 // indirect
+	github.com/mattn/go-runewidth v0.0.2-0.20161012013512-737072b4e32b // indirect
+	github.com/mitchellh/cli v0.0.0-20180406011036-c54c85e9bd49
+	github.com/olekukonko/tablewriter v0.0.0-20160923125401-bdcc175572fd
+	github.com/posener/complete v1.1.1 // indirect
+	github.com/yyoshiki41/go-radiko v0.6.0
+	golang.org/x/net v0.0.0-20170517171515-513929065c19 // indirect
+	golang.org/x/sys v0.0.0-20170721163517-c4489faa6e5a // indirect
+)

Makefile

@@ -0,0 +1,32 @@
+github.com/armon/go-radix v0.0.0-20160115234725-4239b77079c7 h1:MBXhrxjNkjdqJysfNbKMMPFNXlz6EzpOnPcsoYBeD3E=
+github.com/armon/go-radix v0.0.0-20160115234725-4239b77079c7/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8=
+github.com/bgentry/speakeasy v0.1.0 h1:ByYyxL9InA1OWqxJqqp2A5pYHUrCiAL6K3J+LKSsQkY=
+github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs=
+github.com/briandowns/spinner v0.0.0-20161121172928-cd65e8bd7da2 h1:JRYhlZ6BzLGWMKxEZ+QyF8Z8E4gxD2eEhCH3xcM1fBE=
+github.com/briandowns/spinner v0.0.0-20161121172928-cd65e8bd7da2/go.mod h1:hw/JEQBIE+c/BLI4aKM8UU8v+ZqrD3h7HC27kKt8JQU=
+github.com/fatih/color v1.1.1-0.20161025120501-bf82308e8c85 h1:FvdRGnDEscqSP1EedtRtA83DFuWYR3Wv4EF9vlgCAdU=
+github.com/fatih/color v1.1.1-0.20161025120501-bf82308e8c85/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
+github.com/grafov/m3u8 v0.6.2-0.20161102215704-4c69ce4c839a h1:b7HGqWJSgO5V4TnNNl4pDHmgeQlkblbEYgQiuAGBghs=
+github.com/grafov/m3u8 v0.6.2-0.20161102215704-4c69ce4c839a/go.mod h1:PdjzaU/pJUo4jTIn2rcgMFs+HqBGl/sPJLr8BI0Xq/I=
+github.com/hashicorp/errwrap v0.0.0-20141028054710-7554cd9344ce h1:prjrVgOk2Yg6w+PflHoszQNLTUh4kaByUcEWM/9uin4=
+github.com/hashicorp/errwrap v0.0.0-20141028054710-7554cd9344ce/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
+github.com/hashicorp/go-multierror v0.0.0-20171204182908-b7773ae21874 h1:em+tTnzgU7N22woTBMcSJAOW7tRHAkK597W+MD/CpK8=
+github.com/hashicorp/go-multierror v0.0.0-20171204182908-b7773ae21874/go.mod h1:JMRHfdO9jKNzS/+BTlxCjKNQHg/jZAft8U7LloJvN7I=
+github.com/mattn/go-colorable v0.0.7 h1:zh4kz16dcPG+l666m12h0+dO2HGnQ1ngy7crMErE2UU=
+github.com/mattn/go-colorable v0.0.7/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
+github.com/mattn/go-isatty v0.0.2 h1:F+DnWktyadxnOrohKLNUC9/GjFii5RJgY4GFG6ilggw=
+github.com/mattn/go-isatty v0.0.2/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
+github.com/mattn/go-runewidth v0.0.2-0.20161012013512-737072b4e32b h1:zGKCShADxSzhD4RVcNFKuaedhqMYyWD54Fg9aV/BvXM=
+github.com/mattn/go-runewidth v0.0.2-0.20161012013512-737072b4e32b/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU=
+github.com/mitchellh/cli v0.0.0-20180406011036-c54c85e9bd49 h1:kDk3m1UKX0uplAKOlTOqlvpDYqeeZOIEB49er9U4mZ8=
+github.com/mitchellh/cli v0.0.0-20180406011036-c54c85e9bd49/go.mod h1:oGumspjLm2kTyiT1QMGpFqRlmxnKHfCvhZEVnx+5UeE=
+github.com/olekukonko/tablewriter v0.0.0-20160923125401-bdcc175572fd h1:nEatQ6JnwCT9iYD5uqYUiFqq8tJGX25to8KVKXqya7k=
+github.com/olekukonko/tablewriter v0.0.0-20160923125401-bdcc175572fd/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo=
+github.com/posener/complete v1.1.1 h1:ccV59UEOTzVDnDUEFdT95ZzHVZ+5+158q8+SJb2QV5w=
+github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI=
+github.com/yyoshiki41/go-radiko v0.6.0 h1:7CXK15v4EHfxw950l0jf9WcoRXqivc7u+K2kP5IR0qE=
+github.com/yyoshiki41/go-radiko v0.6.0/go.mod h1:ci7oAybvu56U4p+mLqNPbS4/aoYMUbevs6iZZbKSua8=
+golang.org/x/net v0.0.0-20170517171515-513929065c19 h1:TOPcoCWURyGUQXxMClANLf83JAG3WdhCk3QuvG8LZ3E=
+golang.org/x/net v0.0.0-20170517171515-513929065c19/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/sys v0.0.0-20170721163517-c4489faa6e5a h1:8KvbXgrIMDssOA6vHwmODQ7KZgoDdlu3fhUPtHXbEEY=
+golang.org/x/sys v0.0.0-20170721163517-c4489faa6e5a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=