From a4e6c8685640128ed2568c88887864cfe10873f7 Mon Sep 17 00:00:00 2001 From: Francisco Souza Date: Wed, 27 Aug 2014 17:49:03 -0300 Subject: [PATCH] all: use goimports import pattern --- api/handler.go | 13 +++++++------ api/handler_test.go | 15 ++++++++------- api/utils.go | 1 + api/utils_test.go | 3 ++- bin/gandalf.go | 11 ++++++----- bin/gandalf_test.go | 9 +++++---- db/conn_test.go | 3 ++- fs/filesystem_test.go | 3 ++- hook/hook.go | 5 +++-- hook/hook_test.go | 9 +++++---- multipartzip/multipartzip.go | 3 ++- multipartzip/multipartzip_test.go | 3 ++- repository/git.go | 5 +++-- repository/git_test.go | 3 ++- repository/repository.go | 15 ++++++++------- repository/repository_test.go | 17 +++++++++-------- testing/server_test.go | 5 +++-- user/key.go | 13 +++++++------ user/key_test.go | 9 +++++---- user/user.go | 3 ++- user/user_test.go | 9 +++++---- webserver/main.go | 5 +++-- 22 files changed, 92 insertions(+), 70 deletions(-) diff --git a/api/handler.go b/api/handler.go index 4827ace..9ce9439 100644 --- a/api/handler.go +++ b/api/handler.go @@ -8,12 +8,6 @@ import ( "encoding/json" "errors" "fmt" - "github.com/tsuru/config" - "github.com/tsuru/gandalf/db" - "github.com/tsuru/gandalf/hook" - "github.com/tsuru/gandalf/multipartzip" - "github.com/tsuru/gandalf/repository" - "github.com/tsuru/gandalf/user" "io" "io/ioutil" "mime" @@ -22,6 +16,13 @@ import ( "reflect" "strconv" "strings" + + "github.com/tsuru/config" + "github.com/tsuru/gandalf/db" + "github.com/tsuru/gandalf/hook" + "github.com/tsuru/gandalf/multipartzip" + "github.com/tsuru/gandalf/repository" + "github.com/tsuru/gandalf/user" ) var maxMemory uint diff --git a/api/handler_test.go b/api/handler_test.go index 1118151..499092a 100644 --- a/api/handler_test.go +++ b/api/handler_test.go @@ -8,6 +8,14 @@ import ( "bytes" "encoding/json" "fmt" + "io" + "io/ioutil" + "net/http" + "net/http/httptest" + "os" + "path" + "strings" + "github.com/tsuru/config" "github.com/tsuru/gandalf/db" "github.com/tsuru/gandalf/fs" @@ -15,14 +23,7 @@ import ( "github.com/tsuru/gandalf/repository" "github.com/tsuru/gandalf/user" "gopkg.in/mgo.v2/bson" - "io" - "io/ioutil" "launchpad.net/gocheck" - "net/http" - "net/http/httptest" - "os" - "path" - "strings" ) type bufferCloser struct { diff --git a/api/utils.go b/api/utils.go index ae72ab6..7d02518 100644 --- a/api/utils.go +++ b/api/utils.go @@ -6,6 +6,7 @@ package api import ( "fmt" + "github.com/tsuru/gandalf/db" "github.com/tsuru/gandalf/user" "gopkg.in/mgo.v2/bson" diff --git a/api/utils_test.go b/api/utils_test.go index 94f1a81..3b732c3 100644 --- a/api/utils_test.go +++ b/api/utils_test.go @@ -5,6 +5,8 @@ package api import ( + "testing" + "github.com/tsuru/commandmocker" "github.com/tsuru/config" "github.com/tsuru/gandalf/db" @@ -13,7 +15,6 @@ import ( testingfs "github.com/tsuru/tsuru/fs/testing" "gopkg.in/mgo.v2/bson" "launchpad.net/gocheck" - "testing" ) func Test(t *testing.T) { gocheck.TestingT(t) } diff --git a/bin/gandalf.go b/bin/gandalf.go index eeff9c9..7490df0 100644 --- a/bin/gandalf.go +++ b/bin/gandalf.go @@ -8,11 +8,6 @@ import ( "bytes" "errors" "fmt" - "github.com/tsuru/config" - "github.com/tsuru/gandalf/db" - "github.com/tsuru/gandalf/repository" - "github.com/tsuru/gandalf/user" - "gopkg.in/mgo.v2/bson" "io" "log/syslog" "os" @@ -20,6 +15,12 @@ import ( "path" "regexp" "strings" + + "github.com/tsuru/config" + "github.com/tsuru/gandalf/db" + "github.com/tsuru/gandalf/repository" + "github.com/tsuru/gandalf/user" + "gopkg.in/mgo.v2/bson" ) var log *syslog.Writer diff --git a/bin/gandalf_test.go b/bin/gandalf_test.go index c0a70f7..de39423 100644 --- a/bin/gandalf_test.go +++ b/bin/gandalf_test.go @@ -6,6 +6,11 @@ package main import ( "bytes" + "log/syslog" + "os" + "path" + "testing" + "github.com/tsuru/commandmocker" "github.com/tsuru/config" "github.com/tsuru/gandalf/db" @@ -13,10 +18,6 @@ import ( "github.com/tsuru/gandalf/user" "gopkg.in/mgo.v2/bson" "launchpad.net/gocheck" - "log/syslog" - "os" - "path" - "testing" ) func Test(t *testing.T) { gocheck.TestingT(t) } diff --git a/db/conn_test.go b/db/conn_test.go index c141b9e..08ca7f4 100644 --- a/db/conn_test.go +++ b/db/conn_test.go @@ -5,9 +5,10 @@ package db import ( + "testing" + "github.com/tsuru/config" "launchpad.net/gocheck" - "testing" ) func Test(t *testing.T) { gocheck.TestingT(t) } diff --git a/fs/filesystem_test.go b/fs/filesystem_test.go index 14994dd..04e3e59 100644 --- a/fs/filesystem_test.go +++ b/fs/filesystem_test.go @@ -5,9 +5,10 @@ package fs import ( + "testing" + tsurufs "github.com/tsuru/tsuru/fs" "launchpad.net/gocheck" - "testing" ) func Test(t *testing.T) { gocheck.TestingT(t) } diff --git a/hook/hook.go b/hook/hook.go index 34e9626..8709fdc 100644 --- a/hook/hook.go +++ b/hook/hook.go @@ -5,11 +5,12 @@ package hook import ( - "github.com/tsuru/config" - "github.com/tsuru/gandalf/fs" "io" "os" "strings" + + "github.com/tsuru/config" + "github.com/tsuru/gandalf/fs" ) func createHookFile(path string, body io.Reader) error { diff --git a/hook/hook_test.go b/hook/hook_test.go index a2b526c..dfe873e 100644 --- a/hook/hook_test.go +++ b/hook/hook_test.go @@ -5,16 +5,17 @@ package hook import ( + "io/ioutil" + "os" + "strings" + "testing" + "github.com/tsuru/commandmocker" "github.com/tsuru/config" "github.com/tsuru/gandalf/db" "github.com/tsuru/gandalf/fs" testingfs "github.com/tsuru/tsuru/fs/testing" - "io/ioutil" "launchpad.net/gocheck" - "os" - "strings" - "testing" ) func Test(t *testing.T) { gocheck.TestingT(t) } diff --git a/multipartzip/multipartzip.go b/multipartzip/multipartzip.go index 8f32de7..d3ee091 100644 --- a/multipartzip/multipartzip.go +++ b/multipartzip/multipartzip.go @@ -7,11 +7,12 @@ package multipartzip import ( "archive/zip" "fmt" - "github.com/tsuru/gandalf/fs" "io" "mime/multipart" "os" "path" + + "github.com/tsuru/gandalf/fs" ) func ValueField(f *multipart.Form, n string) (string, error) { diff --git a/multipartzip/multipartzip_test.go b/multipartzip/multipartzip_test.go index 19bdf3c..a417471 100644 --- a/multipartzip/multipartzip_test.go +++ b/multipartzip/multipartzip_test.go @@ -9,11 +9,12 @@ import ( "bytes" "io" "io/ioutil" - "launchpad.net/gocheck" "mime/multipart" "os" "path" "testing" + + "launchpad.net/gocheck" ) func Test(t *testing.T) { gocheck.TestingT(t) } diff --git a/repository/git.go b/repository/git.go index 2790654..48c9a12 100644 --- a/repository/git.go +++ b/repository/git.go @@ -6,10 +6,11 @@ package repository import ( "fmt" - "github.com/tsuru/config" - "github.com/tsuru/gandalf/fs" "os/exec" "path" + + "github.com/tsuru/config" + "github.com/tsuru/gandalf/fs" ) var bare string diff --git a/repository/git_test.go b/repository/git_test.go index b0d7430..0246a09 100644 --- a/repository/git_test.go +++ b/repository/git_test.go @@ -6,12 +6,13 @@ package repository import ( "fmt" + "path" + "github.com/tsuru/commandmocker" "github.com/tsuru/config" "github.com/tsuru/gandalf/fs" "github.com/tsuru/tsuru/fs/testing" "launchpad.net/gocheck" - "path" ) func (s *S) TestBareLocationValuShouldComeFromGandalfConf(c *gocheck.C) { diff --git a/repository/repository.go b/repository/repository.go index 906105b..725ecb6 100644 --- a/repository/repository.go +++ b/repository/repository.go @@ -8,13 +8,6 @@ import ( "encoding/json" "errors" "fmt" - "github.com/tsuru/config" - "github.com/tsuru/gandalf/db" - "github.com/tsuru/gandalf/fs" - "github.com/tsuru/gandalf/multipartzip" - "github.com/tsuru/tsuru/log" - "gopkg.in/mgo.v2" - "gopkg.in/mgo.v2/bson" "io/ioutil" "mime/multipart" "os" @@ -22,6 +15,14 @@ import ( "path/filepath" "regexp" "strings" + + "github.com/tsuru/config" + "github.com/tsuru/gandalf/db" + "github.com/tsuru/gandalf/fs" + "github.com/tsuru/gandalf/multipartzip" + "github.com/tsuru/tsuru/log" + "gopkg.in/mgo.v2" + "gopkg.in/mgo.v2/bson" ) var tempDir string diff --git a/repository/repository_test.go b/repository/repository_test.go index ed4d115..4103fbe 100644 --- a/repository/repository_test.go +++ b/repository/repository_test.go @@ -10,22 +10,23 @@ import ( "bytes" "encoding/json" "fmt" - "github.com/tsuru/commandmocker" - "github.com/tsuru/config" - "github.com/tsuru/gandalf/db" - "github.com/tsuru/gandalf/fs" - "github.com/tsuru/gandalf/multipartzip" - fstesting "github.com/tsuru/tsuru/fs/testing" - "gopkg.in/mgo.v2/bson" "io" "io/ioutil" - "launchpad.net/gocheck" "mime/multipart" "os" "os/exec" "path" "strings" "testing" + + "github.com/tsuru/commandmocker" + "github.com/tsuru/config" + "github.com/tsuru/gandalf/db" + "github.com/tsuru/gandalf/fs" + "github.com/tsuru/gandalf/multipartzip" + fstesting "github.com/tsuru/tsuru/fs/testing" + "gopkg.in/mgo.v2/bson" + "launchpad.net/gocheck" ) func Test(t *testing.T) { gocheck.TestingT(t) } diff --git a/testing/server_test.go b/testing/server_test.go index 5211aab..34cde9f 100644 --- a/testing/server_test.go +++ b/testing/server_test.go @@ -1,13 +1,14 @@ -// Copyright 2013 gandalf authors. All rights reserved. +// Copyright 2014 gandalf authors. All rights reserved. // Use of this source code is governed by a BSD-style // license that can be found in the LICENSE file. package testing import ( - "launchpad.net/gocheck" "net/http" "testing" + + "launchpad.net/gocheck" ) func Test(t *testing.T) { gocheck.TestingT(t) } diff --git a/user/key.go b/user/key.go index c40dfac..2e35b5b 100644 --- a/user/key.go +++ b/user/key.go @@ -6,15 +6,9 @@ package user import ( "bufio" - "code.google.com/p/go.crypto/ssh" "encoding/json" "errors" "fmt" - "github.com/tsuru/config" - "github.com/tsuru/gandalf/db" - "github.com/tsuru/gandalf/fs" - "gopkg.in/mgo.v2" - "gopkg.in/mgo.v2/bson" "io" "os" "os/user" @@ -22,6 +16,13 @@ import ( "strings" "syscall" "time" + + "code.google.com/p/go.crypto/ssh" + "github.com/tsuru/config" + "github.com/tsuru/gandalf/db" + "github.com/tsuru/gandalf/fs" + "gopkg.in/mgo.v2" + "gopkg.in/mgo.v2/bson" ) var ( diff --git a/user/key_test.go b/user/key_test.go index 2089a65..e409ac8 100644 --- a/user/key_test.go +++ b/user/key_test.go @@ -9,15 +9,16 @@ import ( "encoding/json" "errors" "fmt" - "github.com/tsuru/config" - "github.com/tsuru/gandalf/db" - "gopkg.in/mgo.v2/bson" "io" "io/ioutil" - "launchpad.net/gocheck" "os" "path" "time" + + "github.com/tsuru/config" + "github.com/tsuru/gandalf/db" + "gopkg.in/mgo.v2/bson" + "launchpad.net/gocheck" ) type shortWriter struct{} diff --git a/user/user.go b/user/user.go index ef7685a..fef3608 100644 --- a/user/user.go +++ b/user/user.go @@ -7,12 +7,13 @@ package user import ( "errors" "fmt" + "regexp" + "github.com/tsuru/gandalf/db" "github.com/tsuru/gandalf/repository" "github.com/tsuru/tsuru/log" "gopkg.in/mgo.v2" "gopkg.in/mgo.v2/bson" - "regexp" ) func init() { diff --git a/user/user_test.go b/user/user_test.go index 2c0440b..d316a14 100644 --- a/user/user_test.go +++ b/user/user_test.go @@ -5,17 +5,18 @@ package user import ( + "io/ioutil" + "os" + "path" + "testing" + "github.com/tsuru/config" "github.com/tsuru/gandalf/db" "github.com/tsuru/gandalf/fs" "github.com/tsuru/gandalf/repository" fstesting "github.com/tsuru/tsuru/fs/testing" "gopkg.in/mgo.v2/bson" - "io/ioutil" "launchpad.net/gocheck" - "os" - "path" - "testing" ) func Test(t *testing.T) { gocheck.TestingT(t) } diff --git a/webserver/main.go b/webserver/main.go index df22e19..df8c5cd 100644 --- a/webserver/main.go +++ b/webserver/main.go @@ -7,11 +7,12 @@ package main import ( "flag" "fmt" + "log" + "net/http" + "github.com/bmizerany/pat" "github.com/tsuru/config" "github.com/tsuru/gandalf/api" - "log" - "net/http" ) const version = "0.5.0"