Skip to content
This repository has been archived by the owner on Apr 26, 2021. It is now read-only.

Commit

Permalink
all: use goimports import pattern
Browse files Browse the repository at this point in the history
  • Loading branch information
Francisco Souza committed Aug 27, 2014
1 parent b52c753 commit a4e6c86
Show file tree
Hide file tree
Showing 22 changed files with 92 additions and 70 deletions.
13 changes: 7 additions & 6 deletions api/handler.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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
Expand Down
15 changes: 8 additions & 7 deletions api/handler_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,21 +8,22 @@ 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"
"github.com/tsuru/gandalf/multipartzip"
"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 {
Expand Down
1 change: 1 addition & 0 deletions api/utils.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ package api

import (
"fmt"

"github.com/tsuru/gandalf/db"
"github.com/tsuru/gandalf/user"
"gopkg.in/mgo.v2/bson"
Expand Down
3 changes: 2 additions & 1 deletion api/utils_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
package api

import (
"testing"

"github.com/tsuru/commandmocker"
"github.com/tsuru/config"
"github.com/tsuru/gandalf/db"
Expand All @@ -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) }
Expand Down
11 changes: 6 additions & 5 deletions bin/gandalf.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,18 +8,19 @@ 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"
"os/exec"
"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
Expand Down
9 changes: 5 additions & 4 deletions bin/gandalf_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,18 @@ package main

import (
"bytes"
"log/syslog"
"os"
"path"
"testing"

"github.com/tsuru/commandmocker"
"github.com/tsuru/config"
"github.com/tsuru/gandalf/db"
"github.com/tsuru/gandalf/repository"
"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) }
Expand Down
3 changes: 2 additions & 1 deletion db/conn_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,10 @@
package db

import (
"testing"

"github.com/tsuru/config"
"launchpad.net/gocheck"
"testing"
)

func Test(t *testing.T) { gocheck.TestingT(t) }
Expand Down
3 changes: 2 additions & 1 deletion fs/filesystem_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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) }
Expand Down
5 changes: 3 additions & 2 deletions hook/hook.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
9 changes: 5 additions & 4 deletions hook/hook_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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) }
Expand Down
3 changes: 2 additions & 1 deletion multipartzip/multipartzip.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
3 changes: 2 additions & 1 deletion multipartzip/multipartzip_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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) }
Expand Down
5 changes: 3 additions & 2 deletions repository/git.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion repository/git_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
15 changes: 8 additions & 7 deletions repository/repository.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,20 +8,21 @@ 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"
"os/exec"
"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
Expand Down
17 changes: 9 additions & 8 deletions repository/repository_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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) }
Expand Down
5 changes: 3 additions & 2 deletions testing/server_test.go
View file
Original file line number Diff line number Diff line change
@@ -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) }
Expand Down
13 changes: 7 additions & 6 deletions user/key.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,22 +6,23 @@ 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"
"path"
"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 (
Expand Down
9 changes: 5 additions & 4 deletions user/key_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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{}
Expand Down
3 changes: 2 additions & 1 deletion user/user.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
Loading

1 comment on commit a4e6c86

@scorphus
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks! 👍

Please sign in to comment.