Move config/message/http/storage packages

This commit is contained in:
Ian Kent 2014-11-23 14:01:36 +00:00
parent 87a60771a6
commit 558e8186b7
14 changed files with 28 additions and 27 deletions

View file

@ -1593,18 +1593,18 @@ type _bintree_t struct {
var _bintree = &_bintree_t{nil, map[string]*_bintree_t{ var _bintree = &_bintree_t{nil, map[string]*_bintree_t{
"assets": &_bintree_t{nil, map[string]*_bintree_t{ "assets": &_bintree_t{nil, map[string]*_bintree_t{
"templates": &_bintree_t{nil, map[string]*_bintree_t{
"index.html": &_bintree_t{assets_templates_index_html, map[string]*_bintree_t{}},
"layout.html": &_bintree_t{assets_templates_layout_html, map[string]*_bintree_t{}},
}},
"images": &_bintree_t{nil, map[string]*_bintree_t{ "images": &_bintree_t{nil, map[string]*_bintree_t{
"ajax-loader.gif": &_bintree_t{assets_images_ajax_loader_gif, map[string]*_bintree_t{}},
"github.png": &_bintree_t{assets_images_github_png, map[string]*_bintree_t{}}, "github.png": &_bintree_t{assets_images_github_png, map[string]*_bintree_t{}},
"hog.png": &_bintree_t{assets_images_hog_png, map[string]*_bintree_t{}}, "hog.png": &_bintree_t{assets_images_hog_png, map[string]*_bintree_t{}},
"ajax-loader.gif": &_bintree_t{assets_images_ajax_loader_gif, map[string]*_bintree_t{}},
}}, }},
"js": &_bintree_t{nil, map[string]*_bintree_t{ "js": &_bintree_t{nil, map[string]*_bintree_t{
"controllers.js": &_bintree_t{assets_js_controllers_js, map[string]*_bintree_t{}}, "controllers.js": &_bintree_t{assets_js_controllers_js, map[string]*_bintree_t{}},
"strutil.js": &_bintree_t{assets_js_strutil_js, map[string]*_bintree_t{}}, "strutil.js": &_bintree_t{assets_js_strutil_js, map[string]*_bintree_t{}},
}}, }},
"templates": &_bintree_t{nil, map[string]*_bintree_t{
"index.html": &_bintree_t{assets_templates_index_html, map[string]*_bintree_t{}},
"layout.html": &_bintree_t{assets_templates_layout_html, map[string]*_bintree_t{}},
}},
}}, }},
}} }}

View file

@ -1,8 +1,8 @@
package config package config
import ( import (
"github.com/ian-kent/Go-MailHog/mailhog/data" "github.com/ian-kent/Go-MailHog/data"
"github.com/ian-kent/Go-MailHog/mailhog/storage" "github.com/ian-kent/Go-MailHog/storage"
) )
func DefaultConfig() *Config { func DefaultConfig() *Config {

View file

@ -5,9 +5,9 @@ import (
"net/smtp" "net/smtp"
"strconv" "strconv"
"github.com/ian-kent/Go-MailHog/mailhog/config" "github.com/ian-kent/Go-MailHog/config"
"github.com/ian-kent/Go-MailHog/mailhog/data" "github.com/ian-kent/Go-MailHog/data"
"github.com/ian-kent/Go-MailHog/mailhog/storage" "github.com/ian-kent/Go-MailHog/storage"
"github.com/ian-kent/go-log/log" "github.com/ian-kent/go-log/log"
gotcha "github.com/ian-kent/gotcha/app" gotcha "github.com/ian-kent/gotcha/app"
"github.com/ian-kent/gotcha/http" "github.com/ian-kent/gotcha/http"

10
main.go
View file

@ -6,12 +6,12 @@ import (
"net" "net"
"os" "os"
"github.com/ian-kent/Go-MailHog/mailhog/config" "github.com/ian-kent/Go-MailHog/config"
"github.com/ian-kent/Go-MailHog/mailhog/data" "github.com/ian-kent/Go-MailHog/data"
mhhttp "github.com/ian-kent/Go-MailHog/mailhog/http" mhhttp "github.com/ian-kent/Go-MailHog/http"
"github.com/ian-kent/Go-MailHog/mailhog/http/api" "github.com/ian-kent/Go-MailHog/http/api"
"github.com/ian-kent/Go-MailHog/mailhog/storage"
smtp "github.com/ian-kent/Go-MailHog/smtp/server" smtp "github.com/ian-kent/Go-MailHog/smtp/server"
"github.com/ian-kent/Go-MailHog/storage"
"github.com/ian-kent/envconf" "github.com/ian-kent/envconf"
"github.com/ian-kent/go-log/log" "github.com/ian-kent/go-log/log"
gotcha "github.com/ian-kent/gotcha/app" gotcha "github.com/ian-kent/gotcha/app"

View file

@ -1,13 +1,14 @@
package main package main
import ( import (
"github.com/ian-kent/Go-MailHog/mailhog/config"
"github.com/ian-kent/Go-MailHog/mailhog/storage"
"github.com/stretchr/testify/assert"
"net" "net"
"regexp" "regexp"
"strings" "strings"
"testing" "testing"
"github.com/ian-kent/Go-MailHog/config"
"github.com/ian-kent/Go-MailHog/storage"
"github.com/stretchr/testify/assert"
) )
// FIXME requires a running instance of MailHog // FIXME requires a running instance of MailHog

View file

@ -8,7 +8,7 @@ import (
"regexp" "regexp"
"strings" "strings"
"github.com/ian-kent/Go-MailHog/mailhog/data" "github.com/ian-kent/Go-MailHog/data"
) )
// Command is a struct representing an SMTP command (verb + arguments) // Command is a struct representing an SMTP command (verb + arguments)

View file

@ -6,7 +6,7 @@ import (
"errors" "errors"
"testing" "testing"
"github.com/ian-kent/Go-MailHog/mailhog/data" "github.com/ian-kent/Go-MailHog/data"
. "github.com/smartystreets/goconvey/convey" . "github.com/smartystreets/goconvey/convey"
) )

View file

@ -7,9 +7,9 @@ import (
"log" "log"
"strings" "strings"
"github.com/ian-kent/Go-MailHog/mailhog/data" "github.com/ian-kent/Go-MailHog/data"
"github.com/ian-kent/Go-MailHog/mailhog/storage"
"github.com/ian-kent/Go-MailHog/smtp/protocol" "github.com/ian-kent/Go-MailHog/smtp/protocol"
"github.com/ian-kent/Go-MailHog/storage"
) )
// Session represents a SMTP session using net.TCPConn // Session represents a SMTP session using net.TCPConn

View file

@ -7,8 +7,8 @@ import (
. "github.com/smartystreets/goconvey/convey" . "github.com/smartystreets/goconvey/convey"
"github.com/ian-kent/Go-MailHog/mailhog/data" "github.com/ian-kent/Go-MailHog/data"
"github.com/ian-kent/Go-MailHog/mailhog/storage" "github.com/ian-kent/Go-MailHog/storage"
) )
type fakeRw struct { type fakeRw struct {

View file

@ -1,6 +1,6 @@
package storage package storage
import "github.com/ian-kent/Go-MailHog/mailhog/data" import "github.com/ian-kent/Go-MailHog/data"
// InMemory is an in memory storage backend // InMemory is an in memory storage backend
type InMemory struct { type InMemory struct {

View file

@ -3,7 +3,7 @@ package storage
import ( import (
"log" "log"
"github.com/ian-kent/Go-MailHog/mailhog/data" "github.com/ian-kent/Go-MailHog/data"
"labix.org/v2/mgo" "labix.org/v2/mgo"
"labix.org/v2/mgo/bson" "labix.org/v2/mgo/bson"
) )

View file

@ -1,6 +1,6 @@
package storage package storage
import "github.com/ian-kent/Go-MailHog/mailhog/data" import "github.com/ian-kent/Go-MailHog/data"
// Storage represents a storage backend // Storage represents a storage backend
type Storage interface { type Storage interface {