STACKITGit/cli
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Reduce duplicate warning message code

Browse source
This commit is contained in:
Sam Coe 2021-10-27 14:07:00 -04:00
parent 95dbd677e0
commit 296cf381a2
No known key found for this signature in database
GPG key ID: 8E322C20F811D086
2 changed files with 50 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

76
pkg/cmd/repo/rename/rename.go
View file

@ -39,7 +39,7 @@ func NewCmdRename(f *cmdutil.Factory, runf func(*RenameOptions) error) *cobra.Co
Short: "Rename a repository",
Long: heredoc.Doc(`Rename a GitHub repository
By default, renames the current repository otherwise rename the specified repository.`),
By default, renames the current repository otherwise renames the specified repository.`),
Args: cobra.MaximumNArgs(1),
RunE: func(cmd *cobra.Command, args []string) error {
opts.BaseRepo = f.BaseRepo
@ -48,7 +48,7 @@ func NewCmdRename(f *cmdutil.Factory, runf func(*RenameOptions) error) *cobra.Co
if len(args) > 0 {
opts.newRepoSelector = args[0]
} else if !opts.IO.CanPrompt() {
return cmdutil.FlagErrorf("could not prompt: new name required when not running interactively\n")
return cmdutil.FlagErrorf("new name argument required when not running interactively\n")
}
if runf != nil {
@ -69,8 +69,6 @@ func renameRun(opts *RenameOptions) error {
return err
}
var newRepo ghrepo.Interface
var baseRemote *context.Remote
newRepoName := opts.newRepoSelector
currRepo, err := opts.BaseRepo()
@ -90,54 +88,52 @@ func renameRun(opts *RenameOptions) error {
}
}
newRepo = ghrepo.NewWithHost(currRepo.RepoOwner(), newRepoName, currRepo.RepoHost())
err = runRename(httpClient, currRepo, newRepoName)
if err != nil {
return fmt.Errorf("API called failed: %s", err)
}
cs := opts.IO.ColorScheme()
newRepo := ghrepo.NewWithHost(currRepo.RepoOwner(), newRepoName, currRepo.RepoHost())
if opts.IO.IsStdoutTTY() {
cs := opts.IO.ColorScheme()
fmt.Fprintf(opts.IO.Out, "%s Renamed repository %s\n", cs.SuccessIcon(), ghrepo.FullName(newRepo))
}
if !opts.HasRepoOverride {
cs := opts.IO.ColorScheme()
cfg, err := opts.Config()
remote, err := updateRemote(currRepo, newRepo, opts)
if err != nil {
fmt.Fprintf(opts.IO.ErrOut, "%s warning: unable to update remote '%s'\n", cs.WarningIcon(), baseRemote.Name)
return nil
}
protocol, err := cfg.Get(currRepo.RepoHost(), "git_protocol")
if err != nil {
fmt.Fprintf(opts.IO.ErrOut, "%s warning: unable to update remote '%s'\n", cs.WarningIcon(), baseRemote.Name)
return nil
}
remotes, err := opts.Remotes()
if err != nil {
fmt.Fprintf(opts.IO.ErrOut, "%s warning: unable to update remote '%s'\n", cs.WarningIcon(), baseRemote.Name)
return nil
}
baseRemote, err = remotes.FindByRepo(currRepo.RepoOwner(), currRepo.RepoName())
if err != nil {
fmt.Fprintf(opts.IO.ErrOut, "%s warning: unable to update remote '%s'\n", cs.WarningIcon(), baseRemote.Name)
return nil
}
remoteURL := ghrepo.FormatRemoteURL(newRepo, protocol)
err = git.UpdateRemoteURL(baseRemote.Name, remoteURL)
if err != nil {
fmt.Fprintf(opts.IO.ErrOut, "%s warning: unable to update remote '%s'\n", cs.WarningIcon(), baseRemote.Name)
return nil
}
if opts.IO.IsStdoutTTY() {
fmt.Fprintf(opts.IO.Out, "%s Updated the %q remote\n", cs.SuccessIcon(), baseRemote.Name)
fmt.Fprintf(opts.IO.ErrOut, "%s Warning: unable to update remote %q\n", cs.WarningIcon(), remote.Name)
} else if opts.IO.IsStdoutTTY() {
fmt.Fprintf(opts.IO.Out, "%s Updated the %q remote\n", cs.SuccessIcon(), remote.Name)
}
}
return nil
}
func updateRemote(repo ghrepo.Interface, renamed ghrepo.Interface, opts *RenameOptions) (*context.Remote, error) {
cfg, err := opts.Config()
if err != nil {
return nil, err
}
protocol, err := cfg.Get(repo.RepoHost(), "git_protocol")
if err != nil {
return nil, err
}
remotes, err := opts.Remotes()
if err != nil {
return nil, err
}
remote, err := remotes.FindByRepo(repo.RepoOwner(), repo.RepoName())
if err != nil {
return nil, err
}
remoteURL := ghrepo.FormatRemoteURL(renamed, protocol)
err = git.UpdateRemoteURL(remote.Name, remoteURL)
return remote, err
}

30
pkg/cmd/repo/rename/rename_test.go
View file

@ -30,7 +30,7 @@ func TestNewCmdRename(t *testing.T) {
{
name: "no arguments no tty",
input: "",
errMsg: "could not prompt: new name required when not running interactively\n",
errMsg: "new name argument required when not running interactively\n",
wantErr: true,
tty: false,
},
@ -83,14 +83,13 @@ func TestNewCmdRename(t *testing.T) {
func TestRenameRun(t *testing.T) {
testCases := []struct {
name string
opts RenameOptions
httpStubs func(*httpmock.Registry)
execStubs func(*run.CommandStubber)
askStubs func(*prompt.AskStubber)
wantOut string
tty bool
HasRepoOverride bool
name string
opts RenameOptions
httpStubs func(*httpmock.Registry)
execStubs func(*run.CommandStubber)
askStubs func(*prompt.AskStubber)
wantOut string
tty bool
}{
{
name: "none argument",
@ -109,8 +108,11 @@ func TestRenameRun(t *testing.T) {
tty: true,
},
{
name: "owner repo change name prompt",
wantOut: "✓ Renamed repository OWNER/NEW_REPO\n✓ Updated the \"origin\" remote\n",
name: "repo override",
opts: RenameOptions{
HasRepoOverride: true,
},
wantOut: "✓ Renamed repository OWNER/NEW_REPO\n",
askStubs: func(q *prompt.AskStubber) {
q.StubOne("NEW_REPO")
},
@ -119,11 +121,7 @@ func TestRenameRun(t *testing.T) {
httpmock.REST("PATCH", "repos/OWNER/REPO"),
httpmock.StatusStringResponse(204, "{}"))
},
execStubs: func(cs *run.CommandStubber) {
cs.Register(`git remote set-url origin https://github.com/OWNER/NEW_REPO.git`, 0, "")
},
tty: true,
HasRepoOverride: true,
tty: true,
},
{
name: "owner repo change name argument tty",