From b654795a32040630afc60e9ba18e6d1057539c6e Mon Sep 17 00:00:00 2001 From: Egor Kovetskiy Date: Sat, 25 Jul 2020 11:09:06 +0300 Subject: [PATCH] bump to 3.0 --- Makefile | 5 +---- go.mod | 1 + go.sum | 2 ++ main.go | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 4abd5f1..36d9485 100644 --- a/Makefile +++ b/Makefile @@ -1,9 +1,6 @@ NAME = $(notdir $(PWD)) -VERSION = $(shell printf "%s.%s" \ - $$(git rev-list --count HEAD) \ - $$(git rev-parse --short HEAD) \ -) +VERSION = $(shell git describe --tags --abbrev=0) GO111MODULE = on diff --git a/go.mod b/go.mod index 67a44e0..05081f5 100644 --- a/go.mod +++ b/go.mod @@ -5,6 +5,7 @@ go 1.14 require ( github.com/BurntSushi/toml v0.3.1 // indirect github.com/bndr/gopencils v0.0.0-20161113114152-22e283ad7611 + github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815 github.com/go-yaml/yaml v2.1.0+incompatible // indirect github.com/iancoleman/strcase v0.0.0-20191112232945-16388991a334 // indirect github.com/kovetskiy/godocs v0.0.0-20160817104724-2d9428f80f34 diff --git a/go.sum b/go.sum index da83f32..6022933 100644 --- a/go.sum +++ b/go.sum @@ -4,6 +4,8 @@ github.com/bndr/gopencils v0.0.0-20161113114152-22e283ad7611 h1:hqtAgYVdJDEoCOqA github.com/bndr/gopencils v0.0.0-20161113114152-22e283ad7611/go.mod h1:h/74eddHMsY5P4bCkKTVWWZ+J6nsKMNvDEetFHG7PIY= github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815 h1:bWDMxwH3px2JBh6AyO7hdCn/PkvCZXii8TGj7sbtEbQ= +github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod h1:WwZ+bS3ebgob9U8Nd0kOddGdZWjyMGR8Wziv+TBNwSE= github.com/go-yaml/yaml v2.1.0+incompatible h1:RYi2hDdss1u4YE7GwixGzWwVo47T8UQwnTLB6vQiq+o= github.com/go-yaml/yaml v2.1.0+incompatible/go.mod h1:w2MrLa16VYP0jy6N7M5kHaCkaLENm+P+Tv+MfurjSw0= github.com/iancoleman/strcase v0.0.0-20191112232945-16388991a334 h1:VHgatEHNcBFEB7inlalqfNqw65aNkM1lGX2yt3NmbS8= diff --git a/main.go b/main.go index 6c7ff11..096d057 100644 --- a/main.go +++ b/main.go @@ -7,7 +7,7 @@ import ( "os" "path/filepath" - "github.com/kovetskiy/godocs" + "github.com/docopt/docopt-go" "github.com/kovetskiy/mark/pkg/confluence" "github.com/kovetskiy/mark/pkg/log" "github.com/kovetskiy/mark/pkg/mark" @@ -132,7 +132,7 @@ Options: ) func main() { - args, err := godocs.Parse(usage, "mark 2.0", godocs.UsePager) + args, err := docopt.Parse(usage, nil, true, "3.0", false) if err != nil { panic(err) }