From 9bc72ddb1f581840976426174baa034e95aa3cbd Mon Sep 17 00:00:00 2001 From: Nicolas Grilly Date: Wed, 13 Apr 2016 22:04:45 +0200 Subject: [PATCH] Use Go 1.6 vendoring (#80) --- .travis.yml | 4 - Godeps/Godeps.json | 10 +- Godeps/_workspace/.gitignore | 2 - .../kardianos/osext/osext_test.go | 79 -------- .../daviddengcn/go-colortext/ct_test.go | 26 --- .../ddollar/dist/Godeps/Godeps.json | 22 --- .../src/github.com/ddollar/dist/Godeps/Readme | 5 - .../github.com/kr/binarydist/common_test.go | 93 --------- .../src/github.com/kr/binarydist/diff_test.go | 67 ------- .../github.com/kr/binarydist/patch_test.go | 62 ------ .../src/github.com/kr/binarydist/sort_test.go | 33 ---- .../kr/binarydist/testdata/sample.new | Bin 10000 -> 0 bytes .../kr/binarydist/testdata/sample.old | Bin 11000 -> 0 bytes .../kr/binarydist/testdata/sample.patch | Bin 1090 -> 0 bytes .../src/github.com/kr/pretty/diff_test.go | 73 ------- .../src/github.com/kr/pretty/example_test.go | 20 -- .../github.com/kr/pretty/formatter_test.go | 146 -------------- .../src/github.com/kr/text/colwriter/Readme | 5 - .../github.com/kr/text/colwriter/column.go | 147 -------------- .../kr/text/colwriter/column_test.go | 90 --------- .../src/github.com/kr/text/indent_test.go | 119 ----------- .../src/github.com/kr/text/mc/Readme | 9 - .../src/github.com/kr/text/mc/mc.go | 62 ------ .../src/github.com/kr/text/wrap_test.go | 44 ----- .../subosito/gotenv/examples_test.go | 15 -- .../subosito/gotenv/fixtures/exported.env | 2 - .../subosito/gotenv/fixtures/plain.env | 5 - .../subosito/gotenv/fixtures/quoted.env | 8 - .../subosito/gotenv/fixtures/yaml.env | 4 - .../github.com/subosito/gotenv/gotenv_test.go | 187 ------------------ Makefile | 2 +- env.go | 2 +- outlet.go | 4 +- procfile.go | 2 +- update.go | 2 +- .../bitbucket.org/kardianos/osext/LICENSE | 0 .../bitbucket.org/kardianos/osext/osext.go | 0 .../kardianos/osext/osext_plan9.go | 0 .../kardianos/osext/osext_procfs.go | 0 .../kardianos/osext/osext_sysctl.go | 0 .../kardianos/osext/osext_windows.go | 0 .../daviddengcn/go-colortext/.gitignore | 0 .../daviddengcn/go-colortext/README.md | 0 .../github.com/daviddengcn/go-colortext/ct.go | 0 .../daviddengcn/go-colortext/ct_ansi.go | 0 .../daviddengcn/go-colortext/ct_win.go | 0 .../github.com/ddollar/dist/dist.go | 6 +- .../github.com/ddollar/dist/version.go | 0 .../github.com/ddollar/go-update/README | 0 .../github.com/ddollar/go-update/update.go | 4 +- .../github.com/kr/binarydist/.gitignore | 0 .../github.com/kr/binarydist/License | 0 .../github.com/kr/binarydist/Readme.md | 0 .../github.com/kr/binarydist/bzip2.go | 0 .../github.com/kr/binarydist/diff.go | 0 .../github.com/kr/binarydist/doc.go | 0 .../github.com/kr/binarydist/encoding.go | 0 .../github.com/kr/binarydist/patch.go | 0 .../github.com/kr/binarydist/seek.go | 0 .../github.com/kr/pretty/.gitignore | 0 .../github.com/kr/pretty/License | 0 .../github.com/kr/pretty/Readme | 0 .../github.com/kr/pretty/diff.go | 0 .../github.com/kr/pretty/formatter.go | 2 +- .../github.com/kr/pretty/pretty.go | 0 .../github.com/kr/pretty/zero.go | 0 .../src => vendor}/github.com/kr/text/License | 0 .../src => vendor}/github.com/kr/text/Readme | 0 .../src => vendor}/github.com/kr/text/doc.go | 0 .../github.com/kr/text/indent.go | 0 .../src => vendor}/github.com/kr/text/wrap.go | 0 .../github.com/subosito/gotenv/.env | 0 .../github.com/subosito/gotenv/.gitignore | 0 .../github.com/subosito/gotenv/LICENSE | 0 .../github.com/subosito/gotenv/README.md | 0 .../github.com/subosito/gotenv/gotenv.go | 0 76 files changed, 16 insertions(+), 1347 deletions(-) delete mode 100644 Godeps/_workspace/.gitignore delete mode 100644 Godeps/_workspace/src/bitbucket.org/kardianos/osext/osext_test.go delete mode 100644 Godeps/_workspace/src/github.com/daviddengcn/go-colortext/ct_test.go delete mode 100644 Godeps/_workspace/src/github.com/ddollar/dist/Godeps/Godeps.json delete mode 100644 Godeps/_workspace/src/github.com/ddollar/dist/Godeps/Readme delete mode 100644 Godeps/_workspace/src/github.com/kr/binarydist/common_test.go delete mode 100644 Godeps/_workspace/src/github.com/kr/binarydist/diff_test.go delete mode 100644 Godeps/_workspace/src/github.com/kr/binarydist/patch_test.go delete mode 100644 Godeps/_workspace/src/github.com/kr/binarydist/sort_test.go delete mode 100644 Godeps/_workspace/src/github.com/kr/binarydist/testdata/sample.new delete mode 100644 Godeps/_workspace/src/github.com/kr/binarydist/testdata/sample.old delete mode 100644 Godeps/_workspace/src/github.com/kr/binarydist/testdata/sample.patch delete mode 100644 Godeps/_workspace/src/github.com/kr/pretty/diff_test.go delete mode 100644 Godeps/_workspace/src/github.com/kr/pretty/example_test.go delete mode 100644 Godeps/_workspace/src/github.com/kr/pretty/formatter_test.go delete mode 100644 Godeps/_workspace/src/github.com/kr/text/colwriter/Readme delete mode 100644 Godeps/_workspace/src/github.com/kr/text/colwriter/column.go delete mode 100644 Godeps/_workspace/src/github.com/kr/text/colwriter/column_test.go delete mode 100644 Godeps/_workspace/src/github.com/kr/text/indent_test.go delete mode 100644 Godeps/_workspace/src/github.com/kr/text/mc/Readme delete mode 100644 Godeps/_workspace/src/github.com/kr/text/mc/mc.go delete mode 100644 Godeps/_workspace/src/github.com/kr/text/wrap_test.go delete mode 100644 Godeps/_workspace/src/github.com/subosito/gotenv/examples_test.go delete mode 100644 Godeps/_workspace/src/github.com/subosito/gotenv/fixtures/exported.env delete mode 100644 Godeps/_workspace/src/github.com/subosito/gotenv/fixtures/plain.env delete mode 100644 Godeps/_workspace/src/github.com/subosito/gotenv/fixtures/quoted.env delete mode 100644 Godeps/_workspace/src/github.com/subosito/gotenv/fixtures/yaml.env delete mode 100644 Godeps/_workspace/src/github.com/subosito/gotenv/gotenv_test.go rename {Godeps/_workspace/src => vendor}/bitbucket.org/kardianos/osext/LICENSE (100%) rename {Godeps/_workspace/src => vendor}/bitbucket.org/kardianos/osext/osext.go (100%) rename {Godeps/_workspace/src => vendor}/bitbucket.org/kardianos/osext/osext_plan9.go (100%) rename {Godeps/_workspace/src => vendor}/bitbucket.org/kardianos/osext/osext_procfs.go (100%) rename {Godeps/_workspace/src => vendor}/bitbucket.org/kardianos/osext/osext_sysctl.go (100%) rename {Godeps/_workspace/src => vendor}/bitbucket.org/kardianos/osext/osext_windows.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/daviddengcn/go-colortext/.gitignore (100%) rename {Godeps/_workspace/src => vendor}/github.com/daviddengcn/go-colortext/README.md (100%) rename {Godeps/_workspace/src => vendor}/github.com/daviddengcn/go-colortext/ct.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/daviddengcn/go-colortext/ct_ansi.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/daviddengcn/go-colortext/ct_win.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/ddollar/dist/dist.go (95%) rename {Godeps/_workspace/src => vendor}/github.com/ddollar/dist/version.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/ddollar/go-update/README (100%) rename {Godeps/_workspace/src => vendor}/github.com/ddollar/go-update/update.go (99%) rename {Godeps/_workspace/src => vendor}/github.com/kr/binarydist/.gitignore (100%) rename {Godeps/_workspace/src => vendor}/github.com/kr/binarydist/License (100%) rename {Godeps/_workspace/src => vendor}/github.com/kr/binarydist/Readme.md (100%) rename {Godeps/_workspace/src => vendor}/github.com/kr/binarydist/bzip2.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/kr/binarydist/diff.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/kr/binarydist/doc.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/kr/binarydist/encoding.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/kr/binarydist/patch.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/kr/binarydist/seek.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/kr/pretty/.gitignore (100%) rename {Godeps/_workspace/src => vendor}/github.com/kr/pretty/License (100%) rename {Godeps/_workspace/src => vendor}/github.com/kr/pretty/Readme (100%) rename {Godeps/_workspace/src => vendor}/github.com/kr/pretty/diff.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/kr/pretty/formatter.go (98%) rename {Godeps/_workspace/src => vendor}/github.com/kr/pretty/pretty.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/kr/pretty/zero.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/kr/text/License (100%) rename {Godeps/_workspace/src => vendor}/github.com/kr/text/Readme (100%) rename {Godeps/_workspace/src => vendor}/github.com/kr/text/doc.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/kr/text/indent.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/kr/text/wrap.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/subosito/gotenv/.env (100%) rename {Godeps/_workspace/src => vendor}/github.com/subosito/gotenv/.gitignore (100%) rename {Godeps/_workspace/src => vendor}/github.com/subosito/gotenv/LICENSE (100%) rename {Godeps/_workspace/src => vendor}/github.com/subosito/gotenv/README.md (100%) rename {Godeps/_workspace/src => vendor}/github.com/subosito/gotenv/gotenv.go (100%) diff --git a/.travis.yml b/.travis.yml index e0d02a6..acfff65 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,9 +8,5 @@ env: global: - PATH=$HOME/gopath/bin:$PATH -before_install: - - go get github.com/tools/godep - - godep restore - script: - make test diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json index 93cd226..ee73386 100644 --- a/Godeps/Godeps.json +++ b/Godeps/Godeps.json @@ -1,9 +1,7 @@ { "ImportPath": "github.com/ddollar/forego", - "GoVersion": "go1.4.1", - "Packages": [ - "." - ], + "GoVersion": "go1.6", + "GodepVersion": "v60", "Deps": [ { "ImportPath": "bitbucket.org/kardianos/osext", @@ -16,8 +14,8 @@ }, { "ImportPath": "github.com/ddollar/dist", - "Comment": "v0.2.0-3-gd4be91e", - "Rev": "d4be91e0cd1771c51ae117e18eb6c379757623f4" + "Comment": "v0.2.0-2-gf559761", + "Rev": "f559761fd36c52dc90d7d2c0bc537e6d96b0edc5" }, { "ImportPath": "github.com/ddollar/go-update", diff --git a/Godeps/_workspace/.gitignore b/Godeps/_workspace/.gitignore deleted file mode 100644 index f037d68..0000000 --- a/Godeps/_workspace/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -/pkg -/bin diff --git a/Godeps/_workspace/src/bitbucket.org/kardianos/osext/osext_test.go b/Godeps/_workspace/src/bitbucket.org/kardianos/osext/osext_test.go deleted file mode 100644 index dc661db..0000000 --- a/Godeps/_workspace/src/bitbucket.org/kardianos/osext/osext_test.go +++ /dev/null @@ -1,79 +0,0 @@ -// Copyright 2012 The Go Authors. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. - -// +build darwin linux freebsd netbsd windows - -package osext - -import ( - "fmt" - "os" - oexec "os/exec" - "path/filepath" - "runtime" - "testing" -) - -const execPath_EnvVar = "OSTEST_OUTPUT_EXECPATH" - -func TestExecPath(t *testing.T) { - ep, err := Executable() - if err != nil { - t.Fatalf("ExecPath failed: %v", err) - } - // we want fn to be of the form "dir/prog" - dir := filepath.Dir(filepath.Dir(ep)) - fn, err := filepath.Rel(dir, ep) - if err != nil { - t.Fatalf("filepath.Rel: %v", err) - } - cmd := &oexec.Cmd{} - // make child start with a relative program path - cmd.Dir = dir - cmd.Path = fn - // forge argv[0] for child, so that we can verify we could correctly - // get real path of the executable without influenced by argv[0]. - cmd.Args = []string{"-", "-test.run=XXXX"} - cmd.Env = []string{fmt.Sprintf("%s=1", execPath_EnvVar)} - out, err := cmd.CombinedOutput() - if err != nil { - t.Fatalf("exec(self) failed: %v", err) - } - outs := string(out) - if !filepath.IsAbs(outs) { - t.Fatalf("Child returned %q, want an absolute path", out) - } - if !sameFile(outs, ep) { - t.Fatalf("Child returned %q, not the same file as %q", out, ep) - } -} - -func sameFile(fn1, fn2 string) bool { - fi1, err := os.Stat(fn1) - if err != nil { - return false - } - fi2, err := os.Stat(fn2) - if err != nil { - return false - } - return os.SameFile(fi1, fi2) -} - -func init() { - if e := os.Getenv(execPath_EnvVar); e != "" { - // first chdir to another path - dir := "/" - if runtime.GOOS == "windows" { - dir = filepath.VolumeName(".") - } - os.Chdir(dir) - if ep, err := Executable(); err != nil { - fmt.Fprint(os.Stderr, "ERROR: ", err) - } else { - fmt.Fprint(os.Stderr, ep) - } - os.Exit(0) - } -} diff --git a/Godeps/_workspace/src/github.com/daviddengcn/go-colortext/ct_test.go b/Godeps/_workspace/src/github.com/daviddengcn/go-colortext/ct_test.go deleted file mode 100644 index b2db738..0000000 --- a/Godeps/_workspace/src/github.com/daviddengcn/go-colortext/ct_test.go +++ /dev/null @@ -1,26 +0,0 @@ -package ct - -import ( - "fmt" - "testing" -) - -func TestChangeColor(t *testing.T) { - defer ResetColor() - fmt.Println("Normal text...") - text := "This is an demo of using ChangeColor to output colorful texts" - i := 1 - for _, c := range text { - ChangeColor(Color(i/2%8)+Black, i%2 == 1, Color((i+2)/2%8)+Black, false) - fmt.Print(string(c)) - i++ - } // for c - fmt.Println() - ChangeColor(Red, true, White, false) - fmt.Println("Before reset.") - ChangeColor(Red, false, White, true) - fmt.Println("Before reset.") - ResetColor() - fmt.Println("After reset.") - fmt.Println("After reset.") -} diff --git a/Godeps/_workspace/src/github.com/ddollar/dist/Godeps/Godeps.json b/Godeps/_workspace/src/github.com/ddollar/dist/Godeps/Godeps.json deleted file mode 100644 index 6bbb1b7..0000000 --- a/Godeps/_workspace/src/github.com/ddollar/dist/Godeps/Godeps.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "ImportPath": "github.com/ddollar/dist", - "GoVersion": "go1.4.1", - "Packages": [ - "." - ], - "Deps": [ - { - "ImportPath": "bitbucket.org/kardianos/osext", - "Comment": "null-13", - "Rev": "5d3ddcf53a508cc2f7404eaebf546ef2cb5cdb6e" - }, - { - "ImportPath": "github.com/ddollar/go-update", - "Rev": "4733469d35539f410e0e84552944fa0df7e72c98" - }, - { - "ImportPath": "github.com/kr/binarydist", - "Rev": "9955b0ab8708602d411341e55fffd7e0700f86bd" - } - ] -} diff --git a/Godeps/_workspace/src/github.com/ddollar/dist/Godeps/Readme b/Godeps/_workspace/src/github.com/ddollar/dist/Godeps/Readme deleted file mode 100644 index 4cdaa53..0000000 --- a/Godeps/_workspace/src/github.com/ddollar/dist/Godeps/Readme +++ /dev/null @@ -1,5 +0,0 @@ -This directory tree is generated automatically by godep. - -Please do not edit. - -See https://github.com/tools/godep for more information. diff --git a/Godeps/_workspace/src/github.com/kr/binarydist/common_test.go b/Godeps/_workspace/src/github.com/kr/binarydist/common_test.go deleted file mode 100644 index af51616..0000000 --- a/Godeps/_workspace/src/github.com/kr/binarydist/common_test.go +++ /dev/null @@ -1,93 +0,0 @@ -package binarydist - -import ( - "crypto/rand" - "io" - "io/ioutil" - "os" -) - -func mustOpen(path string) *os.File { - f, err := os.Open(path) - if err != nil { - panic(err) - } - - return f -} - -func mustReadAll(r io.Reader) []byte { - b, err := ioutil.ReadAll(r) - if err != nil { - panic(err) - } - return b -} - -func fileCmp(a, b *os.File) int64 { - sa, err := a.Seek(0, 2) - if err != nil { - panic(err) - } - - sb, err := b.Seek(0, 2) - if err != nil { - panic(err) - } - - if sa != sb { - return sa - } - - _, err = a.Seek(0, 0) - if err != nil { - panic(err) - } - - _, err = b.Seek(0, 0) - if err != nil { - panic(err) - } - - pa, err := ioutil.ReadAll(a) - if err != nil { - panic(err) - } - - pb, err := ioutil.ReadAll(b) - if err != nil { - panic(err) - } - - for i := range pa { - if pa[i] != pb[i] { - return int64(i) - } - } - return -1 -} - -func mustWriteRandFile(path string, size int) *os.File { - p := make([]byte, size) - _, err := rand.Read(p) - if err != nil { - panic(err) - } - - f, err := os.Create(path) - if err != nil { - panic(err) - } - - _, err = f.Write(p) - if err != nil { - panic(err) - } - - _, err = f.Seek(0, 0) - if err != nil { - panic(err) - } - - return f -} diff --git a/Godeps/_workspace/src/github.com/kr/binarydist/diff_test.go b/Godeps/_workspace/src/github.com/kr/binarydist/diff_test.go deleted file mode 100644 index 9baa492..0000000 --- a/Godeps/_workspace/src/github.com/kr/binarydist/diff_test.go +++ /dev/null @@ -1,67 +0,0 @@ -package binarydist - -import ( - "bytes" - "io/ioutil" - "os" - "os/exec" - "testing" -) - -var diffT = []struct { - old *os.File - new *os.File -}{ - { - old: mustWriteRandFile("test.old", 1e3), - new: mustWriteRandFile("test.new", 1e3), - }, - { - old: mustOpen("testdata/sample.old"), - new: mustOpen("testdata/sample.new"), - }, -} - -func TestDiff(t *testing.T) { - for _, s := range diffT { - got, err := ioutil.TempFile("/tmp", "bspatch.") - if err != nil { - panic(err) - } - os.Remove(got.Name()) - - exp, err := ioutil.TempFile("/tmp", "bspatch.") - if err != nil { - panic(err) - } - - cmd := exec.Command("bsdiff", s.old.Name(), s.new.Name(), exp.Name()) - cmd.Stdout = os.Stdout - err = cmd.Run() - os.Remove(exp.Name()) - if err != nil { - panic(err) - } - - err = Diff(s.old, s.new, got) - if err != nil { - t.Fatal("err", err) - } - - _, err = got.Seek(0, 0) - if err != nil { - panic(err) - } - gotBuf := mustReadAll(got) - expBuf := mustReadAll(exp) - - if !bytes.Equal(gotBuf, expBuf) { - t.Fail() - t.Logf("diff %s %s", s.old.Name(), s.new.Name()) - t.Logf("%s: len(got) = %d", got.Name(), len(gotBuf)) - t.Logf("%s: len(exp) = %d", exp.Name(), len(expBuf)) - i := matchlen(gotBuf, expBuf) - t.Logf("produced different output at pos %d; %d != %d", i, gotBuf[i], expBuf[i]) - } - } -} diff --git a/Godeps/_workspace/src/github.com/kr/binarydist/patch_test.go b/Godeps/_workspace/src/github.com/kr/binarydist/patch_test.go deleted file mode 100644 index 840a919..0000000 --- a/Godeps/_workspace/src/github.com/kr/binarydist/patch_test.go +++ /dev/null @@ -1,62 +0,0 @@ -package binarydist - -import ( - "io/ioutil" - "os" - "os/exec" - "testing" -) - -func TestPatch(t *testing.T) { - mustWriteRandFile("test.old", 1e3) - mustWriteRandFile("test.new", 1e3) - - got, err := ioutil.TempFile("/tmp", "bspatch.") - if err != nil { - panic(err) - } - os.Remove(got.Name()) - - err = exec.Command("bsdiff", "test.old", "test.new", "test.patch").Run() - if err != nil { - panic(err) - } - - err = Patch(mustOpen("test.old"), got, mustOpen("test.patch")) - if err != nil { - t.Fatal("err", err) - } - - ref, err := got.Seek(0, 2) - if err != nil { - panic(err) - } - - t.Logf("got %d bytes", ref) - if n := fileCmp(got, mustOpen("test.new")); n > -1 { - t.Fatalf("produced different output at pos %d", n) - } -} - -func TestPatchHk(t *testing.T) { - got, err := ioutil.TempFile("/tmp", "bspatch.") - if err != nil { - panic(err) - } - os.Remove(got.Name()) - - err = Patch(mustOpen("testdata/sample.old"), got, mustOpen("testdata/sample.patch")) - if err != nil { - t.Fatal("err", err) - } - - ref, err := got.Seek(0, 2) - if err != nil { - panic(err) - } - - t.Logf("got %d bytes", ref) - if n := fileCmp(got, mustOpen("testdata/sample.new")); n > -1 { - t.Fatalf("produced different output at pos %d", n) - } -} diff --git a/Godeps/_workspace/src/github.com/kr/binarydist/sort_test.go b/Godeps/_workspace/src/github.com/kr/binarydist/sort_test.go deleted file mode 100644 index be483c3..0000000 --- a/Godeps/_workspace/src/github.com/kr/binarydist/sort_test.go +++ /dev/null @@ -1,33 +0,0 @@ -package binarydist - -import ( - "bytes" - "crypto/rand" - "testing" -) - -var sortT = [][]byte{ - mustRandBytes(1000), - mustReadAll(mustOpen("test.old")), - []byte("abcdefabcdef"), -} - -func TestQsufsort(t *testing.T) { - for _, s := range sortT { - I := qsufsort(s) - for i := 1; i < len(I); i++ { - if bytes.Compare(s[I[i-1]:], s[I[i]:]) > 0 { - t.Fatalf("unsorted at %d", i) - } - } - } -} - -func mustRandBytes(n int) []byte { - b := make([]byte, n) - _, err := rand.Read(b) - if err != nil { - panic(err) - } - return b -} diff --git a/Godeps/_workspace/src/github.com/kr/binarydist/testdata/sample.new b/Godeps/_workspace/src/github.com/kr/binarydist/testdata/sample.new deleted file mode 100644 index 592cdbe2dff6a7f7f9bcdbd80fdf30fb775d8e13..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 10000 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 Jc&U;-_-}XSHje-R diff --git a/Godeps/_workspace/src/github.com/kr/binarydist/testdata/sample.old b/Godeps/_workspace/src/github.com/kr/binarydist/testdata/sample.old deleted file mode 100644 index 7bc64dacb0a93810ef51ba9bba355b1755738734..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 11000 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 F1^_f>!+rn& diff --git a/Godeps/_workspace/src/github.com/kr/pretty/diff_test.go b/Godeps/_workspace/src/github.com/kr/pretty/diff_test.go deleted file mode 100644 index 02d1953..0000000 --- a/Godeps/_workspace/src/github.com/kr/pretty/diff_test.go +++ /dev/null @@ -1,73 +0,0 @@ -package pretty - -import ( - "testing" -) - -type difftest struct { - a interface{} - b interface{} - exp []string -} - -type S struct { - A int - S *S - I interface{} - C []int -} - -var diffs = []difftest{ - {a: nil, b: nil}, - {a: S{A: 1}, b: S{A: 1}}, - - {0, "", []string{`int != string`}}, - {0, 1, []string{`0 != 1`}}, - {S{}, new(S), []string{`pretty.S != *pretty.S`}}, - {"a", "b", []string{`"a" != "b"`}}, - {S{}, S{A: 1}, []string{`A: 0 != 1`}}, - {new(S), &S{A: 1}, []string{`A: 0 != 1`}}, - {S{S: new(S)}, S{S: &S{A: 1}}, []string{`S.A: 0 != 1`}}, - {S{}, S{I: 0}, []string{`I: nil != 0`}}, - {S{I: 1}, S{I: "x"}, []string{`I: int != string`}}, - {S{}, S{C: []int{1}}, []string{`C: []int(nil) != []int{1}`}}, - {S{C: []int{}}, S{C: []int{1}}, []string{`C: []int{} != []int{1}`}}, - {S{}, S{A: 1, S: new(S)}, []string{`A: 0 != 1`, `S: nil != &{0 []}`}}, -} - -func TestDiff(t *testing.T) { - for _, tt := range diffs { - got := Diff(tt.a, tt.b) - eq := len(got) == len(tt.exp) - if eq { - for i := range got { - eq = eq && got[i] == tt.exp[i] - } - } - if !eq { - t.Errorf("diffing % #v", tt.a) - t.Errorf("with % #v", tt.b) - diffdiff(t, got, tt.exp) - continue - } - } -} - -func diffdiff(t *testing.T, got, exp []string) { - minus(t, "unexpected:", got, exp) - minus(t, "missing:", exp, got) -} - -func minus(t *testing.T, s string, a, b []string) { - var i, j int - for i = 0; i < len(a); i++ { - for j = 0; j < len(b); j++ { - if a[i] == b[j] { - break - } - } - if j == len(b) { - t.Error(s, a[i]) - } - } -} diff --git a/Godeps/_workspace/src/github.com/kr/pretty/example_test.go b/Godeps/_workspace/src/github.com/kr/pretty/example_test.go deleted file mode 100644 index 37c4e9b..0000000 --- a/Godeps/_workspace/src/github.com/kr/pretty/example_test.go +++ /dev/null @@ -1,20 +0,0 @@ -package pretty_test - -import ( - "fmt" - "github.com/ddollar/forego/Godeps/_workspace/src/github.com/kr/pretty" -) - -func Example() { - type myType struct { - a, b int - } - var x = []myType{{1, 2}, {3, 4}, {5, 6}} - fmt.Printf("%# v", pretty.Formatter(x)) - // output: - // []pretty_test.myType{ - // {a:1, b:2}, - // {a:3, b:4}, - // {a:5, b:6}, - // } -} diff --git a/Godeps/_workspace/src/github.com/kr/pretty/formatter_test.go b/Godeps/_workspace/src/github.com/kr/pretty/formatter_test.go deleted file mode 100644 index 303f033..0000000 --- a/Godeps/_workspace/src/github.com/kr/pretty/formatter_test.go +++ /dev/null @@ -1,146 +0,0 @@ -package pretty - -import ( - "fmt" - "io" - "testing" - "unsafe" -) - -type test struct { - v interface{} - s string -} - -type LongStructTypeName struct { - longFieldName interface{} - otherLongFieldName interface{} -} - -type SA struct { - t *T -} - -type T struct { - x, y int -} - -type F int - -func (f F) Format(s fmt.State, c rune) { - fmt.Fprintf(s, "F(%d)", int(f)) -} - -var long = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789" - -var gosyntax = []test{ - {nil, `nil`}, - {"", `""`}, - {"a", `"a"`}, - {1, "int(1)"}, - {1.0, "float64(1)"}, - {[]int(nil), "[]int(nil)"}, - {[0]int{}, "[0]int{}"}, - {complex(1, 0), "(1+0i)"}, - //{make(chan int), "(chan int)(0x1234)"}, - {unsafe.Pointer(uintptr(1)), "unsafe.Pointer(0x1)"}, - {func(int) {}, "func(int) {...}"}, - {map[int]int{1: 1}, "map[int]int{1:1}"}, - {int32(1), "int32(1)"}, - {io.EOF, `&errors.errorString{s:"EOF"}`}, - {[]string{"a"}, `[]string{"a"}`}, - { - []string{long}, - `[]string{"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"}`, - }, - {F(5), "pretty.F(5)"}, - { - SA{&T{1, 2}}, - `pretty.SA{ - t: &pretty.T{x:1, y:2}, -}`, - }, - { - map[int][]byte{1: []byte{}}, - `map[int][]uint8{ - 1: {}, -}`, - }, - { - map[int]T{1: T{}}, - `map[int]pretty.T{ - 1: {}, -}`, - }, - { - long, - `"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"`, - }, - { - LongStructTypeName{ - longFieldName: LongStructTypeName{}, - otherLongFieldName: long, - }, - `pretty.LongStructTypeName{ - longFieldName: pretty.LongStructTypeName{}, - otherLongFieldName: "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789", -}`, - }, - { - &LongStructTypeName{ - longFieldName: &LongStructTypeName{}, - otherLongFieldName: (*LongStructTypeName)(nil), - }, - `&pretty.LongStructTypeName{ - longFieldName: &pretty.LongStructTypeName{}, - otherLongFieldName: (*pretty.LongStructTypeName)(nil), -}`, - }, - { - []LongStructTypeName{ - {nil, nil}, - {3, 3}, - {long, nil}, - }, - `[]pretty.LongStructTypeName{ - {}, - { - longFieldName: int(3), - otherLongFieldName: int(3), - }, - { - longFieldName: "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789", - otherLongFieldName: nil, - }, -}`, - }, - { - []interface{}{ - LongStructTypeName{nil, nil}, - []byte{1, 2, 3}, - T{3, 4}, - LongStructTypeName{long, nil}, - }, - `[]interface {}{ - pretty.LongStructTypeName{}, - []uint8{0x1, 0x2, 0x3}, - pretty.T{x:3, y:4}, - pretty.LongStructTypeName{ - longFieldName: "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789", - otherLongFieldName: nil, - }, -}`, - }, -} - -func TestGoSyntax(t *testing.T) { - for _, tt := range gosyntax { - s := fmt.Sprintf("%# v", Formatter(tt.v)) - if tt.s != s { - t.Errorf("expected %q", tt.s) - t.Errorf("got %q", s) - t.Errorf("expraw\n%s", tt.s) - t.Errorf("gotraw\n%s", s) - } - } -} diff --git a/Godeps/_workspace/src/github.com/kr/text/colwriter/Readme b/Godeps/_workspace/src/github.com/kr/text/colwriter/Readme deleted file mode 100644 index 1c1f4e6..0000000 --- a/Godeps/_workspace/src/github.com/kr/text/colwriter/Readme +++ /dev/null @@ -1,5 +0,0 @@ -Package colwriter provides a write filter that formats -input lines in multiple columns. - -The package is a straightforward translation from -/src/cmd/draw/mc.c in Plan 9 from User Space. diff --git a/Godeps/_workspace/src/github.com/kr/text/colwriter/column.go b/Godeps/_workspace/src/github.com/kr/text/colwriter/column.go deleted file mode 100644 index 7302ce9..0000000 --- a/Godeps/_workspace/src/github.com/kr/text/colwriter/column.go +++ /dev/null @@ -1,147 +0,0 @@ -// Package colwriter provides a write filter that formats -// input lines in multiple columns. -// -// The package is a straightforward translation from -// /src/cmd/draw/mc.c in Plan 9 from User Space. -package colwriter - -import ( - "bytes" - "io" - "unicode/utf8" -) - -const ( - tab = 4 -) - -const ( - // Print each input line ending in a colon ':' separately. - BreakOnColon uint = 1 << iota -) - -// A Writer is a filter that arranges input lines in as many columns as will -// fit in its width. Tab '\t' chars in the input are translated to sequences -// of spaces ending at multiples of 4 positions. -// -// If BreakOnColon is set, each input line ending in a colon ':' is written -// separately. -// -// The Writer assumes that all Unicode code points have the same width; this -// may not be true in some fonts. -type Writer struct { - w io.Writer - buf []byte - width int - flag uint -} - -// NewWriter allocates and initializes a new Writer writing to w. -// Parameter width controls the total number of characters on each line -// across all columns. -func NewWriter(w io.Writer, width int, flag uint) *Writer { - return &Writer{ - w: w, - width: width, - flag: flag, - } -} - -// Write writes p to the writer w. The only errors returned are ones -// encountered while writing to the underlying output stream. -func (w *Writer) Write(p []byte) (n int, err error) { - var linelen int - var lastWasColon bool - for i, c := range p { - w.buf = append(w.buf, c) - linelen++ - if c == '\t' { - w.buf[len(w.buf)-1] = ' ' - for linelen%tab != 0 { - w.buf = append(w.buf, ' ') - linelen++ - } - } - if w.flag&BreakOnColon != 0 && c == ':' { - lastWasColon = true - } else if lastWasColon { - if c == '\n' { - pos := bytes.LastIndex(w.buf[:len(w.buf)-1], []byte{'\n'}) - if pos < 0 { - pos = 0 - } - line := w.buf[pos:] - w.buf = w.buf[:pos] - if err = w.columnate(); err != nil { - if len(line) < i { - return i - len(line), err - } - return 0, err - } - if n, err := w.w.Write(line); err != nil { - if r := len(line) - n; r < i { - return i - r, err - } - return 0, err - } - } - lastWasColon = false - } - if c == '\n' { - linelen = 0 - } - } - return len(p), nil -} - -// Flush should be called after the last call to Write to ensure that any data -// buffered in the Writer is written to output. -func (w *Writer) Flush() error { - return w.columnate() -} - -func (w *Writer) columnate() error { - words := bytes.Split(w.buf, []byte{'\n'}) - w.buf = nil - if len(words[len(words)-1]) == 0 { - words = words[:len(words)-1] - } - maxwidth := 0 - for _, wd := range words { - if n := utf8.RuneCount(wd); n > maxwidth { - maxwidth = n - } - } - maxwidth++ // space char - wordsPerLine := w.width / maxwidth - if wordsPerLine <= 0 { - wordsPerLine = 1 - } - nlines := (len(words) + wordsPerLine - 1) / wordsPerLine - for i := 0; i < nlines; i++ { - col := 0 - endcol := 0 - for j := i; j < len(words); j += nlines { - endcol += maxwidth - _, err := w.w.Write(words[j]) - if err != nil { - return err - } - col += utf8.RuneCount(words[j]) - if j+nlines < len(words) { - for col < endcol { - _, err := w.w.Write([]byte{' '}) - if err != nil { - return err - } - col++ - } - } - } - _, err := w.w.Write([]byte{'\n'}) - if err != nil { - return err - } - } - return nil -} diff --git a/Godeps/_workspace/src/github.com/kr/text/colwriter/column_test.go b/Godeps/_workspace/src/github.com/kr/text/colwriter/column_test.go deleted file mode 100644 index 8d0bf8f..0000000 --- a/Godeps/_workspace/src/github.com/kr/text/colwriter/column_test.go +++ /dev/null @@ -1,90 +0,0 @@ -package colwriter - -import ( - "bytes" - "testing" -) - -var src = ` -.git -.gitignore -.godir -Procfile: -README.md -api.go -apps.go -auth.go -darwin.go -data.go -dyno.go: -env.go -git.go -help.go -hkdist -linux.go -ls.go -main.go -plugin.go -run.go -scale.go -ssh.go -tail.go -term -unix.go -update.go -version.go -windows.go -`[1:] - -var tests = []struct{ - wid int - flag uint - src string - want string -}{ - {80, 0, "", ""}, - {80, 0, src, ` -.git README.md darwin.go git.go ls.go scale.go unix.go -.gitignore api.go data.go help.go main.go ssh.go update.go -.godir apps.go dyno.go: hkdist plugin.go tail.go version.go -Procfile: auth.go env.go linux.go run.go term windows.go -`[1:]}, - {80, BreakOnColon, src, ` -.git .gitignore .godir - -Procfile: -README.md api.go apps.go auth.go darwin.go data.go - -dyno.go: -env.go hkdist main.go scale.go term version.go -git.go linux.go plugin.go ssh.go unix.go windows.go -help.go ls.go run.go tail.go update.go -`[1:]}, - {20, 0, ` -Hello -Γειά σου -안녕 -今日は -`[1:], ` -Hello 안녕 -Γειά σου 今日は -`[1:]}, -} - -func TestWriter(t *testing.T) { - for _, test := range tests { - b := new(bytes.Buffer) - w := NewWriter(b, test.wid, test.flag) - if _, err := w.Write([]byte(test.src)); err != nil { - t.Error(err) - } - if err := w.Flush(); err != nil { - t.Error(err) - } - if g := b.String(); test.want != g { - t.Log("\n" + test.want) - t.Log("\n" + g) - t.Errorf("%q != %q", test.want, g) - } - } -} diff --git a/Godeps/_workspace/src/github.com/kr/text/indent_test.go b/Godeps/_workspace/src/github.com/kr/text/indent_test.go deleted file mode 100644 index 5c723ee..0000000 --- a/Godeps/_workspace/src/github.com/kr/text/indent_test.go +++ /dev/null @@ -1,119 +0,0 @@ -package text - -import ( - "bytes" - "testing" -) - -type T struct { - inp, exp, pre string -} - -var tests = []T{ - { - "The quick brown fox\njumps over the lazy\ndog.\nBut not quickly.\n", - "xxxThe quick brown fox\nxxxjumps over the lazy\nxxxdog.\nxxxBut not quickly.\n", - "xxx", - }, - { - "The quick brown fox\njumps over the lazy\ndog.\n\nBut not quickly.", - "xxxThe quick brown fox\nxxxjumps over the lazy\nxxxdog.\n\nxxxBut not quickly.", - "xxx", - }, -} - -func TestIndent(t *testing.T) { - for _, test := range tests { - got := Indent(test.inp, test.pre) - if got != test.exp { - t.Errorf("mismatch %q != %q", got, test.exp) - } - } -} - -type IndentWriterTest struct { - inp, exp string - pre []string -} - -var ts = []IndentWriterTest{ - { - ` -The quick brown fox -jumps over the lazy -dog. -But not quickly. -`[1:], - ` -xxxThe quick brown fox -xxxjumps over the lazy -xxxdog. -xxxBut not quickly. -`[1:], - []string{"xxx"}, - }, - { - ` -The quick brown fox -jumps over the lazy -dog. -But not quickly. -`[1:], - ` -xxaThe quick brown fox -xxxjumps over the lazy -xxxdog. -xxxBut not quickly. -`[1:], - []string{"xxa", "xxx"}, - }, - { - ` -The quick brown fox -jumps over the lazy -dog. -But not quickly. -`[1:], - ` -xxaThe quick brown fox -xxbjumps over the lazy -xxcdog. -xxxBut not quickly. -`[1:], - []string{"xxa", "xxb", "xxc", "xxx"}, - }, - { - ` -The quick brown fox -jumps over the lazy -dog. - -But not quickly.`[1:], - ` -xxaThe quick brown fox -xxxjumps over the lazy -xxxdog. -xxx -xxxBut not quickly.`[1:], - []string{"xxa", "xxx"}, - }, -} - -func TestIndentWriter(t *testing.T) { - for _, test := range ts { - b := new(bytes.Buffer) - pre := make([][]byte, len(test.pre)) - for i := range test.pre { - pre[i] = []byte(test.pre[i]) - } - w := NewIndentWriter(b, pre...) - if _, err := w.Write([]byte(test.inp)); err != nil { - t.Error(err) - } - if got := b.String(); got != test.exp { - t.Errorf("mismatch %q != %q", got, test.exp) - t.Log(got) - t.Log(test.exp) - } - } -} diff --git a/Godeps/_workspace/src/github.com/kr/text/mc/Readme b/Godeps/_workspace/src/github.com/kr/text/mc/Readme deleted file mode 100644 index 519ddc0..0000000 --- a/Godeps/_workspace/src/github.com/kr/text/mc/Readme +++ /dev/null @@ -1,9 +0,0 @@ -Command mc prints in multiple columns. - - Usage: mc [-] [-N] [file...] - -Mc splits the input into as many columns as will fit in N -print positions. If the output is a tty, the default N is -the number of characters in a terminal line; otherwise the -default N is 80. Under option - each input line ending in -a colon ':' is printed separately. diff --git a/Godeps/_workspace/src/github.com/kr/text/mc/mc.go b/Godeps/_workspace/src/github.com/kr/text/mc/mc.go deleted file mode 100644 index ac5c110..0000000 --- a/Godeps/_workspace/src/github.com/kr/text/mc/mc.go +++ /dev/null @@ -1,62 +0,0 @@ -// Command mc prints in multiple columns. -// -// Usage: mc [-] [-N] [file...] -// -// Mc splits the input into as many columns as will fit in N -// print positions. If the output is a tty, the default N is -// the number of characters in a terminal line; otherwise the -// default N is 80. Under option - each input line ending in -// a colon ':' is printed separately. -package main - -import ( - "github.com/kr/pty" - "github.com/ddollar/forego/Godeps/_workspace/src/github.com/kr/text/colwriter" - "io" - "log" - "os" - "strconv" -) - -func main() { - var width int - var flag uint - args := os.Args[1:] - for len(args) > 0 && len(args[0]) > 0 && args[0][0] == '-' { - if len(args[0]) > 1 { - width, _ = strconv.Atoi(args[0][1:]) - } else { - flag |= colwriter.BreakOnColon - } - args = args[1:] - } - if width < 1 { - _, width, _ = pty.Getsize(os.Stdout) - } - if width < 1 { - width = 80 - } - - w := colwriter.NewWriter(os.Stdout, width, flag) - if len(args) > 0 { - for _, s := range args { - if f, err := os.Open(s); err == nil { - copyin(w, f) - f.Close() - } else { - log.Println(err) - } - } - } else { - copyin(w, os.Stdin) - } -} - -func copyin(w *colwriter.Writer, r io.Reader) { - if _, err := io.Copy(w, r); err != nil { - log.Println(err) - } - if err := w.Flush(); err != nil { - log.Println(err) - } -} diff --git a/Godeps/_workspace/src/github.com/kr/text/wrap_test.go b/Godeps/_workspace/src/github.com/kr/text/wrap_test.go deleted file mode 100644 index 90f065c..0000000 --- a/Godeps/_workspace/src/github.com/kr/text/wrap_test.go +++ /dev/null @@ -1,44 +0,0 @@ -package text - -import ( - "bytes" - "testing" -) - -var text = "The quick brown fox jumps over the lazy dog." - -func TestWrap(t *testing.T) { - exp := [][]string{ - {"The", "quick", "brown", "fox"}, - {"jumps", "over", "the", "lazy", "dog."}, - } - words := bytes.Split([]byte(text), sp) - got := WrapWords(words, 1, 24, defaultPenalty) - if len(exp) != len(got) { - t.Fail() - } - for i := range exp { - if len(exp[i]) != len(got[i]) { - t.Fail() - } - for j := range exp[i] { - if exp[i][j] != string(got[i][j]) { - t.Fatal(i, exp[i][j], got[i][j]) - } - } - } -} - -func TestWrapNarrow(t *testing.T) { - exp := "The\nquick\nbrown\nfox\njumps\nover\nthe\nlazy\ndog." - if Wrap(text, 5) != exp { - t.Fail() - } -} - -func TestWrapOneLine(t *testing.T) { - exp := "The quick brown fox jumps over the lazy dog." - if Wrap(text, 500) != exp { - t.Fail() - } -} diff --git a/Godeps/_workspace/src/github.com/subosito/gotenv/examples_test.go b/Godeps/_workspace/src/github.com/subosito/gotenv/examples_test.go deleted file mode 100644 index 812fb43..0000000 --- a/Godeps/_workspace/src/github.com/subosito/gotenv/examples_test.go +++ /dev/null @@ -1,15 +0,0 @@ -package gotenv_test - -import ( - "strings" - "fmt" - "github.com/ddollar/forego/Godeps/_workspace/src/github.com/subosito/gotenv" -) - -func ExampleParse() { - pairs := gotenv.Parse(strings.NewReader("FOO=test\nBAR=$FOO")) - fmt.Printf("%+v\n", pairs) // gotenv.Env{"FOO": "test", "BAR": "test"} - - pairs = gotenv.Parse(strings.NewReader(`FOO="bar"`)) - fmt.Printf("%+v\n", pairs) // gotenv.Env{"FOO": "bar"} -} diff --git a/Godeps/_workspace/src/github.com/subosito/gotenv/fixtures/exported.env b/Godeps/_workspace/src/github.com/subosito/gotenv/fixtures/exported.env deleted file mode 100644 index 5821377..0000000 --- a/Godeps/_workspace/src/github.com/subosito/gotenv/fixtures/exported.env +++ /dev/null @@ -1,2 +0,0 @@ -export OPTION_A=2 -export OPTION_B='\n' diff --git a/Godeps/_workspace/src/github.com/subosito/gotenv/fixtures/plain.env b/Godeps/_workspace/src/github.com/subosito/gotenv/fixtures/plain.env deleted file mode 100644 index c983b06..0000000 --- a/Godeps/_workspace/src/github.com/subosito/gotenv/fixtures/plain.env +++ /dev/null @@ -1,5 +0,0 @@ -OPTION_A=1 -OPTION_B=2 -OPTION_C= 3 -OPTION_D =4 -OPTION_E = 5 diff --git a/Godeps/_workspace/src/github.com/subosito/gotenv/fixtures/quoted.env b/Godeps/_workspace/src/github.com/subosito/gotenv/fixtures/quoted.env deleted file mode 100644 index a03ce24..0000000 --- a/Godeps/_workspace/src/github.com/subosito/gotenv/fixtures/quoted.env +++ /dev/null @@ -1,8 +0,0 @@ -OPTION_A='1' -OPTION_B='2' -OPTION_C='' -OPTION_D='\n' -OPTION_E="1" -OPTION_F="2" -OPTION_G="" -OPTION_H="\n" diff --git a/Godeps/_workspace/src/github.com/subosito/gotenv/fixtures/yaml.env b/Godeps/_workspace/src/github.com/subosito/gotenv/fixtures/yaml.env deleted file mode 100644 index ea7ec65..0000000 --- a/Godeps/_workspace/src/github.com/subosito/gotenv/fixtures/yaml.env +++ /dev/null @@ -1,4 +0,0 @@ -OPTION_A: 1 -OPTION_B: '2' -OPTION_C: '' -OPTION_D: '\n' diff --git a/Godeps/_workspace/src/github.com/subosito/gotenv/gotenv_test.go b/Godeps/_workspace/src/github.com/subosito/gotenv/gotenv_test.go deleted file mode 100644 index 82c3a19..0000000 --- a/Godeps/_workspace/src/github.com/subosito/gotenv/gotenv_test.go +++ /dev/null @@ -1,187 +0,0 @@ -package gotenv - -import ( - "fmt" - "os" - "strings" - "testing" -) - -var formats = []struct { - in string - out Env - preset bool -}{ - // parses unquoted values - {`FOO=bar`, Env{"FOO": "bar"}, false}, - - // parses values with spaces around equal sign - {`FOO =bar`, Env{"FOO": "bar"}, false}, - {`FOO= bar`, Env{"FOO": "bar"}, false}, - - // parses double quoted values - {`FOO="bar"`, Env{"FOO": "bar"}, false}, - - // parses single quoted values - {`FOO='bar'`, Env{"FOO": "bar"}, false}, - - // parses escaped double quotes - {`FOO="escaped\"bar"`, Env{"FOO": `escaped"bar`}, false}, - - // parses empty values - {`FOO=`, Env{"FOO": ""}, false}, - - // expands variables found in values - {"FOO=test\nBAR=$FOO", Env{"FOO": "test", "BAR": "test"}, false}, - - // parses variables wrapped in brackets - {"FOO=test\nBAR=${FOO}bar", Env{"FOO": "test", "BAR": "testbar"}, false}, - - // reads variables from ENV when expanding if not found in local env - {`BAR=$FOO`, Env{"BAR": "test"}, true}, - - // expands undefined variables to an empty string - {`BAR=$FOO`, Env{"BAR": ""}, false}, - - // expands variables in quoted strings - {"FOO=test\nBAR='quote $FOO'", Env{"FOO": "test", "BAR": "quote test"}, false}, - - // does not expand escaped variables - {`FOO="foo\$BAR"`, Env{"FOO": "foo$BAR"}, false}, - {`FOO="foo\${BAR}"`, Env{"FOO": "foo${BAR}"}, false}, - - // parses yaml style options - {"OPTION_A: 1", Env{"OPTION_A": "1"}, false}, - - // parses export keyword - {"export OPTION_A=2", Env{"OPTION_A": "2"}, false}, - - // expands newlines in quoted strings - {`FOO="bar\nbaz"`, Env{"FOO": "bar\nbaz"}, false}, - - // parses varibales with "." in the name - {`FOO.BAR=foobar`, Env{"FOO.BAR": "foobar"}, false}, - - // strips unquoted values - {`foo=bar `, Env{"foo": "bar"}, false}, // not 'bar ' - - // ignores empty lines - {"\n \t \nfoo=bar\n \nfizz=buzz", Env{"foo": "bar", "fizz": "buzz"}, false}, - - // ignores inline comments - {"foo=bar # this is foo", Env{"foo": "bar"}, false}, - - // allows # in quoted value - {`foo="bar#baz" # comment`, Env{"foo": "bar#baz"}, false}, - - // ignores comment lines - {"\n\n\n # HERE GOES FOO \nfoo=bar", Env{"foo": "bar"}, false}, - - // parses # in quoted values - {`foo="ba#r"`, Env{"foo": "ba#r"}, false}, - {"foo='ba#r'", Env{"foo": "ba#r"}, false}, - - // incorrect line format - {"lol$wut", Env{}, false}, -} - -var fixtures = []struct { - filename string - results Env -}{ - { - "fixtures/exported.env", - Env{ - "OPTION_A": "2", - "OPTION_B": `\n`, - }, - }, - { - "fixtures/plain.env", - Env{ - "OPTION_A": "1", - "OPTION_B": "2", - "OPTION_C": "3", - "OPTION_D": "4", - "OPTION_E": "5", - }, - }, - { - "fixtures/quoted.env", - Env{ - "OPTION_A": "1", - "OPTION_B": "2", - "OPTION_C": "", - "OPTION_D": `\n`, - "OPTION_E": "1", - "OPTION_F": "2", - "OPTION_G": "", - "OPTION_H": "\n", - }, - }, - { - "fixtures/yaml.env", - Env{ - "OPTION_A": "1", - "OPTION_B": "2", - "OPTION_C": "", - "OPTION_D": `\n`, - }, - }, -} - -func TestParse(t *testing.T) { - for i, tt := range formats { - if tt.preset { - os.Setenv("FOO", "test") - } - - exp := Parse(strings.NewReader(tt.in)) - - x := fmt.Sprintf("%+v\n", exp) - o := fmt.Sprintf("%+v\n", tt.out) - - if x != o { - t.Logf("%q\n", tt.in) - t.Errorf("(%d) %s != %s\n", i, x, o) - } - - os.Clearenv() - } -} - -func TestLoad(t *testing.T) { - for i, tt := range fixtures { - Load(tt.filename) - - for key, val := range tt.results { - if eval := os.Getenv(key); eval != val { - t.Errorf("(%d) %s => %s != %s", i, key, eval, val) - } - } - - os.Clearenv() - } -} - -func TestLoadEnv(t *testing.T) { - Load() - - tkey := "HELLO" - val := "world" - - if tval := os.Getenv(tkey); tval != val { - t.Errorf("%s => %s != %s", tkey, tval, val) - } - - os.Clearenv() -} - -func TestLoadNonExist(t *testing.T) { - file := ".nonexist.env" - - err := Load(file) - if err == nil { - t.Errorf("Load(`%s`) => error: `no such file or directory` != nil", file) - } -} diff --git a/Makefile b/Makefile index f490ad2..7db7f43 100644 --- a/Makefile +++ b/Makefile @@ -21,4 +21,4 @@ test: lint build cd eg && ../forego start $(BIN): $(SRC) - godep go build -o $@ + go build -o $@ diff --git a/env.go b/env.go index 19894b5..61ec535 100644 --- a/env.go +++ b/env.go @@ -5,7 +5,7 @@ import ( "os" "regexp" - "github.com/ddollar/forego/Godeps/_workspace/src/github.com/subosito/gotenv" + "github.com/subosito/gotenv" ) var envEntryRegexp = regexp.MustCompile("^([A-Za-z_0-9]+)=(.*)$") diff --git a/outlet.go b/outlet.go index 64d33c0..3150a16 100644 --- a/outlet.go +++ b/outlet.go @@ -4,7 +4,7 @@ import ( "bufio" "bytes" "fmt" - "github.com/ddollar/forego/Godeps/_workspace/src/github.com/daviddengcn/go-colortext" + "github.com/daviddengcn/go-colortext" "io" "os" "sync" @@ -40,7 +40,7 @@ func (of *OutletFactory) LineReader(wg *sync.WaitGroup, name string, index int, for { buf := make([]byte, 1024) - + if n, err := reader.Read(buf); err != nil { return } else { diff --git a/procfile.go b/procfile.go index 506bd13..910695a 100644 --- a/procfile.go +++ b/procfile.go @@ -3,7 +3,7 @@ package main import ( "bufio" "fmt" - _ "github.com/ddollar/forego/Godeps/_workspace/src/github.com/kr/pretty" + _ "github.com/kr/pretty" "io" "math" "os" diff --git a/update.go b/update.go index 0580a81..6018538 100644 --- a/update.go +++ b/update.go @@ -2,7 +2,7 @@ package main import ( "fmt" - "github.com/ddollar/forego/Godeps/_workspace/src/github.com/ddollar/dist" + "github.com/ddollar/dist" ) var cmdUpdate = &Command{ diff --git a/Godeps/_workspace/src/bitbucket.org/kardianos/osext/LICENSE b/vendor/bitbucket.org/kardianos/osext/LICENSE similarity index 100% rename from Godeps/_workspace/src/bitbucket.org/kardianos/osext/LICENSE rename to vendor/bitbucket.org/kardianos/osext/LICENSE diff --git a/Godeps/_workspace/src/bitbucket.org/kardianos/osext/osext.go b/vendor/bitbucket.org/kardianos/osext/osext.go similarity index 100% rename from Godeps/_workspace/src/bitbucket.org/kardianos/osext/osext.go rename to vendor/bitbucket.org/kardianos/osext/osext.go diff --git a/Godeps/_workspace/src/bitbucket.org/kardianos/osext/osext_plan9.go b/vendor/bitbucket.org/kardianos/osext/osext_plan9.go similarity index 100% rename from Godeps/_workspace/src/bitbucket.org/kardianos/osext/osext_plan9.go rename to vendor/bitbucket.org/kardianos/osext/osext_plan9.go diff --git a/Godeps/_workspace/src/bitbucket.org/kardianos/osext/osext_procfs.go b/vendor/bitbucket.org/kardianos/osext/osext_procfs.go similarity index 100% rename from Godeps/_workspace/src/bitbucket.org/kardianos/osext/osext_procfs.go rename to vendor/bitbucket.org/kardianos/osext/osext_procfs.go diff --git a/Godeps/_workspace/src/bitbucket.org/kardianos/osext/osext_sysctl.go b/vendor/bitbucket.org/kardianos/osext/osext_sysctl.go similarity index 100% rename from Godeps/_workspace/src/bitbucket.org/kardianos/osext/osext_sysctl.go rename to vendor/bitbucket.org/kardianos/osext/osext_sysctl.go diff --git a/Godeps/_workspace/src/bitbucket.org/kardianos/osext/osext_windows.go b/vendor/bitbucket.org/kardianos/osext/osext_windows.go similarity index 100% rename from Godeps/_workspace/src/bitbucket.org/kardianos/osext/osext_windows.go rename to vendor/bitbucket.org/kardianos/osext/osext_windows.go diff --git a/Godeps/_workspace/src/github.com/daviddengcn/go-colortext/.gitignore b/vendor/github.com/daviddengcn/go-colortext/.gitignore similarity index 100% rename from Godeps/_workspace/src/github.com/daviddengcn/go-colortext/.gitignore rename to vendor/github.com/daviddengcn/go-colortext/.gitignore diff --git a/Godeps/_workspace/src/github.com/daviddengcn/go-colortext/README.md b/vendor/github.com/daviddengcn/go-colortext/README.md similarity index 100% rename from Godeps/_workspace/src/github.com/daviddengcn/go-colortext/README.md rename to vendor/github.com/daviddengcn/go-colortext/README.md diff --git a/Godeps/_workspace/src/github.com/daviddengcn/go-colortext/ct.go b/vendor/github.com/daviddengcn/go-colortext/ct.go similarity index 100% rename from Godeps/_workspace/src/github.com/daviddengcn/go-colortext/ct.go rename to vendor/github.com/daviddengcn/go-colortext/ct.go diff --git a/Godeps/_workspace/src/github.com/daviddengcn/go-colortext/ct_ansi.go b/vendor/github.com/daviddengcn/go-colortext/ct_ansi.go similarity index 100% rename from Godeps/_workspace/src/github.com/daviddengcn/go-colortext/ct_ansi.go rename to vendor/github.com/daviddengcn/go-colortext/ct_ansi.go diff --git a/Godeps/_workspace/src/github.com/daviddengcn/go-colortext/ct_win.go b/vendor/github.com/daviddengcn/go-colortext/ct_win.go similarity index 100% rename from Godeps/_workspace/src/github.com/daviddengcn/go-colortext/ct_win.go rename to vendor/github.com/daviddengcn/go-colortext/ct_win.go diff --git a/Godeps/_workspace/src/github.com/ddollar/dist/dist.go b/vendor/github.com/ddollar/dist/dist.go similarity index 95% rename from Godeps/_workspace/src/github.com/ddollar/dist/dist.go rename to vendor/github.com/ddollar/dist/dist.go index 5526507..07d7007 100644 --- a/Godeps/_workspace/src/github.com/ddollar/dist/dist.go +++ b/vendor/github.com/ddollar/dist/dist.go @@ -2,7 +2,7 @@ package dist import ( - "github.com/ddollar/forego/Godeps/_workspace/src/bitbucket.org/kardianos/osext" + "bitbucket.org/kardianos/osext" "bytes" "crypto/tls" "crypto/x509" @@ -10,8 +10,8 @@ import ( "encoding/pem" "errors" "fmt" - "github.com/ddollar/forego/Godeps/_workspace/src/github.com/ddollar/go-update" - "github.com/ddollar/forego/Godeps/_workspace/src/github.com/kr/binarydist" + "github.com/ddollar/go-update" + "github.com/kr/binarydist" "io/ioutil" "net/http" "os" diff --git a/Godeps/_workspace/src/github.com/ddollar/dist/version.go b/vendor/github.com/ddollar/dist/version.go similarity index 100% rename from Godeps/_workspace/src/github.com/ddollar/dist/version.go rename to vendor/github.com/ddollar/dist/version.go diff --git a/Godeps/_workspace/src/github.com/ddollar/go-update/README b/vendor/github.com/ddollar/go-update/README similarity index 100% rename from Godeps/_workspace/src/github.com/ddollar/go-update/README rename to vendor/github.com/ddollar/go-update/README diff --git a/Godeps/_workspace/src/github.com/ddollar/go-update/update.go b/vendor/github.com/ddollar/go-update/update.go similarity index 99% rename from Godeps/_workspace/src/github.com/ddollar/go-update/update.go rename to vendor/github.com/ddollar/go-update/update.go index 04a2fe9..b9a55b5 100644 --- a/Godeps/_workspace/src/github.com/ddollar/go-update/update.go +++ b/vendor/github.com/ddollar/go-update/update.go @@ -29,7 +29,7 @@ download progress, package update import ( - "github.com/ddollar/forego/Godeps/_workspace/src/bitbucket.org/kardianos/osext" + "bitbucket.org/kardianos/osext" "compress/gzip" "fmt" "io" @@ -137,7 +137,7 @@ func NewDownload(url string) *Download { HttpClient: new(http.Client), Progress: make(chan int), Method: "GET", - Url: url, + Url: url, } } diff --git a/Godeps/_workspace/src/github.com/kr/binarydist/.gitignore b/vendor/github.com/kr/binarydist/.gitignore similarity index 100% rename from Godeps/_workspace/src/github.com/kr/binarydist/.gitignore rename to vendor/github.com/kr/binarydist/.gitignore diff --git a/Godeps/_workspace/src/github.com/kr/binarydist/License b/vendor/github.com/kr/binarydist/License similarity index 100% rename from Godeps/_workspace/src/github.com/kr/binarydist/License rename to vendor/github.com/kr/binarydist/License diff --git a/Godeps/_workspace/src/github.com/kr/binarydist/Readme.md b/vendor/github.com/kr/binarydist/Readme.md similarity index 100% rename from Godeps/_workspace/src/github.com/kr/binarydist/Readme.md rename to vendor/github.com/kr/binarydist/Readme.md diff --git a/Godeps/_workspace/src/github.com/kr/binarydist/bzip2.go b/vendor/github.com/kr/binarydist/bzip2.go similarity index 100% rename from Godeps/_workspace/src/github.com/kr/binarydist/bzip2.go rename to vendor/github.com/kr/binarydist/bzip2.go diff --git a/Godeps/_workspace/src/github.com/kr/binarydist/diff.go b/vendor/github.com/kr/binarydist/diff.go similarity index 100% rename from Godeps/_workspace/src/github.com/kr/binarydist/diff.go rename to vendor/github.com/kr/binarydist/diff.go diff --git a/Godeps/_workspace/src/github.com/kr/binarydist/doc.go b/vendor/github.com/kr/binarydist/doc.go similarity index 100% rename from Godeps/_workspace/src/github.com/kr/binarydist/doc.go rename to vendor/github.com/kr/binarydist/doc.go diff --git a/Godeps/_workspace/src/github.com/kr/binarydist/encoding.go b/vendor/github.com/kr/binarydist/encoding.go similarity index 100% rename from Godeps/_workspace/src/github.com/kr/binarydist/encoding.go rename to vendor/github.com/kr/binarydist/encoding.go diff --git a/Godeps/_workspace/src/github.com/kr/binarydist/patch.go b/vendor/github.com/kr/binarydist/patch.go similarity index 100% rename from Godeps/_workspace/src/github.com/kr/binarydist/patch.go rename to vendor/github.com/kr/binarydist/patch.go diff --git a/Godeps/_workspace/src/github.com/kr/binarydist/seek.go b/vendor/github.com/kr/binarydist/seek.go similarity index 100% rename from Godeps/_workspace/src/github.com/kr/binarydist/seek.go rename to vendor/github.com/kr/binarydist/seek.go diff --git a/Godeps/_workspace/src/github.com/kr/pretty/.gitignore b/vendor/github.com/kr/pretty/.gitignore similarity index 100% rename from Godeps/_workspace/src/github.com/kr/pretty/.gitignore rename to vendor/github.com/kr/pretty/.gitignore diff --git a/Godeps/_workspace/src/github.com/kr/pretty/License b/vendor/github.com/kr/pretty/License similarity index 100% rename from Godeps/_workspace/src/github.com/kr/pretty/License rename to vendor/github.com/kr/pretty/License diff --git a/Godeps/_workspace/src/github.com/kr/pretty/Readme b/vendor/github.com/kr/pretty/Readme similarity index 100% rename from Godeps/_workspace/src/github.com/kr/pretty/Readme rename to vendor/github.com/kr/pretty/Readme diff --git a/Godeps/_workspace/src/github.com/kr/pretty/diff.go b/vendor/github.com/kr/pretty/diff.go similarity index 100% rename from Godeps/_workspace/src/github.com/kr/pretty/diff.go rename to vendor/github.com/kr/pretty/diff.go diff --git a/Godeps/_workspace/src/github.com/kr/pretty/formatter.go b/vendor/github.com/kr/pretty/formatter.go similarity index 98% rename from Godeps/_workspace/src/github.com/kr/pretty/formatter.go rename to vendor/github.com/kr/pretty/formatter.go index 521e8f4..1161de7 100644 --- a/Godeps/_workspace/src/github.com/kr/pretty/formatter.go +++ b/vendor/github.com/kr/pretty/formatter.go @@ -2,7 +2,7 @@ package pretty import ( "fmt" - "github.com/ddollar/forego/Godeps/_workspace/src/github.com/kr/text" + "github.com/kr/text" "io" "reflect" "strconv" diff --git a/Godeps/_workspace/src/github.com/kr/pretty/pretty.go b/vendor/github.com/kr/pretty/pretty.go similarity index 100% rename from Godeps/_workspace/src/github.com/kr/pretty/pretty.go rename to vendor/github.com/kr/pretty/pretty.go diff --git a/Godeps/_workspace/src/github.com/kr/pretty/zero.go b/vendor/github.com/kr/pretty/zero.go similarity index 100% rename from Godeps/_workspace/src/github.com/kr/pretty/zero.go rename to vendor/github.com/kr/pretty/zero.go diff --git a/Godeps/_workspace/src/github.com/kr/text/License b/vendor/github.com/kr/text/License similarity index 100% rename from Godeps/_workspace/src/github.com/kr/text/License rename to vendor/github.com/kr/text/License diff --git a/Godeps/_workspace/src/github.com/kr/text/Readme b/vendor/github.com/kr/text/Readme similarity index 100% rename from Godeps/_workspace/src/github.com/kr/text/Readme rename to vendor/github.com/kr/text/Readme diff --git a/Godeps/_workspace/src/github.com/kr/text/doc.go b/vendor/github.com/kr/text/doc.go similarity index 100% rename from Godeps/_workspace/src/github.com/kr/text/doc.go rename to vendor/github.com/kr/text/doc.go diff --git a/Godeps/_workspace/src/github.com/kr/text/indent.go b/vendor/github.com/kr/text/indent.go similarity index 100% rename from Godeps/_workspace/src/github.com/kr/text/indent.go rename to vendor/github.com/kr/text/indent.go diff --git a/Godeps/_workspace/src/github.com/kr/text/wrap.go b/vendor/github.com/kr/text/wrap.go similarity index 100% rename from Godeps/_workspace/src/github.com/kr/text/wrap.go rename to vendor/github.com/kr/text/wrap.go diff --git a/Godeps/_workspace/src/github.com/subosito/gotenv/.env b/vendor/github.com/subosito/gotenv/.env similarity index 100% rename from Godeps/_workspace/src/github.com/subosito/gotenv/.env rename to vendor/github.com/subosito/gotenv/.env diff --git a/Godeps/_workspace/src/github.com/subosito/gotenv/.gitignore b/vendor/github.com/subosito/gotenv/.gitignore similarity index 100% rename from Godeps/_workspace/src/github.com/subosito/gotenv/.gitignore rename to vendor/github.com/subosito/gotenv/.gitignore diff --git a/Godeps/_workspace/src/github.com/subosito/gotenv/LICENSE b/vendor/github.com/subosito/gotenv/LICENSE similarity index 100% rename from Godeps/_workspace/src/github.com/subosito/gotenv/LICENSE rename to vendor/github.com/subosito/gotenv/LICENSE diff --git a/Godeps/_workspace/src/github.com/subosito/gotenv/README.md b/vendor/github.com/subosito/gotenv/README.md similarity index 100% rename from Godeps/_workspace/src/github.com/subosito/gotenv/README.md rename to vendor/github.com/subosito/gotenv/README.md diff --git a/Godeps/_workspace/src/github.com/subosito/gotenv/gotenv.go b/vendor/github.com/subosito/gotenv/gotenv.go similarity index 100% rename from Godeps/_workspace/src/github.com/subosito/gotenv/gotenv.go rename to vendor/github.com/subosito/gotenv/gotenv.go