From e4c48a0705b7b3b6b2e42340b73212cfb337bdb5 Mon Sep 17 00:00:00 2001 From: James Hillyerd Date: Sun, 24 Feb 2019 09:43:10 -0800 Subject: [PATCH 1/3] go code: rename to github.com/inbucket/inbucket --- cmd/client/list.go | 2 +- cmd/client/match.go | 2 +- cmd/client/mbox.go | 2 +- cmd/inbucket/main.go | 24 ++++++++++++------------ go.mod | 2 +- pkg/config/config.go | 2 +- pkg/message/manager.go | 8 ++++---- pkg/message/message.go | 2 +- pkg/policy/address.go | 4 ++-- pkg/policy/address_test.go | 4 ++-- pkg/rest/apiv1_controller.go | 8 ++++---- pkg/rest/apiv1_controller_test.go | 4 ++-- pkg/rest/client/apiv1_client.go | 2 +- pkg/rest/client/apiv1_client_test.go | 2 +- pkg/rest/client/example_test.go | 2 +- pkg/rest/routes.go | 2 +- pkg/rest/socketv1_controller.go | 6 +++--- pkg/rest/testutils_test.go | 8 ++++---- pkg/server/pop3/handler.go | 2 +- pkg/server/pop3/listener.go | 4 ++-- pkg/server/smtp/handler.go | 2 +- pkg/server/smtp/handler_test.go | 10 +++++----- pkg/server/smtp/listener.go | 8 ++++---- pkg/server/web/context.go | 6 +++--- pkg/server/web/server.go | 6 +++--- pkg/storage/file/fstore.go | 6 +++--- pkg/storage/file/fstore_test.go | 8 ++++---- pkg/storage/file/mbox.go | 2 +- pkg/storage/lock_test.go | 2 +- pkg/storage/mem/message.go | 2 +- pkg/storage/mem/store.go | 4 ++-- pkg/storage/mem/store_test.go | 6 +++--- pkg/storage/retention.go | 4 ++-- pkg/storage/retention_test.go | 8 ++++---- pkg/storage/storage.go | 2 +- pkg/stringutil/utils_test.go | 2 +- pkg/test/integration_test.go | 22 +++++++++++----------- pkg/test/manager.go | 8 ++++---- pkg/test/storage.go | 2 +- pkg/test/storage_suite.go | 6 +++--- pkg/webui/mailbox_controller.go | 8 ++++---- pkg/webui/root_controller.go | 4 ++-- pkg/webui/routes.go | 2 +- pkg/webui/sanitize/html_test.go | 2 +- 44 files changed, 112 insertions(+), 112 deletions(-) diff --git a/cmd/client/list.go b/cmd/client/list.go index 82f69d8..e682e5e 100644 --- a/cmd/client/list.go +++ b/cmd/client/list.go @@ -6,7 +6,7 @@ import ( "fmt" "github.com/google/subcommands" - "github.com/jhillyerd/inbucket/pkg/rest/client" + "github.com/inbucket/inbucket/pkg/rest/client" ) type listCmd struct { diff --git a/cmd/client/match.go b/cmd/client/match.go index 21a4ad0..cc0aa0a 100644 --- a/cmd/client/match.go +++ b/cmd/client/match.go @@ -10,7 +10,7 @@ import ( "time" "github.com/google/subcommands" - "github.com/jhillyerd/inbucket/pkg/rest/client" + "github.com/inbucket/inbucket/pkg/rest/client" ) type matchCmd struct { diff --git a/cmd/client/mbox.go b/cmd/client/mbox.go index 2105d24..bee4274 100644 --- a/cmd/client/mbox.go +++ b/cmd/client/mbox.go @@ -7,7 +7,7 @@ import ( "os" "github.com/google/subcommands" - "github.com/jhillyerd/inbucket/pkg/rest/client" + "github.com/inbucket/inbucket/pkg/rest/client" ) type mboxCmd struct { diff --git a/cmd/inbucket/main.go b/cmd/inbucket/main.go index 89fdb2a..242943a 100644 --- a/cmd/inbucket/main.go +++ b/cmd/inbucket/main.go @@ -14,18 +14,18 @@ import ( "syscall" "time" - "github.com/jhillyerd/inbucket/pkg/config" - "github.com/jhillyerd/inbucket/pkg/message" - "github.com/jhillyerd/inbucket/pkg/msghub" - "github.com/jhillyerd/inbucket/pkg/policy" - "github.com/jhillyerd/inbucket/pkg/rest" - "github.com/jhillyerd/inbucket/pkg/server/pop3" - "github.com/jhillyerd/inbucket/pkg/server/smtp" - "github.com/jhillyerd/inbucket/pkg/server/web" - "github.com/jhillyerd/inbucket/pkg/storage" - "github.com/jhillyerd/inbucket/pkg/storage/file" - "github.com/jhillyerd/inbucket/pkg/storage/mem" - "github.com/jhillyerd/inbucket/pkg/webui" + "github.com/inbucket/inbucket/pkg/config" + "github.com/inbucket/inbucket/pkg/message" + "github.com/inbucket/inbucket/pkg/msghub" + "github.com/inbucket/inbucket/pkg/policy" + "github.com/inbucket/inbucket/pkg/rest" + "github.com/inbucket/inbucket/pkg/server/pop3" + "github.com/inbucket/inbucket/pkg/server/smtp" + "github.com/inbucket/inbucket/pkg/server/web" + "github.com/inbucket/inbucket/pkg/storage" + "github.com/inbucket/inbucket/pkg/storage/file" + "github.com/inbucket/inbucket/pkg/storage/mem" + "github.com/inbucket/inbucket/pkg/webui" "github.com/rs/zerolog" "github.com/rs/zerolog/log" ) diff --git a/go.mod b/go.mod index 27e5b9d..8cebf9b 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/jhillyerd/inbucket +module github.com/inbucket/inbucket require ( github.com/davecgh/go-spew v1.1.1 // indirect diff --git a/pkg/config/config.go b/pkg/config/config.go index c1ed92c..2c5f2a3 100644 --- a/pkg/config/config.go +++ b/pkg/config/config.go @@ -8,7 +8,7 @@ import ( "text/tabwriter" "time" - "github.com/jhillyerd/inbucket/pkg/stringutil" + "github.com/inbucket/inbucket/pkg/stringutil" "github.com/kelseyhightower/envconfig" ) diff --git a/pkg/message/manager.go b/pkg/message/manager.go index cd32ba0..f942ec6 100644 --- a/pkg/message/manager.go +++ b/pkg/message/manager.go @@ -7,11 +7,11 @@ import ( "strings" "time" + "github.com/inbucket/inbucket/pkg/msghub" + "github.com/inbucket/inbucket/pkg/policy" + "github.com/inbucket/inbucket/pkg/storage" + "github.com/inbucket/inbucket/pkg/stringutil" "github.com/jhillyerd/enmime" - "github.com/jhillyerd/inbucket/pkg/msghub" - "github.com/jhillyerd/inbucket/pkg/policy" - "github.com/jhillyerd/inbucket/pkg/storage" - "github.com/jhillyerd/inbucket/pkg/stringutil" "github.com/rs/zerolog/log" ) diff --git a/pkg/message/message.go b/pkg/message/message.go index 8c97cda..acbc361 100644 --- a/pkg/message/message.go +++ b/pkg/message/message.go @@ -8,8 +8,8 @@ import ( "net/textproto" "time" + "github.com/inbucket/inbucket/pkg/storage" "github.com/jhillyerd/enmime" - "github.com/jhillyerd/inbucket/pkg/storage" ) // Metadata holds information about a message, but not the content. diff --git a/pkg/policy/address.go b/pkg/policy/address.go index dc2b855..23b54f2 100644 --- a/pkg/policy/address.go +++ b/pkg/policy/address.go @@ -6,8 +6,8 @@ import ( "net/mail" "strings" - "github.com/jhillyerd/inbucket/pkg/config" - "github.com/jhillyerd/inbucket/pkg/stringutil" + "github.com/inbucket/inbucket/pkg/config" + "github.com/inbucket/inbucket/pkg/stringutil" ) // Addressing handles email address policy. diff --git a/pkg/policy/address_test.go b/pkg/policy/address_test.go index 2956dd3..088ba1a 100644 --- a/pkg/policy/address_test.go +++ b/pkg/policy/address_test.go @@ -4,8 +4,8 @@ import ( "strings" "testing" - "github.com/jhillyerd/inbucket/pkg/config" - "github.com/jhillyerd/inbucket/pkg/policy" + "github.com/inbucket/inbucket/pkg/config" + "github.com/inbucket/inbucket/pkg/policy" ) func TestShouldAcceptDomain(t *testing.T) { diff --git a/pkg/rest/apiv1_controller.go b/pkg/rest/apiv1_controller.go index 1e68013..8250fa3 100644 --- a/pkg/rest/apiv1_controller.go +++ b/pkg/rest/apiv1_controller.go @@ -10,10 +10,10 @@ import ( "encoding/json" "strconv" - "github.com/jhillyerd/inbucket/pkg/rest/model" - "github.com/jhillyerd/inbucket/pkg/server/web" - "github.com/jhillyerd/inbucket/pkg/storage" - "github.com/jhillyerd/inbucket/pkg/stringutil" + "github.com/inbucket/inbucket/pkg/rest/model" + "github.com/inbucket/inbucket/pkg/server/web" + "github.com/inbucket/inbucket/pkg/storage" + "github.com/inbucket/inbucket/pkg/stringutil" ) // MailboxListV1 renders a list of messages in a mailbox diff --git a/pkg/rest/apiv1_controller_test.go b/pkg/rest/apiv1_controller_test.go index 4b4e4d4..efb0936 100644 --- a/pkg/rest/apiv1_controller_test.go +++ b/pkg/rest/apiv1_controller_test.go @@ -9,9 +9,9 @@ import ( "testing" "time" + "github.com/inbucket/inbucket/pkg/message" + "github.com/inbucket/inbucket/pkg/test" "github.com/jhillyerd/enmime" - "github.com/jhillyerd/inbucket/pkg/message" - "github.com/jhillyerd/inbucket/pkg/test" ) const ( diff --git a/pkg/rest/client/apiv1_client.go b/pkg/rest/client/apiv1_client.go index d88afce..a3af5ec 100644 --- a/pkg/rest/client/apiv1_client.go +++ b/pkg/rest/client/apiv1_client.go @@ -8,7 +8,7 @@ import ( "net/url" "time" - "github.com/jhillyerd/inbucket/pkg/rest/model" + "github.com/inbucket/inbucket/pkg/rest/model" ) // Client accesses the Inbucket REST API v1 diff --git a/pkg/rest/client/apiv1_client_test.go b/pkg/rest/client/apiv1_client_test.go index 61b54c7..e7bb4c1 100644 --- a/pkg/rest/client/apiv1_client_test.go +++ b/pkg/rest/client/apiv1_client_test.go @@ -7,7 +7,7 @@ import ( "testing" "time" - "github.com/jhillyerd/inbucket/pkg/rest/client" + "github.com/inbucket/inbucket/pkg/rest/client" ) func TestClientV1ListMailbox(t *testing.T) { diff --git a/pkg/rest/client/example_test.go b/pkg/rest/client/example_test.go index 7b36ded..5723dd2 100644 --- a/pkg/rest/client/example_test.go +++ b/pkg/rest/client/example_test.go @@ -7,7 +7,7 @@ import ( "net/http/httptest" "github.com/gorilla/mux" - "github.com/jhillyerd/inbucket/pkg/rest/client" + "github.com/inbucket/inbucket/pkg/rest/client" ) // Example demonstrates basic usage for the Inbucket REST client. diff --git a/pkg/rest/routes.go b/pkg/rest/routes.go index 9c4305c..8d14873 100644 --- a/pkg/rest/routes.go +++ b/pkg/rest/routes.go @@ -1,7 +1,7 @@ package rest import "github.com/gorilla/mux" -import "github.com/jhillyerd/inbucket/pkg/server/web" +import "github.com/inbucket/inbucket/pkg/server/web" // SetupRoutes populates the routes for the REST interface func SetupRoutes(r *mux.Router) { diff --git a/pkg/rest/socketv1_controller.go b/pkg/rest/socketv1_controller.go index 84e6c72..64e84c2 100644 --- a/pkg/rest/socketv1_controller.go +++ b/pkg/rest/socketv1_controller.go @@ -5,9 +5,9 @@ import ( "time" "github.com/gorilla/websocket" - "github.com/jhillyerd/inbucket/pkg/msghub" - "github.com/jhillyerd/inbucket/pkg/rest/model" - "github.com/jhillyerd/inbucket/pkg/server/web" + "github.com/inbucket/inbucket/pkg/msghub" + "github.com/inbucket/inbucket/pkg/rest/model" + "github.com/inbucket/inbucket/pkg/server/web" "github.com/rs/zerolog/log" ) diff --git a/pkg/rest/testutils_test.go b/pkg/rest/testutils_test.go index ec1c016..9936b52 100644 --- a/pkg/rest/testutils_test.go +++ b/pkg/rest/testutils_test.go @@ -9,10 +9,10 @@ import ( "strings" "testing" - "github.com/jhillyerd/inbucket/pkg/config" - "github.com/jhillyerd/inbucket/pkg/message" - "github.com/jhillyerd/inbucket/pkg/msghub" - "github.com/jhillyerd/inbucket/pkg/server/web" + "github.com/inbucket/inbucket/pkg/config" + "github.com/inbucket/inbucket/pkg/message" + "github.com/inbucket/inbucket/pkg/msghub" + "github.com/inbucket/inbucket/pkg/server/web" ) func testRestGet(url string) (*httptest.ResponseRecorder, error) { diff --git a/pkg/server/pop3/handler.go b/pkg/server/pop3/handler.go index 11c80df..04242d1 100644 --- a/pkg/server/pop3/handler.go +++ b/pkg/server/pop3/handler.go @@ -10,7 +10,7 @@ import ( "strings" "time" - "github.com/jhillyerd/inbucket/pkg/storage" + "github.com/inbucket/inbucket/pkg/storage" "github.com/rs/zerolog" "github.com/rs/zerolog/log" ) diff --git a/pkg/server/pop3/listener.go b/pkg/server/pop3/listener.go index c9a652f..b1aa002 100644 --- a/pkg/server/pop3/listener.go +++ b/pkg/server/pop3/listener.go @@ -6,8 +6,8 @@ import ( "sync" "time" - "github.com/jhillyerd/inbucket/pkg/config" - "github.com/jhillyerd/inbucket/pkg/storage" + "github.com/inbucket/inbucket/pkg/config" + "github.com/inbucket/inbucket/pkg/storage" "github.com/rs/zerolog/log" ) diff --git a/pkg/server/smtp/handler.go b/pkg/server/smtp/handler.go index fcae44e..b90333e 100644 --- a/pkg/server/smtp/handler.go +++ b/pkg/server/smtp/handler.go @@ -13,7 +13,7 @@ import ( "strings" "time" - "github.com/jhillyerd/inbucket/pkg/policy" + "github.com/inbucket/inbucket/pkg/policy" "github.com/rs/zerolog" "github.com/rs/zerolog/log" ) diff --git a/pkg/server/smtp/handler_test.go b/pkg/server/smtp/handler_test.go index 66a7ac9..bc63a58 100644 --- a/pkg/server/smtp/handler_test.go +++ b/pkg/server/smtp/handler_test.go @@ -12,11 +12,11 @@ import ( "testing" "time" - "github.com/jhillyerd/inbucket/pkg/config" - "github.com/jhillyerd/inbucket/pkg/message" - "github.com/jhillyerd/inbucket/pkg/policy" - "github.com/jhillyerd/inbucket/pkg/storage" - "github.com/jhillyerd/inbucket/pkg/test" + "github.com/inbucket/inbucket/pkg/config" + "github.com/inbucket/inbucket/pkg/message" + "github.com/inbucket/inbucket/pkg/policy" + "github.com/inbucket/inbucket/pkg/storage" + "github.com/inbucket/inbucket/pkg/test" ) type scriptStep struct { diff --git a/pkg/server/smtp/listener.go b/pkg/server/smtp/listener.go index a4d3a3f..9ef8c4e 100644 --- a/pkg/server/smtp/listener.go +++ b/pkg/server/smtp/listener.go @@ -9,10 +9,10 @@ import ( "sync" "time" - "github.com/jhillyerd/inbucket/pkg/config" - "github.com/jhillyerd/inbucket/pkg/message" - "github.com/jhillyerd/inbucket/pkg/metric" - "github.com/jhillyerd/inbucket/pkg/policy" + "github.com/inbucket/inbucket/pkg/config" + "github.com/inbucket/inbucket/pkg/message" + "github.com/inbucket/inbucket/pkg/metric" + "github.com/inbucket/inbucket/pkg/policy" "github.com/rs/zerolog/log" ) diff --git a/pkg/server/web/context.go b/pkg/server/web/context.go index 32c2c6f..5174062 100644 --- a/pkg/server/web/context.go +++ b/pkg/server/web/context.go @@ -5,9 +5,9 @@ import ( "strings" "github.com/gorilla/mux" - "github.com/jhillyerd/inbucket/pkg/config" - "github.com/jhillyerd/inbucket/pkg/message" - "github.com/jhillyerd/inbucket/pkg/msghub" + "github.com/inbucket/inbucket/pkg/config" + "github.com/inbucket/inbucket/pkg/message" + "github.com/inbucket/inbucket/pkg/msghub" ) // Context is passed into every request handler function diff --git a/pkg/server/web/server.go b/pkg/server/web/server.go index d6e0b99..b8ac2b3 100644 --- a/pkg/server/web/server.go +++ b/pkg/server/web/server.go @@ -13,9 +13,9 @@ import ( "time" "github.com/gorilla/mux" - "github.com/jhillyerd/inbucket/pkg/config" - "github.com/jhillyerd/inbucket/pkg/message" - "github.com/jhillyerd/inbucket/pkg/msghub" + "github.com/inbucket/inbucket/pkg/config" + "github.com/inbucket/inbucket/pkg/message" + "github.com/inbucket/inbucket/pkg/msghub" "github.com/rs/zerolog/log" ) diff --git a/pkg/storage/file/fstore.go b/pkg/storage/file/fstore.go index 5d3dcc7..b08b021 100644 --- a/pkg/storage/file/fstore.go +++ b/pkg/storage/file/fstore.go @@ -9,9 +9,9 @@ import ( "sync" "time" - "github.com/jhillyerd/inbucket/pkg/config" - "github.com/jhillyerd/inbucket/pkg/storage" - "github.com/jhillyerd/inbucket/pkg/stringutil" + "github.com/inbucket/inbucket/pkg/config" + "github.com/inbucket/inbucket/pkg/storage" + "github.com/inbucket/inbucket/pkg/stringutil" "github.com/rs/zerolog/log" ) diff --git a/pkg/storage/file/fstore_test.go b/pkg/storage/file/fstore_test.go index 7023706..53c438f 100644 --- a/pkg/storage/file/fstore_test.go +++ b/pkg/storage/file/fstore_test.go @@ -13,10 +13,10 @@ import ( "testing" "time" - "github.com/jhillyerd/inbucket/pkg/config" - "github.com/jhillyerd/inbucket/pkg/message" - "github.com/jhillyerd/inbucket/pkg/storage" - "github.com/jhillyerd/inbucket/pkg/test" + "github.com/inbucket/inbucket/pkg/config" + "github.com/inbucket/inbucket/pkg/message" + "github.com/inbucket/inbucket/pkg/storage" + "github.com/inbucket/inbucket/pkg/test" "github.com/stretchr/testify/assert" ) diff --git a/pkg/storage/file/mbox.go b/pkg/storage/file/mbox.go index 55f1c9f..42fe652 100644 --- a/pkg/storage/file/mbox.go +++ b/pkg/storage/file/mbox.go @@ -9,7 +9,7 @@ import ( "path/filepath" "sync" - "github.com/jhillyerd/inbucket/pkg/storage" + "github.com/inbucket/inbucket/pkg/storage" "github.com/rs/zerolog/log" ) diff --git a/pkg/storage/lock_test.go b/pkg/storage/lock_test.go index ab87bba..2aa8da2 100644 --- a/pkg/storage/lock_test.go +++ b/pkg/storage/lock_test.go @@ -3,7 +3,7 @@ package storage_test import ( "testing" - "github.com/jhillyerd/inbucket/pkg/storage" + "github.com/inbucket/inbucket/pkg/storage" ) func TestHashLock(t *testing.T) { diff --git a/pkg/storage/mem/message.go b/pkg/storage/mem/message.go index 02ae503..3c14898 100644 --- a/pkg/storage/mem/message.go +++ b/pkg/storage/mem/message.go @@ -8,7 +8,7 @@ import ( "net/mail" "time" - "github.com/jhillyerd/inbucket/pkg/storage" + "github.com/inbucket/inbucket/pkg/storage" ) // Message is a memory store message. diff --git a/pkg/storage/mem/store.go b/pkg/storage/mem/store.go index e8096db..8b4d017 100644 --- a/pkg/storage/mem/store.go +++ b/pkg/storage/mem/store.go @@ -7,8 +7,8 @@ import ( "strconv" "sync" - "github.com/jhillyerd/inbucket/pkg/config" - "github.com/jhillyerd/inbucket/pkg/storage" + "github.com/inbucket/inbucket/pkg/config" + "github.com/inbucket/inbucket/pkg/storage" ) // Store implements an in-memory message store. diff --git a/pkg/storage/mem/store_test.go b/pkg/storage/mem/store_test.go index c48bca8..5f945cc 100644 --- a/pkg/storage/mem/store_test.go +++ b/pkg/storage/mem/store_test.go @@ -5,9 +5,9 @@ import ( "testing" "time" - "github.com/jhillyerd/inbucket/pkg/config" - "github.com/jhillyerd/inbucket/pkg/storage" - "github.com/jhillyerd/inbucket/pkg/test" + "github.com/inbucket/inbucket/pkg/config" + "github.com/inbucket/inbucket/pkg/storage" + "github.com/inbucket/inbucket/pkg/test" ) // TestSuite runs storage package test suite on file store. diff --git a/pkg/storage/retention.go b/pkg/storage/retention.go index ac33084..86839c1 100644 --- a/pkg/storage/retention.go +++ b/pkg/storage/retention.go @@ -5,8 +5,8 @@ import ( "expvar" "time" - "github.com/jhillyerd/inbucket/pkg/config" - "github.com/jhillyerd/inbucket/pkg/metric" + "github.com/inbucket/inbucket/pkg/config" + "github.com/inbucket/inbucket/pkg/metric" "github.com/rs/zerolog/log" ) diff --git a/pkg/storage/retention_test.go b/pkg/storage/retention_test.go index e918cc1..52c9934 100644 --- a/pkg/storage/retention_test.go +++ b/pkg/storage/retention_test.go @@ -5,10 +5,10 @@ import ( "testing" "time" - "github.com/jhillyerd/inbucket/pkg/config" - "github.com/jhillyerd/inbucket/pkg/message" - "github.com/jhillyerd/inbucket/pkg/storage" - "github.com/jhillyerd/inbucket/pkg/test" + "github.com/inbucket/inbucket/pkg/config" + "github.com/inbucket/inbucket/pkg/message" + "github.com/inbucket/inbucket/pkg/storage" + "github.com/inbucket/inbucket/pkg/test" ) func TestDoRetentionScan(t *testing.T) { diff --git a/pkg/storage/storage.go b/pkg/storage/storage.go index 7cd40b3..d644429 100644 --- a/pkg/storage/storage.go +++ b/pkg/storage/storage.go @@ -8,7 +8,7 @@ import ( "net/mail" "time" - "github.com/jhillyerd/inbucket/pkg/config" + "github.com/inbucket/inbucket/pkg/config" ) var ( diff --git a/pkg/stringutil/utils_test.go b/pkg/stringutil/utils_test.go index 4bc3cc7..cf6df32 100644 --- a/pkg/stringutil/utils_test.go +++ b/pkg/stringutil/utils_test.go @@ -4,7 +4,7 @@ import ( "net/mail" "testing" - "github.com/jhillyerd/inbucket/pkg/stringutil" + "github.com/inbucket/inbucket/pkg/stringutil" ) func TestHashMailboxName(t *testing.T) { diff --git a/pkg/test/integration_test.go b/pkg/test/integration_test.go index 3871185..ebc0994 100644 --- a/pkg/test/integration_test.go +++ b/pkg/test/integration_test.go @@ -11,18 +11,18 @@ import ( "testing" "time" + "github.com/inbucket/inbucket/pkg/config" + "github.com/inbucket/inbucket/pkg/message" + "github.com/inbucket/inbucket/pkg/msghub" + "github.com/inbucket/inbucket/pkg/policy" + "github.com/inbucket/inbucket/pkg/rest" + "github.com/inbucket/inbucket/pkg/rest/client" + "github.com/inbucket/inbucket/pkg/server/smtp" + "github.com/inbucket/inbucket/pkg/server/web" + "github.com/inbucket/inbucket/pkg/storage" + "github.com/inbucket/inbucket/pkg/storage/mem" + "github.com/inbucket/inbucket/pkg/webui" "github.com/jhillyerd/goldiff" - "github.com/jhillyerd/inbucket/pkg/config" - "github.com/jhillyerd/inbucket/pkg/message" - "github.com/jhillyerd/inbucket/pkg/msghub" - "github.com/jhillyerd/inbucket/pkg/policy" - "github.com/jhillyerd/inbucket/pkg/rest" - "github.com/jhillyerd/inbucket/pkg/rest/client" - "github.com/jhillyerd/inbucket/pkg/server/smtp" - "github.com/jhillyerd/inbucket/pkg/server/web" - "github.com/jhillyerd/inbucket/pkg/storage" - "github.com/jhillyerd/inbucket/pkg/storage/mem" - "github.com/jhillyerd/inbucket/pkg/webui" "github.com/rs/zerolog" "github.com/rs/zerolog/log" ) diff --git a/pkg/test/manager.go b/pkg/test/manager.go index fa77ef5..a1df3d8 100644 --- a/pkg/test/manager.go +++ b/pkg/test/manager.go @@ -3,10 +3,10 @@ package test import ( "errors" - "github.com/jhillyerd/inbucket/pkg/config" - "github.com/jhillyerd/inbucket/pkg/message" - "github.com/jhillyerd/inbucket/pkg/policy" - "github.com/jhillyerd/inbucket/pkg/storage" + "github.com/inbucket/inbucket/pkg/config" + "github.com/inbucket/inbucket/pkg/message" + "github.com/inbucket/inbucket/pkg/policy" + "github.com/inbucket/inbucket/pkg/storage" ) // ManagerStub is a test stub for message.Manager diff --git a/pkg/test/storage.go b/pkg/test/storage.go index b52445d..9c9571d 100644 --- a/pkg/test/storage.go +++ b/pkg/test/storage.go @@ -3,7 +3,7 @@ package test import ( "errors" - "github.com/jhillyerd/inbucket/pkg/storage" + "github.com/inbucket/inbucket/pkg/storage" ) // StoreStub stubs storage.Store for testing. diff --git a/pkg/test/storage_suite.go b/pkg/test/storage_suite.go index 7324b76..f86908c 100644 --- a/pkg/test/storage_suite.go +++ b/pkg/test/storage_suite.go @@ -9,9 +9,9 @@ import ( "testing" "time" - "github.com/jhillyerd/inbucket/pkg/config" - "github.com/jhillyerd/inbucket/pkg/message" - "github.com/jhillyerd/inbucket/pkg/storage" + "github.com/inbucket/inbucket/pkg/config" + "github.com/inbucket/inbucket/pkg/message" + "github.com/inbucket/inbucket/pkg/storage" ) // StoreFactory returns a new store for the test suite. diff --git a/pkg/webui/mailbox_controller.go b/pkg/webui/mailbox_controller.go index b1a6033..f002a9c 100644 --- a/pkg/webui/mailbox_controller.go +++ b/pkg/webui/mailbox_controller.go @@ -7,10 +7,10 @@ import ( "net/http" "strconv" - "github.com/jhillyerd/inbucket/pkg/server/web" - "github.com/jhillyerd/inbucket/pkg/storage" - "github.com/jhillyerd/inbucket/pkg/stringutil" - "github.com/jhillyerd/inbucket/pkg/webui/sanitize" + "github.com/inbucket/inbucket/pkg/server/web" + "github.com/inbucket/inbucket/pkg/storage" + "github.com/inbucket/inbucket/pkg/stringutil" + "github.com/inbucket/inbucket/pkg/webui/sanitize" "github.com/rs/zerolog/log" ) diff --git a/pkg/webui/root_controller.go b/pkg/webui/root_controller.go index f3b7eb3..9338990 100644 --- a/pkg/webui/root_controller.go +++ b/pkg/webui/root_controller.go @@ -5,8 +5,8 @@ import ( "io/ioutil" "net/http" - "github.com/jhillyerd/inbucket/pkg/config" - "github.com/jhillyerd/inbucket/pkg/server/web" + "github.com/inbucket/inbucket/pkg/config" + "github.com/inbucket/inbucket/pkg/server/web" ) // RootGreeting serves the Inbucket greeting. diff --git a/pkg/webui/routes.go b/pkg/webui/routes.go index 54fea46..3797daf 100644 --- a/pkg/webui/routes.go +++ b/pkg/webui/routes.go @@ -3,7 +3,7 @@ package webui import ( "github.com/gorilla/mux" - "github.com/jhillyerd/inbucket/pkg/server/web" + "github.com/inbucket/inbucket/pkg/server/web" ) // SetupRoutes populates routes for the webui into the provided Router. diff --git a/pkg/webui/sanitize/html_test.go b/pkg/webui/sanitize/html_test.go index c5443f4..678c9d7 100644 --- a/pkg/webui/sanitize/html_test.go +++ b/pkg/webui/sanitize/html_test.go @@ -3,7 +3,7 @@ package sanitize_test import ( "testing" - "github.com/jhillyerd/inbucket/pkg/webui/sanitize" + "github.com/inbucket/inbucket/pkg/webui/sanitize" ) // TestHTMLPlainStrings test plain text passthrough From 2b3dd51e71f7b88eecafef64a03ba232089be98f Mon Sep 17 00:00:00 2001 From: James Hillyerd Date: Sun, 24 Feb 2019 10:09:33 -0800 Subject: [PATCH 2/3] docs: rename to github.com/inbucket/inbucket --- CHANGELOG.md | 44 +++++++++++++++++++++++++++----------------- README.md | 26 +++++++++++++------------- ui/src/Layout.elm | 2 +- 3 files changed, 41 insertions(+), 31 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 696e6ce..6dfb0dd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,16 @@ This project adheres to [Semantic Versioning](http://semver.org/). - `posix-millis` field to REST message and header responses for easier date parsing. +### Changed +- Rewrote the user interface from scratch, it's now an Elm powered single page + application. +- Moved the Inbucket repository to its own GitHub organization. + + +## v2.1.0 + +No change from beta1. + ## [v2.1.0-beta1] @@ -104,7 +114,7 @@ This project adheres to [Semantic Versioning](http://semver.org/). - `rest/client` types `MessageHeader` and `Message` with convenience methods; provides a more natural API - Powerful command line REST - [client](https://github.com/jhillyerd/inbucket/wiki/cmd-client) + [client](https://github.com/inbucket/inbucket/wiki/cmd-client) - Allow use of `latest` as a message ID in REST calls ### Changed @@ -119,9 +129,9 @@ This project adheres to [Semantic Versioning](http://semver.org/). ### Added - Storage of `To:` header in messages (likely breaks existing datastores) - Attachment list to [GET message - JSON](https://github.com/jhillyerd/inbucket/wiki/REST-GET-message) + JSON](https://github.com/inbucket/inbucket/wiki/REST-GET-message) - [Go client for REST - API](https://godoc.org/github.com/jhillyerd/inbucket/rest/client) + API](https://godoc.org/github.com/inbucket/inbucket/rest/client) - Monitor feature: lists messages as they arrive, regardless of their destination mailbox - Make `@inbucket` mailbox prompt configurable @@ -184,19 +194,19 @@ This project adheres to [Semantic Versioning](http://semver.org/). - Add Link button to messages, allows for directing another person to a specific message. -[Unreleased]: https://github.com/jhillyerd/inbucket/compare/master...develop -[v2.1.0-beta1]: https://github.com/jhillyerd/inbucket/compare/v2.0.0...v2.1.0-beta1 -[v2.0.0]: https://github.com/jhillyerd/inbucket/compare/v2.0.0-rc1...v2.0.0 -[v2.0.0-rc1]: https://github.com/jhillyerd/inbucket/compare/v1.3.1...v2.0.0-rc1 -[v1.3.1]: https://github.com/jhillyerd/inbucket/compare/v1.3.0...v1.3.1 -[v1.3.0]: https://github.com/jhillyerd/inbucket/compare/v1.2.0...v1.3.0 -[v1.2.0]: https://github.com/jhillyerd/inbucket/compare/1.2.0-rc2...1.2.0 -[v1.2.0-rc2]: https://github.com/jhillyerd/inbucket/compare/1.2.0-rc1...1.2.0-rc2 -[v1.2.0-rc1]: https://github.com/jhillyerd/inbucket/compare/1.1.0...1.2.0-rc1 -[v1.1.0]: https://github.com/jhillyerd/inbucket/compare/1.1.0-rc2...1.1.0 -[v1.1.0-rc2]: https://github.com/jhillyerd/inbucket/compare/1.1.0-rc1...1.1.0-rc2 -[v1.1.0-rc1]: https://github.com/jhillyerd/inbucket/compare/1.0...1.1.0-rc1 -[v1.0]: https://github.com/jhillyerd/inbucket/compare/1.0-rc1...1.0 +[Unreleased]: https://github.com/inbucket/inbucket/compare/master...develop +[v2.1.0-beta1]: https://github.com/inbucket/inbucket/compare/v2.0.0...v2.1.0-beta1 +[v2.0.0]: https://github.com/inbucket/inbucket/compare/v2.0.0-rc1...v2.0.0 +[v2.0.0-rc1]: https://github.com/inbucket/inbucket/compare/v1.3.1...v2.0.0-rc1 +[v1.3.1]: https://github.com/inbucket/inbucket/compare/v1.3.0...v1.3.1 +[v1.3.0]: https://github.com/inbucket/inbucket/compare/v1.2.0...v1.3.0 +[v1.2.0]: https://github.com/inbucket/inbucket/compare/1.2.0-rc2...1.2.0 +[v1.2.0-rc2]: https://github.com/inbucket/inbucket/compare/1.2.0-rc1...1.2.0-rc2 +[v1.2.0-rc1]: https://github.com/inbucket/inbucket/compare/1.1.0...1.2.0-rc1 +[v1.1.0]: https://github.com/inbucket/inbucket/compare/1.1.0-rc2...1.1.0 +[v1.1.0-rc2]: https://github.com/inbucket/inbucket/compare/1.1.0-rc1...1.1.0-rc2 +[v1.1.0-rc1]: https://github.com/inbucket/inbucket/compare/1.0...1.1.0-rc1 +[v1.0]: https://github.com/inbucket/inbucket/compare/1.0-rc1...1.0 ## Release Checklist @@ -209,7 +219,7 @@ This project adheres to [Semantic Versioning](http://semver.org/). 3. Run tests 4. Test cross-compile: `goreleaser --snapshot` 5. Commit changes and merge release: `git flow release finish` -6. Push tags and wait for https://travis-ci.org/jhillyerd/inbucket build to +6. Push tags and wait for https://travis-ci.org/inbucket/inbucket build to complete 7. Update `binary_versions` option in `inbucket-site/_config.yml` diff --git a/README.md b/README.md index 2d829a2..5eba25f 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ -Inbucket +Inbucket ============================================================================= -[![Build Status](https://travis-ci.org/jhillyerd/inbucket.png?branch=master)][Build Status] +[![Build Status](https://travis-ci.org/inbucket/inbucket.png?branch=master)][Build Status] Inbucket is an email testing service; it will accept messages for any email address and make them available via web, REST and POP3. Once compiled, @@ -8,7 +8,7 @@ Inbucket does not have any external dependencies (HTTP, SMTP, POP3 and storage are all built in). A Go client for the REST API is available in -`github.com/jhillyerd/inbucket/pkg/rest/client` - [Go API docs] +`github.com/inbucket/inbucket/pkg/rest/client` - [Go API docs] Read more at the [Inbucket Website] @@ -25,7 +25,7 @@ to contribute code to the project check out [CONTRIBUTING.md]. ## Homebrew Tap (currently broken, being tracked in [issue -#68](https://github.com/jhillyerd/inbucket/issues/68)) +#68](https://github.com/inbucket/inbucket/issues/68)) Inbucket has an OS X [Homebrew] tap available as [jhillyerd/inbucket][Homebrew Tap], see the `README.md` there for installation instructions. @@ -37,12 +37,12 @@ You will need a functioning [Go installation][Google Go] for this to work. Grab the Inbucket source code and compile the daemon: - go get -v github.com/jhillyerd/inbucket/cmd/inbucket + go get -v github.com/inbucket/inbucket/cmd/inbucket Edit etc/inbucket.conf and tailor to your environment. It should work on most Unix and OS X machines as is. Launch the daemon: - $GOPATH/bin/inbucket $GOPATH/src/github.com/jhillyerd/inbucket/etc/inbucket.conf + $GOPATH/bin/inbucket $GOPATH/src/github.com/inbucket/inbucket/etc/inbucket.conf By default the SMTP server will be listening on localhost port 2500 and the web interface will be available at [localhost:9000](http://localhost:9000/). @@ -56,15 +56,15 @@ The Inbucket website has a more complete guide to Inbucket is written in [Google Go] Inbucket is open source software released under the MIT License. The latest -version can be found at https://github.com/jhillyerd/inbucket +version can be found at https://github.com/inbucket/inbucket -[Go API docs]: https://godoc.org/github.com/jhillyerd/inbucket/pkg/rest/client -[Build Status]: https://travis-ci.org/jhillyerd/inbucket -[Change Log]: https://github.com/jhillyerd/inbucket/blob/master/CHANGELOG.md -[CONTRIBUTING.md]: https://github.com/jhillyerd/inbucket/blob/develop/CONTRIBUTING.md +[Go API docs]: https://godoc.org/github.com/inbucket/inbucket/pkg/rest/client +[Build Status]: https://travis-ci.org/inbucket/inbucket +[Change Log]: https://github.com/inbucket/inbucket/blob/master/CHANGELOG.md +[CONTRIBUTING.md]: https://github.com/inbucket/inbucket/blob/develop/CONTRIBUTING.md [From Source]: http://www.inbucket.org/installation/from-source.html [Google Go]: http://golang.org/ [Homebrew]: http://brew.sh/ -[Homebrew Tap]: https://github.com/jhillyerd/homebrew-inbucket +[Homebrew Tap]: https://github.com/inbucket/homebrew-inbucket [Inbucket Website]: http://www.inbucket.org/ -[Issues List]: https://github.com/jhillyerd/inbucket/issues?state=open +[Issues List]: https://github.com/inbucket/inbucket/issues?state=open diff --git a/ui/src/Layout.elm b/ui/src/Layout.elm index b038749..717d7cc 100644 --- a/ui/src/Layout.elm +++ b/ui/src/Layout.elm @@ -151,7 +151,7 @@ frame { model, session, activePage, activeMailbox, modal, content } = [ div [ class "footer" ] [ externalLink "https://www.inbucket.org" "Inbucket" , text " is an open source project hosted on " - , externalLink "https://github.com/jhillyerd/inbucket" "GitHub" + , externalLink "https://github.com/inbucket/inbucket" "GitHub" , text "." ] ] From c1b7e3605c948d25f3e577f4f927e52027a8a00d Mon Sep 17 00:00:00 2001 From: James Hillyerd Date: Sun, 24 Feb 2019 10:35:38 -0800 Subject: [PATCH 3/3] goreleaser: update github owner to inbucket --- .goreleaser.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.goreleaser.yml b/.goreleaser.yml index 7bb4cc9..50417ca 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -2,7 +2,7 @@ project_name: inbucket release: github: - owner: jhillyerd + owner: inbucket name: inbucket name_template: '{{.Tag}}'