diff --git a/cmd/download.go b/cmd/download.go index bb6f4879..20819360 100644 --- a/cmd/download.go +++ b/cmd/download.go @@ -10,6 +10,7 @@ import ( "github.com/yanosea/jrp/internal/gzip" "github.com/yanosea/jrp/internal/httpclient" "github.com/yanosea/jrp/internal/iomanager" + "github.com/yanosea/jrp/internal/spinnerservice" "github.com/yanosea/jrp/internal/usermanager" "github.com/yanosea/jrp/logic" ) @@ -42,7 +43,14 @@ func NewDownloadCommand(g *GlobalOption) *cobra.Command { } func (o *DownloadOption) DownloadRunE(_ *cobra.Command, _ []string) error { - o.Downloader = logic.NewDBFileDownloader(usermanager.OSUserProvider{}, fs.OsFileManager{}, httpclient.DefaultHTTPClient{}, iomanager.DefaultIOHelper{}, gzip.DefaultGzipHandler{}) + o.Downloader = logic.NewDBFileDownloader( + usermanager.OSUserProvider{}, + fs.OsFileManager{}, + httpclient.DefaultHTTPClient{}, + iomanager.DefaultIOHelper{}, + gzip.DefaultGzipHandler{}, + spinnerservice.NewRealSpinnerService(), + ) return o.Download() } diff --git a/cmd/download_test.go b/cmd/download_test.go index ec4d505f..05cdbbaf 100644 --- a/cmd/download_test.go +++ b/cmd/download_test.go @@ -12,6 +12,7 @@ import ( "github.com/yanosea/jrp/internal/gzip" "github.com/yanosea/jrp/internal/httpclient" "github.com/yanosea/jrp/internal/iomanager" + "github.com/yanosea/jrp/internal/spinnerservice" "github.com/yanosea/jrp/internal/usermanager" "github.com/yanosea/jrp/logic" @@ -51,7 +52,7 @@ func TestDownloadRunE(t *testing.T) { }{ { name: "positive testing", - args: args{o: cmd.DownloadOption{Out: os.Stdout, ErrOut: os.Stderr, Downloader: logic.NewDBFileDownloader(usermanager.OSUserProvider{}, fs.OsFileManager{}, httpclient.DefaultHTTPClient{}, iomanager.DefaultIOHelper{}, gzip.DefaultGzipHandler{})}}, + args: args{o: cmd.DownloadOption{Out: os.Stdout, ErrOut: os.Stderr, Downloader: logic.NewDBFileDownloader(usermanager.OSUserProvider{}, fs.OsFileManager{}, httpclient.DefaultHTTPClient{}, iomanager.DefaultIOHelper{}, gzip.DefaultGzipHandler{}, spinnerservice.NewRealSpinnerService())}}, }, } for _, tt := range tests { @@ -79,7 +80,7 @@ func TestDownload(t *testing.T) { }{ { name: "positive testing", - args: args{o: cmd.DownloadOption{Out: os.Stdout, ErrOut: os.Stderr, Downloader: logic.NewDBFileDownloader(usermanager.OSUserProvider{}, fs.OsFileManager{}, httpclient.DefaultHTTPClient{}, iomanager.DefaultIOHelper{}, gzip.DefaultGzipHandler{})}}, + args: args{o: cmd.DownloadOption{Out: os.Stdout, ErrOut: os.Stderr, Downloader: logic.NewDBFileDownloader(usermanager.OSUserProvider{}, fs.OsFileManager{}, httpclient.DefaultHTTPClient{}, iomanager.DefaultIOHelper{}, gzip.DefaultGzipHandler{}, spinnerservice.NewRealSpinnerService())}}, wantErr: false, setup: nil, }, diff --git a/cmd/root_test.go b/cmd/root_test.go index e20050d0..850ca140 100644 --- a/cmd/root_test.go +++ b/cmd/root_test.go @@ -16,6 +16,7 @@ import ( "github.com/yanosea/jrp/internal/gzip" "github.com/yanosea/jrp/internal/httpclient" "github.com/yanosea/jrp/internal/iomanager" + "github.com/yanosea/jrp/internal/spinnerservice" "github.com/yanosea/jrp/internal/usermanager" "github.com/yanosea/jrp/logic" @@ -52,7 +53,7 @@ func TestExecute(t *testing.T) { tu := usermanager.OSUserProvider{} tcu, _ := tu.Current() dbFileDirPath := filepath.Join(tcu.HomeDir, ".local", "share", "jrp") - tdl := logic.NewDBFileDownloader(usermanager.OSUserProvider{}, fs.OsFileManager{}, httpclient.DefaultHTTPClient{}, iomanager.DefaultIOHelper{}, gzip.DefaultGzipHandler{}) + tdl := logic.NewDBFileDownloader(usermanager.OSUserProvider{}, fs.OsFileManager{}, httpclient.DefaultHTTPClient{}, iomanager.DefaultIOHelper{}, gzip.DefaultGzipHandler{}, spinnerservice.NewRealSpinnerService()) type args struct { globalOption *cmd.GlobalOption diff --git a/go.mod b/go.mod index 27635f66..352adadb 100644 --- a/go.mod +++ b/go.mod @@ -3,6 +3,7 @@ module github.com/yanosea/jrp go 1.20 require ( + github.com/briandowns/spinner v1.23.1 github.com/fatih/color v1.17.0 github.com/spf13/cobra v1.8.1 go.uber.org/mock v0.4.0 @@ -10,7 +11,6 @@ require ( ) require ( - github.com/briandowns/spinner v1.23.1 // indirect github.com/dustin/go-humanize v1.0.1 // indirect github.com/google/uuid v1.6.0 // indirect github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect diff --git a/internal/spinnerservice/spinner_service.go b/internal/spinnerservice/spinner_service.go new file mode 100644 index 00000000..19f8d4ad --- /dev/null +++ b/internal/spinnerservice/spinner_service.go @@ -0,0 +1,40 @@ +package spinnerservice + +import ( + "time" + + "github.com/briandowns/spinner" +) + +type SpinnerService interface { + Start() + Stop() + SetColor(colors ...string) error + SetSuffix(suffix string) +} + +type RealSpinnerService struct { + sp *spinner.Spinner +} + +func NewRealSpinnerService() *RealSpinnerService { + s := spinner.New(spinner.CharSets[11], 100*time.Millisecond) + s.Reverse() + return &RealSpinnerService{sp: s} +} + +func (rss *RealSpinnerService) Start() { + rss.sp.Start() +} + +func (rss *RealSpinnerService) Stop() { + rss.sp.Stop() +} + +func (rss *RealSpinnerService) SetColor(colors ...string) error { + return rss.sp.Color(colors...) +} + +func (rss *RealSpinnerService) SetSuffix(suffix string) { + rss.sp.Suffix = suffix +} diff --git a/logic/downloader.go b/logic/downloader.go index 8c1cd74e..135d8c92 100644 --- a/logic/downloader.go +++ b/logic/downloader.go @@ -5,9 +5,7 @@ import ( "io" "os" "path/filepath" - "time" - "github.com/briandowns/spinner" "github.com/fatih/color" "github.com/yanosea/jrp/constant" @@ -15,6 +13,7 @@ import ( "github.com/yanosea/jrp/internal/gzip" "github.com/yanosea/jrp/internal/httpclient" "github.com/yanosea/jrp/internal/iomanager" + "github.com/yanosea/jrp/internal/spinnerservice" "github.com/yanosea/jrp/internal/usermanager" ) @@ -28,16 +27,18 @@ type DBFileDownloader struct { HttpClient httpclient.HTTPClient IO iomanager.IOHelper Gzip gzip.GzipHandler + Spinner spinnerservice.SpinnerService } func NewDBFileDownloader(u usermanager.UserProvider, f fs.FileManager, - h httpclient.HTTPClient, i iomanager.IOHelper, g gzip.GzipHandler) *DBFileDownloader { + h httpclient.HTTPClient, i iomanager.IOHelper, g gzip.GzipHandler, s spinnerservice.SpinnerService) *DBFileDownloader { return &DBFileDownloader{ User: u, FileSystem: f, HttpClient: h, IO: i, Gzip: g, + Spinner: s, } } @@ -62,12 +63,12 @@ func (d *DBFileDownloader) Download() error { dbFilePath := filepath.Join(dbFileDirPath, constant.WNJPN_DB_FILE_NAME) if _, err := os.Stat(dbFilePath); os.IsNotExist(err) { // spinner settings - s := spinner.New(spinner.CharSets[11], 100*time.Millisecond) - s.Reverse() - s.Color("yellow") - s.Suffix = color.YellowString(constant.DOWNLOAD_MESSAGE_DOWNLOADING) + if err := d.Spinner.SetColor("yellow"); err != nil { + return err + } + d.Spinner.SetSuffix(color.YellowString(constant.DOWNLOAD_MESSAGE_DOWNLOADING)) // start spinner - s.Start() + d.Spinner.Start() // download db archive file resp, err := d.HttpClient.Get(constant.WNJPN_DB_ARCHIVE_FILE_URL) @@ -111,7 +112,7 @@ func (d *DBFileDownloader) Download() error { } // stop spinner - s.Stop() + d.Spinner.Stop() // if db file is downloaded successfully, print message fmt.Println(color.GreenString(constant.DOWNLOAD_MESSAGE_SUCCEEDED)) diff --git a/logic/downloader_test.go b/logic/downloader_test.go index 21253c66..956ef021 100644 --- a/logic/downloader_test.go +++ b/logic/downloader_test.go @@ -16,12 +16,14 @@ import ( "github.com/yanosea/jrp/internal/gzip" "github.com/yanosea/jrp/internal/httpclient" "github.com/yanosea/jrp/internal/iomanager" + "github.com/yanosea/jrp/internal/spinnerservice" "github.com/yanosea/jrp/internal/usermanager" mock_fs "github.com/yanosea/jrp/mock/fs" mock_gzip "github.com/yanosea/jrp/mock/gzip" mock_httpclient "github.com/yanosea/jrp/mock/httpclient" mock_iomanager "github.com/yanosea/jrp/mock/iomanager" + mock_spinnerservice "github.com/yanosea/jrp/mock/spinnerservice" mock_usermanager "github.com/yanosea/jrp/mock/usermanager" ) @@ -32,6 +34,7 @@ func TestNewDBFileDownloader(t *testing.T) { h httpclient.HTTPClient i iomanager.IOHelper g gzip.GzipHandler + s spinnerservice.SpinnerService } tests := []struct { name string @@ -39,12 +42,12 @@ func TestNewDBFileDownloader(t *testing.T) { }{ { name: "positive testing", - args: args{u: usermanager.OSUserProvider{}, f: fs.OsFileManager{}, h: httpclient.DefaultHTTPClient{}, i: iomanager.DefaultIOHelper{}, g: gzip.DefaultGzipHandler{}}, + args: args{u: usermanager.OSUserProvider{}, f: fs.OsFileManager{}, h: httpclient.DefaultHTTPClient{}, i: iomanager.DefaultIOHelper{}, g: gzip.DefaultGzipHandler{}, s: spinnerservice.NewRealSpinnerService()}, }, } for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { - u := NewDBFileDownloader(tt.args.u, tt.args.f, tt.args.h, tt.args.i, tt.args.g) + u := NewDBFileDownloader(tt.args.u, tt.args.f, tt.args.h, tt.args.i, tt.args.g, tt.args.s) if u == nil { t.Errorf("NewDBFileDownloader() : returned nil") } @@ -55,6 +58,7 @@ func TestNewDBFileDownloader(t *testing.T) { func TestDownload(t *testing.T) { tu := usermanager.OSUserProvider{} tcu, _ := tu.Current() + sp := spinnerservice.NewRealSpinnerService() defaultDBFileDirPath := filepath.Join(tcu.HomeDir, ".local", "share", "jrp") envDBFileDirPath := filepath.Join(tcu.HomeDir, "jrp") defaultTempFilePath := filepath.Join(os.TempDir(), constant.WNJPN_DB_ARCHIVE_FILE_NAME) @@ -74,7 +78,7 @@ func TestDownload(t *testing.T) { args: args{downloader: nil, env: ""}, wantErr: false, setup: func(mockCtrl *gomock.Controller, tt *args) { - downloader := NewDBFileDownloader(usermanager.OSUserProvider{}, fs.OsFileManager{}, httpclient.DefaultHTTPClient{}, iomanager.DefaultIOHelper{}, gzip.DefaultGzipHandler{}) + downloader := NewDBFileDownloader(usermanager.OSUserProvider{}, fs.OsFileManager{}, httpclient.DefaultHTTPClient{}, iomanager.DefaultIOHelper{}, gzip.DefaultGzipHandler{}, sp) tt.downloader = downloader }, }, { @@ -82,7 +86,7 @@ func TestDownload(t *testing.T) { args: args{downloader: nil, env: filepath.Join(tcu.HomeDir, "jrp")}, wantErr: false, setup: func(mockCtrl *gomock.Controller, tt *args) { - downloader := NewDBFileDownloader(usermanager.OSUserProvider{}, fs.OsFileManager{}, httpclient.DefaultHTTPClient{}, iomanager.DefaultIOHelper{}, gzip.DefaultGzipHandler{}) + downloader := NewDBFileDownloader(usermanager.OSUserProvider{}, fs.OsFileManager{}, httpclient.DefaultHTTPClient{}, iomanager.DefaultIOHelper{}, gzip.DefaultGzipHandler{}, sp) tt.downloader = downloader }, }, { @@ -90,7 +94,7 @@ func TestDownload(t *testing.T) { args: args{downloader: nil, env: ""}, wantErr: false, setup: func(mockCtrl *gomock.Controller, tt *args) { - downloader := NewDBFileDownloader(usermanager.OSUserProvider{}, fs.OsFileManager{}, httpclient.DefaultHTTPClient{}, iomanager.DefaultIOHelper{}, gzip.DefaultGzipHandler{}) + downloader := NewDBFileDownloader(usermanager.OSUserProvider{}, fs.OsFileManager{}, httpclient.DefaultHTTPClient{}, iomanager.DefaultIOHelper{}, gzip.DefaultGzipHandler{}, sp) tt.downloader = downloader if err := downloader.Download(); err != nil { t.Error(err) @@ -103,17 +107,27 @@ func TestDownload(t *testing.T) { setup: func(mockCtrl *gomock.Controller, tt *args) { mu := mock_usermanager.NewMockUserProvider(mockCtrl) mu.EXPECT().Current().Return(nil, errors.New("failed to get current user")) - downloader := NewDBFileDownloader(mu, fs.OsFileManager{}, httpclient.DefaultHTTPClient{}, iomanager.DefaultIOHelper{}, gzip.DefaultGzipHandler{}) + downloader := NewDBFileDownloader(mu, fs.OsFileManager{}, httpclient.DefaultHTTPClient{}, iomanager.DefaultIOHelper{}, gzip.DefaultGzipHandler{}, sp) tt.downloader = downloader }, }, { - name: "negative testing (os.MkdirAll(dbFileDirPath, os.Filemode(0755)) fails)", + name: "negative testing (os.MkdirAll(dbFileDirPath, os.Filemode(0755) fails)", args: args{downloader: nil, env: ""}, wantErr: true, setup: func(mockCtrl *gomock.Controller, tt *args) { mfs := mock_fs.NewMockFileManager(mockCtrl) mfs.EXPECT().MkdirAll(gomock.Any(), os.FileMode(0755)).Return(errors.New("failed to create db file dir")) - downloader := NewDBFileDownloader(usermanager.OSUserProvider{}, mfs, httpclient.DefaultHTTPClient{}, iomanager.DefaultIOHelper{}, gzip.DefaultGzipHandler{}) + downloader := NewDBFileDownloader(usermanager.OSUserProvider{}, mfs, httpclient.DefaultHTTPClient{}, iomanager.DefaultIOHelper{}, gzip.DefaultGzipHandler{}, sp) + tt.downloader = downloader + }, + }, { + name: "negative testing (d.Spinner.SetColor(\"yellow\") fails)", + args: args{downloader: nil, env: ""}, + wantErr: true, + setup: func(mockCtrl *gomock.Controller, tt *args) { + ms := mock_spinnerservice.NewMockSpinnerService(mockCtrl) + ms.EXPECT().SetColor(gomock.Any()).Return(errors.New("failed to set spinner color")) + downloader := NewDBFileDownloader(usermanager.OSUserProvider{}, fs.OsFileManager{}, httpclient.DefaultHTTPClient{}, iomanager.DefaultIOHelper{}, gzip.DefaultGzipHandler{}, ms) tt.downloader = downloader }, }, { @@ -123,7 +137,7 @@ func TestDownload(t *testing.T) { setup: func(mockCtrl *gomock.Controller, tt *args) { mhc := mock_httpclient.NewMockHTTPClient(mockCtrl) mhc.EXPECT().Get(gomock.Any()).Return(nil, errors.New("failed to get http response")) - downloader := NewDBFileDownloader(usermanager.OSUserProvider{}, fs.OsFileManager{}, mhc, iomanager.DefaultIOHelper{}, gzip.DefaultGzipHandler{}) + downloader := NewDBFileDownloader(usermanager.OSUserProvider{}, fs.OsFileManager{}, mhc, iomanager.DefaultIOHelper{}, gzip.DefaultGzipHandler{}, sp) tt.downloader = downloader }, }, { @@ -136,7 +150,7 @@ func TestDownload(t *testing.T) { mfs.EXPECT().MkdirAll(defaultDBFileDirPath, os.FileMode(0755)).Return(nil), mfs.EXPECT().Create(gomock.Any()).Return(nil, errors.New("failed to create temp file")), ) - downloader := NewDBFileDownloader(usermanager.OSUserProvider{}, mfs, httpclient.DefaultHTTPClient{}, iomanager.DefaultIOHelper{}, gzip.DefaultGzipHandler{}) + downloader := NewDBFileDownloader(usermanager.OSUserProvider{}, mfs, httpclient.DefaultHTTPClient{}, iomanager.DefaultIOHelper{}, gzip.DefaultGzipHandler{}, sp) tt.downloader = downloader }, }, { @@ -146,7 +160,7 @@ func TestDownload(t *testing.T) { setup: func(mockCtrl *gomock.Controller, tt *args) { mio := mock_iomanager.NewMockIOHelper(mockCtrl) mio.EXPECT().Copy(gomock.Any(), gomock.Any()).Return(int64(0), errors.New("failed to copy response body to temp file")) - downloader := NewDBFileDownloader(usermanager.OSUserProvider{}, fs.OsFileManager{}, httpclient.DefaultHTTPClient{}, mio, gzip.DefaultGzipHandler{}) + downloader := NewDBFileDownloader(usermanager.OSUserProvider{}, fs.OsFileManager{}, httpclient.DefaultHTTPClient{}, mio, gzip.DefaultGzipHandler{}, sp) tt.downloader = downloader }, }, { @@ -167,7 +181,7 @@ func TestDownload(t *testing.T) { ) mio := mock_iomanager.NewMockIOHelper(mockCtrl) mio.EXPECT().Copy(mf, gomock.Any()).Return(int64(0), nil) - downloader := NewDBFileDownloader(usermanager.OSUserProvider{}, mfs, httpclient.DefaultHTTPClient{}, mio, gzip.DefaultGzipHandler{}) + downloader := NewDBFileDownloader(usermanager.OSUserProvider{}, mfs, httpclient.DefaultHTTPClient{}, mio, gzip.DefaultGzipHandler{}, sp) tt.downloader = downloader }, }, { @@ -177,7 +191,7 @@ func TestDownload(t *testing.T) { setup: func(mockCtrl *gomock.Controller, tt *args) { mgz := mock_gzip.NewMockGzipHandler(mockCtrl) mgz.EXPECT().NewReader(gomock.Any()).Return(nil, errors.New("failed to new reader")) - downloader := NewDBFileDownloader(usermanager.OSUserProvider{}, fs.OsFileManager{}, httpclient.DefaultHTTPClient{}, iomanager.DefaultIOHelper{}, mgz) + downloader := NewDBFileDownloader(usermanager.OSUserProvider{}, fs.OsFileManager{}, httpclient.DefaultHTTPClient{}, iomanager.DefaultIOHelper{}, mgz, sp) tt.downloader = downloader }, }, { @@ -193,7 +207,7 @@ func TestDownload(t *testing.T) { mfs.EXPECT().Create(defaultTempFilePath).Return(tempFile, nil), mfs.EXPECT().Create(dbFilePath).Return(nil, errors.New("failed to create db file")), ) - downloader := NewDBFileDownloader(usermanager.OSUserProvider{}, mfs, httpclient.DefaultHTTPClient{}, iomanager.DefaultIOHelper{}, gzip.DefaultGzipHandler{}) + downloader := NewDBFileDownloader(usermanager.OSUserProvider{}, mfs, httpclient.DefaultHTTPClient{}, iomanager.DefaultIOHelper{}, gzip.DefaultGzipHandler{}, sp) tt.downloader = downloader }, }, { @@ -219,7 +233,7 @@ func TestDownload(t *testing.T) { mhc.EXPECT().Get(gomock.Any()).Return(&http.Response{Body: io.NopCloser(bytes.NewReader([]byte{}))}, nil) mgz := mock_gzip.NewMockGzipHandler(mockCtrl) mgz.EXPECT().NewReader(gomock.Any()).Return(io.NopCloser(bytes.NewReader([]byte{})), nil) - tt.downloader = NewDBFileDownloader(usermanager.OSUserProvider{}, mfs, mhc, mio, mgz) + tt.downloader = NewDBFileDownloader(usermanager.OSUserProvider{}, mfs, mhc, mio, mgz, sp) }, }, { name: "negative testing (os.Remove(tempFilePath) fails)", @@ -246,7 +260,7 @@ func TestDownload(t *testing.T) { mgz := mock_gzip.NewMockGzipHandler(mockCtrl) mgz.EXPECT().NewReader(gomock.Any()).Return(io.NopCloser(bytes.NewReader([]byte{})), nil) os.RemoveAll(filepath.Join(tcu.HomeDir, ".local", "share", "jrp")) - tt.downloader = NewDBFileDownloader(usermanager.OSUserProvider{}, mfs, mhc, mio, mgz) + tt.downloader = NewDBFileDownloader(usermanager.OSUserProvider{}, mfs, mhc, mio, mgz, sp) }, }, } diff --git a/logic/generator_test.go b/logic/generator_test.go index 48e168f8..b3352fe7 100644 --- a/logic/generator_test.go +++ b/logic/generator_test.go @@ -15,6 +15,7 @@ import ( "github.com/yanosea/jrp/internal/gzip" "github.com/yanosea/jrp/internal/httpclient" "github.com/yanosea/jrp/internal/iomanager" + "github.com/yanosea/jrp/internal/spinnerservice" "github.com/yanosea/jrp/internal/usermanager" mock_database "github.com/yanosea/jrp/mock/database" @@ -117,7 +118,7 @@ func TestGenerate(t *testing.T) { tu := usermanager.OSUserProvider{} tcu, _ := tu.Current() defaultDBFileDirPath := filepath.Join(tcu.HomeDir, ".local", "share", "jrp") - tdl := NewDBFileDownloader(usermanager.OSUserProvider{}, fs.OsFileManager{}, httpclient.DefaultHTTPClient{}, iomanager.DefaultIOHelper{}, gzip.DefaultGzipHandler{}) + tdl := NewDBFileDownloader(usermanager.OSUserProvider{}, fs.OsFileManager{}, httpclient.DefaultHTTPClient{}, iomanager.DefaultIOHelper{}, gzip.DefaultGzipHandler{}, spinnerservice.NewRealSpinnerService()) if err := tdl.Download(); err != nil { t.Error(err) } diff --git a/main_test.go b/main_test.go index c2fe969e..449cd54b 100644 --- a/main_test.go +++ b/main_test.go @@ -9,6 +9,7 @@ import ( "github.com/yanosea/jrp/internal/gzip" "github.com/yanosea/jrp/internal/httpclient" "github.com/yanosea/jrp/internal/iomanager" + "github.com/yanosea/jrp/internal/spinnerservice" "github.com/yanosea/jrp/internal/usermanager" "github.com/yanosea/jrp/logic" ) @@ -17,7 +18,7 @@ func TestMain(t *testing.T) { tu := usermanager.OSUserProvider{} tcu, _ := tu.Current() dbFileDirPath := filepath.Join(tcu.HomeDir, ".local", "share", "jrp") - tdl := logic.NewDBFileDownloader(usermanager.OSUserProvider{}, fs.OsFileManager{}, httpclient.DefaultHTTPClient{}, iomanager.DefaultIOHelper{}, gzip.DefaultGzipHandler{}) + tdl := logic.NewDBFileDownloader(usermanager.OSUserProvider{}, fs.OsFileManager{}, httpclient.DefaultHTTPClient{}, iomanager.DefaultIOHelper{}, gzip.DefaultGzipHandler{}, spinnerservice.NewRealSpinnerService()) tests := []struct { name string diff --git a/mock/spinnerservice/spinner_service.go b/mock/spinnerservice/spinner_service.go new file mode 100644 index 00000000..7dfc0aa4 --- /dev/null +++ b/mock/spinnerservice/spinner_service.go @@ -0,0 +1,93 @@ +// Code generated by MockGen. DO NOT EDIT. +// Source: internal/spinnerservice/spinner_service.go +// +// Generated by this command: +// +// mockgen -source=internal/spinnerservice/spinner_service.go -destination=mock/spinnerservice/spinner_service.go -package=mock_spinnerservice +// + +// Package mock_spinnerservice is a generated GoMock package. +package mock_spinnerservice + +import ( + reflect "reflect" + + gomock "go.uber.org/mock/gomock" +) + +// MockSpinnerService is a mock of SpinnerService interface. +type MockSpinnerService struct { + ctrl *gomock.Controller + recorder *MockSpinnerServiceMockRecorder +} + +// MockSpinnerServiceMockRecorder is the mock recorder for MockSpinnerService. +type MockSpinnerServiceMockRecorder struct { + mock *MockSpinnerService +} + +// NewMockSpinnerService creates a new mock instance. +func NewMockSpinnerService(ctrl *gomock.Controller) *MockSpinnerService { + mock := &MockSpinnerService{ctrl: ctrl} + mock.recorder = &MockSpinnerServiceMockRecorder{mock} + return mock +} + +// EXPECT returns an object that allows the caller to indicate expected use. +func (m *MockSpinnerService) EXPECT() *MockSpinnerServiceMockRecorder { + return m.recorder +} + +// SetColor mocks base method. +func (m *MockSpinnerService) SetColor(colors ...string) error { + m.ctrl.T.Helper() + varargs := []any{} + for _, a := range colors { + varargs = append(varargs, a) + } + ret := m.ctrl.Call(m, "SetColor", varargs...) + ret0, _ := ret[0].(error) + return ret0 +} + +// SetColor indicates an expected call of SetColor. +func (mr *MockSpinnerServiceMockRecorder) SetColor(colors ...any) *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetColor", reflect.TypeOf((*MockSpinnerService)(nil).SetColor), colors...) +} + +// SetSuffix mocks base method. +func (m *MockSpinnerService) SetSuffix(suffix string) { + m.ctrl.T.Helper() + m.ctrl.Call(m, "SetSuffix", suffix) +} + +// SetSuffix indicates an expected call of SetSuffix. +func (mr *MockSpinnerServiceMockRecorder) SetSuffix(suffix any) *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetSuffix", reflect.TypeOf((*MockSpinnerService)(nil).SetSuffix), suffix) +} + +// Start mocks base method. +func (m *MockSpinnerService) Start() { + m.ctrl.T.Helper() + m.ctrl.Call(m, "Start") +} + +// Start indicates an expected call of Start. +func (mr *MockSpinnerServiceMockRecorder) Start() *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Start", reflect.TypeOf((*MockSpinnerService)(nil).Start)) +} + +// Stop mocks base method. +func (m *MockSpinnerService) Stop() { + m.ctrl.T.Helper() + m.ctrl.Call(m, "Stop") +} + +// Stop indicates an expected call of Stop. +func (mr *MockSpinnerServiceMockRecorder) Stop() *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Stop", reflect.TypeOf((*MockSpinnerService)(nil).Stop)) +} diff --git a/test/cover.html b/test/cover.html index 3e5a8361..369dc222 100644 --- a/test/cover.html +++ b/test/cover.html @@ -95,19 +95,21 @@ - + - + - + - + - + - + - + + + @@ -274,6 +276,7 @@ "github.com/yanosea/jrp/internal/gzip" "github.com/yanosea/jrp/internal/httpclient" "github.com/yanosea/jrp/internal/iomanager" + "github.com/yanosea/jrp/internal/spinnerservice" "github.com/yanosea/jrp/internal/usermanager" "github.com/yanosea/jrp/logic" ) @@ -306,7 +309,14 @@ } func (o *DownloadOption) DownloadRunE(_ *cobra.Command, _ []string) error { - o.Downloader = logic.NewDBFileDownloader(usermanager.OSUserProvider{}, fs.OsFileManager{}, httpclient.DefaultHTTPClient{}, iomanager.DefaultIOHelper{}, gzip.DefaultGzipHandler{}) + o.Downloader = logic.NewDBFileDownloader( + usermanager.OSUserProvider{}, + fs.OsFileManager{}, + httpclient.DefaultHTTPClient{}, + iomanager.DefaultIOHelper{}, + gzip.DefaultGzipHandler{}, + spinnerservice.NewRealSpinnerService(), + ) return o.Download() } @@ -836,7 +846,49 @@ } -