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

Merging from v1
This commit is contained in:
Dan Buch 2016-05-23 19:54:57 -04:00
commit 685865d2d9
3 changed files with 28 additions and 14 deletions

View File

@ -1,4 +1,5 @@
[![Build Status](https://travis-ci.org/urfave/cli.svg?branch=master)](https://travis-ci.org/urfave/cli) [![Build Status](https://travis-ci.org/urfave/cli.svg?branch=master)](https://travis-ci.org/urfave/cli)
[![Windows Build Status](https://ci.appveyor.com/api/projects/status/rtgk5xufi932pb2v?svg=true)](https://ci.appveyor.com/project/meatballhat/cli)
[![GoDoc](https://godoc.org/github.com/urfave/cli?status.svg)](https://godoc.org/github.com/urfave/cli) [![GoDoc](https://godoc.org/github.com/urfave/cli?status.svg)](https://godoc.org/github.com/urfave/cli)
[![codebeat](https://codebeat.co/badges/0a8f30aa-f975-404b-b878-5fab3ae1cc5f)](https://codebeat.co/projects/github-com-urfave-cli) [![codebeat](https://codebeat.co/badges/0a8f30aa-f975-404b-b878-5fab3ae1cc5f)](https://codebeat.co/projects/github-com-urfave-cli)
[![Go Report Card](https://goreportcard.com/badge/urfave/cli)](https://goreportcard.com/report/urfave/cli) [![Go Report Card](https://goreportcard.com/badge/urfave/cli)](https://goreportcard.com/report/urfave/cli)

View File

@ -2,15 +2,24 @@ version: "{build}"
os: Windows Server 2012 R2 os: Windows Server 2012 R2
clone_folder: c:\gopath\src\github.com\urfave\cli
environment:
GOPATH: C:\gopath
GOVERSION: 1.6
PYTHON: C:\Python27-x64
PYTHON_VERSION: 2.7.x
PYTHON_ARCH: 64
GFMXR_DEBUG: 1
install: install:
- go version - set PATH=%GOPATH%\bin;C:\go\bin;%PATH%
- go env - go version
- go env
- go get github.com/urfave/gfmxr/...
- go get -v -t ./...
build_script: build_script:
- cd %APPVEYOR_BUILD_FOLDER% - python runtests vet
- go vet ./... - python runtests test
- go test -v ./... - python runtests gfmxr
test: off
deploy: off

View File

@ -49,9 +49,9 @@ def _test():
('{}/{}'.format(PACKAGE_NAME, subpackage)).rstrip('/') ('{}/{}'.format(PACKAGE_NAME, subpackage)).rstrip('/')
]) ])
combined = _combine_coverprofiles(coverprofiles) combined_name = _combine_coverprofiles(coverprofiles)
_run('go tool cover -func={}'.format(combined.name).split()) _run('go tool cover -func={}'.format(combined_name).split())
combined.close() os.remove(combined_name)
def _gfmxr(): def _gfmxr():
@ -78,7 +78,9 @@ def _is_go_runnable(line):
def _combine_coverprofiles(coverprofiles): def _combine_coverprofiles(coverprofiles):
combined = tempfile.NamedTemporaryFile(suffix='.coverprofile') combined = tempfile.NamedTemporaryFile(
suffix='.coverprofile', delete=False
)
combined.write('mode: set\n') combined.write('mode: set\n')
for coverprofile in coverprofiles: for coverprofile in coverprofiles:
@ -88,7 +90,9 @@ def _combine_coverprofiles(coverprofiles):
combined.write(line) combined.write(line)
combined.flush() combined.flush()
return combined name = combined.name
combined.close()
return name
if __name__ == '__main__': if __name__ == '__main__':