Merge branch 'fix/failed-tests' into feat/gh-owner-core

pkg/cmd/repo/archive/archive.go

@@ -47,15 +47,7 @@ With no argument, archives the current repository.`),
 		Args: cobra.MaximumNArgs(1),
 		RunE: func(cmd *cobra.Command, args []string) error {
 			if len(args) > 0 {
-				defaultOwner, err := opts.DefaultOwner()
-				if err != nil {
-					return err
-				}
-				repository, err := ghowner.RepoToOwnerRepo(defaultOwner, args[0])
-				if err != nil {
-					return err
-				}
-				opts.RepoArg = repository
+				opts.RepoArg = args[0]
 			}
 
 			if !opts.Confirmed && !opts.IO.CanPrompt() {
@@ -105,7 +97,14 @@ func archiveRun(opts *ArchiveOptions) error {
 			if err != nil {
 				return err
 			}
-			repoSelector = currentUser + "/" + repoSelector
+			if defaultOwner, _ := opts.DefaultOwner(); defaultOwner != "" {
+				repoSelector, err = ghowner.RepoToOwnerRepo(defaultOwner, repoSelector)
+				if err != nil {
+					return err
+				}
+			} else {
+				repoSelector = currentUser + "/" + repoSelector
+			}
 		}
 
 		toArchive, err = ghrepo.FromFullName(repoSelector)

pkg/cmd/repo/clone/clone.go

@@ -143,22 +143,18 @@ func cloneRun(opts *CloneOptions) error {
 		if repositoryIsFullName {
 			fullName = opts.Repository
 		} else {
-			defaultOwner, err := opts.DefaultOwner()
+			host, _ := cfg.Authentication().DefaultHost()
+			currentUser, err := api.CurrentLoginName(apiClient, host)
 			if err != nil {
 				return err
 			}
-			if defaultOwner != "" {
-				repository, err := ghowner.RepoToOwnerRepo(defaultOwner, opts.Repository)
+			if defaultOwner, _ := opts.DefaultOwner(); defaultOwner != "" {
+				// TODO: Find a way to test this
+				fullName, err = ghowner.RepoToOwnerRepo(defaultOwner, fullName)
 				if err != nil {
 					return err
 				}
-				fullName = repository
 			} else {
-				host, _ := cfg.Authentication().DefaultHost()
-				currentUser, err := api.CurrentLoginName(apiClient, host)
-				if err != nil {
-					return err
-				}
 				fullName = currentUser + "/" + opts.Repository
 			}
 		}

pkg/cmd/repo/clone/clone_test.go

@@ -110,6 +110,9 @@ func runCloneCommand(httpClient *http.Client, cli string) (*test.CmdOut, error)
 			GhPath:  "some/path/gh",
 			GitPath: "some/path/git",
 		},
+		DefaultOwner: func() (string, error) {
+			return "", nil
+		},
 	}
 
 	cmd := NewCmdClone(fac, nil)

pkg/cmd/repo/delete/delete.go

@@ -50,15 +50,7 @@ To authorize, run "gh auth refresh -s delete_repo"`,
 		Args: cobra.MaximumNArgs(1),
 		RunE: func(cmd *cobra.Command, args []string) error {
 			if len(args) > 0 {
-				defaultOwner, err := opts.DefaultOwner()
-				if err != nil {
-					return err
-				}
-				repository, err := ghowner.RepoToOwnerRepo(defaultOwner, args[0])
-				if err != nil {
-					return err
-				}
-				opts.RepoArg = repository
+				opts.RepoArg = args[0]
 			}
 
 			if !opts.IO.CanPrompt() && !opts.Confirmed {
@@ -101,7 +93,14 @@ func deleteRun(opts *DeleteOptions) error {
 			if err != nil {
 				return err
 			}
-			repoSelector = currentUser + "/" + repoSelector
+			if defaultOwner, _ := opts.DefaultOwner(); defaultOwner != "" {
+				repoSelector, err = ghowner.RepoToOwnerRepo(defaultOwner, repoSelector)
+				if err != nil {
+					return err
+				}
+			} else {
+				repoSelector = currentUser + "/" + repoSelector
+			}
 		}
 		toDelete, err = ghrepo.FromFullName(repoSelector)
 		if err != nil {

pkg/cmd/repo/delete/delete_test.go

@@ -180,6 +180,10 @@ func Test_deleteRun(t *testing.T) {
 			return ghrepo.New("OWNER", "REPO"), nil
 		}
 
+		tt.opts.DefaultOwner = func() (string, error) {
+			return "", nil
+		}
+
 		reg := &httpmock.Registry{}
 		if tt.httpStubs != nil {
 			tt.httpStubs(reg)

pkg/cmd/repo/fork/fork.go

@@ -102,15 +102,7 @@ func NewCmdFork(f *cmdutil.Factory, runF func(*ForkOptions) error) *cobra.Comman
 		RunE: func(cmd *cobra.Command, args []string) error {
 			promptOk := opts.IO.CanPrompt()
 			if len(args) > 0 {
-				defaultOwner, err := opts.DefaultOwner()
-				if err != nil {
-					return err
-				}
-				repository, err := ghowner.RepoToOwnerRepo(defaultOwner, args[0])
-				if err != nil {
-					return err
-				}
-				opts.Repository = repository
+				opts.Repository = args[0]
 				opts.GitArgs = args[1:]
 			}
 
@@ -188,6 +180,12 @@ func forkRun(opts *ForkOptions) error {
 				return fmt.Errorf("did not understand argument: %w", err)
 			}
 		} else {
+			if defaultOwner, _ := opts.DefaultOwner(); defaultOwner != "" {
+				repoArg, err = ghowner.RepoToOwnerRepo(defaultOwner, repoArg)
+				if err != nil {
+					return err
+				}
+			}
 			repoToFork, err = ghrepo.FromFullName(repoArg)
 			if err != nil {
 				return fmt.Errorf("argument error: %w", err)

pkg/cmd/repo/fork/fork_test.go

@@ -724,6 +724,10 @@ func TestRepoFork(t *testing.T) {
 				return ghrepo.New("OWNER", "REPO"), nil
 			}
 
+			tt.opts.DefaultOwner = func() (string, error) {
+				return "", nil
+			}
+
 			reg := &httpmock.Registry{}
 			if tt.httpStubs != nil {
 				tt.httpStubs(reg)

pkg/cmd/repo/list/list.go

@@ -89,12 +89,6 @@ func NewCmdList(f *cmdutil.Factory, runF func(*ListOptions) error) *cobra.Comman
 
 			if len(args) > 0 {
 				opts.Owner = args[0]
-			} else {
-				defaultOwner, err := opts.DefaultOwner()
-				if err != nil {
-					return err
-				}
-				opts.Owner = defaultOwner
 			}
 
 			if runF != nil {
@@ -165,6 +159,16 @@ func listRun(opts *ListOptions) error {
 		filter.Fields = opts.Exporter.Fields()
 	}
 
+	if opts.Owner == "" {
+		defaultOwner, err := opts.DefaultOwner()
+		if err != nil {
+			return err
+		}
+		if defaultOwner != "" {
+			opts.Owner = defaultOwner
+		}
+	}
+
 	listResult, err := listRepos(httpClient, host, opts.Limit, opts.Owner, filter)
 	if err != nil {
 		return err

pkg/cmd/repo/list/list_test.go

@@ -286,6 +286,9 @@ func runCommand(rt http.RoundTripper, isTTY bool, cli string) (*test.CmdOut, err
 		Config: func() (gh.Config, error) {
 			return config.NewBlankConfig(), nil
 		},
+		DefaultOwner: func() (string, error) {
+			return "", nil
+		},
 	}
 
 	cmd := NewCmdList(factory, nil)
@@ -334,6 +337,9 @@ func TestRepoList_nontty(t *testing.T) {
 			return t
 		},
 		Limit: 30,
+		DefaultOwner: func() (string, error) {
+			return "octocat", nil
+		},
 	}
 
 	err := listRun(&opts)
@@ -375,6 +381,9 @@ func TestRepoList_tty(t *testing.T) {
 			return t
 		},
 		Limit: 30,
+		DefaultOwner: func() (string, error) {
+			return "octocat", nil
+		},
 	}
 
 	err := listRun(&opts)
@@ -446,6 +455,9 @@ func TestRepoList_noVisibilityField(t *testing.T) {
 		},
 		Limit:    30,
 		Detector: &fd.DisabledDetectorMock{},
+		DefaultOwner: func() (string, error) {
+			return "octocat", nil
+		},
 	}
 
 	err := listRun(&opts)

pkg/cmd/repo/setdefault/setdefault_test.go

@@ -84,6 +84,9 @@ func TestNewCmdSetDefault(t *testing.T) {
 		f := &cmdutil.Factory{
 			IOStreams: io,
 			GitClient: &git.Client{GitPath: "/fake/path/to/git"},
+			DefaultOwner: func() (string, error) {
+				return "", nil
+			},
 		}
 
 		var gotOpts *SetDefaultOptions

pkg/cmd/repo/unarchive/unarchive.go

@@ -46,15 +46,7 @@ With no argument, unarchives the current repository.`),
 		Args: cobra.MaximumNArgs(1),
 		RunE: func(cmd *cobra.Command, args []string) error {
 			if len(args) > 0 {
-				defaultOwner, err := opts.DefaultOwner()
-				if err != nil {
-					return err
-				}
-				repository, err := ghowner.RepoToOwnerRepo(defaultOwner, args[0])
-				if err != nil {
-					return err
-				}
-				opts.RepoArg = repository
+				opts.RepoArg = args[0]
 			}
 
 			if !opts.Confirmed && !opts.IO.CanPrompt() {
@@ -104,7 +96,14 @@ func unarchiveRun(opts *UnarchiveOptions) error {
 			if err != nil {
 				return err
 			}
-			repoSelector = currentUser + "/" + repoSelector
+			if defaultOwner, _ := opts.DefaultOwner(); defaultOwner != "" {
+				repoSelector, err = ghowner.RepoToOwnerRepo(defaultOwner, repoSelector)
+				if err != nil {
+					return err
+				}
+			} else {
+				repoSelector = currentUser + "/" + repoSelector
+			}
 		}
 
 		toUnarchive, err = ghrepo.FromFullName(repoSelector)

pkg/cmd/repo/view/view.go

@@ -58,15 +58,7 @@ With '--branch', view a specific branch of the repository.`,
 		Args: cobra.MaximumNArgs(1),
 		RunE: func(c *cobra.Command, args []string) error {
 			if len(args) > 0 {
-				defaultOwner, err := opts.DefaultOwner()
-				if err != nil {
-					return err
-				}
-				repository, err := ghowner.RepoToOwnerRepo(defaultOwner, args[0])
-				if err != nil {
-					return err
-				}
-				opts.RepoArg = repository
+				opts.RepoArg = args[0]
 			}
 			if runF != nil {
 				return runF(&opts)
@@ -112,7 +104,14 @@ func viewRun(opts *ViewOptions) error {
 			if err != nil {
 				return err
 			}
-			viewURL = currentUser + "/" + viewURL
+			if defaultOwner, _ := opts.DefaultOwner(); defaultOwner != "" {
+				viewURL, err = ghowner.RepoToOwnerRepo(defaultOwner, viewURL)
+				if err != nil {
+					return err
+				}
+			} else {
+				viewURL = currentUser + "/" + viewURL
+			}
 		}
 		toView, err = ghrepo.FromFullName(viewURL)
 		if err != nil {

pkg/cmd/repo/view/view_test.go

@@ -534,6 +534,9 @@ func Test_ViewRun_WithoutUsername(t *testing.T) {
 		Config: func() (gh.Config, error) {
 			return config.NewBlankConfig(), nil
 		},
+		DefaultOwner: func() (string, error) {
+			return "", nil
+		},
 	}
 
 	if err := viewRun(opts); err != nil {

pkg/cmdutil/repo_override.go

@@ -53,15 +53,6 @@ func EnableRepoOverride(cmd *cobra.Command, f *Factory) {
 			return err
 		}
 		repoOverride, _ := cmd.Flags().GetString("repo")
-		defaultOwner, err := f.DefaultOwner()
-		if err != nil {
-			return err
-		}
-
-		repoOverride, err = ghowner.RepoToOwnerRepo(defaultOwner, repoOverride)
-		if err != nil {
-			return err
-		}
 		f.BaseRepo = OverrideBaseRepoFunc(f, repoOverride)
 		return nil
 	}
@@ -73,7 +64,17 @@ func OverrideBaseRepoFunc(f *Factory, override string) func() (ghrepo.Interface,
 	}
 	if override != "" {
 		return func() (ghrepo.Interface, error) {
-			return ghrepo.FromFullName(override)
+			defaultOwner, err := f.DefaultOwner()
+			if err != nil {
+				return nil, err
+			}
+
+			repository, err := ghowner.RepoToOwnerRepo(defaultOwner, override)
+			if err != nil {
+				return nil, err
+			}
+
+			return ghrepo.FromFullName(repository)
 		}
 	}
 	return f.BaseRepo