# HG changeset patch # User Mikael Berthe # Date 1538216683 -7200 # Node ID 605a00e9d1ab4d3e5f2d56654a1dca96827e5339 # Parent d5d0260ead4030e1505dcca5ea543ddb24e56e27 Switch to Go modules (and bump Go version requirement) Go >= 1.9 required to support Go modules (because madon has a v2 major version); v1.11+ is recommended. diff -r d5d0260ead40 -r 605a00e9d1ab .travis.yml --- a/.travis.yml Fri Sep 07 22:57:49 2018 +0200 +++ b/.travis.yml Sat Sep 29 12:24:43 2018 +0200 @@ -1,9 +1,8 @@ language: go go: -- "1.7" -- "1.8" - "1.9" - "1.10" +- "1.11" - master matrix: allow_failures: diff -r d5d0260ead40 -r 605a00e9d1ab README.md --- a/README.md Fri Sep 07 22:57:49 2018 +0200 +++ b/README.md Sat Sep 29 12:24:43 2018 +0200 @@ -22,16 +22,25 @@ ### From source -To install the application from source (you need to have Go >= 1.7), just type: +madonctl now uses Go modules introduced with Go v1.11. + +You should still be able to build it "the old way" with an up-to-date release +of Go 1.9/1.10/1.11+ with: go get -u github.com/McKael/madonctl -and you should be able to run `madonctl`. - For upgrades, don't forget the `-u` option to ensure the dependencies (especially [madon](https://github.com/McKael/madon)) are updated as well. -Travis automated testing is run for Go versions 1.7 - 1.10. +Alternatively, with Go >= 1.11: + + git clone git clone https://github.com/McKael/madonctl + cd madonctl + go build # (or go install) + +and you should be able to use `madonctl`. + +Travis automated testing is run for Go versions 1.9 - 1.11. ## Usage diff -r d5d0260ead40 -r 605a00e9d1ab cmd/accounts.go --- a/cmd/accounts.go Fri Sep 07 22:57:49 2018 +0200 +++ b/cmd/accounts.go Sat Sep 29 12:24:43 2018 +0200 @@ -14,7 +14,7 @@ "github.com/spf13/cobra" flag "github.com/spf13/pflag" - "github.com/McKael/madon" + "github.com/McKael/madon/v2" ) var accountUpdateFlags, accountMuteFlags, accountFollowFlags *flag.FlagSet diff -r d5d0260ead40 -r 605a00e9d1ab cmd/domainblocks.go --- a/cmd/domainblocks.go Fri Sep 07 22:57:49 2018 +0200 +++ b/cmd/domainblocks.go Sat Sep 29 12:24:43 2018 +0200 @@ -11,7 +11,7 @@ "github.com/pkg/errors" "github.com/spf13/cobra" - "github.com/McKael/madon" + "github.com/McKael/madon/v2" ) var domainBlocksOpts struct { diff -r d5d0260ead40 -r 605a00e9d1ab cmd/emojis.go --- a/cmd/emojis.go Fri Sep 07 22:57:49 2018 +0200 +++ b/cmd/emojis.go Sat Sep 29 12:24:43 2018 +0200 @@ -10,7 +10,7 @@ "github.com/spf13/cobra" - "github.com/McKael/madon" + "github.com/McKael/madon/v2" ) var emojiOpts struct { diff -r d5d0260ead40 -r 605a00e9d1ab cmd/lists.go --- a/cmd/lists.go Fri Sep 07 22:57:49 2018 +0200 +++ b/cmd/lists.go Sat Sep 29 12:24:43 2018 +0200 @@ -11,7 +11,7 @@ "github.com/pkg/errors" "github.com/spf13/cobra" - "github.com/McKael/madon" + "github.com/McKael/madon/v2" ) var listsOpts struct { diff -r d5d0260ead40 -r 605a00e9d1ab cmd/madon.go --- a/cmd/madon.go Fri Sep 07 22:57:49 2018 +0200 +++ b/cmd/madon.go Sat Sep 29 12:24:43 2018 +0200 @@ -9,7 +9,7 @@ "strconv" "strings" - "github.com/McKael/madon" + "github.com/McKael/madon/v2" "github.com/pkg/errors" "github.com/spf13/viper" ) diff -r d5d0260ead40 -r 605a00e9d1ab cmd/media.go --- a/cmd/media.go Fri Sep 07 22:57:49 2018 +0200 +++ b/cmd/media.go Sat Sep 29 12:24:43 2018 +0200 @@ -12,7 +12,7 @@ "github.com/spf13/cobra" flag "github.com/spf13/pflag" - "github.com/McKael/madon" + "github.com/McKael/madon/v2" ) var mediaFlags *flag.FlagSet diff -r d5d0260ead40 -r 605a00e9d1ab cmd/notifications.go --- a/cmd/notifications.go Fri Sep 07 22:57:49 2018 +0200 +++ b/cmd/notifications.go Sat Sep 29 12:24:43 2018 +0200 @@ -12,7 +12,7 @@ "github.com/pkg/errors" "github.com/spf13/cobra" - "github.com/McKael/madon" + "github.com/McKael/madon/v2" ) var notificationsOpts struct { diff -r d5d0260ead40 -r 605a00e9d1ab cmd/root.go --- a/cmd/root.go Fri Sep 07 22:57:49 2018 +0200 +++ b/cmd/root.go Sat Sep 29 12:24:43 2018 +0200 @@ -11,7 +11,7 @@ "github.com/spf13/cobra" "github.com/spf13/viper" - "github.com/McKael/madon" + "github.com/McKael/madon/v2" ) // AppName is the CLI application name diff -r d5d0260ead40 -r 605a00e9d1ab cmd/status.go --- a/cmd/status.go Fri Sep 07 22:57:49 2018 +0200 +++ b/cmd/status.go Sat Sep 29 12:24:43 2018 +0200 @@ -14,7 +14,7 @@ "github.com/spf13/cobra" flag "github.com/spf13/pflag" - "github.com/McKael/madon" + "github.com/McKael/madon/v2" ) var statusPostFlags *flag.FlagSet diff -r d5d0260ead40 -r 605a00e9d1ab cmd/stream.go --- a/cmd/stream.go Fri Sep 07 22:57:49 2018 +0200 +++ b/cmd/stream.go Sat Sep 29 12:24:43 2018 +0200 @@ -13,7 +13,7 @@ "github.com/pkg/errors" "github.com/spf13/cobra" - "github.com/McKael/madon" + "github.com/McKael/madon/v2" ) var streamOpts struct { diff -r d5d0260ead40 -r 605a00e9d1ab cmd/suggestions.go --- a/cmd/suggestions.go Fri Sep 07 22:57:49 2018 +0200 +++ b/cmd/suggestions.go Sat Sep 29 12:24:43 2018 +0200 @@ -11,7 +11,7 @@ "github.com/pkg/errors" "github.com/spf13/cobra" - "github.com/McKael/madon" + "github.com/McKael/madon/v2" ) var suggestionsOpts struct { diff -r d5d0260ead40 -r 605a00e9d1ab cmd/timelines.go --- a/cmd/timelines.go Fri Sep 07 22:57:49 2018 +0200 +++ b/cmd/timelines.go Sat Sep 29 12:24:43 2018 +0200 @@ -11,7 +11,7 @@ "github.com/spf13/cobra" - "github.com/McKael/madon" + "github.com/McKael/madon/v2" ) var timelineOpts struct { diff -r d5d0260ead40 -r 605a00e9d1ab cmd/toot.go --- a/cmd/toot.go Fri Sep 07 22:57:49 2018 +0200 +++ b/cmd/toot.go Sat Sep 29 12:24:43 2018 +0200 @@ -13,7 +13,7 @@ flag "github.com/spf13/pflag" "github.com/spf13/viper" - "github.com/McKael/madon" + "github.com/McKael/madon/v2" ) // toot is a kind of alias for status post diff -r d5d0260ead40 -r 605a00e9d1ab cmd/version.go --- a/cmd/version.go Fri Sep 07 22:57:49 2018 +0200 +++ b/cmd/version.go Sat Sep 29 12:24:43 2018 +0200 @@ -10,7 +10,7 @@ "github.com/spf13/cobra" - "github.com/McKael/madon" + "github.com/McKael/madon/v2" "github.com/McKael/madonctl/printer" ) diff -r d5d0260ead40 -r 605a00e9d1ab go.mod --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/go.mod Sat Sep 29 12:24:43 2018 +0200 @@ -0,0 +1,22 @@ +module github.com/McKael/madonctl + +require ( + github.com/BurntSushi/toml v0.3.1 // indirect + github.com/McKael/madon/v2 v2.3.1-0.20180929094633-c679abc985d6 + github.com/cpuguy83/go-md2man v1.0.8 // indirect + github.com/ghodss/yaml v1.0.0 + github.com/inconshreveable/mousetrap v1.0.0 // indirect + github.com/kr/pretty v0.1.0 // indirect + github.com/kr/text v0.1.0 + github.com/mattn/go-isatty v0.0.4 + github.com/pkg/errors v0.8.0 + github.com/russross/blackfriday v2.0.0+incompatible // indirect + github.com/shurcooL/sanitized_anchor_name v0.0.0-20170918181015-86672fcb3f95 // indirect + github.com/spf13/cobra v0.0.3 + github.com/spf13/pflag v1.0.2 + github.com/spf13/viper v1.2.1 + github.com/stretchr/testify v1.2.2 + golang.org/x/net v0.0.0-20180926154720-4dfa2610cdf3 + golang.org/x/sys v0.0.0-20180928133829-e4b3c5e90611 // indirect + gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 // indirect +) diff -r d5d0260ead40 -r 605a00e9d1ab go.sum --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/go.sum Sat Sep 29 12:24:43 2018 +0200 @@ -0,0 +1,77 @@ +github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ= +github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= +github.com/McKael/madon/v2 v2.3.1-0.20180929094633-c679abc985d6 h1:nAYYHVa3g5VJUg2jmEKnNXv27NiXRE5c1HcxAHcFeWM= +github.com/McKael/madon/v2 v2.3.1-0.20180929094633-c679abc985d6/go.mod h1:mvlJhxZCchfiasx3XvN3hBu5RekGwTDm09dKlSM/dQQ= +github.com/cpuguy83/go-md2man v1.0.8 h1:DwoNytLphI8hzS2Af4D0dfaEaiSq2bN05mEm4R6vf8M= +github.com/cpuguy83/go-md2man v1.0.8/go.mod h1:N6JayAiVKtlHSnuTCeuLSQVs75hb8q+dYQLjr7cDsKY= +github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= +github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I= +github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= +github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk= +github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= +github.com/golang/protobuf v1.2.0 h1:P3YflyNX/ehuJFLhxviNdFxQPkGK5cDcApsge1SqnvM= +github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/gorilla/websocket v1.4.0 h1:WDFjx/TMzVgy9VdMMQi2K2Emtwi2QcUQsztZ/zLaH/Q= +github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= +github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4= +github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= +github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM= +github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= +github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= +github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= +github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= +github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= +github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= +github.com/magiconair/properties v1.8.0 h1:LLgXmsheXeRoUOBOjtwPQCWIYqM/LU1ayDtDePerRcY= +github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= +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/mitchellh/mapstructure v1.0.0 h1:vVpGvMXJPqSDh2VYHF7gsfQj8Ncx+Xw5Y1KHeTRY+7I= +github.com/mitchellh/mapstructure v1.0.0/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= +github.com/pelletier/go-toml v1.2.0 h1:T5zMGML61Wp+FlcbWjRDT7yAxhJNAiPPLOFECq181zc= +github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= +github.com/pkg/errors v0.8.0 h1:WdK/asTD0HN+q6hsWO3/vpuAkAr+tw6aNJNDFFf0+qw= +github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= +github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/russross/blackfriday v2.0.0+incompatible h1:cBXrhZNUf9C+La9/YpS+UHpUT8YD6Td9ZMSU9APFcsk= +github.com/russross/blackfriday v2.0.0+incompatible/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g= +github.com/sendgrid/rest v2.4.1+incompatible h1:HDib/5xzQREPq34lN3YMhQtMkdXxS/qLp5G3k9a5++4= +github.com/sendgrid/rest v2.4.1+incompatible/go.mod h1:kXX7q3jZtJXK5c5qK83bSGMdV6tsOE70KbHoqJls4lE= +github.com/shurcooL/sanitized_anchor_name v0.0.0-20170918181015-86672fcb3f95 h1:/vdW8Cb7EXrkqWGufVMES1OH2sU9gKVb2n9/1y5NMBY= +github.com/shurcooL/sanitized_anchor_name v0.0.0-20170918181015-86672fcb3f95/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= +github.com/spf13/afero v1.1.2 h1:m8/z1t7/fwjysjQRYbP0RD+bUIF/8tJwPdEZsI83ACI= +github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ= +github.com/spf13/cast v1.2.0 h1:HHl1DSRbEQN2i8tJmtS6ViPyHx35+p51amrdsiTCrkg= +github.com/spf13/cast v1.2.0/go.mod h1:r2rcYCSwa1IExKTDiTfzaxqT2FNHs8hODu4LnUfgKEg= +github.com/spf13/cobra v0.0.3 h1:ZlrZ4XsMRm04Fr5pSFxBgfND2EBVa1nLpiy1stUsX/8= +github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ= +github.com/spf13/jwalterweatherman v1.0.0 h1:XHEdyB+EcvlqZamSM4ZOMGlc93t6AcsBEu9Gc1vn7yk= +github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo= +github.com/spf13/pflag v1.0.2 h1:Fy0orTDgHdbnzHcsOgfCN4LtHf0ec3wwtiwJqwvf3Gc= +github.com/spf13/pflag v1.0.2/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= +github.com/spf13/viper v1.2.1 h1:bIcUwXqLseLF3BDAZduuNfekWG87ibtFxi59Bq+oI9M= +github.com/spf13/viper v1.2.1/go.mod h1:P4AexN0a+C9tGAnUFNwDMYYZv3pjFuvmeiMyKRaNVlI= +github.com/stretchr/testify v1.2.2 h1:bSDNvY7ZPG5RlJ8otE/7V6gMiyenm9RtJ7IUVIAoJ1w= +github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= +golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20180926154720-4dfa2610cdf3 h1:dgd4x4kJt7G4k4m93AYLzM8Ni6h2qLTfh9n9vXJT3/0= +golang.org/x/net v0.0.0-20180926154720-4dfa2610cdf3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be h1:vEDujvNQGv4jgYKudGeI/+DAX4Jffq6hpD55MmoEvKs= +golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= +golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f h1:wMNYb4v58l5UBM7MYRLPG6ZhfOqbKu7X5eyFl8ZhKvA= +golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sys v0.0.0-20180906133057-8cf3aee42992 h1:BH3eQWeGbwRU2+wxxuuPOdFBmaiBH81O8BugSjHeTFg= +golang.org/x/sys v0.0.0-20180906133057-8cf3aee42992/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20180928133829-e4b3c5e90611 h1:O33LKL7WyJgjN9CvxfTIomjIClbd/Kq86/iipowHQU0= +golang.org/x/sys v0.0.0-20180928133829-e4b3c5e90611/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= +google.golang.org/appengine v1.2.0 h1:S0iUepdCWODXRvtE+gcRDd15L+k+k1AiHlMiMjefH24= +google.golang.org/appengine v1.2.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY= +gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/yaml.v2 v2.2.1 h1:mUhvW9EsL+naU5Q3cakzfE91YhliOondGd6ZrsDBHQE= +gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= diff -r d5d0260ead40 -r 605a00e9d1ab printer/plainprinter.go --- a/printer/plainprinter.go Fri Sep 07 22:57:49 2018 +0200 +++ b/printer/plainprinter.go Sat Sep 29 12:24:43 2018 +0200 @@ -12,7 +12,7 @@ "reflect" "time" - "github.com/McKael/madon" + "github.com/McKael/madon/v2" "github.com/McKael/madonctl/printer/html2text" ) diff -r d5d0260ead40 -r 605a00e9d1ab printer/templateprinter.go --- a/printer/templateprinter.go Fri Sep 07 22:57:49 2018 +0200 +++ b/printer/templateprinter.go Sat Sep 29 12:24:43 2018 +0200 @@ -18,7 +18,7 @@ "github.com/kr/text" "github.com/mattn/go-isatty" - "github.com/McKael/madon" + "github.com/McKael/madon/v2" "github.com/McKael/madonctl/printer/colors" ) diff -r d5d0260ead40 -r 605a00e9d1ab printer/themeprinter.go --- a/printer/themeprinter.go Fri Sep 07 22:57:49 2018 +0200 +++ b/printer/themeprinter.go Sat Sep 29 12:24:43 2018 +0200 @@ -15,7 +15,7 @@ "github.com/pkg/errors" - "github.com/McKael/madon" + "github.com/McKael/madon/v2" ) const themeDirName = "themes"