Refactor packages (#75)

* Refactor: move di package * Refactor: move adaptor packages * Refactor: move github client package * Refactor: move git package * Refactor: move usecase packages * Refactor: fix import alias
suzuki-shunsuke · Jan 23, 2021 · 7552549 · 7552549
1 parent d041807
commit 7552549
Show file tree

Hide file tree

Showing 51 changed files with 227 additions and 227 deletions.
diff --git a/di/di.go b/di/di.go
diff --git a/main.go b/main.go
@@ -3,7 +3,7 @@ package main
 import (
 	"os"
 
-	"github.com/int128/ghcp/di"
+	"github.com/int128/ghcp/pkg/di"
 )
 
 var version = "HEAD"

diff --git a/adaptors/cmd/cmd.go → pkg/cmd/cmd.go b/adaptors/cmd/cmd.go → pkg/cmd/cmd.go
@@ -6,13 +6,13 @@ import (
 	"fmt"
 
 	"github.com/google/wire"
-	"github.com/int128/ghcp/adaptors/env"
-	"github.com/int128/ghcp/adaptors/logger"
-	"github.com/int128/ghcp/infrastructure/github"
-	"github.com/int128/ghcp/usecases/commit"
-	"github.com/int128/ghcp/usecases/forkcommit"
-	"github.com/int128/ghcp/usecases/pullrequest"
-	"github.com/int128/ghcp/usecases/release"
+	"github.com/int128/ghcp/pkg/env"
+	"github.com/int128/ghcp/pkg/github/client"
+	"github.com/int128/ghcp/pkg/logger"
+	"github.com/int128/ghcp/pkg/usecases/commit"
+	"github.com/int128/ghcp/pkg/usecases/forkcommit"
+	"github.com/int128/ghcp/pkg/usecases/pullrequest"
+	"github.com/int128/ghcp/pkg/usecases/release"
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
 	"golang.org/x/xerrors"
@@ -47,7 +47,7 @@ type Interface interface {
 type Runner struct {
 	Env               env.Interface
 	NewLogger         logger.NewFunc
-	NewGitHub         github.NewFunc
+	NewGitHub         client.NewFunc
 	NewInternalRunner NewInternalRunnerFunc
 }
 
@@ -100,7 +100,7 @@ func (r *Runner) newRootCmd(o *globalOptions) *cobra.Command {
 	return c
 }
 
-type NewInternalRunnerFunc func(logger.Interface, github.Interface) *InternalRunner
+type NewInternalRunnerFunc func(logger.Interface, client.Interface) *InternalRunner
 
 // InternalRunner has the set of use-cases.
 type InternalRunner struct {
@@ -134,7 +134,7 @@ func (r *Runner) newInternalRunner(o *globalOptions) (*InternalRunner, error) {
 			log.Debugf("Using GitHub Enterprise URL from environment variable $%s", envGitHubAPI)
 		}
 	}
-	gh, err := r.NewGitHub(github.Option{
+	gh, err := r.NewGitHub(client.Option{
 		Token: o.GitHubToken,
 		URLv3: o.GitHubAPI,
 	})

diff --git a/adaptors/cmd/cmd_test.go → pkg/cmd/cmd_test.go b/adaptors/cmd/cmd_test.go → pkg/cmd/cmd_test.go
@@ -7,20 +7,20 @@ import (
 	"github.com/golang/mock/gomock"
 	"github.com/google/go-cmp/cmp"
 
-	"github.com/int128/ghcp/adaptors/env/mock_env"
-	"github.com/int128/ghcp/adaptors/logger"
-	testingLogger "github.com/int128/ghcp/adaptors/logger/testing"
-	"github.com/int128/ghcp/domain/git"
-	"github.com/int128/ghcp/domain/git/commitstrategy"
-	"github.com/int128/ghcp/infrastructure/github"
-	"github.com/int128/ghcp/usecases/commit"
-	"github.com/int128/ghcp/usecases/commit/mock_commit"
-	"github.com/int128/ghcp/usecases/forkcommit"
-	"github.com/int128/ghcp/usecases/forkcommit/mock_forkcommit"
-	"github.com/int128/ghcp/usecases/pullrequest"
-	"github.com/int128/ghcp/usecases/pullrequest/mock_pullrequest"
-	"github.com/int128/ghcp/usecases/release"
-	"github.com/int128/ghcp/usecases/release/mock_release"
+	"github.com/int128/ghcp/pkg/env/mock_env"
+	"github.com/int128/ghcp/pkg/git"
+	"github.com/int128/ghcp/pkg/git/commitstrategy"
+	"github.com/int128/ghcp/pkg/github/client"
+	"github.com/int128/ghcp/pkg/logger"
+	testingLogger "github.com/int128/ghcp/pkg/logger/testing"
+	"github.com/int128/ghcp/pkg/usecases/commit"
+	"github.com/int128/ghcp/pkg/usecases/commit/mock_commit"
+	"github.com/int128/ghcp/pkg/usecases/forkcommit"
+	"github.com/int128/ghcp/pkg/usecases/forkcommit/mock_forkcommit"
+	"github.com/int128/ghcp/pkg/usecases/pullrequest"
+	"github.com/int128/ghcp/pkg/usecases/pullrequest/mock_pullrequest"
+	"github.com/int128/ghcp/pkg/usecases/release"
+	"github.com/int128/ghcp/pkg/usecases/release/mock_release"
 )
 
 func TestCmd_Run(t *testing.T) {
@@ -43,7 +43,7 @@ func TestCmd_Run(t *testing.T) {
 				})
 			r := Runner{
 				NewLogger:         newLogger(t, logger.Option{}),
-				NewGitHub:         newGitHub(t, github.Option{Token: "YOUR_TOKEN"}),
+				NewGitHub:         newGitHub(t, client.Option{Token: "YOUR_TOKEN"}),
 				Env:               newEnv(ctrl, map[string]string{envGitHubAPI: ""}),
 				NewInternalRunner: newInternalRunner(InternalRunner{CommitUseCase: commitUseCase}),
 			}
@@ -78,7 +78,7 @@ func TestCmd_Run(t *testing.T) {
 				})
 			r := Runner{
 				NewLogger:         newLogger(t, logger.Option{}),
-				NewGitHub:         newGitHub(t, github.Option{Token: "YOUR_TOKEN"}),
+				NewGitHub:         newGitHub(t, client.Option{Token: "YOUR_TOKEN"}),
 				Env:               newEnv(ctrl, map[string]string{envGitHubAPI: ""}),
 				NewInternalRunner: newInternalRunner(InternalRunner{CommitUseCase: commitUseCase}),
 			}
@@ -114,7 +114,7 @@ func TestCmd_Run(t *testing.T) {
 				})
 			r := Runner{
 				NewLogger:         newLogger(t, logger.Option{}),
-				NewGitHub:         newGitHub(t, github.Option{Token: "YOUR_TOKEN"}),
+				NewGitHub:         newGitHub(t, client.Option{Token: "YOUR_TOKEN"}),
 				Env:               newEnv(ctrl, map[string]string{envGitHubAPI: ""}),
 				NewInternalRunner: newInternalRunner(InternalRunner{CommitUseCase: commitUseCase}),
 			}
@@ -151,7 +151,7 @@ func TestCmd_Run(t *testing.T) {
 				})
 			r := Runner{
 				NewLogger:         newLogger(t, logger.Option{}),
-				NewGitHub:         newGitHub(t, github.Option{Token: "YOUR_TOKEN"}),
+				NewGitHub:         newGitHub(t, client.Option{Token: "YOUR_TOKEN"}),
 				Env:               newEnv(ctrl, map[string]string{envGitHubAPI: ""}),
 				NewInternalRunner: newInternalRunner(InternalRunner{CommitUseCase: commitUseCase}),
 			}
@@ -178,7 +178,7 @@ func TestCmd_Run(t *testing.T) {
 			defer ctrl.Finish()
 			r := Runner{
 				NewLogger:         newLogger(t, logger.Option{}),
-				NewGitHub:         newGitHub(t, github.Option{Token: "YOUR_TOKEN"}),
+				NewGitHub:         newGitHub(t, client.Option{Token: "YOUR_TOKEN"}),
 				Env:               newEnv(ctrl, nil),
 				NewInternalRunner: newInternalRunner(InternalRunner{}),
 			}
@@ -206,7 +206,7 @@ func TestCmd_Run(t *testing.T) {
 			defer ctrl.Finish()
 			r := Runner{
 				NewLogger:         newLogger(t, logger.Option{}),
-				NewGitHub:         newGitHub(t, github.Option{Token: "YOUR_TOKEN"}),
+				NewGitHub:         newGitHub(t, client.Option{Token: "YOUR_TOKEN"}),
 				Env:               newEnv(ctrl, nil),
 				NewInternalRunner: newInternalRunner(InternalRunner{}),
 			}
@@ -231,7 +231,7 @@ func TestCmd_Run(t *testing.T) {
 			defer ctrl.Finish()
 			r := Runner{
 				NewLogger:         newLogger(t, logger.Option{}),
-				NewGitHub:         newGitHub(t, github.Option{Token: "YOUR_TOKEN"}),
+				NewGitHub:         newGitHub(t, client.Option{Token: "YOUR_TOKEN"}),
 				Env:               newEnv(ctrl, nil),
 				NewInternalRunner: newInternalRunner(InternalRunner{}),
 			}
@@ -266,7 +266,7 @@ func TestCmd_Run(t *testing.T) {
 				})
 			r := Runner{
 				NewLogger:         newLogger(t, logger.Option{}),
-				NewGitHub:         newGitHub(t, github.Option{Token: "YOUR_TOKEN"}),
+				NewGitHub:         newGitHub(t, client.Option{Token: "YOUR_TOKEN"}),
 				Env:               newEnv(ctrl, map[string]string{envGitHubAPI: ""}),
 				NewInternalRunner: newInternalRunner(InternalRunner{CommitUseCase: commitUseCase}),
 			}
@@ -302,7 +302,7 @@ func TestCmd_Run(t *testing.T) {
 				})
 			r := Runner{
 				NewLogger:         newLogger(t, logger.Option{}),
-				NewGitHub:         newGitHub(t, github.Option{Token: "YOUR_TOKEN"}),
+				NewGitHub:         newGitHub(t, client.Option{Token: "YOUR_TOKEN"}),
 				Env:               newEnv(ctrl, map[string]string{envGitHubAPI: ""}),
 				NewInternalRunner: newInternalRunner(InternalRunner{CommitUseCase: commitUseCase}),
 			}
@@ -338,7 +338,7 @@ func TestCmd_Run(t *testing.T) {
 				})
 			r := Runner{
 				NewLogger:         newLogger(t, logger.Option{}),
-				NewGitHub:         newGitHub(t, github.Option{Token: "YOUR_TOKEN"}),
+				NewGitHub:         newGitHub(t, client.Option{Token: "YOUR_TOKEN"}),
 				Env:               newEnv(ctrl, map[string]string{envGitHubAPI: ""}),
 				NewInternalRunner: newInternalRunner(InternalRunner{CommitUseCase: commitUseCase}),
 			}
@@ -372,7 +372,7 @@ func TestCmd_Run(t *testing.T) {
 				})
 			r := Runner{
 				NewLogger:         newLogger(t, logger.Option{}),
-				NewGitHub:         newGitHub(t, github.Option{Token: "YOUR_TOKEN"}),
+				NewGitHub:         newGitHub(t, client.Option{Token: "YOUR_TOKEN"}),
 				Env:               newEnv(ctrl, map[string]string{envGitHubAPI: ""}),
 				NewInternalRunner: newInternalRunner(InternalRunner{ForkCommitUseCase: commitUseCase}),
 			}
@@ -407,7 +407,7 @@ func TestCmd_Run(t *testing.T) {
 				})
 			r := Runner{
 				NewLogger:         newLogger(t, logger.Option{}),
-				NewGitHub:         newGitHub(t, github.Option{Token: "YOUR_TOKEN"}),
+				NewGitHub:         newGitHub(t, client.Option{Token: "YOUR_TOKEN"}),
 				Env:               newEnv(ctrl, map[string]string{envGitHubAPI: ""}),
 				NewInternalRunner: newInternalRunner(InternalRunner{ForkCommitUseCase: commitUseCase}),
 			}
@@ -444,7 +444,7 @@ func TestCmd_Run(t *testing.T) {
 				})
 			r := Runner{
 				NewLogger:         newLogger(t, logger.Option{}),
-				NewGitHub:         newGitHub(t, github.Option{Token: "YOUR_TOKEN"}),
+				NewGitHub:         newGitHub(t, client.Option{Token: "YOUR_TOKEN"}),
 				Env:               newEnv(ctrl, map[string]string{envGitHubAPI: ""}),
 				NewInternalRunner: newInternalRunner(InternalRunner{PullRequestUseCase: useCase}),
 			}
@@ -477,7 +477,7 @@ func TestCmd_Run(t *testing.T) {
 				})
 			r := Runner{
 				NewLogger:         newLogger(t, logger.Option{}),
-				NewGitHub:         newGitHub(t, github.Option{Token: "YOUR_TOKEN"}),
+				NewGitHub:         newGitHub(t, client.Option{Token: "YOUR_TOKEN"}),
 				Env:               newEnv(ctrl, map[string]string{envGitHubAPI: ""}),
 				NewInternalRunner: newInternalRunner(InternalRunner{PullRequestUseCase: useCase}),
 			}
@@ -515,7 +515,7 @@ func TestCmd_Run(t *testing.T) {
 				})
 			r := Runner{
 				NewLogger:         newLogger(t, logger.Option{}),
-				NewGitHub:         newGitHub(t, github.Option{Token: "YOUR_TOKEN"}),
+				NewGitHub:         newGitHub(t, client.Option{Token: "YOUR_TOKEN"}),
 				Env:               newEnv(ctrl, map[string]string{envGitHubAPI: ""}),
 				NewInternalRunner: newInternalRunner(InternalRunner{ReleaseUseCase: releaseUseCase}),
 			}
@@ -554,7 +554,7 @@ func TestCmd_Run(t *testing.T) {
 				Do(ctx, input)
 			r := Runner{
 				NewLogger:         newLogger(t, logger.Option{Debug: true}),
-				NewGitHub:         newGitHub(t, github.Option{Token: "YOUR_TOKEN"}),
+				NewGitHub:         newGitHub(t, client.Option{Token: "YOUR_TOKEN"}),
 				Env:               newEnv(ctrl, map[string]string{envGitHubAPI: ""}),
 				NewInternalRunner: newInternalRunner(InternalRunner{CommitUseCase: commitUseCase}),
 			}
@@ -586,7 +586,7 @@ func TestCmd_Run(t *testing.T) {
 				Chdir("dir")
 			r := Runner{
 				NewLogger:         newLogger(t, logger.Option{}),
-				NewGitHub:         newGitHub(t, github.Option{Token: "YOUR_TOKEN"}),
+				NewGitHub:         newGitHub(t, client.Option{Token: "YOUR_TOKEN"}),
 				Env:               mockEnv,
 				NewInternalRunner: newInternalRunner(InternalRunner{CommitUseCase: commitUseCase}),
 			}
@@ -615,7 +615,7 @@ func TestCmd_Run(t *testing.T) {
 				Do(ctx, input)
 			r := Runner{
 				NewLogger:         newLogger(t, logger.Option{}),
-				NewGitHub:         newGitHub(t, github.Option{Token: "YOUR_TOKEN"}),
+				NewGitHub:         newGitHub(t, client.Option{Token: "YOUR_TOKEN"}),
 				Env:               newEnv(ctrl, map[string]string{envGitHubToken: "YOUR_TOKEN", envGitHubAPI: ""}),
 				NewInternalRunner: newInternalRunner(InternalRunner{CommitUseCase: commitUseCase}),
 			}
@@ -639,7 +639,7 @@ func TestCmd_Run(t *testing.T) {
 			defer ctrl.Finish()
 			r := Runner{
 				NewLogger:         newLogger(t, logger.Option{}),
-				NewGitHub:         newGitHub(t, github.Option{}),
+				NewGitHub:         newGitHub(t, client.Option{}),
 				Env:               newEnv(ctrl, map[string]string{envGitHubToken: ""}),
 				NewInternalRunner: newInternalRunner(InternalRunner{}),
 			}
@@ -666,7 +666,7 @@ func TestCmd_Run(t *testing.T) {
 				Do(ctx, input)
 			r := Runner{
 				NewLogger:         newLogger(t, logger.Option{}),
-				NewGitHub:         newGitHub(t, github.Option{Token: "YOUR_TOKEN", URLv3: "https://github.example.com/api/v3/"}),
+				NewGitHub:         newGitHub(t, client.Option{Token: "YOUR_TOKEN", URLv3: "https://github.example.com/api/v3/"}),
 				Env:               newEnv(ctrl, nil),
 				NewInternalRunner: newInternalRunner(InternalRunner{CommitUseCase: commitUseCase}),
 			}
@@ -695,7 +695,7 @@ func TestCmd_Run(t *testing.T) {
 				Do(ctx, input)
 			r := Runner{
 				NewLogger:         newLogger(t, logger.Option{}),
-				NewGitHub:         newGitHub(t, github.Option{Token: "YOUR_TOKEN", URLv3: "https://github.example.com/api/v3/"}),
+				NewGitHub:         newGitHub(t, client.Option{Token: "YOUR_TOKEN", URLv3: "https://github.example.com/api/v3/"}),
 				Env:               newEnv(ctrl, map[string]string{envGitHubAPI: "https://github.example.com/api/v3/"}),
 				NewInternalRunner: newInternalRunner(InternalRunner{CommitUseCase: commitUseCase}),
 			}
@@ -726,8 +726,8 @@ func newLogger(t *testing.T, want logger.Option) logger.NewFunc {
 	}
 }
 
-func newGitHub(t *testing.T, want github.Option) github.NewFunc {
-	return func(got github.Option) (github.Interface, error) {
+func newGitHub(t *testing.T, want client.Option) client.NewFunc {
+	return func(got client.Option) (client.Interface, error) {
 		if diff := cmp.Diff(want, got); diff != "" {
 			t.Errorf("mismatch (-want +got):\n%s", diff)
 		}
@@ -744,7 +744,7 @@ func newEnv(ctrl *gomock.Controller, getenv map[string]string) *mock_env.MockInt
 }
 
 func newInternalRunner(base InternalRunner) NewInternalRunnerFunc {
-	return func(l logger.Interface, g github.Interface) *InternalRunner {
+	return func(l logger.Interface, g client.Interface) *InternalRunner {
 		base.Logger = l
 		return &base
 	}

diff --git a/adaptors/cmd/commit.go → pkg/cmd/commit.go b/adaptors/cmd/commit.go → pkg/cmd/commit.go
@@ -8,9 +8,9 @@ import (
 	"github.com/spf13/pflag"
 	"golang.org/x/xerrors"
 
-	"github.com/int128/ghcp/domain/git"
-	"github.com/int128/ghcp/domain/git/commitstrategy"
-	"github.com/int128/ghcp/usecases/commit"
+	"github.com/int128/ghcp/pkg/git"
+	"github.com/int128/ghcp/pkg/git/commitstrategy"
+	"github.com/int128/ghcp/pkg/usecases/commit"
 )
 
 const commitCmdExample = `  To commit files to the default branch:

diff --git a/adaptors/cmd/commit_attribute_options.go → pkg/cmd/commit_attribute_options.go b/adaptors/cmd/commit_attribute_options.go → pkg/cmd/commit_attribute_options.go
@@ -4,7 +4,7 @@ import (
 	"github.com/spf13/pflag"
 	"golang.org/x/xerrors"
 
-	"github.com/int128/ghcp/domain/git"
+	"github.com/int128/ghcp/pkg/git"
 )
 
 type commitAttributeOptions struct {

diff --git a/adaptors/cmd/empty_commit.go → pkg/cmd/empty_commit.go b/adaptors/cmd/empty_commit.go → pkg/cmd/empty_commit.go
@@ -8,9 +8,9 @@ import (
 	"github.com/spf13/pflag"
 	"golang.org/x/xerrors"
 
-	"github.com/int128/ghcp/domain/git"
-	"github.com/int128/ghcp/domain/git/commitstrategy"
-	"github.com/int128/ghcp/usecases/commit"
+	"github.com/int128/ghcp/pkg/git"
+	"github.com/int128/ghcp/pkg/git/commitstrategy"
+	"github.com/int128/ghcp/pkg/usecases/commit"
 )
 
 const emptyCommitCmdExample = `  To create an empty commit to the default branch:

diff --git a/adaptors/cmd/forkcommit.go → pkg/cmd/forkcommit.go b/adaptors/cmd/forkcommit.go → pkg/cmd/forkcommit.go
@@ -8,9 +8,9 @@ import (
 	"github.com/spf13/pflag"
 	"golang.org/x/xerrors"
 
-	"github.com/int128/ghcp/domain/git"
-	"github.com/int128/ghcp/domain/git/commitstrategy"
-	"github.com/int128/ghcp/usecases/forkcommit"
+	"github.com/int128/ghcp/pkg/git"
+	"github.com/int128/ghcp/pkg/git/commitstrategy"
+	"github.com/int128/ghcp/pkg/usecases/forkcommit"
 )
 
 func (r *Runner) newForkCommitCmd(ctx context.Context, gOpts *globalOptions) *cobra.Command {