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

res comments

Browse source
This commit is contained in:
Parth Patel 2021-10-13 16:31:54 -04:00
parent c1c2946179
commit 69db6fca25
2 changed files with 19 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -20,8 +20,8 @@ type RenameOptions struct {
HttpClient func() (*http.Client, error)
IO *iostreams.IOStreams
Config func() (config.Config, error)
oldRepoName string
newRepoName string
oldRepoSelector string
newRepoSelector string
}
type renameRepo struct {
@ -39,13 +39,13 @@ func NewCmdRename(f *cmdutil.Factory, runf func(*RenameOptions) error) *cobra.Co
cmd := &cobra.Command{
DisableFlagsInUseLine: true,
Use: "rename <user/old_repo_name> <new_repo_name>",
Use: "rename <repository> <new-name>",
Short: "Rename a repository",
Long: "Rename a GitHub repository",
Args: cmdutil.ExactArgs(2, "cannot rename: repository argument required"),
RunE: func(cmd *cobra.Command, args []string) error {
opts.oldRepoName = args[0]
opts.newRepoName = args[1]
opts.oldRepoSelector = args[0]
opts.newRepoSelector = args[1]
if runf != nil {
return runf(opts)
}
@ -63,17 +63,17 @@ func renameRun(opts *RenameOptions) error {
}
apiClient := api.NewClientFromHTTP(httpClient)
oldRepoName := opts.oldRepoName
if !strings.Contains(oldRepoName, "/") {
oldRepoURL := opts.oldRepoSelector
if !strings.Contains(oldRepoURL, "/") {
currentUser, err := api.CurrentLoginName(apiClient, ghinstance.Default())
if err != nil {
return err
}
oldRepoName = currentUser + "/" + oldRepoName
oldRepoURL = currentUser + "/" + oldRepoURL
}
newRepoName := opts.newRepoName
newRepoName := opts.newRepoSelector
repo, err := ghrepo.FromFullName(oldRepoName)
repo, err := ghrepo.FromFullName(oldRepoURL)
if err != nil {
return fmt.Errorf("argument error: %w", err)
}
@ -105,9 +105,5 @@ func runRename(apiClient *api.Client, hostname string, input renameRepo) error {
return err
}
err := apiClient.REST(hostname, "PATCH", path, body, nil)
if err != nil {
return err
}
return nil
return apiClient.REST(hostname, "PATCH", path, body, nil)
}

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

@ -28,8 +28,8 @@ func TestNewCmdRename(t *testing.T) {
name: "correct argument",
args: "OWNER/REPO REPOS",
wantOpts: RenameOptions{
oldRepoName: "OWNER/REPO",
newRepoName: "REPOS",
oldRepoSelector: "OWNER/REPO",
newRepoSelector: "REPOS",
},
},
}
@ -63,8 +63,8 @@ func TestNewCmdRename(t *testing.T) {
assert.Equal(t, "", stdout.String())
assert.Equal(t, "", stderr.String())
assert.Equal(t, tt.wantOpts.oldRepoName, opts.oldRepoName)
assert.Equal(t, tt.wantOpts.newRepoName, opts.newRepoName)
assert.Equal(t, tt.wantOpts.oldRepoSelector, opts.oldRepoSelector)
assert.Equal(t, tt.wantOpts.newRepoSelector, opts.newRepoSelector)
})
}
}
@ -80,8 +80,8 @@ func TestRenameRun(t *testing.T) {
{
name: "owner repo change name tty",
opts: RenameOptions{
oldRepoName: "OWNER/REPO",
newRepoName: "NEW_REPO",
oldRepoSelector: "OWNER/REPO",
newRepoSelector: "NEW_REPO",
},
wantOut: "✓ Renamed repository OWNER/NEW_REPO\n",
httpStubs: func(reg *httpmock.Registry) {
@ -94,8 +94,8 @@ func TestRenameRun(t *testing.T) {
{
name: "owner repo change name notty",
opts: RenameOptions{
oldRepoName: "OWNER/REPO",
newRepoName: "NEW_REPO",
oldRepoSelector: "OWNER/REPO",
newRepoSelector: "NEW_REPO",
},
httpStubs: func(reg *httpmock.Registry) {
reg.Register(