# HG changeset patch # User Sean E. Russell # Date 1494001560 14400 # Fri May 05 12:26:00 2017 -0400 # Node ID 4dbd4d9d7e10af26c99c5889f7cdfa233580fd2a # Parent ff902a7b88c5e1e95f644632c7b7077ece43c42a Move to bitbucket diff --git a/.hgignore b/.hgignore new file mode 100644 --- /dev/null +++ b/.hgignore @@ -0,0 +1,4 @@ +syntax: glob + +vendor +*.swp diff --git a/Gopkg.lock b/Gopkg.lock new file mode 100644 --- /dev/null +++ b/Gopkg.lock @@ -0,0 +1,31 @@ +memo = "acf402c3166eb56385f5348f56067df56af1afbdfad8b09ed27e7e6c1b1faa2a" + +[[projects]] + branch = "master" + name = "github.com/ajstarks/svgo" + packages = ["."] + revision = "672fe547df4e49efc6db67a74391368bcb149b37" + +[[projects]] + name = "github.com/davecgh/go-spew" + packages = ["spew"] + revision = "346938d642f2ec3594ed81d874461961cd0faa76" + version = "v1.1.0" + +[[projects]] + branch = "master" + name = "github.com/droundy/goopt" + packages = ["."] + revision = "17f16b1df30b00550475f4bf7da2d83f9a09223f" + +[[projects]] + name = "github.com/pmezard/go-difflib" + packages = ["difflib"] + revision = "792786c7400a136282c1664665ae0a8db921c6c2" + version = "v1.0.0" + +[[projects]] + name = "github.com/stretchr/testify" + packages = ["assert"] + revision = "69483b4bd14f5845b5a1e55bca19e954e827f1d0" + version = "v1.1.4" diff --git a/Gopkg.toml b/Gopkg.toml new file mode 100644 --- /dev/null +++ b/Gopkg.toml @@ -0,0 +1,4 @@ + +[[dependencies]] + branch = "master" + name = "github.com/ajstarks/svgo" diff --git a/bitbucket-pipelines.yml b/bitbucket-pipelines.yml new file mode 100644 --- /dev/null +++ b/bitbucket-pipelines.yml @@ -0,0 +1,34 @@ +# Check our guides at https://confluence.atlassian.com/x/5Q4SMw for more examples. +# Only use spaces to indent your .yml configuration. +image: golang:1.8 + +pipelines: + default: + - step: + script: + - PACKAGE_PATH="${GOPATH}/src/bitbucket.org/${BITBUCKET_REPO_OWNER}/${BITBUCKET_REPO_SLUG}" + - mkdir -pv "${PACKAGE_PATH}" + - tar -cO . | tar -xv -C "${PACKAGE_PATH}" + - cd "${PACKAGE_PATH}" + - curl -L -O https://bitbucket.org/seanerussell/legume/downloads/dep + - chmod u+x ./dep + - ./dep ensure + - go test -cover $(go list -f '{{join .Deps "\n"}}' ./cmd/orgchart | grep orgchart | grep -v vendor) ./cmd/orgchart + - go build -v ./cmd/orgchart + bookmarks: + v*: + - step: + script: + - PACKAGE_PATH="${GOPATH}/src/bitbucket.org/${BITBUCKET_REPO_OWNER}/${BITBUCKET_REPO_SLUG}" + - mkdir -pv "${PACKAGE_PATH}" + - tar -cO . | tar -xv -C "${PACKAGE_PATH}" + - cd "${PACKAGE_PATH}" + - curl -L -O https://bitbucket.org/seanerussell/orgchart/downloads/dep + - chmod u+x ./dep + - ./dep ensure + - GOOS=linux go build -ldflags "-X main.Version=${BITBUCKET_TAG}" -v -o orgchart_${BITBUCKET_TAG}_linux ./cmd/orgchart + - GOOS=darwin go build -ldflags "-X main.Version=${BITBUCKET_TAG}" -v -o orgchart_${BITBUCKET_TAG}_darwin ./cmd/orgchart + - GOOS=windows go build -ldflags "-X main.Version=${BITBUCKET_TAG}" -v -o orgchart_${BITBUCKET_TAG}_windows.exe ./cmd/orgchart + - curl -X POST "https://${BB_AUTH_STRING}@api.bitbucket.org/2.0/repositories/${BITBUCKET_REPO_OWNER}/${BITBUCKET_REPO_SLUG}/downloads" --form files=@"orgchart_${BITBUCKET_TAG}_linux" + - curl -X POST "https://${BB_AUTH_STRING}@api.bitbucket.org/2.0/repositories/${BITBUCKET_REPO_OWNER}/${BITBUCKET_REPO_SLUG}/downloads" --form files=@"orgchart_${BITBUCKET_TAG}_darwin" + - curl -X POST "https://${BB_AUTH_STRING}@api.bitbucket.org/2.0/repositories/${BITBUCKET_REPO_OWNER}/${BITBUCKET_REPO_SLUG}/downloads" --form files=@"orgchart_${BITBUCKET_TAG}_windows.exe" diff --git a/cmd/filter/main.go b/cmd/filter/main.go --- a/cmd/filter/main.go +++ b/cmd/filter/main.go @@ -6,7 +6,7 @@ "text/template" "github.com/droundy/goopt" - oc "repos.seanerussell.us/orgchart" + oc "bitbucket.org/seanerussell/orgchart" ) func main() { diff --git a/cmd/orgchart/main.go b/cmd/orgchart/main.go --- a/cmd/orgchart/main.go +++ b/cmd/orgchart/main.go @@ -20,7 +20,7 @@ "strings" "github.com/droundy/goopt" - oc "repos.seanerussell.us/orgchart" + oc "bitbucket.org/seanerussell/orgchart" ) /************************************************************************** diff --git a/todo.txt b/todo.txt --- a/todo.txt +++ b/todo.txt @@ -11,3 +11,6 @@ Add ability to style the text in Person boxes. Upload a spreadsheet, select columns @WebInterface Render graph @WebInterface +Two-column reports +Interactive graph (click to collapse) +Re-root tree diff --git a/vendor/manifest b/vendor/manifest deleted file mode 100644 --- a/vendor/manifest +++ /dev/null @@ -1,56 +0,0 @@ -{ - "version": 0, - "dependencies": [ - { - "importpath": "github.com/ajstarks/svgo", - "repository": "https://github.com/ajstarks/svgo", - "vcs": "git", - "revision": "672fe547df4e49efc6db67a74391368bcb149b37", - "branch": "master", - "notests": true - }, - { - "importpath": "github.com/droundy/goopt", - "repository": "https://github.com/droundy/goopt", - "vcs": "git", - "revision": "e5c9ab183a102ef3ad2363b04483784258984157", - "branch": "master", - "notests": true - }, - { - "importpath": "github.com/stretchr/testify/assert", - "repository": "https://github.com/stretchr/testify", - "vcs": "git", - "revision": "4d4bfba8f1d1027c4fdbe371823030df51419987", - "branch": "master", - "path": "/assert", - "notests": true - }, - { - "importpath": "github.com/stretchr/testify/vendor/github.com/davecgh/go-spew/spew", - "repository": "https://github.com/stretchr/testify", - "vcs": "git", - "revision": "4d4bfba8f1d1027c4fdbe371823030df51419987", - "branch": "master", - "path": "vendor/github.com/davecgh/go-spew/spew", - "notests": true - }, - { - "importpath": "github.com/stretchr/testify/vendor/github.com/pmezard/go-difflib/difflib", - "repository": "https://github.com/stretchr/testify", - "vcs": "git", - "revision": "4d4bfba8f1d1027c4fdbe371823030df51419987", - "branch": "master", - "path": "vendor/github.com/pmezard/go-difflib/difflib", - "notests": true - }, - { - "importpath": "honnef.co/go/structlayout", - "repository": "https://github.com/dominikh/go-structlayout", - "vcs": "", - "revision": "504fdf06ef5c0d83a29c594b3a169af68b9c2e14", - "branch": "master", - "notests": true - } - ] -} \ No newline at end of file