WIP refactoring

vilmibm · vilmibm · commit 0e2861a507cc · 2021-09-20T17:05:19.000-05:00
diff --git a/pkg/cmd/extension/manager.go b/pkg/cmd/extension/manager.go
@@ -195,7 +195,7 @@ func (m *Manager) Install(client *http.Client, repo ghrepo.Interface, io *iostre
 		return fmt.Errorf("could not check for binary extension: %w", err)
 	}
 	if isBin {
-		return m.InstallBin(client, repo)
+		return m.installBin(client, repo)
 	}
 
 	hs, err := hasScript(client, repo)
@@ -208,10 +208,10 @@ func (m *Manager) Install(client *http.Client, repo ghrepo.Interface, io *iostre
 	}
 
 	protocol, _ := cfg.Get(repo.RepoHost(), "git_protocol")
-	return m.InstallGit(ghrepo.FormatRemoteURL(repo, protocol), io.Out, io.ErrOut)
+	return m.installGit(ghrepo.FormatRemoteURL(repo, protocol), io.Out, io.ErrOut)
 }
 
-func (m *Manager) InstallBin(client *http.Client, repo ghrepo.Interface) error {
+func (m *Manager) installBin(client *http.Client, repo ghrepo.Interface) error {
 	var r *release
 	r, err := fetchLatestRelease(client, repo)
 	if err != nil {
@@ -276,7 +276,7 @@ func (m *Manager) InstallBin(client *http.Client, repo ghrepo.Interface) error {
 	return nil
 }
 
-func (m *Manager) InstallGit(cloneURL string, stdout, stderr io.Writer) error {
+func (m *Manager) installGit(cloneURL string, stdout, stderr io.Writer) error {
 	exe, err := m.lookPath("git")
 	if err != nil {
 		return err
diff --git a/pkg/extensions/extension.go b/pkg/extensions/extension.go
@@ -22,8 +22,6 @@ type Extension interface {
 type ExtensionManager interface {
 	List(includeMetadata bool) []Extension
 	Install(*http.Client, ghrepo.Interface, *iostreams.IOStreams, config.Config) error
-	InstallBin(*http.Client, ghrepo.Interface) error
-	InstallGit(string, io.Writer, io.Writer) error
 	InstallLocal(dir string) error
 	Upgrade(name string, force bool, stdout, stderr io.Writer) error
 	Remove(name string) error
diff --git a/pkg/extensions/manager_mock.go b/pkg/extensions/manager_mock.go

Original file line number	Diff line number	Diff line change
`@@ -195,7 +195,7 @@ func (m Manager) Install(client http.Client, repo ghrepo.Interface, io *iostre`
`195`	`195`	`return fmt.Errorf("could not check for binary extension: %w", err)`
`196`	`196`	`}`
`197`	`197`	`if isBin {`
`198`		`- return m.InstallBin(client, repo)`
	`198`	`+ return m.installBin(client, repo)`
`199`	`199`	`}`
`200`	`200`
`201`	`201`	`hs, err := hasScript(client, repo)`
`@@ -208,10 +208,10 @@ func (m Manager) Install(client http.Client, repo ghrepo.Interface, io *iostre`
`208`	`208`	`}`
`209`	`209`
`210`	`210`	`protocol, _ := cfg.Get(repo.RepoHost(), "git_protocol")`
`211`		`- return m.InstallGit(ghrepo.FormatRemoteURL(repo, protocol), io.Out, io.ErrOut)`
	`211`	`+ return m.installGit(ghrepo.FormatRemoteURL(repo, protocol), io.Out, io.ErrOut)`
`212`	`212`	`}`
`213`	`213`
`214`		`-func (m Manager) InstallBin(client http.Client, repo ghrepo.Interface) error {`
	`214`	`+func (m Manager) installBin(client http.Client, repo ghrepo.Interface) error {`
`215`	`215`	`var r *release`
`216`	`216`	`r, err := fetchLatestRelease(client, repo)`
`217`	`217`	`if err != nil {`
`@@ -276,7 +276,7 @@ func (m Manager) InstallBin(client http.Client, repo ghrepo.Interface) error {`
`276`	`276`	`return nil`
`277`	`277`	`}`
`278`	`278`
`279`		`-func (m *Manager) InstallGit(cloneURL string, stdout, stderr io.Writer) error {`
	`279`	`+func (m *Manager) installGit(cloneURL string, stdout, stderr io.Writer) error {`
`280`	`280`	`exe, err := m.lookPath("git")`
`281`	`281`	`if err != nil {`
`282`	`282`	`return err`