Merge branch 'v2' into flake8-typegen

.travis.yml

@@ -26,12 +26,11 @@ matrix:
 
 before_script:
 - $pip_install flake8
-- 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 ;
   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
@@ -42,7 +41,7 @@ script:
 - ./runtests gen
 - ./runtests vet
 - ./runtests test
-- ./runtests gfmxr
+- ./runtests gfmrun
 - ./cli-v1-to-v2 --selftest
 - ./runtests migrations
 - ./runtests toc

appveyor.yml

@@ -18,7 +18,7 @@ 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/...
 - rmdir c:\gopath\src\gopkg.in\urfave\cli.v2 /s /q
 - rmdir c:\gopath\pkg /s /q
 - git clone . c:\gopath\src\gopkg.in\urfave\cli.v2
@@ -28,7 +28,7 @@ install:
 build_script:
 - python runtests vet
 - python runtests test
-- python runtests gfmxr
+- python runtests gfmrun
 - python cli-v1-to-v2 --selftest
 - python runtests migrations
 - python runtests toc

runtests

@@ -60,8 +60,8 @@ def _test():
 
 
 @_target
-def _gfmxr():
-    _run(['gfmxr', '-c', str(_gfmxr_count()), '-s', 'README.md'])
+def _gfmrun():
+    _run(['gfmrun', '-c', str(_gfmrun_count()), '-s', 'README.md'])
 
 
 @_target
@@ -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):
@@ -123,7 +123,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))