Use Go 1.5 vendoring instead of Godeps

Change made by:

- running "gvt fetch" on each of the packages mentioned in
  Godeps/Godeps.json
- `rm -rf Godeps`
- tweaking the build scripts to not mention Godeps
- tweaking the build scripts to test `./lib/...`, `./cmd/...` explicitly
  (to avoid testing vendor)
- tweaking the build scripts to not juggle GOPATH for Godeps and instead
  set GO15VENDOREXPERIMENT.

This also results in some updated packages at the same time I bet.

Building with Go 1.3 and 1.4 still *works* but won't use our vendored
dependencies - the user needs to have the actual packages in their
GOPATH then, which they'll get with a normal "go get". Building with Go
1.6+ will get our vendored dependencies by default even when not using
our build script, which is nice.

By doing this we gain some freedom in that we can pick and choose
manually what to include in vendor, as it's not based on just dependency
analysis of our own code. This is also a risk as we might pick up
dependencies we are unaware of, as the build may work locally with those
packages present in GOPATH. On the other hand the build server will
detect this as it has no packages in it's GOPATH beyond what is included
in the repo.

Recommended tool to manage dependencies is github.com/FiloSottile/gvt.

vendor/github.com/onsi/gomega/gbytes/buffer.go

@@ -0,0 +1,229 @@
+/*
+Package gbytes provides a buffer that supports incrementally detecting input.
+
+You use gbytes.Buffer with the gbytes.Say matcher.  When Say finds a match, it fastforwards the buffer's read cursor to the end of that match.
+
+Subsequent matches against the buffer will only operate against data that appears *after* the read cursor.
+
+The read cursor is an opaque implementation detail that you cannot access.  You should use the Say matcher to sift through the buffer.  You can always
+access the entire buffer's contents with Contents().
+
+*/
+package gbytes
+
+import (
+	"errors"
+	"fmt"
+	"io"
+	"regexp"
+	"sync"
+	"time"
+)
+
+/*
+gbytes.Buffer implements an io.Writer and can be used with the gbytes.Say matcher.
+
+You should only use a gbytes.Buffer in test code.  It stores all writes in an in-memory buffer - behavior that is inappropriate for production code!
+*/
+type Buffer struct {
+	contents     []byte
+	readCursor   uint64
+	lock         *sync.Mutex
+	detectCloser chan interface{}
+	closed       bool
+}
+
+/*
+NewBuffer returns a new gbytes.Buffer
+*/
+func NewBuffer() *Buffer {
+	return &Buffer{
+		lock: &sync.Mutex{},
+	}
+}
+
+/*
+BufferWithBytes returns a new gbytes.Buffer seeded with the passed in bytes
+*/
+func BufferWithBytes(bytes []byte) *Buffer {
+	return &Buffer{
+		lock:     &sync.Mutex{},
+		contents: bytes,
+	}
+}
+
+/*
+Write implements the io.Writer interface
+*/
+func (b *Buffer) Write(p []byte) (n int, err error) {
+	b.lock.Lock()
+	defer b.lock.Unlock()
+
+	if b.closed {
+		return 0, errors.New("attempt to write to closed buffer")
+	}
+
+	b.contents = append(b.contents, p...)
+	return len(p), nil
+}
+
+/*
+Read implements the io.Reader interface. It advances the
+cursor as it reads.
+
+Returns an error if called after Close.
+*/
+func (b *Buffer) Read(d []byte) (int, error) {
+	b.lock.Lock()
+	defer b.lock.Unlock()
+
+	if b.closed {
+		return 0, errors.New("attempt to read from closed buffer")
+	}
+
+	if uint64(len(b.contents)) <= b.readCursor {
+		return 0, io.EOF
+	}
+
+	n := copy(d, b.contents[b.readCursor:])
+	b.readCursor += uint64(n)
+
+	return n, nil
+}
+
+/*
+Close signifies that the buffer will no longer be written to
+*/
+func (b *Buffer) Close() error {
+	b.lock.Lock()
+	defer b.lock.Unlock()
+
+	b.closed = true
+
+	return nil
+}
+
+/*
+Closed returns true if the buffer has been closed
+*/
+func (b *Buffer) Closed() bool {
+	b.lock.Lock()
+	defer b.lock.Unlock()
+
+	return b.closed
+}
+
+/*
+Contents returns all data ever written to the buffer.
+*/
+func (b *Buffer) Contents() []byte {
+	b.lock.Lock()
+	defer b.lock.Unlock()
+
+	contents := make([]byte, len(b.contents))
+	copy(contents, b.contents)
+	return contents
+}
+
+/*
+Detect takes a regular expression and returns a channel.
+
+The channel will receive true the first time data matching the regular expression is written to the buffer.
+The channel is subsequently closed and the buffer's read-cursor is fast-forwarded to just after the matching region.
+
+You typically don't need to use Detect and should use the ghttp.Say matcher instead.  Detect is useful, however, in cases where your code must
+be branch and handle different outputs written to the buffer.
+
+For example, consider a buffer hooked up to the stdout of a client library.  You may (or may not, depending on state outside of your control) need to authenticate the client library.
+
+You could do something like:
+
+select {
+case <-buffer.Detect("You are not logged in"):
+	//log in
+case <-buffer.Detect("Success"):
+	//carry on
+case <-time.After(time.Second):
+	//welp
+}
+buffer.CancelDetects()
+
+You should always call CancelDetects after using Detect.  This will close any channels that have not detected and clean up the goroutines that were spawned to support them.
+
+Finally, you can pass detect a format string followed by variadic arguments.  This will construct the regexp using fmt.Sprintf.
+*/
+func (b *Buffer) Detect(desired string, args ...interface{}) chan bool {
+	formattedRegexp := desired
+	if len(args) > 0 {
+		formattedRegexp = fmt.Sprintf(desired, args...)
+	}
+	re := regexp.MustCompile(formattedRegexp)
+
+	b.lock.Lock()
+	defer b.lock.Unlock()
+
+	if b.detectCloser == nil {
+		b.detectCloser = make(chan interface{})
+	}
+
+	closer := b.detectCloser
+	response := make(chan bool)
+	go func() {
+		ticker := time.NewTicker(10 * time.Millisecond)
+		defer ticker.Stop()
+		defer close(response)
+		for {
+			select {
+			case <-ticker.C:
+				b.lock.Lock()
+				data, cursor := b.contents[b.readCursor:], b.readCursor
+				loc := re.FindIndex(data)
+				b.lock.Unlock()
+
+				if loc != nil {
+					response <- true
+					b.lock.Lock()
+					newCursorPosition := cursor + uint64(loc[1])
+					if newCursorPosition >= b.readCursor {
+						b.readCursor = newCursorPosition
+					}
+					b.lock.Unlock()
+					return
+				}
+			case <-closer:
+				return
+			}
+		}
+	}()
+
+	return response
+}
+
+/*
+CancelDetects cancels any pending detects and cleans up their goroutines.  You should always call this when you're done with a set of Detect channels.
+*/
+func (b *Buffer) CancelDetects() {
+	b.lock.Lock()
+	defer b.lock.Unlock()
+
+	close(b.detectCloser)
+	b.detectCloser = nil
+}
+
+func (b *Buffer) didSay(re *regexp.Regexp) (bool, []byte) {
+	b.lock.Lock()
+	defer b.lock.Unlock()
+
+	unreadBytes := b.contents[b.readCursor:]
+	copyOfUnreadBytes := make([]byte, len(unreadBytes))
+	copy(copyOfUnreadBytes, unreadBytes)
+
+	loc := re.FindIndex(unreadBytes)
+
+	if loc != nil {
+		b.readCursor += uint64(loc[1])
+		return true, copyOfUnreadBytes
+	} else {
+		return false, copyOfUnreadBytes
+	}
+}

vendor/github.com/onsi/gomega/gbytes/buffer_test.go

@@ -0,0 +1,158 @@
+package gbytes_test
+
+import (
+	"io"
+	"time"
+
+	. "github.com/onsi/gomega/gbytes"
+
+	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/gomega"
+)
+
+var _ = Describe("Buffer", func() {
+	var buffer *Buffer
+
+	BeforeEach(func() {
+		buffer = NewBuffer()
+	})
+
+	Describe("dumping the entire contents of the buffer", func() {
+		It("should return everything that's been written", func() {
+			buffer.Write([]byte("abc"))
+			buffer.Write([]byte("def"))
+			Ω(buffer.Contents()).Should(Equal([]byte("abcdef")))
+
+			Ω(buffer).Should(Say("bcd"))
+			Ω(buffer.Contents()).Should(Equal([]byte("abcdef")))
+		})
+	})
+
+	Describe("creating a buffer with bytes", func() {
+		It("should create the buffer with the cursor set to the beginning", func() {
+			buffer := BufferWithBytes([]byte("abcdef"))
+			Ω(buffer.Contents()).Should(Equal([]byte("abcdef")))
+			Ω(buffer).Should(Say("abc"))
+			Ω(buffer).ShouldNot(Say("abc"))
+			Ω(buffer).Should(Say("def"))
+		})
+	})
+
+	Describe("reading from a buffer", func() {
+		It("should read the current contents of the buffer", func() {
+			buffer := BufferWithBytes([]byte("abcde"))
+
+			dest := make([]byte, 3)
+			n, err := buffer.Read(dest)
+			Ω(err).ShouldNot(HaveOccurred())
+			Ω(n).Should(Equal(3))
+			Ω(string(dest)).Should(Equal("abc"))
+
+			dest = make([]byte, 3)
+			n, err = buffer.Read(dest)
+			Ω(err).ShouldNot(HaveOccurred())
+			Ω(n).Should(Equal(2))
+			Ω(string(dest[:n])).Should(Equal("de"))
+
+			n, err = buffer.Read(dest)
+			Ω(err).Should(Equal(io.EOF))
+			Ω(n).Should(Equal(0))
+		})
+
+		Context("after the buffer has been closed", func() {
+			It("returns an error", func() {
+				buffer := BufferWithBytes([]byte("abcde"))
+
+				buffer.Close()
+
+				dest := make([]byte, 3)
+				n, err := buffer.Read(dest)
+				Ω(err).Should(HaveOccurred())
+				Ω(n).Should(Equal(0))
+			})
+		})
+	})
+
+	Describe("detecting regular expressions", func() {
+		It("should fire the appropriate channel when the passed in pattern matches, then close it", func(done Done) {
+			go func() {
+				time.Sleep(10 * time.Millisecond)
+				buffer.Write([]byte("abcde"))
+			}()
+
+			A := buffer.Detect("%s", "a.c")
+			B := buffer.Detect("def")
+
+			var gotIt bool
+			select {
+			case gotIt = <-A:
+			case <-B:
+				Fail("should not have gotten here")
+			}
+
+			Ω(gotIt).Should(BeTrue())
+			Eventually(A).Should(BeClosed())
+
+			buffer.Write([]byte("f"))
+			Eventually(B).Should(Receive())
+			Eventually(B).Should(BeClosed())
+
+			close(done)
+		})
+
+		It("should fast-forward the buffer upon detection", func(done Done) {
+			buffer.Write([]byte("abcde"))
+			<-buffer.Detect("abc")
+			Ω(buffer).ShouldNot(Say("abc"))
+			Ω(buffer).Should(Say("de"))
+			close(done)
+		})
+
+		It("should only fast-forward the buffer when the channel is read, and only if doing so would not rewind it", func(done Done) {
+			buffer.Write([]byte("abcde"))
+			A := buffer.Detect("abc")
+			time.Sleep(20 * time.Millisecond) //give the goroutine a chance to detect and write to the channel
+			Ω(buffer).Should(Say("abcd"))
+			<-A
+			Ω(buffer).ShouldNot(Say("d"))
+			Ω(buffer).Should(Say("e"))
+			Eventually(A).Should(BeClosed())
+			close(done)
+		})
+
+		It("should be possible to cancel a detection", func(done Done) {
+			A := buffer.Detect("abc")
+			B := buffer.Detect("def")
+			buffer.CancelDetects()
+			buffer.Write([]byte("abcdef"))
+			Eventually(A).Should(BeClosed())
+			Eventually(B).Should(BeClosed())
+
+			Ω(buffer).Should(Say("bcde"))
+			<-buffer.Detect("f")
+			close(done)
+		})
+	})
+
+	Describe("closing the buffer", func() {
+		It("should error when further write attempts are made", func() {
+			_, err := buffer.Write([]byte("abc"))
+			Ω(err).ShouldNot(HaveOccurred())
+
+			buffer.Close()
+
+			_, err = buffer.Write([]byte("def"))
+			Ω(err).Should(HaveOccurred())
+
+			Ω(buffer.Contents()).Should(Equal([]byte("abc")))
+		})
+
+		It("should be closed", func() {
+			Ω(buffer.Closed()).Should(BeFalse())
+
+			buffer.Close()
+
+			Ω(buffer.Closed()).Should(BeTrue())
+		})
+	})
+})

vendor/github.com/onsi/gomega/gbytes/gbuffer_suite_test.go

@@ -0,0 +1,13 @@
+package gbytes_test
+
+import (
+	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/gomega"
+
+	"testing"
+)
+
+func TestGbytes(t *testing.T) {
+	RegisterFailHandler(Fail)
+	RunSpecs(t, "Gbytes Suite")
+}

vendor/github.com/onsi/gomega/gbytes/say_matcher.go

@@ -0,0 +1,105 @@
+package gbytes
+
+import (
+	"fmt"
+	"regexp"
+
+	"github.com/onsi/gomega/format"
+)
+
+//Objects satisfying the BufferProvider can be used with the Say matcher.
+type BufferProvider interface {
+	Buffer() *Buffer
+}
+
+/*
+Say is a Gomega matcher that operates on gbytes.Buffers:
+
+	Ω(buffer).Should(Say("something"))
+
+will succeed if the unread portion of the buffer matches the regular expression "something".
+
+When Say succeeds, it fast forwards the gbytes.Buffer's read cursor to just after the succesful match.
+Thus, subsequent calls to Say will only match against the unread portion of the buffer
+
+Say pairs very well with Eventually.  To asser that a buffer eventually receives data matching "[123]-star" within 3 seconds you can:
+
+	Eventually(buffer, 3).Should(Say("[123]-star"))
+
+Ditto with consistently.  To assert that a buffer does not receive data matching "never-see-this" for 1 second you can:
+
+	Consistently(buffer, 1).ShouldNot(Say("never-see-this"))
+
+In addition to bytes.Buffers, Say can operate on objects that implement the gbytes.BufferProvider interface.
+In such cases, Say simply operates on the *gbytes.Buffer returned by Buffer()
+
+If the buffer is closed, the Say matcher will tell Eventually to abort.
+*/
+func Say(expected string, args ...interface{}) *sayMatcher {
+	formattedRegexp := expected
+	if len(args) > 0 {
+		formattedRegexp = fmt.Sprintf(expected, args...)
+	}
+	return &sayMatcher{
+		re: regexp.MustCompile(formattedRegexp),
+	}
+}
+
+type sayMatcher struct {
+	re              *regexp.Regexp
+	receivedSayings []byte
+}
+
+func (m *sayMatcher) buffer(actual interface{}) (*Buffer, bool) {
+	var buffer *Buffer
+
+	switch x := actual.(type) {
+	case *Buffer:
+		buffer = x
+	case BufferProvider:
+		buffer = x.Buffer()
+	default:
+		return nil, false
+	}
+
+	return buffer, true
+}
+
+func (m *sayMatcher) Match(actual interface{}) (success bool, err error) {
+	buffer, ok := m.buffer(actual)
+	if !ok {
+		return false, fmt.Errorf("Say must be passed a *gbytes.Buffer or BufferProvider.  Got:\n%s", format.Object(actual, 1))
+	}
+
+	didSay, sayings := buffer.didSay(m.re)
+	m.receivedSayings = sayings
+
+	return didSay, nil
+}
+
+func (m *sayMatcher) FailureMessage(actual interface{}) (message string) {
+	return fmt.Sprintf(
+		"Got stuck at:\n%s\nWaiting for:\n%s",
+		format.IndentString(string(m.receivedSayings), 1),
+		format.IndentString(m.re.String(), 1),
+	)
+}
+
+func (m *sayMatcher) NegatedFailureMessage(actual interface{}) (message string) {
+	return fmt.Sprintf(
+		"Saw:\n%s\nWhich matches the unexpected:\n%s",
+		format.IndentString(string(m.receivedSayings), 1),
+		format.IndentString(m.re.String(), 1),
+	)
+}
+
+func (m *sayMatcher) MatchMayChangeInTheFuture(actual interface{}) bool {
+	switch x := actual.(type) {
+	case *Buffer:
+		return !x.Closed()
+	case BufferProvider:
+		return !x.Buffer().Closed()
+	default:
+		return true
+	}
+}

vendor/github.com/onsi/gomega/gbytes/say_matcher_test.go

@@ -0,0 +1,163 @@
+package gbytes_test
+
+import (
+	. "github.com/onsi/gomega/gbytes"
+	"time"
+
+	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/gomega"
+)
+
+type speaker struct {
+	buffer *Buffer
+}
+
+func (s *speaker) Buffer() *Buffer {
+	return s.buffer
+}
+
+var _ = Describe("SayMatcher", func() {
+	var buffer *Buffer
+
+	BeforeEach(func() {
+		buffer = NewBuffer()
+		buffer.Write([]byte("abc"))
+	})
+
+	Context("when actual is not a gexec Buffer, or a BufferProvider", func() {
+		It("should error", func() {
+			failures := InterceptGomegaFailures(func() {
+				Ω("foo").Should(Say("foo"))
+			})
+			Ω(failures[0]).Should(ContainSubstring("*gbytes.Buffer"))
+		})
+	})
+
+	Context("when a match is found", func() {
+		It("should succeed", func() {
+			Ω(buffer).Should(Say("abc"))
+		})
+
+		It("should support printf-like formatting", func() {
+			Ω(buffer).Should(Say("a%sc", "b"))
+		})
+
+		It("should use a regular expression", func() {
+			Ω(buffer).Should(Say("a.c"))
+		})
+
+		It("should fastforward the buffer", func() {
+			buffer.Write([]byte("def"))
+			Ω(buffer).Should(Say("abcd"))
+			Ω(buffer).Should(Say("ef"))
+			Ω(buffer).ShouldNot(Say("[a-z]"))
+		})
+	})
+
+	Context("when no match is found", func() {
+		It("should not error", func() {
+			Ω(buffer).ShouldNot(Say("def"))
+		})
+
+		Context("when the buffer is closed", func() {
+			BeforeEach(func() {
+				buffer.Close()
+			})
+
+			It("should abort an eventually", func() {
+				t := time.Now()
+				failures := InterceptGomegaFailures(func() {
+					Eventually(buffer).Should(Say("def"))
+				})
+				Eventually(buffer).ShouldNot(Say("def"))
+				Ω(time.Since(t)).Should(BeNumerically("<", 500*time.Millisecond))
+				Ω(failures).Should(HaveLen(1))
+
+				t = time.Now()
+				Eventually(buffer).Should(Say("abc"))
+				Ω(time.Since(t)).Should(BeNumerically("<", 500*time.Millisecond))
+			})
+
+			It("should abort a consistently", func() {
+				t := time.Now()
+				Consistently(buffer, 2.0).ShouldNot(Say("def"))
+				Ω(time.Since(t)).Should(BeNumerically("<", 500*time.Millisecond))
+			})
+
+			It("should not error with a synchronous matcher", func() {
+				Ω(buffer).ShouldNot(Say("def"))
+				Ω(buffer).Should(Say("abc"))
+			})
+		})
+	})
+
+	Context("when a positive match fails", func() {
+		It("should report where it got stuck", func() {
+			Ω(buffer).Should(Say("abc"))
+			buffer.Write([]byte("def"))
+			failures := InterceptGomegaFailures(func() {
+				Ω(buffer).Should(Say("abc"))
+			})
+			Ω(failures[0]).Should(ContainSubstring("Got stuck at:"))
+			Ω(failures[0]).Should(ContainSubstring("def"))
+		})
+	})
+
+	Context("when a negative match fails", func() {
+		It("should report where it got stuck", func() {
+			failures := InterceptGomegaFailures(func() {
+				Ω(buffer).ShouldNot(Say("abc"))
+			})
+			Ω(failures[0]).Should(ContainSubstring("Saw:"))
+			Ω(failures[0]).Should(ContainSubstring("Which matches the unexpected:"))
+			Ω(failures[0]).Should(ContainSubstring("abc"))
+		})
+	})
+
+	Context("when a match is not found", func() {
+		It("should not fastforward the buffer", func() {
+			Ω(buffer).ShouldNot(Say("def"))
+			Ω(buffer).Should(Say("abc"))
+		})
+	})
+
+	Context("a nice real-life example", func() {
+		It("should behave well", func() {
+			Ω(buffer).Should(Say("abc"))
+			go func() {
+				time.Sleep(10 * time.Millisecond)
+				buffer.Write([]byte("def"))
+			}()
+			Ω(buffer).ShouldNot(Say("def"))
+			Eventually(buffer).Should(Say("def"))
+		})
+	})
+
+	Context("when actual is a BufferProvider", func() {
+		It("should use actual's buffer", func() {
+			s := &speaker{
+				buffer: NewBuffer(),
+			}
+
+			Ω(s).ShouldNot(Say("abc"))
+
+			s.Buffer().Write([]byte("abc"))
+			Ω(s).Should(Say("abc"))
+		})
+
+		It("should abort an eventually", func() {
+			s := &speaker{
+				buffer: NewBuffer(),
+			}
+
+			s.buffer.Close()
+
+			t := time.Now()
+			failures := InterceptGomegaFailures(func() {
+				Eventually(s).Should(Say("def"))
+			})
+			Ω(failures).Should(HaveLen(1))
+			Ω(time.Since(t)).Should(BeNumerically("<", 500*time.Millisecond))
+		})
+	})
+})