Merge pull request #17 from ninedraft/move-code-to-subpackage

refactor(project): ♻️ move source code into a subpackage
ninedraft · Mar 30, 2021 · d8d9c8b · d8d9c8b
2 parents 347baa6 + 730c0ce
commit d8d9c8b
Show file tree

Hide file tree

Showing 28 changed files with 20 additions and 20 deletions.
diff --git a/README.md b/README.md
@@ -12,7 +12,7 @@ MIT
 
 ## Installation
 
-`go install github.com/ninedraft/gemax`
+`go install github.com/ninedraft/gemax/gemax`
 
 ## Examples
 

diff --git a/examples/server/main.go b/examples/server/main.go
@@ -6,7 +6,7 @@ import (
 	"embed"
 	"log"
 
-	gemax "github.com/ninedraft/gemax"
+	gemax "github.com/ninedraft/gemax/gemax"
 )
 
 func main() {

diff --git a/client.go → gemax/client.go b/client.go → gemax/client.go
@@ -11,8 +11,8 @@ import (
 	"strings"
 	"sync"
 
-	"github.com/ninedraft/gemax/internal/bufreader"
-	"github.com/ninedraft/gemax/status"
+	"github.com/ninedraft/gemax/gemax/internal/bufreader"
+	"github.com/ninedraft/gemax/gemax/status"
 )
 
 // Client is used to fetch gemini resources.

diff --git a/client_header.go → gemax/client_header.go b/client_header.go → gemax/client_header.go
@@ -7,8 +7,8 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/ninedraft/gemax/internal/multierr"
-	"github.com/ninedraft/gemax/status"
+	"github.com/ninedraft/gemax/gemax/internal/multierr"
+	"github.com/ninedraft/gemax/gemax/status"
 )
 
 // MaxHeaderSize is used while parsing server responses.

diff --git a/client_header_test.go → gemax/client_header_test.go b/client_header_test.go → gemax/client_header_test.go
@@ -6,8 +6,8 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/ninedraft/gemax"
-	"github.com/ninedraft/gemax/status"
+	"github.com/ninedraft/gemax/gemax"
+	"github.com/ninedraft/gemax/gemax/status"
 )
 
 func TestParseResponseHeader(test *testing.T) {

diff --git a/client_test.go → gemax/client_test.go b/client_test.go → gemax/client_test.go
@@ -6,8 +6,8 @@ import (
 	"io"
 	"testing"
 
-	"github.com/ninedraft/gemax"
-	"github.com/ninedraft/gemax/internal/tester"
+	"github.com/ninedraft/gemax/gemax"
+	"github.com/ninedraft/gemax/gemax/internal/tester"
 )
 
 //go:embed testdata/client/pages/*

diff --git a/client_tls.go → gemax/client_tls.go b/client_tls.go → gemax/client_tls.go
diff --git a/doc.go → gemax/doc.go b/doc.go → gemax/doc.go
diff --git a/fs.go → gemax/fs.go b/fs.go → gemax/fs.go
@@ -11,7 +11,7 @@ import (
 	"path"
 	"strings"
 
-	"github.com/ninedraft/gemax/status"
+	"github.com/ninedraft/gemax/gemax/status"
 )
 
 // FileSystem serves file systems as gemini catalogs.

diff --git a/internal/bufreader/bufreader.go → gemax/internal/bufreader/bufreader.go b/internal/bufreader/bufreader.go → gemax/internal/bufreader/bufreader.go
diff --git a/internal/bufwriter/bufwriter.go → gemax/internal/bufwriter/bufwriter.go b/internal/bufwriter/bufwriter.go → gemax/internal/bufwriter/bufwriter.go
@@ -6,7 +6,7 @@ import (
 	"errors"
 	"io"
 
-	"github.com/ninedraft/gemax/internal/multierr"
+	"github.com/ninedraft/gemax/gemax/internal/multierr"
 )
 
 // Writer is a buffered io.Writer wrapper.

diff --git a/internal/multierr/mulitierr.go → gemax/internal/multierr/mulitierr.go b/internal/multierr/mulitierr.go → gemax/internal/multierr/mulitierr.go
diff --git a/internal/tester/dialer.go → gemax/internal/tester/dialer.go b/internal/tester/dialer.go → gemax/internal/tester/dialer.go
diff --git a/internal/tester/doc.go → gemax/internal/tester/doc.go b/internal/tester/doc.go → gemax/internal/tester/doc.go
diff --git a/mime.go → gemax/mime.go b/mime.go → gemax/mime.go
diff --git a/request.go → gemax/request.go b/request.go → gemax/request.go
diff --git a/response.go → gemax/response.go b/response.go → gemax/response.go
@@ -6,8 +6,8 @@ import (
 	"io"
 	"sync"
 
-	"github.com/ninedraft/gemax/internal/bufwriter"
-	"github.com/ninedraft/gemax/status"
+	"github.com/ninedraft/gemax/gemax/internal/bufwriter"
+	"github.com/ninedraft/gemax/gemax/status"
 )
 
 // ResponseWriter describes a server side response writer.

diff --git a/server.go → gemax/server.go b/server.go → gemax/server.go
@@ -8,7 +8,7 @@ import (
 	"net/url"
 	"sync"
 
-	"github.com/ninedraft/gemax/status"
+	"github.com/ninedraft/gemax/gemax/status"
 )
 
 // Handler describes a gemini protocol handler.

diff --git a/server_test.go → gemax/server_test.go b/server_test.go → gemax/server_test.go
@@ -11,8 +11,8 @@ import (
 	"testing"
 	"time"
 
-	"github.com/ninedraft/gemax"
-	"github.com/ninedraft/gemax/status"
+	"github.com/ninedraft/gemax/gemax"
+	"github.com/ninedraft/gemax/gemax/status"
 )
 
 func TestServerSuccess(test *testing.T) {

diff --git a/server_utils.go → gemax/server_utils.go b/server_utils.go → gemax/server_utils.go
@@ -8,7 +8,7 @@ import (
 	"sort"
 	"strings"
 
-	"github.com/ninedraft/gemax/status"
+	"github.com/ninedraft/gemax/gemax/status"
 )
 
 // Redirect client to another page.

diff --git a/server_utils_test.go → gemax/server_utils_test.go b/server_utils_test.go → gemax/server_utils_test.go
@@ -8,8 +8,8 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/ninedraft/gemax"
-	"github.com/ninedraft/gemax/status"
+	"github.com/ninedraft/gemax/gemax"
+	"github.com/ninedraft/gemax/gemax/status"
 )
 
 func TestServeContent(test *testing.T) {

diff --git a/status/doc.go → gemax/status/doc.go b/status/doc.go → gemax/status/doc.go
diff --git a/status/status.go → gemax/status/status.go b/status/status.go → gemax/status/status.go
diff --git a/status/status_string.go → gemax/status/status_string.go b/status/status_string.go → gemax/status/status_string.go
diff --git a/testdata/cert.pem → gemax/testdata/cert.pem b/testdata/cert.pem → gemax/testdata/cert.pem
diff --git a/testdata/client/pages/success.com → gemax/testdata/client/pages/success.com b/testdata/client/pages/success.com → gemax/testdata/client/pages/success.com
diff --git a/testdata/key.pem → gemax/testdata/key.pem b/testdata/key.pem → gemax/testdata/key.pem
diff --git a/tofu.go → gemax/tofu.go b/tofu.go → gemax/tofu.go