Skip to content
This repository was archived by the owner on Dec 16, 2022. It is now read-only.

Commit edfbce0

Browse files
committed
Update dependencies to use dep
1 parent 468f48d commit edfbce0

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

64 files changed

+3427
-1231
lines changed

Godeps/Godeps.json

-59
This file was deleted.

Godeps/Readme

-5
This file was deleted.

Gopkg.lock

+94
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Gopkg.toml

+48
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
# Gopkg.toml example
2+
#
3+
# Refer to https://golang.github.io/dep/docs/Gopkg.toml.html
4+
# for detailed Gopkg.toml documentation.
5+
#
6+
# required = ["github.com/user/thing/cmd/thing"]
7+
# ignored = ["github.com/user/project/pkgX", "bitbucket.org/user/project/pkgA/pkgY"]
8+
#
9+
# [[constraint]]
10+
# name = "github.com/user/project"
11+
# version = "1.0.0"
12+
#
13+
# [[constraint]]
14+
# name = "github.com/user/project2"
15+
# branch = "dev"
16+
# source = "github.com/myfork/project2"
17+
#
18+
# [[override]]
19+
# name = "github.com/x/y"
20+
# version = "2.4.0"
21+
22+
[[constraint]]
23+
name = "github.com/go-sql-driver/mysql"
24+
version = "1.4.1"
25+
26+
[[constraint]]
27+
name = "github.com/jmoiron/sqlx"
28+
version = "1.2.0"
29+
30+
[[constraint]]
31+
name = "github.com/joho/godotenv"
32+
version = "1.3.0"
33+
34+
[[constraint]]
35+
branch = "master"
36+
name = "github.com/martini-contrib/auth"
37+
38+
[[constraint]]
39+
name = "github.com/patrickmn/go-cache"
40+
version = "2.1.0"
41+
42+
[[constraint]]
43+
name = "github.com/rakyll/statik"
44+
version = "0.1.6"
45+
46+
[prune]
47+
go-tests = true
48+
unused-packages = true

Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ statik:
77
statik -src=$(shell pwd)/public
88

99
build: statik
10-
godep go build
10+
go build
1111

1212
test:
13-
TZ=UTC godep go test ./...
13+
TZ=UTC go test ./...
1414

1515
clean:
1616
rm -rf gossip

api.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ func (h *Handler) FetchLatestMessages(w http.ResponseWriter, r *http.Request) {
6868
messages, err := h.DB.LatestMessages(limit)
6969

7070
if err != nil {
71-
errMsg := fmt.Sprintf("Could not fetch latest messages with limit=%s: %s", limit, err.Error())
71+
errMsg := fmt.Sprintf("Could not fetch latest messages with limit=%d: %s", limit, err.Error())
7272
http.Error(w, response.New().WithError(errors.New(errMsg)).Json(), 500)
7373
return
7474
}

response/response_test.go

+6-6
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ func TestNew(t *testing.T) {
1818
func TestWithError(t *testing.T) {
1919
res := New().WithError(errors.New("Broken."))
2020
if res.Error == nil || res.Error.Error() != "Broken." {
21-
t.Fatalf("WithError() failed: expected the error to be set, got '%s'", res.Error)
21+
t.Fatalf("WithError() failed: expected the error to be set, got '%+v'", res.Error)
2222
}
2323
}
2424

@@ -43,7 +43,7 @@ func TestWithMessages(t *testing.T) {
4343
}
4444
res.WithMessages([]database.Message{})
4545
if res.Messages == nil {
46-
t.Fatalf("WithMessages() failed: got '%s' instead of a new slice", res.Messages)
46+
t.Fatalf("WithMessages() failed: got '%+v' instead of a new slice", res.Messages)
4747
}
4848
}
4949

@@ -52,7 +52,7 @@ func TestWithMessageWithNoMessages(t *testing.T) {
5252
msg := database.Message{}
5353
res.WithMessage(&msg)
5454
if !reflect.DeepEqual(res.Messages[0], msg) {
55-
t.Fatalf("WithMessage() failed: got '%s' instead of %s", &res.Messages[0], msg)
55+
t.Fatalf("WithMessage() failed: got '%+v' instead of %+v", &res.Messages[0], msg)
5656
}
5757
}
5858

@@ -61,14 +61,14 @@ func TestWithMessageWithOtherMessages(t *testing.T) {
6161
msg := database.Message{Room: "#github"}
6262
res.WithMessage(&msg)
6363
if !reflect.DeepEqual(res.Messages[1], msg) {
64-
t.Fatalf("WithMessage() failed: got '%s' instead of %s", res.Messages[1], msg)
64+
t.Fatalf("WithMessage() failed: got '%+v' instead of %+v", res.Messages[1], msg)
6565
}
6666
}
6767

6868
func TestChaining(t *testing.T) {
6969
res := New()
7070
if res.Messages != nil {
71-
t.Fatalf("Default value of .Messages is not nil, but rather '%s'", res.Messages)
71+
t.Fatalf("Default value of .Messages is not nil, but rather '%+v'", res.Messages)
7272
}
7373
if res.Limit != 0 {
7474
t.Fatalf("Default value of .Limit is not 0, but rather '%d'", res.Limit)
@@ -78,7 +78,7 @@ func TestChaining(t *testing.T) {
7878
t.Fatalf("WithLimit() failed: got '%d' instead of 5", res.Limit)
7979
}
8080
if res.Messages == nil {
81-
t.Fatalf("WithMessages() failed: got '%s' instead of a new slice", res.Messages)
81+
t.Fatalf("WithMessages() failed: got '%+v' instead of a new slice", res.Messages)
8282
}
8383
}
8484

statik/statik.go

+4-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/codegangsta/inject/README.md

+3-91
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/codegangsta/inject/update_readme.sh

-3
This file was deleted.

0 commit comments

Comments
 (0)