From 2c1fd1510c7526a9cb628fdaea7bd85f44412fa8 Mon Sep 17 00:00:00 2001 From: Dan Buch Date: Sat, 16 Jul 2016 09:12:42 -0400 Subject: [PATCH 1/2] Switch to renamed gfmrun tool --- .travis.yml | 4 ++-- appveyor.yml | 4 ++-- runtests | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index f5b95ed..30dd111 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,7 +22,7 @@ matrix: os: osx before_script: -- go get github.com/urfave/gfmxr/... +- go get github.com/urfave/gfmrun/... - go get golang.org/x/tools/cmd/goimports - if [ ! -f node_modules/.bin/markdown-toc ] ; then npm install markdown-toc ; @@ -32,5 +32,5 @@ script: - ./runtests gen - ./runtests vet - ./runtests test -- ./runtests gfmxr +- ./runtests gfmrun - ./runtests toc diff --git a/appveyor.yml b/appveyor.yml index 173086e..9e9d271 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -16,10 +16,10 @@ install: - set PATH=%GOPATH%\bin;C:\go\bin;%PATH% - go version - go env -- go get github.com/urfave/gfmxr/... +- go get github.com/urfave/gfmrun/... - go get -v -t ./... build_script: - python runtests vet - python runtests test -- python runtests gfmxr +- python runtests gfmrun diff --git a/runtests b/runtests index 2e47233..d9fa542 100755 --- a/runtests +++ b/runtests @@ -18,7 +18,7 @@ def main(sysargs=sys.argv[:]): targets = { 'vet': _vet, 'test': _test, - 'gfmxr': _gfmxr, + 'gfmrun': _gfmrun, 'toc': _toc, 'gen': _gen, } @@ -56,8 +56,8 @@ def _test(): os.remove(combined_name) -def _gfmxr(): - _run(['gfmxr', '-c', str(_gfmxr_count()), '-s', 'README.md']) +def _gfmrun(): + _run(['gfmrun', '-c', str(_gfmrun_count()), '-s', 'README.md']) def _vet(): @@ -86,7 +86,7 @@ def _run(command): check_call(command) -def _gfmxr_count(): +def _gfmrun_count(): with open('README.md') as infile: lines = infile.read().splitlines() return len(filter(_is_go_runnable, lines)) From 67cf9194196e72f3a4a4bd44762bbde5f95f625b Mon Sep 17 00:00:00 2001 From: Dan Buch Date: Sat, 16 Jul 2016 12:24:16 -0400 Subject: [PATCH 2/2] Fix some trailing gfmxr refs --- .travis.yml | 1 - runtests | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 82c058b..72d5bd7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -31,7 +31,6 @@ before_script: - if [ ! -f node_modules/.bin/markdown-toc ] ; then npm install markdown-toc ; fi -- go get github.com/urfave/gfmxr/... - mkdir -p ${GOPATH%%:*}/src/gopkg.in/urfave - rm -rvf ${GOPATH%%:*}/src/gopkg.in/urfave/cli.v2 - rm -rvf ${GOPATH%%:*}/pkg/*/gopkg.in/urfave/cli.v2.a diff --git a/runtests b/runtests index d82fd44..4af1b7d 100755 --- a/runtests +++ b/runtests @@ -83,7 +83,7 @@ def _migrations(): try: os.chdir(tmpdir) _run('curl -sSL -o README.md {}'.format(v1_readme_url).split()) - _run('gfmxr extract -o .'.split()) + _run('gfmrun extract -o .'.split()) for gofile in glob.glob('*.go'): for i in (0, 1):