x/urfave-cli
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #486 from urfave/merging-from-v1

Browse Source 
Merging from v1
This commit is contained in:
Dan Buch 2016-07-16 12:47:21 -04:00 committed by GitHub
commit 215f2422ff
3 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.travis.yml
View File

@ -26,12 +26,11 @@ matrix:
before_script: before_script:
- $pip_install flake8 - $pip_install flake8
- go get github.com/urfave/gfmxr/... - go get github.com/urfave/gfmrun/...
- go get golang.org/x/tools/cmd/goimports - go get golang.org/x/tools/cmd/goimports
- if [ ! -f node_modules/.bin/markdown-toc ] ; then - if [ ! -f node_modules/.bin/markdown-toc ] ; then
npm install markdown-toc ; npm install markdown-toc ;
fi fi
- go get github.com/urfave/gfmxr/...
- mkdir -p ${GOPATH%%:*}/src/gopkg.in/urfave - mkdir -p ${GOPATH%%:*}/src/gopkg.in/urfave
- rm -rvf ${GOPATH%%:*}/src/gopkg.in/urfave/cli.v2 - rm -rvf ${GOPATH%%:*}/src/gopkg.in/urfave/cli.v2
- rm -rvf ${GOPATH%%:*}/pkg/*/gopkg.in/urfave/cli.v2.a - rm -rvf ${GOPATH%%:*}/pkg/*/gopkg.in/urfave/cli.v2.a
@ -42,7 +41,7 @@ script:
- ./runtests gen - ./runtests gen
- ./runtests vet - ./runtests vet
- ./runtests test - ./runtests test
- ./runtests gfmxr - ./runtests gfmrun
- ./cli-v1-to-v2 --selftest - ./cli-v1-to-v2 --selftest
- ./runtests migrations - ./runtests migrations
- ./runtests toc - ./runtests toc

4
appveyor.yml
View File

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

8
runtests
View File

@ -60,8 +60,8 @@ def _test():
@_target @_target
def _gfmxr(): def _gfmrun():
_run(['gfmxr', '-c', str(_gfmxr_count()), '-s', 'README.md']) _run(['gfmrun', '-c', str(_gfmrun_count()), '-s', 'README.md'])
@_target @_target
@ -83,7 +83,7 @@ def _migrations():
try: try:
os.chdir(tmpdir) os.chdir(tmpdir)
_run('curl -sSL -o README.md {}'.format(v1_readme_url).split()) _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 gofile in glob.glob('*.go'):
for i in (0, 1): for i in (0, 1):
@ -123,7 +123,7 @@ def _run(command):
check_call(command) check_call(command)
def _gfmxr_count(): def _gfmrun_count():
with open('README.md') as infile: with open('README.md') as infile:
lines = infile.read().splitlines() lines = infile.read().splitlines()
return len(filter(_is_go_runnable, lines)) return len(filter(_is_go_runnable, lines))