Merge branch 'trunk' into multi-devcontainer
This commit is contained in:
Jeff Hubbard
GitHub
commit
ef0672eac0
47 changed files with 3148 additions and 133 deletions
|
|
@ -316,41 +316,55 @@ func graphQLClient(h *http.Client, hostname string) *graphql.Client {
|
|||
|
||||
// REST performs a REST request and parses the response.
|
||||
func (c Client) REST(hostname string, method string, p string, body io.Reader, data interface{}) error {
|
||||
_, err := c.RESTWithNext(hostname, method, p, body, data)
|
||||
return err
|
||||
}
|
||||
|
||||
func (c Client) RESTWithNext(hostname string, method string, p string, body io.Reader, data interface{}) (string, error) {
|
||||
req, err := http.NewRequest(method, restURL(hostname, p), body)
|
||||
if err != nil {
|
||||
return err
|
||||
return "", err
|
||||
}
|
||||
|
||||
req.Header.Set("Content-Type", "application/json; charset=utf-8")
|
||||
|
||||
resp, err := c.http.Do(req)
|
||||
if err != nil {
|
||||
return err
|
||||
return "", err
|
||||
}
|
||||
defer resp.Body.Close()
|
||||
|
||||
success := resp.StatusCode >= 200 && resp.StatusCode < 300
|
||||
if !success {
|
||||
return HandleHTTPError(resp)
|
||||
return "", HandleHTTPError(resp)
|
||||
}
|
||||
|
||||
if resp.StatusCode == http.StatusNoContent {
|
||||
return nil
|
||||
return "", nil
|
||||
}
|
||||
|
||||
b, err := ioutil.ReadAll(resp.Body)
|
||||
if err != nil {
|
||||
return err
|
||||
return "", err
|
||||
}
|
||||
|
||||
err = json.Unmarshal(b, &data)
|
||||
if err != nil {
|
||||
return err
|
||||
return "", err
|
||||
}
|
||||
|
||||
return nil
|
||||
var next string
|
||||
for _, m := range linkRE.FindAllStringSubmatch(resp.Header.Get("Link"), -1) {
|
||||
if len(m) > 2 && m[2] == "next" {
|
||||
next = m[1]
|
||||
}
|
||||
}
|
||||
|
||||
return next, nil
|
||||
}
|
||||
|
||||
var linkRE = regexp.MustCompile(`<([^>]+)>;\s*rel="([^"]+)"`)
|
||||
|
||||
func restURL(hostname string, pathOrURL string) string {
|
||||
if strings.HasPrefix(pathOrURL, "https://") || strings.HasPrefix(pathOrURL, "http://") {
|
||||
return pathOrURL
|
||||
|
|
|
|||
|
|
@ -58,7 +58,7 @@ func mainRun() exitCode {
|
|||
updateMessageChan <- rel
|
||||
}()
|
||||
|
||||
hasDebug := os.Getenv("DEBUG") != ""
|
||||
hasDebug, _ := utils.IsDebugEnabled()
|
||||
|
||||
cmdFactory := factory.New(buildVersion)
|
||||
stderr := cmdFactory.IOStreams.ErrOut
|
||||
|
|
@ -327,8 +327,10 @@ func checkForUpdate(currentVersion string) (*update.ReleaseInfo, error) {
|
|||
// does not depend on user configuration
|
||||
func basicClient(currentVersion string) (*api.Client, error) {
|
||||
var opts []api.ClientOption
|
||||
if verbose := os.Getenv("DEBUG"); verbose != "" {
|
||||
opts = append(opts, apiVerboseLog())
|
||||
if isVerbose, debugValue := utils.IsDebugEnabled(); isVerbose {
|
||||
colorize := utils.IsTerminal(os.Stderr)
|
||||
logTraffic := strings.Contains(debugValue, "api")
|
||||
opts = append(opts, api.VerboseLog(colorable.NewColorable(os.Stderr), logTraffic, colorize))
|
||||
}
|
||||
opts = append(opts, api.AddHeader("User-Agent", fmt.Sprintf("GitHub CLI %s", currentVersion)))
|
||||
|
||||
|
|
@ -344,12 +346,6 @@ func basicClient(currentVersion string) (*api.Client, error) {
|
|||
return api.NewClient(opts...), nil
|
||||
}
|
||||
|
||||
func apiVerboseLog() api.ClientOption {
|
||||
logTraffic := strings.Contains(os.Getenv("DEBUG"), "api")
|
||||
colorize := utils.IsTerminal(os.Stderr)
|
||||
return api.VerboseLog(colorable.NewColorable(os.Stderr), logTraffic, colorize)
|
||||
}
|
||||
|
||||
func isRecentRelease(publishedAt time.Time) bool {
|
||||
return !publishedAt.IsZero() && time.Since(publishedAt) < time.Hour*24
|
||||
}
|
||||
|
|
|
|||
5
go.mod
5
go.mod
|
|
@ -7,12 +7,13 @@ require (
|
|||
github.com/MakeNowJust/heredoc v1.0.0
|
||||
github.com/briandowns/spinner v1.18.1
|
||||
github.com/charmbracelet/glamour v0.4.0
|
||||
github.com/charmbracelet/lipgloss v0.5.0
|
||||
github.com/cli/browser v1.1.0
|
||||
github.com/cli/oauth v0.9.0
|
||||
github.com/cli/safeexec v1.0.0
|
||||
github.com/cli/shurcooL-graphql v0.0.1
|
||||
github.com/cpuguy83/go-md2man/v2 v2.0.1
|
||||
github.com/creack/pty v1.1.17
|
||||
github.com/creack/pty v1.1.18
|
||||
github.com/gabriel-vasile/mimetype v1.4.0
|
||||
github.com/google/go-cmp v0.5.7
|
||||
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510
|
||||
|
|
@ -27,7 +28,7 @@ require (
|
|||
github.com/mattn/go-isatty v0.0.14
|
||||
github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d
|
||||
github.com/muesli/reflow v0.3.0
|
||||
github.com/muesli/termenv v0.9.0
|
||||
github.com/muesli/termenv v0.11.1-0.20220204035834-5ac8409525e0
|
||||
github.com/muhammadmuzzammil1998/jsonc v0.0.0-20201229145248-615b0916ca38
|
||||
github.com/opentracing/opentracing-go v1.1.0
|
||||
github.com/shurcooL/githubv4 v0.0.0-20200928013246-d292edc3691b
|
||||
|
|
|
|||
10
go.sum
10
go.sum
|
|
@ -48,6 +48,8 @@ github.com/briandowns/spinner v1.18.1/go.mod h1:mQak9GHqbspjC/5iUx3qMlIho8xBS/pp
|
|||
github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
|
||||
github.com/charmbracelet/glamour v0.4.0 h1:scR+smyB7WdmrlIaff6IVlm48P48JaNM7JypM/VGl4k=
|
||||
github.com/charmbracelet/glamour v0.4.0/go.mod h1:9ZRtG19AUIzcTm7FGLGbq3D5WKQ5UyZBbQsMQN0XIqc=
|
||||
github.com/charmbracelet/lipgloss v0.5.0 h1:lulQHuVeodSgDez+3rGiuxlPVXSnhth442DATR2/8t8=
|
||||
github.com/charmbracelet/lipgloss v0.5.0/go.mod h1:EZLha/HbzEt7cYqdFPovlqy5FZPj0xFhg5SaqxScmgs=
|
||||
github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
|
||||
github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
|
||||
github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
|
||||
|
|
@ -66,8 +68,9 @@ github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDk
|
|||
github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
|
||||
github.com/cpuguy83/go-md2man/v2 v2.0.1 h1:r/myEWzV9lfsM1tFLgDyu0atFtJ1fXn261LKYj/3DxU=
|
||||
github.com/cpuguy83/go-md2man/v2 v2.0.1/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
|
||||
github.com/creack/pty v1.1.17 h1:QeVUsEDNrLBW4tMgZHvxy18sKtr6VI492kBhUfhDJNI=
|
||||
github.com/creack/pty v1.1.17/go.mod h1:MOBLtS5ELjhRRrroQr9kyvTxUAFNvYEK993ew/Vr4O4=
|
||||
github.com/creack/pty v1.1.18 h1:n56/Zwd5o6whRC5PMGretI4IdRLlmBXYNjScPaBgsbY=
|
||||
github.com/creack/pty v1.1.18/go.mod h1:MOBLtS5ELjhRRrroQr9kyvTxUAFNvYEK993ew/Vr4O4=
|
||||
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
||||
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
|
||||
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
||||
|
|
@ -181,6 +184,7 @@ github.com/mattn/go-isatty v0.0.13/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Ky
|
|||
github.com/mattn/go-isatty v0.0.14 h1:yVuAays6BHfxijgZPzw+3Zlu5yQgKGP2/hcQbHb7S9Y=
|
||||
github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
|
||||
github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI=
|
||||
github.com/mattn/go-runewidth v0.0.10/go.mod h1:RAqKPSqVFrSLVXbA8x7dzmKdmGzieGRCM46jaSJTDAk=
|
||||
github.com/mattn/go-runewidth v0.0.12/go.mod h1:RAqKPSqVFrSLVXbA8x7dzmKdmGzieGRCM46jaSJTDAk=
|
||||
github.com/mattn/go-runewidth v0.0.13 h1:lTGmDsbAYt5DmK6OnoV7EuIF1wEIFAcxld6ypU4OSgU=
|
||||
github.com/mattn/go-runewidth v0.0.13/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
|
||||
|
|
@ -189,10 +193,12 @@ github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d h1:5PJl274Y63IEHC+7izoQ
|
|||
github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d/go.mod h1:01TrycV0kFyexm33Z7vhZRXopbI8J3TDReVlkTgMUxE=
|
||||
github.com/microcosm-cc/bluemonday v1.0.17 h1:Z1a//hgsQ4yjC+8zEkV8IWySkXnsxmdSY642CTFQb5Y=
|
||||
github.com/microcosm-cc/bluemonday v1.0.17/go.mod h1:Z0r70sCuXHig8YpBzCc5eGHAap2K7e/u082ZUpDRRqM=
|
||||
github.com/muesli/reflow v0.2.1-0.20210115123740-9e1d0d53df68/go.mod h1:Xk+z4oIWdQqJzsxyjgl3P22oYZnHdZ8FFTHAQQt5BMQ=
|
||||
github.com/muesli/reflow v0.3.0 h1:IFsN6K9NfGtjeggFP+68I4chLZV2yIKsXJFNZ+eWh6s=
|
||||
github.com/muesli/reflow v0.3.0/go.mod h1:pbwTDkVPibjO2kyvBQRBxTWEEGDGq0FlB1BIKtnHY/8=
|
||||
github.com/muesli/termenv v0.9.0 h1:wnbOaGz+LUR3jNT0zOzinPnyDaCZUQRZj9GxK8eRVl8=
|
||||
github.com/muesli/termenv v0.9.0/go.mod h1:R/LzAKf+suGs4IsO95y7+7DpFHO0KABgnZqtlyx2mBw=
|
||||
github.com/muesli/termenv v0.11.1-0.20220204035834-5ac8409525e0 h1:STjmj0uFfRryL9fzRA/OupNppeAID6QJYPMavTL7jtY=
|
||||
github.com/muesli/termenv v0.11.1-0.20220204035834-5ac8409525e0/go.mod h1:Bd5NYQ7pd+SrtBSrSNoBBmXlcY8+Xj4BMJgh8qcZrvs=
|
||||
github.com/muhammadmuzzammil1998/jsonc v0.0.0-20201229145248-615b0916ca38 h1:0FrBxrkJ0hVembTb/e4EU5Ml6vLcOusAqymmYISg5Uo=
|
||||
github.com/muhammadmuzzammil1998/jsonc v0.0.0-20201229145248-615b0916ca38/go.mod h1:saF2fIVw4banK0H4+/EuqfFLpRnoy5S+ECwTOCcRcSU=
|
||||
github.com/olekukonko/tablewriter v0.0.5 h1:P2Ga83D34wi1o9J6Wh1mRuqd4mF/x/lgBS7N7AbDhec=
|
||||
|
|
|
|||
|
|
@ -12,6 +12,7 @@ import (
|
|||
"github.com/cli/cli/v2/internal/ghinstance"
|
||||
"github.com/cli/cli/v2/pkg/cmdutil"
|
||||
"github.com/cli/cli/v2/pkg/iostreams"
|
||||
"github.com/cli/cli/v2/utils"
|
||||
"github.com/cli/oauth"
|
||||
)
|
||||
|
||||
|
|
@ -53,8 +54,9 @@ func authFlow(oauthHost string, IO *iostreams.IOStreams, notice string, addition
|
|||
cs := IO.ColorScheme()
|
||||
|
||||
httpClient := http.DefaultClient
|
||||
if envDebug := os.Getenv("DEBUG"); envDebug != "" {
|
||||
logTraffic := strings.Contains(envDebug, "api") || strings.Contains(envDebug, "oauth")
|
||||
debugEnabled, debugValue := utils.IsDebugEnabled()
|
||||
if debugEnabled {
|
||||
logTraffic := strings.Contains(debugValue, "api")
|
||||
httpClient.Transport = api.VerboseLog(IO.ErrOut, logTraffic, IO.ColorEnabled())(httpClient.Transport)
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -8,6 +8,8 @@ import (
|
|||
"os/exec"
|
||||
"path/filepath"
|
||||
"strings"
|
||||
|
||||
"github.com/cli/cli/v2/utils"
|
||||
)
|
||||
|
||||
// Runnable is typically an exec.Cmd or its stub in tests
|
||||
|
|
@ -28,7 +30,7 @@ type cmdWithStderr struct {
|
|||
}
|
||||
|
||||
func (c cmdWithStderr) Output() ([]byte, error) {
|
||||
if os.Getenv("DEBUG") != "" {
|
||||
if isVerbose, _ := utils.IsDebugEnabled(); isVerbose {
|
||||
_ = printArgs(os.Stderr, c.Cmd.Args)
|
||||
}
|
||||
if c.Cmd.Stderr != nil {
|
||||
|
|
@ -44,7 +46,7 @@ func (c cmdWithStderr) Output() ([]byte, error) {
|
|||
}
|
||||
|
||||
func (c cmdWithStderr) Run() error {
|
||||
if os.Getenv("DEBUG") != "" {
|
||||
if isVerbose, _ := utils.IsDebugEnabled(); isVerbose {
|
||||
_ = printArgs(os.Stderr, c.Cmd.Args)
|
||||
}
|
||||
if c.Cmd.Stderr != nil {
|
||||
|
|
|
|||
|
|
@ -59,7 +59,7 @@ func newSSHCmd(app *App) *cobra.Command {
|
|||
$ gh codespace ssh
|
||||
|
||||
$ gh codespace ssh --config > ~/.ssh/codespaces
|
||||
$ echo 'include ~/.ssh/codespaces' >> ~/.ssh/config
|
||||
$ printf 'Match all\nInclude ~/.ssh/codespaces\n' >> ~/.ssh/config
|
||||
`),
|
||||
PreRunE: func(c *cobra.Command, args []string) error {
|
||||
if opts.stdio {
|
||||
|
|
|
|||
|
|
@ -65,7 +65,13 @@ func NewCmdExtension(f *cmdutil.Factory) *cobra.Command {
|
|||
if !c.IsBinary() && len(version) > 8 {
|
||||
version = version[:8]
|
||||
}
|
||||
t.AddField(version, nil, nil)
|
||||
|
||||
if c.IsPinned() {
|
||||
t.AddField(version, nil, cs.Cyan)
|
||||
} else {
|
||||
t.AddField(version, nil, nil)
|
||||
}
|
||||
|
||||
var updateAvailable string
|
||||
if c.UpdateAvailable() {
|
||||
updateAvailable = "Upgrade available"
|
||||
|
|
@ -76,10 +82,12 @@ func NewCmdExtension(f *cmdutil.Factory) *cobra.Command {
|
|||
return t.Render()
|
||||
},
|
||||
},
|
||||
&cobra.Command{
|
||||
Use: "install <repository>",
|
||||
Short: "Install a gh extension from a repository",
|
||||
Long: heredoc.Doc(`
|
||||
func() *cobra.Command {
|
||||
var pinFlag string
|
||||
cmd := &cobra.Command{
|
||||
Use: "install <repository>",
|
||||
Short: "Install a gh extension from a repository",
|
||||
Long: heredoc.Doc(`
|
||||
Install a GitHub repository locally as a GitHub CLI extension.
|
||||
|
||||
The repository argument can be specified in "owner/repo" format as well as a full URL.
|
||||
|
|
@ -90,41 +98,57 @@ func NewCmdExtension(f *cmdutil.Factory) *cobra.Command {
|
|||
|
||||
See the list of available extensions at <https://github.com/topics/gh-extension>.
|
||||
`),
|
||||
Example: heredoc.Doc(`
|
||||
Example: heredoc.Doc(`
|
||||
$ gh extension install owner/gh-extension
|
||||
$ gh extension install https://git.example.com/owner/gh-extension
|
||||
$ gh extension install .
|
||||
`),
|
||||
Args: cmdutil.MinimumArgs(1, "must specify a repository to install from"),
|
||||
RunE: func(cmd *cobra.Command, args []string) error {
|
||||
if args[0] == "." {
|
||||
wd, err := os.Getwd()
|
||||
Args: cmdutil.MinimumArgs(1, "must specify a repository to install from"),
|
||||
RunE: func(cmd *cobra.Command, args []string) error {
|
||||
if args[0] == "." {
|
||||
if pinFlag != "" {
|
||||
return fmt.Errorf("local extensions cannot be pinned")
|
||||
}
|
||||
wd, err := os.Getwd()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
return m.InstallLocal(wd)
|
||||
}
|
||||
|
||||
repo, err := ghrepo.FromFullName(args[0])
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
return m.InstallLocal(wd)
|
||||
}
|
||||
|
||||
repo, err := ghrepo.FromFullName(args[0])
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
if err := checkValidExtension(cmd.Root(), m, repo.RepoName()); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
if err := checkValidExtension(cmd.Root(), m, repo.RepoName()); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
if err := m.Install(repo); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
if io.IsStdoutTTY() {
|
||||
cs := io.ColorScheme()
|
||||
fmt.Fprintf(io.Out, "%s Installed extension %s\n", cs.SuccessIcon(), args[0])
|
||||
}
|
||||
return nil
|
||||
},
|
||||
},
|
||||
if err := m.Install(repo, pinFlag); err != nil {
|
||||
if errors.Is(err, releaseNotFoundErr) {
|
||||
return fmt.Errorf("%s Could not find a release of %s for %s",
|
||||
cs.FailureIcon(), args[0], cs.Cyan(pinFlag))
|
||||
} else if errors.Is(err, commitNotFoundErr) {
|
||||
return fmt.Errorf("%s %s does not exist in %s",
|
||||
cs.FailureIcon(), cs.Cyan(pinFlag), args[0])
|
||||
}
|
||||
return err
|
||||
}
|
||||
|
||||
if io.IsStdoutTTY() {
|
||||
fmt.Fprintf(io.Out, "%s Installed extension %s\n", cs.SuccessIcon(), args[0])
|
||||
if pinFlag != "" {
|
||||
fmt.Fprintf(io.Out, "%s Pinned extension at %s\n", cs.SuccessIcon(), cs.Cyan(pinFlag))
|
||||
}
|
||||
}
|
||||
return nil
|
||||
},
|
||||
}
|
||||
cmd.Flags().StringVar(&pinFlag, "pin", "", "pin extension to a release tag or commit ref")
|
||||
return cmd
|
||||
}(),
|
||||
func() *cobra.Command {
|
||||
var flagAll bool
|
||||
var flagForce bool
|
||||
|
|
@ -153,6 +177,9 @@ func NewCmdExtension(f *cmdutil.Factory) *cobra.Command {
|
|||
if err != nil && !errors.Is(err, upToDateError) {
|
||||
if name != "" {
|
||||
fmt.Fprintf(io.ErrOut, "%s Failed upgrading extension %s: %s\n", cs.FailureIcon(), name, err)
|
||||
} else if errors.Is(err, noExtensionsInstalledError) {
|
||||
fmt.Fprintf(io.ErrOut, "%s No installed extensions found\n", cs.WarningIcon())
|
||||
return nil
|
||||
} else {
|
||||
fmt.Fprintf(io.ErrOut, "%s Failed upgrading extensions\n", cs.FailureIcon())
|
||||
}
|
||||
|
|
|
|||
|
|
@ -44,7 +44,7 @@ func TestNewCmdExtension(t *testing.T) {
|
|||
em.ListFunc = func(bool) []extensions.Extension {
|
||||
return []extensions.Extension{}
|
||||
}
|
||||
em.InstallFunc = func(_ ghrepo.Interface) error {
|
||||
em.InstallFunc = func(_ ghrepo.Interface, _ string) error {
|
||||
return nil
|
||||
}
|
||||
return func(t *testing.T) {
|
||||
|
|
@ -86,6 +86,13 @@ func TestNewCmdExtension(t *testing.T) {
|
|||
}
|
||||
},
|
||||
},
|
||||
{
|
||||
name: "install local extension with pin",
|
||||
args: []string{"install", ".", "--pin", "v1.0.0"},
|
||||
wantErr: true,
|
||||
errMsg: "local extensions cannot be pinned",
|
||||
isTTY: true,
|
||||
},
|
||||
{
|
||||
name: "upgrade argument error",
|
||||
args: []string{"upgrade"},
|
||||
|
|
@ -207,6 +214,22 @@ func TestNewCmdExtension(t *testing.T) {
|
|||
isTTY: true,
|
||||
wantStdout: "✓ Successfully upgraded extensions\n",
|
||||
},
|
||||
{
|
||||
name: "upgrade all none installed",
|
||||
args: []string{"upgrade", "--all"},
|
||||
managerStubs: func(em *extensions.ExtensionManagerMock) func(*testing.T) {
|
||||
em.UpgradeFunc = func(name string, force bool) error {
|
||||
return noExtensionsInstalledError
|
||||
}
|
||||
return func(t *testing.T) {
|
||||
calls := em.UpgradeCalls()
|
||||
assert.Equal(t, 1, len(calls))
|
||||
assert.Equal(t, "", calls[0].Name)
|
||||
}
|
||||
},
|
||||
isTTY: true,
|
||||
wantStderr: "! No installed extensions found\n",
|
||||
},
|
||||
{
|
||||
name: "upgrade all notty",
|
||||
args: []string{"upgrade", "--all"},
|
||||
|
|
|
|||
|
|
@ -18,6 +18,7 @@ type Extension struct {
|
|||
path string
|
||||
url string
|
||||
isLocal bool
|
||||
isPinned bool
|
||||
currentVersion string
|
||||
latestVersion string
|
||||
kind ExtensionKind
|
||||
|
|
@ -43,8 +44,13 @@ func (e *Extension) CurrentVersion() string {
|
|||
return e.currentVersion
|
||||
}
|
||||
|
||||
func (e *Extension) IsPinned() bool {
|
||||
return e.isPinned
|
||||
}
|
||||
|
||||
func (e *Extension) UpdateAvailable() bool {
|
||||
if e.isLocal ||
|
||||
if e.isPinned ||
|
||||
e.isLocal ||
|
||||
e.currentVersion == "" ||
|
||||
e.latestVersion == "" ||
|
||||
e.currentVersion == e.latestVersion {
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@ package extension
|
|||
|
||||
import (
|
||||
"encoding/json"
|
||||
"errors"
|
||||
"fmt"
|
||||
"io"
|
||||
"io/ioutil"
|
||||
|
|
@ -80,6 +81,9 @@ func downloadAsset(httpClient *http.Client, asset releaseAsset, destPath string)
|
|||
return err
|
||||
}
|
||||
|
||||
var releaseNotFoundErr = errors.New("release not found")
|
||||
var commitNotFoundErr = errors.New("commit not found")
|
||||
|
||||
// fetchLatestRelease finds the latest published release for a repository.
|
||||
func fetchLatestRelease(httpClient *http.Client, baseRepo ghrepo.Interface) (*release, error) {
|
||||
path := fmt.Sprintf("repos/%s/%s/releases/latest", baseRepo.RepoOwner(), baseRepo.RepoName())
|
||||
|
|
@ -112,3 +116,71 @@ func fetchLatestRelease(httpClient *http.Client, baseRepo ghrepo.Interface) (*re
|
|||
|
||||
return &r, nil
|
||||
}
|
||||
|
||||
// fetchReleaseFromTag finds release by tag name for a repository
|
||||
func fetchReleaseFromTag(httpClient *http.Client, baseRepo ghrepo.Interface, tagName string) (*release, error) {
|
||||
fullRepoName := fmt.Sprintf("%s/%s", baseRepo.RepoOwner(), baseRepo.RepoName())
|
||||
path := fmt.Sprintf("repos/%s/releases/tags/%s", fullRepoName, tagName)
|
||||
url := ghinstance.RESTPrefix(baseRepo.RepoHost()) + path
|
||||
req, err := http.NewRequest("GET", url, nil)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
resp, err := httpClient.Do(req)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
defer resp.Body.Close()
|
||||
if resp.StatusCode == 404 {
|
||||
return nil, releaseNotFoundErr
|
||||
}
|
||||
if resp.StatusCode > 299 {
|
||||
return nil, api.HandleHTTPError(resp)
|
||||
}
|
||||
|
||||
b, err := ioutil.ReadAll(resp.Body)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
var r release
|
||||
err = json.Unmarshal(b, &r)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
return &r, nil
|
||||
}
|
||||
|
||||
// fetchCommitSHA finds full commit SHA from a target ref in a repo
|
||||
func fetchCommitSHA(httpClient *http.Client, baseRepo ghrepo.Interface, targetRef string) (string, error) {
|
||||
path := fmt.Sprintf("repos/%s/%s/commits/%s", baseRepo.RepoOwner(), baseRepo.RepoName(), targetRef)
|
||||
url := ghinstance.RESTPrefix(baseRepo.RepoHost()) + path
|
||||
req, err := http.NewRequest("GET", url, nil)
|
||||
if err != nil {
|
||||
return "", err
|
||||
}
|
||||
|
||||
req.Header.Set("Accept", "application/vnd.github.VERSION.sha")
|
||||
resp, err := httpClient.Do(req)
|
||||
if err != nil {
|
||||
return "", err
|
||||
}
|
||||
|
||||
defer resp.Body.Close()
|
||||
if resp.StatusCode == 422 {
|
||||
return "", commitNotFoundErr
|
||||
}
|
||||
if resp.StatusCode > 299 {
|
||||
return "", api.HandleHTTPError(resp)
|
||||
}
|
||||
|
||||
body, err := ioutil.ReadAll(resp.Body)
|
||||
if err != nil {
|
||||
return "", err
|
||||
}
|
||||
|
||||
return string(body), nil
|
||||
}
|
||||
|
|
|
|||
|
|
@ -198,6 +198,7 @@ func (m *Manager) parseBinaryExtensionDir(fi fs.FileInfo) (Extension, error) {
|
|||
remoteURL := ghrepo.GenerateRepoURL(repo, "")
|
||||
ext.url = remoteURL
|
||||
ext.currentVersion = bm.Tag
|
||||
ext.isPinned = bm.IsPinned
|
||||
return ext, nil
|
||||
}
|
||||
|
||||
|
|
@ -206,12 +207,20 @@ func (m *Manager) parseGitExtensionDir(fi fs.FileInfo) (Extension, error) {
|
|||
exePath := filepath.Join(id, fi.Name(), fi.Name())
|
||||
remoteUrl := m.getRemoteUrl(fi.Name())
|
||||
currentVersion := m.getCurrentVersion(fi.Name())
|
||||
|
||||
var isPinned bool
|
||||
pinPath := filepath.Join(id, fi.Name(), fmt.Sprintf(".pin-%s", currentVersion))
|
||||
if _, err := os.Stat(pinPath); err == nil {
|
||||
isPinned = true
|
||||
}
|
||||
|
||||
return Extension{
|
||||
path: exePath,
|
||||
url: remoteUrl,
|
||||
isLocal: false,
|
||||
currentVersion: currentVersion,
|
||||
kind: GitKind,
|
||||
isPinned: isPinned,
|
||||
}, nil
|
||||
}
|
||||
|
||||
|
|
@ -224,6 +233,7 @@ func (m *Manager) getCurrentVersion(extension string) string {
|
|||
dir := m.installDir()
|
||||
gitDir := "--git-dir=" + filepath.Join(dir, extension, ".git")
|
||||
cmd := m.newCommand(gitExe, gitDir, "rev-parse", "HEAD")
|
||||
|
||||
localSha, err := cmd.Output()
|
||||
if err != nil {
|
||||
return ""
|
||||
|
|
@ -312,21 +322,23 @@ func (m *Manager) InstallLocal(dir string) error {
|
|||
}
|
||||
|
||||
type binManifest struct {
|
||||
Owner string
|
||||
Name string
|
||||
Host string
|
||||
Tag string
|
||||
Owner string
|
||||
Name string
|
||||
Host string
|
||||
Tag string
|
||||
IsPinned bool
|
||||
// TODO I may end up not using this; just thinking ahead to local installs
|
||||
Path string
|
||||
}
|
||||
|
||||
func (m *Manager) Install(repo ghrepo.Interface) error {
|
||||
// Install installs an extension from repo, and pins to commitish if provided
|
||||
func (m *Manager) Install(repo ghrepo.Interface, target string) error {
|
||||
isBin, err := isBinExtension(m.client, repo)
|
||||
if err != nil {
|
||||
return fmt.Errorf("could not check for binary extension: %w", err)
|
||||
}
|
||||
if isBin {
|
||||
return m.installBin(repo)
|
||||
return m.installBin(repo, target)
|
||||
}
|
||||
|
||||
hs, err := hasScript(m.client, repo)
|
||||
|
|
@ -337,13 +349,18 @@ func (m *Manager) Install(repo ghrepo.Interface) error {
|
|||
return errors.New("extension is not installable: missing executable")
|
||||
}
|
||||
|
||||
protocol, _ := m.config.GetOrDefault(repo.RepoHost(), "git_protocol")
|
||||
return m.installGit(ghrepo.FormatRemoteURL(repo, protocol), m.io.Out, m.io.ErrOut)
|
||||
return m.installGit(repo, target, m.io.Out, m.io.ErrOut)
|
||||
}
|
||||
|
||||
func (m *Manager) installBin(repo ghrepo.Interface) error {
|
||||
func (m *Manager) installBin(repo ghrepo.Interface, target string) error {
|
||||
var r *release
|
||||
r, err := fetchLatestRelease(m.client, repo)
|
||||
var err error
|
||||
isPinned := target != ""
|
||||
if isPinned {
|
||||
r, err = fetchReleaseFromTag(m.client, repo, target)
|
||||
} else {
|
||||
r, err = fetchLatestRelease(m.client, repo)
|
||||
}
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
|
@ -365,6 +382,7 @@ func (m *Manager) installBin(repo ghrepo.Interface) error {
|
|||
|
||||
name := repo.RepoName()
|
||||
targetDir := filepath.Join(m.installDir(), name)
|
||||
|
||||
// TODO clean this up if function errs?
|
||||
err = os.MkdirAll(targetDir, 0755)
|
||||
if err != nil {
|
||||
|
|
@ -380,11 +398,12 @@ func (m *Manager) installBin(repo ghrepo.Interface) error {
|
|||
}
|
||||
|
||||
manifest := binManifest{
|
||||
Name: name,
|
||||
Owner: repo.RepoOwner(),
|
||||
Host: repo.RepoHost(),
|
||||
Path: binPath,
|
||||
Tag: r.Tag,
|
||||
Name: name,
|
||||
Owner: repo.RepoOwner(),
|
||||
Host: repo.RepoHost(),
|
||||
Path: binPath,
|
||||
Tag: r.Tag,
|
||||
IsPinned: isPinned,
|
||||
}
|
||||
|
||||
bs, err := yaml.Marshal(manifest)
|
||||
|
|
@ -408,21 +427,52 @@ func (m *Manager) installBin(repo ghrepo.Interface) error {
|
|||
return nil
|
||||
}
|
||||
|
||||
func (m *Manager) installGit(cloneURL string, stdout, stderr io.Writer) error {
|
||||
func (m *Manager) installGit(repo ghrepo.Interface, target string, stdout, stderr io.Writer) error {
|
||||
protocol, _ := m.config.GetOrDefault(repo.RepoHost(), "git_protocol")
|
||||
cloneURL := ghrepo.FormatRemoteURL(repo, protocol)
|
||||
|
||||
exe, err := m.lookPath("git")
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
var commitSHA string
|
||||
if target != "" {
|
||||
commitSHA, err = fetchCommitSHA(m.client, repo, target)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
|
||||
name := strings.TrimSuffix(path.Base(cloneURL), ".git")
|
||||
targetDir := filepath.Join(m.installDir(), name)
|
||||
|
||||
externalCmd := m.newCommand(exe, "clone", cloneURL, targetDir)
|
||||
externalCmd.Stdout = stdout
|
||||
externalCmd.Stderr = stderr
|
||||
return externalCmd.Run()
|
||||
if err := externalCmd.Run(); err != nil {
|
||||
return err
|
||||
}
|
||||
if commitSHA == "" {
|
||||
return nil
|
||||
}
|
||||
|
||||
checkoutCmd := m.newCommand(exe, "-C", targetDir, "checkout", commitSHA)
|
||||
checkoutCmd.Stdout = stdout
|
||||
checkoutCmd.Stderr = stderr
|
||||
if err := checkoutCmd.Run(); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
pinPath := filepath.Join(targetDir, fmt.Sprintf(".pin-%s", commitSHA))
|
||||
f, err := os.OpenFile(pinPath, os.O_WRONLY|os.O_CREATE, 0600)
|
||||
if err != nil {
|
||||
return fmt.Errorf("failed to create pin file in directory: %w", err)
|
||||
}
|
||||
return f.Close()
|
||||
}
|
||||
|
||||
var pinnedExtensionUpgradeError = errors.New("pinned extensions can not be upgraded")
|
||||
var localExtensionUpgradeError = errors.New("local extensions can not be upgraded")
|
||||
var upToDateError = errors.New("already up to date")
|
||||
var noExtensionsInstalledError = errors.New("no extensions installed")
|
||||
|
|
@ -462,7 +512,8 @@ func (m *Manager) upgradeExtensions(exts []Extension, force bool) error {
|
|||
err := m.upgradeExtension(f, force)
|
||||
if err != nil {
|
||||
if !errors.Is(err, localExtensionUpgradeError) &&
|
||||
!errors.Is(err, upToDateError) {
|
||||
!errors.Is(err, upToDateError) &&
|
||||
!errors.Is(err, pinnedExtensionUpgradeError) {
|
||||
failed = true
|
||||
}
|
||||
fmt.Fprintf(m.io.Out, "%s\n", err)
|
||||
|
|
@ -480,6 +531,9 @@ func (m *Manager) upgradeExtension(ext Extension, force bool) error {
|
|||
if ext.isLocal {
|
||||
return localExtensionUpgradeError
|
||||
}
|
||||
if ext.IsPinned() {
|
||||
return pinnedExtensionUpgradeError
|
||||
}
|
||||
if !ext.UpdateAvailable() {
|
||||
return upToDateError
|
||||
}
|
||||
|
|
@ -498,7 +552,7 @@ func (m *Manager) upgradeExtension(ext Extension, force bool) error {
|
|||
if err != nil {
|
||||
return fmt.Errorf("failed to migrate to new precompiled extension format: %w", err)
|
||||
}
|
||||
return m.installBin(repo)
|
||||
return m.installBin(repo, "")
|
||||
}
|
||||
err = m.upgradeGitExtension(ext, force)
|
||||
}
|
||||
|
|
@ -525,7 +579,7 @@ func (m *Manager) upgradeBinExtension(ext Extension) error {
|
|||
if err != nil {
|
||||
return fmt.Errorf("failed to parse URL %s: %w", ext.url, err)
|
||||
}
|
||||
return m.installBin(repo)
|
||||
return m.installBin(repo, "")
|
||||
}
|
||||
|
||||
func (m *Manager) Remove(name string) error {
|
||||
|
|
|
|||
|
|
@ -445,6 +445,50 @@ func TestManager_UpgradeExtension_BinaryExtension(t *testing.T) {
|
|||
assert.Equal(t, "", stderr.String())
|
||||
}
|
||||
|
||||
func TestManager_UpgradeExtension_BinaryExtension_Pinned(t *testing.T) {
|
||||
tempDir := t.TempDir()
|
||||
|
||||
assert.NoError(t, stubBinaryExtension(
|
||||
filepath.Join(tempDir, "extensions", "gh-bin-ext"),
|
||||
binManifest{
|
||||
Owner: "owner",
|
||||
Name: "gh-bin-ext",
|
||||
Host: "example.com",
|
||||
Tag: "v1.6.3",
|
||||
IsPinned: true,
|
||||
}))
|
||||
|
||||
io, _, _, _ := iostreams.Test()
|
||||
m := newTestManager(tempDir, nil, io)
|
||||
exts, err := m.list(false)
|
||||
assert.Nil(t, err)
|
||||
assert.Equal(t, 1, len(exts))
|
||||
ext := exts[0]
|
||||
|
||||
err = m.upgradeExtension(ext, false)
|
||||
assert.NotNil(t, err)
|
||||
assert.Equal(t, err, pinnedExtensionUpgradeError)
|
||||
}
|
||||
|
||||
func TestManager_UpgradeExtenion_GitExtension_Pinned(t *testing.T) {
|
||||
tempDir := t.TempDir()
|
||||
extDir := filepath.Join(tempDir, "extensions", "gh-remote")
|
||||
assert.NoError(t, stubPinnedExtension(filepath.Join(extDir, "gh-remote"), "abcd1234"))
|
||||
|
||||
io, _, _, _ := iostreams.Test()
|
||||
m := newTestManager(tempDir, nil, io)
|
||||
exts, err := m.list(false)
|
||||
assert.NoError(t, err)
|
||||
assert.Equal(t, 1, len(exts))
|
||||
ext := exts[0]
|
||||
ext.isPinned = true
|
||||
ext.latestVersion = "new version"
|
||||
|
||||
err = m.upgradeExtension(ext, false)
|
||||
assert.NotNil(t, err)
|
||||
assert.Equal(t, err, pinnedExtensionUpgradeError)
|
||||
}
|
||||
|
||||
func TestManager_Install_git(t *testing.T) {
|
||||
tempDir := t.TempDir()
|
||||
|
||||
|
|
@ -472,12 +516,113 @@ func TestManager_Install_git(t *testing.T) {
|
|||
|
||||
repo := ghrepo.New("owner", "gh-some-ext")
|
||||
|
||||
err := m.Install(repo)
|
||||
err := m.Install(repo, "")
|
||||
assert.NoError(t, err)
|
||||
assert.Equal(t, fmt.Sprintf("[git clone https://github.com/owner/gh-some-ext.git %s]\n", filepath.Join(tempDir, "extensions", "gh-some-ext")), stdout.String())
|
||||
assert.Equal(t, "", stderr.String())
|
||||
}
|
||||
|
||||
func TestManager_Install_git_pinned(t *testing.T) {
|
||||
tempDir := t.TempDir()
|
||||
|
||||
reg := httpmock.Registry{}
|
||||
defer reg.Verify(t)
|
||||
client := http.Client{Transport: ®}
|
||||
|
||||
io, _, _, stderr := iostreams.Test()
|
||||
m := newTestManager(tempDir, &client, io)
|
||||
|
||||
reg.Register(
|
||||
httpmock.REST("GET", "repos/owner/gh-cool-ext/releases/latest"),
|
||||
httpmock.JSONResponse(
|
||||
release{
|
||||
Assets: []releaseAsset{
|
||||
{
|
||||
Name: "not-a-binary",
|
||||
APIURL: "https://example.com/release/cool",
|
||||
},
|
||||
},
|
||||
}))
|
||||
reg.Register(
|
||||
httpmock.REST("GET", "repos/owner/gh-cool-ext/commits/some-ref"),
|
||||
httpmock.StringResponse("abcd1234"))
|
||||
reg.Register(
|
||||
httpmock.REST("GET", "repos/owner/gh-cool-ext/contents/gh-cool-ext"),
|
||||
httpmock.StringResponse("script"))
|
||||
|
||||
_ = os.MkdirAll(filepath.Join(m.installDir(), "gh-cool-ext"), 0700)
|
||||
repo := ghrepo.New("owner", "gh-cool-ext")
|
||||
err := m.Install(repo, "some-ref")
|
||||
assert.NoError(t, err)
|
||||
assert.Equal(t, "", stderr.String())
|
||||
}
|
||||
|
||||
func TestManager_Install_binary_pinned(t *testing.T) {
|
||||
repo := ghrepo.NewWithHost("owner", "gh-bin-ext", "example.com")
|
||||
|
||||
reg := httpmock.Registry{}
|
||||
defer reg.Verify(t)
|
||||
|
||||
reg.Register(
|
||||
httpmock.REST("GET", "api/v3/repos/owner/gh-bin-ext/releases/latest"),
|
||||
httpmock.JSONResponse(
|
||||
release{
|
||||
Assets: []releaseAsset{
|
||||
{
|
||||
Name: "gh-bin-ext-windows-amd64.exe",
|
||||
APIURL: "https://example.com/release/cool",
|
||||
},
|
||||
},
|
||||
}))
|
||||
reg.Register(
|
||||
httpmock.REST("GET", "api/v3/repos/owner/gh-bin-ext/releases/tags/v1.6.3-pre"),
|
||||
httpmock.JSONResponse(
|
||||
release{
|
||||
Tag: "v1.6.3-pre",
|
||||
Assets: []releaseAsset{
|
||||
{
|
||||
Name: "gh-bin-ext-windows-amd64.exe",
|
||||
APIURL: "https://example.com/release/cool",
|
||||
},
|
||||
},
|
||||
}))
|
||||
reg.Register(
|
||||
httpmock.REST("GET", "release/cool"),
|
||||
httpmock.StringResponse("FAKE BINARY"))
|
||||
|
||||
io, _, stdout, stderr := iostreams.Test()
|
||||
tempDir := t.TempDir()
|
||||
|
||||
m := newTestManager(tempDir, &http.Client{Transport: ®}, io)
|
||||
|
||||
err := m.Install(repo, "v1.6.3-pre")
|
||||
assert.NoError(t, err)
|
||||
|
||||
manifest, err := os.ReadFile(filepath.Join(tempDir, "extensions/gh-bin-ext", manifestName))
|
||||
assert.NoError(t, err)
|
||||
|
||||
var bm binManifest
|
||||
err = yaml.Unmarshal(manifest, &bm)
|
||||
assert.NoError(t, err)
|
||||
|
||||
assert.Equal(t, binManifest{
|
||||
Name: "gh-bin-ext",
|
||||
Owner: "owner",
|
||||
Host: "example.com",
|
||||
Tag: "v1.6.3-pre",
|
||||
IsPinned: true,
|
||||
Path: filepath.Join(tempDir, "extensions/gh-bin-ext/gh-bin-ext.exe"),
|
||||
}, bm)
|
||||
|
||||
fakeBin, err := os.ReadFile(filepath.Join(tempDir, "extensions/gh-bin-ext/gh-bin-ext.exe"))
|
||||
assert.NoError(t, err)
|
||||
assert.Equal(t, "FAKE BINARY", string(fakeBin))
|
||||
|
||||
assert.Equal(t, "", stdout.String())
|
||||
assert.Equal(t, "", stderr.String())
|
||||
|
||||
}
|
||||
|
||||
func TestManager_Install_binary_unsupported(t *testing.T) {
|
||||
repo := ghrepo.NewWithHost("owner", "gh-bin-ext", "example.com")
|
||||
|
||||
|
|
@ -514,7 +659,7 @@ func TestManager_Install_binary_unsupported(t *testing.T) {
|
|||
|
||||
m := newTestManager(tempDir, &client, io)
|
||||
|
||||
err := m.Install(repo)
|
||||
err := m.Install(repo, "")
|
||||
assert.EqualError(t, err, "gh-bin-ext unsupported for windows-amd64. Open an issue: `gh issue create -R owner/gh-bin-ext -t'Support windows-amd64'`")
|
||||
|
||||
assert.Equal(t, "", stdout.String())
|
||||
|
|
@ -559,7 +704,7 @@ func TestManager_Install_binary(t *testing.T) {
|
|||
|
||||
m := newTestManager(tempDir, &http.Client{Transport: ®}, io)
|
||||
|
||||
err := m.Install(repo)
|
||||
err := m.Install(repo, "")
|
||||
assert.NoError(t, err)
|
||||
|
||||
manifest, err := os.ReadFile(filepath.Join(tempDir, "extensions/gh-bin-ext", manifestName))
|
||||
|
|
@ -702,6 +847,24 @@ func stubExtension(path string) error {
|
|||
return f.Close()
|
||||
}
|
||||
|
||||
func stubPinnedExtension(path string, pinnedVersion string) error {
|
||||
if err := os.MkdirAll(filepath.Dir(path), 0755); err != nil {
|
||||
return err
|
||||
}
|
||||
f, err := os.OpenFile(path, os.O_CREATE, 0755)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
f.Close()
|
||||
|
||||
pinPath := filepath.Join(filepath.Dir(path), fmt.Sprintf(".pin-%s", pinnedVersion))
|
||||
f, err = os.OpenFile(pinPath, os.O_WRONLY|os.O_CREATE, 0600)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
return f.Close()
|
||||
}
|
||||
|
||||
func stubLocalExtension(tempDir, path string) error {
|
||||
extDir, err := ioutil.TempDir(tempDir, "local-ext")
|
||||
if err != nil {
|
||||
|
|
|
|||
|
|
@ -3,7 +3,6 @@ package factory
|
|||
import (
|
||||
"fmt"
|
||||
"net/http"
|
||||
"os"
|
||||
"regexp"
|
||||
"strings"
|
||||
"time"
|
||||
|
|
@ -12,6 +11,7 @@ import (
|
|||
"github.com/cli/cli/v2/internal/ghinstance"
|
||||
"github.com/cli/cli/v2/internal/httpunix"
|
||||
"github.com/cli/cli/v2/pkg/iostreams"
|
||||
"github.com/cli/cli/v2/utils"
|
||||
)
|
||||
|
||||
var timezoneNames = map[int]string{
|
||||
|
|
@ -84,8 +84,8 @@ func NewHTTPClient(io *iostreams.IOStreams, cfg configGetter, appVersion string,
|
|||
}))
|
||||
}
|
||||
|
||||
if verbose := os.Getenv("DEBUG"); verbose != "" {
|
||||
logTraffic := strings.Contains(verbose, "api")
|
||||
if isVerbose, debugValue := utils.IsDebugEnabled(); isVerbose {
|
||||
logTraffic := strings.Contains(debugValue, "api")
|
||||
opts = append(opts, api.VerboseLog(io.ErrOut, logTraffic, io.IsStderrTTY()))
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -24,6 +24,8 @@ func TestNewHTTPClient(t *testing.T) {
|
|||
name string
|
||||
args args
|
||||
envDebug string
|
||||
setGhDebug bool
|
||||
envGhDebug string
|
||||
host string
|
||||
sso string
|
||||
wantHeader map[string]string
|
||||
|
|
@ -82,8 +84,39 @@ func TestNewHTTPClient(t *testing.T) {
|
|||
appVersion: "v1.2.3",
|
||||
setAccept: true,
|
||||
},
|
||||
host: "github.com",
|
||||
envDebug: "api",
|
||||
host: "github.com",
|
||||
envDebug: "api",
|
||||
setGhDebug: false,
|
||||
wantHeader: map[string]string{
|
||||
"authorization": "token MYTOKEN",
|
||||
"user-agent": "GitHub CLI v1.2.3",
|
||||
"accept": "application/vnd.github.merge-info-preview+json, application/vnd.github.nebula-preview",
|
||||
},
|
||||
wantStderr: heredoc.Doc(`
|
||||
* Request at <time>
|
||||
* Request to http://<host>:<port>
|
||||
> GET / HTTP/1.1
|
||||
> Host: github.com
|
||||
> Accept: application/vnd.github.merge-info-preview+json, application/vnd.github.nebula-preview
|
||||
> Authorization: token ████████████████████
|
||||
> User-Agent: GitHub CLI v1.2.3
|
||||
|
||||
< HTTP/1.1 204 No Content
|
||||
< Date: <time>
|
||||
|
||||
* Request took <duration>
|
||||
`),
|
||||
},
|
||||
{
|
||||
name: "github.com in verbose mode",
|
||||
args: args{
|
||||
config: tinyConfig{"github.com:oauth_token": "MYTOKEN"},
|
||||
appVersion: "v1.2.3",
|
||||
setAccept: true,
|
||||
},
|
||||
host: "github.com",
|
||||
envGhDebug: "api",
|
||||
setGhDebug: true,
|
||||
wantHeader: map[string]string{
|
||||
"authorization": "token MYTOKEN",
|
||||
"user-agent": "GitHub CLI v1.2.3",
|
||||
|
|
@ -145,9 +178,16 @@ func TestNewHTTPClient(t *testing.T) {
|
|||
for _, tt := range tests {
|
||||
t.Run(tt.name, func(t *testing.T) {
|
||||
oldDebug := os.Getenv("DEBUG")
|
||||
oldGhDebug := os.Getenv("GH_DEBUG")
|
||||
os.Setenv("DEBUG", tt.envDebug)
|
||||
if tt.setGhDebug {
|
||||
os.Setenv("GH_DEBUG", tt.envGhDebug)
|
||||
} else {
|
||||
os.Unsetenv("GH_DEBUG")
|
||||
}
|
||||
t.Cleanup(func() {
|
||||
os.Setenv("DEBUG", oldDebug)
|
||||
os.Setenv("GH_DEBUG", oldGhDebug)
|
||||
})
|
||||
|
||||
io, _, _, stderr := iostreams.Test()
|
||||
|
|
|
|||
|
|
@ -55,6 +55,8 @@ func NewCmdList(f *cmdutil.Factory, runF func(*ListOptions) error) *cobra.Comman
|
|||
Browser: f.Browser,
|
||||
}
|
||||
|
||||
var appAuthor string
|
||||
|
||||
cmd := &cobra.Command{
|
||||
Use: "list",
|
||||
Short: "List issues in a repository",
|
||||
|
|
@ -81,6 +83,14 @@ func NewCmdList(f *cmdutil.Factory, runF func(*ListOptions) error) *cobra.Comman
|
|||
return cmdutil.FlagErrorf("invalid limit: %v", opts.LimitResults)
|
||||
}
|
||||
|
||||
if cmd.Flags().Changed("author") && cmd.Flags().Changed("app") {
|
||||
return cmdutil.FlagErrorf("specify only `--author` or `--app`")
|
||||
}
|
||||
|
||||
if cmd.Flags().Changed("app") {
|
||||
opts.Author = fmt.Sprintf("app/%s", appAuthor)
|
||||
}
|
||||
|
||||
if runF != nil {
|
||||
return runF(opts)
|
||||
}
|
||||
|
|
@ -94,6 +104,7 @@ func NewCmdList(f *cmdutil.Factory, runF func(*ListOptions) error) *cobra.Comman
|
|||
cmdutil.StringEnumFlag(cmd, &opts.State, "state", "s", "open", []string{"open", "closed", "all"}, "Filter by state")
|
||||
cmd.Flags().IntVarP(&opts.LimitResults, "limit", "L", 30, "Maximum number of issues to fetch")
|
||||
cmd.Flags().StringVarP(&opts.Author, "author", "A", "", "Filter by author")
|
||||
cmd.Flags().StringVar(&appAuthor, "app", "", "Filter by GitHub App author")
|
||||
cmd.Flags().StringVar(&opts.Mention, "mention", "", "Filter by mention")
|
||||
cmd.Flags().StringVarP(&opts.Milestone, "milestone", "m", "", "Filter by milestone number or title")
|
||||
cmd.Flags().StringVarP(&opts.Search, "search", "S", "", "Search issues with `query`")
|
||||
|
|
|
|||
|
|
@ -136,6 +136,32 @@ No issues match your search in OWNER/REPO
|
|||
`, output.String())
|
||||
}
|
||||
|
||||
func TestIssueList_tty_withAppFlag(t *testing.T) {
|
||||
http := &httpmock.Registry{}
|
||||
defer http.Verify(t)
|
||||
|
||||
http.Register(
|
||||
httpmock.GraphQL(`query IssueList\b`),
|
||||
httpmock.GraphQLQuery(`
|
||||
{ "data": { "repository": {
|
||||
"hasIssuesEnabled": true,
|
||||
"issues": { "nodes": [] }
|
||||
} } }`, func(_ string, params map[string]interface{}) {
|
||||
assert.Equal(t, "app/dependabot", params["author"].(string))
|
||||
}))
|
||||
|
||||
output, err := runCommand(http, true, "--app dependabot")
|
||||
if err != nil {
|
||||
t.Errorf("error running command `issue list`: %v", err)
|
||||
}
|
||||
|
||||
assert.Equal(t, "", output.Stderr())
|
||||
assert.Equal(t, `
|
||||
No issues match your search in OWNER/REPO
|
||||
|
||||
`, output.String())
|
||||
}
|
||||
|
||||
func TestIssueList_withInvalidLimitFlag(t *testing.T) {
|
||||
http := &httpmock.Registry{}
|
||||
defer http.Verify(t)
|
||||
|
|
|
|||
134
pkg/cmd/label/create/create.go
Normal file
134
pkg/cmd/label/create/create.go
Normal file
|
|
@ -0,0 +1,134 @@
|
|||
package create
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"math/rand"
|
||||
"net/http"
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
"github.com/MakeNowJust/heredoc"
|
||||
"github.com/cli/cli/v2/api"
|
||||
"github.com/cli/cli/v2/internal/ghrepo"
|
||||
"github.com/cli/cli/v2/pkg/cmd/label/shared"
|
||||
"github.com/cli/cli/v2/pkg/cmdutil"
|
||||
"github.com/cli/cli/v2/pkg/iostreams"
|
||||
"github.com/spf13/cobra"
|
||||
)
|
||||
|
||||
var randomColors = []string{
|
||||
"B60205",
|
||||
"D93F0B",
|
||||
"FBCA04",
|
||||
"0E8A16",
|
||||
"006B75",
|
||||
"1D76DB",
|
||||
"0052CC",
|
||||
"5319E7",
|
||||
"E99695",
|
||||
"F9D0C4",
|
||||
"FEF2C0",
|
||||
"C2E0C6",
|
||||
"BFDADC",
|
||||
"C5DEF5",
|
||||
"BFD4F2",
|
||||
"D4C5F9",
|
||||
}
|
||||
|
||||
type CreateOptions struct {
|
||||
BaseRepo func() (ghrepo.Interface, error)
|
||||
HttpClient func() (*http.Client, error)
|
||||
IO *iostreams.IOStreams
|
||||
|
||||
Color string
|
||||
Description string
|
||||
Name string
|
||||
}
|
||||
|
||||
func NewCmdCreate(f *cmdutil.Factory, runF func(*CreateOptions) error) *cobra.Command {
|
||||
opts := CreateOptions{
|
||||
HttpClient: f.HttpClient,
|
||||
IO: f.IOStreams,
|
||||
}
|
||||
|
||||
cmd := &cobra.Command{
|
||||
Use: "create <name>",
|
||||
Short: "Create a new label",
|
||||
Long: heredoc.Docf(`
|
||||
Create a new label on GitHub.
|
||||
|
||||
Must specify name for the label, the description and color are optional.
|
||||
If a color isn't provided, a random one will be chosen.
|
||||
|
||||
Color needs to be 6 character hex value.
|
||||
`),
|
||||
Example: heredoc.Doc(`
|
||||
$ gh label create bug --description "Something isn't working" --color E99695
|
||||
`),
|
||||
Args: cmdutil.ExactArgs(1, "cannot create label: name argument required"),
|
||||
RunE: func(c *cobra.Command, args []string) error {
|
||||
opts.BaseRepo = f.BaseRepo
|
||||
opts.Name = args[0]
|
||||
opts.Color = strings.TrimPrefix(opts.Color, "#")
|
||||
if runF != nil {
|
||||
return runF(&opts)
|
||||
}
|
||||
return createRun(&opts)
|
||||
},
|
||||
}
|
||||
|
||||
cmd.Flags().StringVarP(&opts.Description, "description", "d", "", "Description of the label")
|
||||
cmd.Flags().StringVarP(&opts.Color, "color", "c", "", "Color of the label, if not specified one will be selected at random")
|
||||
|
||||
return cmd
|
||||
}
|
||||
|
||||
func createRun(opts *CreateOptions) error {
|
||||
httpClient, err := opts.HttpClient()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
baseRepo, err := opts.BaseRepo()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
if opts.Color == "" {
|
||||
rand.Seed(time.Now().UnixNano())
|
||||
opts.Color = randomColors[rand.Intn(len(randomColors)-1)]
|
||||
}
|
||||
|
||||
opts.IO.StartProgressIndicator()
|
||||
err = createLabel(httpClient, baseRepo, opts)
|
||||
opts.IO.StopProgressIndicator()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
if opts.IO.IsStdoutTTY() {
|
||||
cs := opts.IO.ColorScheme()
|
||||
successMsg := fmt.Sprintf("\n%s Label %q created in %s\n", cs.SuccessIcon(), opts.Name, ghrepo.FullName(baseRepo))
|
||||
fmt.Fprint(opts.IO.Out, successMsg)
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
func createLabel(client *http.Client, repo ghrepo.Interface, opts *CreateOptions) error {
|
||||
apiClient := api.NewClientFromHTTP(client)
|
||||
path := fmt.Sprintf("repos/%s/%s/labels", repo.RepoOwner(), repo.RepoName())
|
||||
requestByte, err := json.Marshal(map[string]string{
|
||||
"name": opts.Name,
|
||||
"description": opts.Description,
|
||||
"color": opts.Color,
|
||||
})
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
requestBody := bytes.NewReader(requestByte)
|
||||
result := shared.Label{}
|
||||
return apiClient.REST(repo.RepoHost(), "POST", path, requestBody, &result)
|
||||
}
|
||||
151
pkg/cmd/label/create/create_test.go
Normal file
151
pkg/cmd/label/create/create_test.go
Normal file
|
|
@ -0,0 +1,151 @@
|
|||
package create
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"encoding/json"
|
||||
"io/ioutil"
|
||||
"net/http"
|
||||
"testing"
|
||||
|
||||
"github.com/cli/cli/v2/internal/ghrepo"
|
||||
"github.com/cli/cli/v2/pkg/cmdutil"
|
||||
"github.com/cli/cli/v2/pkg/httpmock"
|
||||
"github.com/cli/cli/v2/pkg/iostreams"
|
||||
"github.com/google/shlex"
|
||||
"github.com/stretchr/testify/assert"
|
||||
)
|
||||
|
||||
func TestNewCmdCreate(t *testing.T) {
|
||||
tests := []struct {
|
||||
name string
|
||||
input string
|
||||
output CreateOptions
|
||||
wantErr bool
|
||||
errMsg string
|
||||
}{
|
||||
{
|
||||
name: "no argument",
|
||||
input: "",
|
||||
wantErr: true,
|
||||
errMsg: "cannot create label: name argument required",
|
||||
},
|
||||
{
|
||||
name: "name argument",
|
||||
input: "test",
|
||||
output: CreateOptions{Name: "test"},
|
||||
},
|
||||
{
|
||||
name: "description flag",
|
||||
input: "test --description 'some description'",
|
||||
output: CreateOptions{Name: "test", Description: "some description"},
|
||||
},
|
||||
{
|
||||
name: "color flag",
|
||||
input: "test --color FFFFFF",
|
||||
output: CreateOptions{Name: "test", Color: "FFFFFF"},
|
||||
},
|
||||
{
|
||||
name: "color flag with pound sign",
|
||||
input: "test --color '#AAAAAA'",
|
||||
output: CreateOptions{Name: "test", Color: "AAAAAA"},
|
||||
},
|
||||
}
|
||||
|
||||
for _, tt := range tests {
|
||||
t.Run(tt.name, func(t *testing.T) {
|
||||
io, _, _, _ := iostreams.Test()
|
||||
f := &cmdutil.Factory{
|
||||
IOStreams: io,
|
||||
}
|
||||
argv, err := shlex.Split(tt.input)
|
||||
assert.NoError(t, err)
|
||||
var gotOpts *CreateOptions
|
||||
cmd := NewCmdCreate(f, func(opts *CreateOptions) error {
|
||||
gotOpts = opts
|
||||
return nil
|
||||
})
|
||||
cmd.SetArgs(argv)
|
||||
cmd.SetIn(&bytes.Buffer{})
|
||||
cmd.SetOut(&bytes.Buffer{})
|
||||
cmd.SetErr(&bytes.Buffer{})
|
||||
|
||||
_, err = cmd.ExecuteC()
|
||||
if tt.wantErr {
|
||||
assert.EqualError(t, err, tt.errMsg)
|
||||
return
|
||||
}
|
||||
|
||||
assert.NoError(t, err)
|
||||
assert.Equal(t, tt.output.Color, gotOpts.Color)
|
||||
assert.Equal(t, tt.output.Description, gotOpts.Description)
|
||||
assert.Equal(t, tt.output.Name, gotOpts.Name)
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
func TestCreateRun(t *testing.T) {
|
||||
tests := []struct {
|
||||
name string
|
||||
tty bool
|
||||
opts *CreateOptions
|
||||
httpStubs func(*httpmock.Registry)
|
||||
wantStdout string
|
||||
}{
|
||||
{
|
||||
name: "creates label",
|
||||
tty: true,
|
||||
opts: &CreateOptions{Name: "test", Description: "some description"},
|
||||
httpStubs: func(reg *httpmock.Registry) {
|
||||
reg.Register(
|
||||
httpmock.REST("POST", "repos/OWNER/REPO/labels"),
|
||||
httpmock.StatusStringResponse(201, "{}"),
|
||||
)
|
||||
},
|
||||
wantStdout: "\n✓ Label \"test\" created in OWNER/REPO\n",
|
||||
},
|
||||
{
|
||||
name: "creates label notty",
|
||||
tty: false,
|
||||
opts: &CreateOptions{Name: "test", Description: "some description"},
|
||||
httpStubs: func(reg *httpmock.Registry) {
|
||||
reg.Register(
|
||||
httpmock.REST("POST", "repos/OWNER/REPO/labels"),
|
||||
httpmock.StatusStringResponse(201, "{}"),
|
||||
)
|
||||
},
|
||||
wantStdout: "",
|
||||
},
|
||||
}
|
||||
|
||||
for _, tt := range tests {
|
||||
t.Run(tt.name, func(t *testing.T) {
|
||||
reg := &httpmock.Registry{}
|
||||
if tt.httpStubs != nil {
|
||||
tt.httpStubs(reg)
|
||||
}
|
||||
tt.opts.HttpClient = func() (*http.Client, error) {
|
||||
return &http.Client{Transport: reg}, nil
|
||||
}
|
||||
io, _, stdout, _ := iostreams.Test()
|
||||
io.SetStdoutTTY(tt.tty)
|
||||
io.SetStdinTTY(tt.tty)
|
||||
io.SetStderrTTY(tt.tty)
|
||||
tt.opts.IO = io
|
||||
tt.opts.BaseRepo = func() (ghrepo.Interface, error) {
|
||||
return ghrepo.New("OWNER", "REPO"), nil
|
||||
}
|
||||
defer reg.Verify(t)
|
||||
err := createRun(tt.opts)
|
||||
assert.NoError(t, err)
|
||||
assert.Equal(t, tt.wantStdout, stdout.String())
|
||||
|
||||
bodyBytes, _ := ioutil.ReadAll(reg.Requests[0].Body)
|
||||
reqBody := map[string]string{}
|
||||
err = json.Unmarshal(bodyBytes, &reqBody)
|
||||
assert.NoError(t, err)
|
||||
assert.NotEqual(t, "", reqBody["color"])
|
||||
assert.Equal(t, "some description", reqBody["description"])
|
||||
assert.Equal(t, "test", reqBody["name"])
|
||||
})
|
||||
}
|
||||
}
|
||||
22
pkg/cmd/label/label.go
Normal file
22
pkg/cmd/label/label.go
Normal file
|
|
@ -0,0 +1,22 @@
|
|||
package label
|
||||
|
||||
import (
|
||||
labelCreateCmd "github.com/cli/cli/v2/pkg/cmd/label/create"
|
||||
labelListCmd "github.com/cli/cli/v2/pkg/cmd/label/list"
|
||||
"github.com/cli/cli/v2/pkg/cmdutil"
|
||||
"github.com/spf13/cobra"
|
||||
)
|
||||
|
||||
func NewCmdLabel(f *cmdutil.Factory) *cobra.Command {
|
||||
cmd := &cobra.Command{
|
||||
Use: "label <command>",
|
||||
Short: "Manage labels",
|
||||
Long: `Work with GitHub labels.`,
|
||||
}
|
||||
cmdutil.EnableRepoOverride(cmd, f)
|
||||
|
||||
cmd.AddCommand(labelListCmd.NewCmdList(f, nil))
|
||||
cmd.AddCommand(labelCreateCmd.NewCmdCreate(f, nil))
|
||||
|
||||
return cmd
|
||||
}
|
||||
88
pkg/cmd/label/list/http.go
Normal file
88
pkg/cmd/label/list/http.go
Normal file
|
|
@ -0,0 +1,88 @@
|
|||
package list
|
||||
|
||||
import (
|
||||
"net/http"
|
||||
|
||||
"github.com/cli/cli/v2/api"
|
||||
"github.com/cli/cli/v2/internal/ghrepo"
|
||||
"github.com/cli/cli/v2/pkg/cmd/label/shared"
|
||||
)
|
||||
|
||||
func listLabels(client *http.Client, repo ghrepo.Interface, limit int) ([]shared.Label, int, error) {
|
||||
apiClient := api.NewClientFromHTTP(client)
|
||||
query := `
|
||||
query LabelList($owner: String!,$repo: String!, $limit: Int!, $endCursor: String) {
|
||||
repository(owner: $owner, name: $repo) {
|
||||
labels(first: $limit, after: $endCursor) {
|
||||
totalCount,
|
||||
nodes {
|
||||
name,
|
||||
description,
|
||||
color
|
||||
}
|
||||
pageInfo {
|
||||
hasNextPage
|
||||
endCursor
|
||||
}
|
||||
}
|
||||
}
|
||||
}`
|
||||
|
||||
variables := map[string]interface{}{
|
||||
"owner": repo.RepoOwner(),
|
||||
"repo": repo.RepoName(),
|
||||
}
|
||||
|
||||
type responseData struct {
|
||||
Repository struct {
|
||||
Labels struct {
|
||||
TotalCount int
|
||||
Nodes []shared.Label
|
||||
PageInfo struct {
|
||||
HasNextPage bool
|
||||
EndCursor string
|
||||
}
|
||||
}
|
||||
HasIssuesEnabled bool
|
||||
}
|
||||
}
|
||||
|
||||
var labels []shared.Label
|
||||
var totalCount int
|
||||
pageLimit := min(limit, 100)
|
||||
|
||||
loop:
|
||||
for {
|
||||
var response responseData
|
||||
variables["limit"] = pageLimit
|
||||
err := apiClient.GraphQL(repo.RepoHost(), query, variables, &response)
|
||||
if err != nil {
|
||||
return nil, 0, err
|
||||
}
|
||||
|
||||
totalCount = response.Repository.Labels.TotalCount
|
||||
|
||||
for _, label := range response.Repository.Labels.Nodes {
|
||||
labels = append(labels, label)
|
||||
if len(labels) == limit {
|
||||
break loop
|
||||
}
|
||||
}
|
||||
|
||||
if response.Repository.Labels.PageInfo.HasNextPage {
|
||||
variables["endCursor"] = response.Repository.Labels.PageInfo.EndCursor
|
||||
pageLimit = min(pageLimit, limit-len(labels))
|
||||
} else {
|
||||
break
|
||||
}
|
||||
}
|
||||
|
||||
return labels, totalCount, nil
|
||||
}
|
||||
|
||||
func min(a, b int) int {
|
||||
if a < b {
|
||||
return a
|
||||
}
|
||||
return b
|
||||
}
|
||||
80
pkg/cmd/label/list/http_test.go
Normal file
80
pkg/cmd/label/list/http_test.go
Normal file
|
|
@ -0,0 +1,80 @@
|
|||
package list
|
||||
|
||||
import (
|
||||
"net/http"
|
||||
"testing"
|
||||
|
||||
"github.com/cli/cli/v2/internal/ghrepo"
|
||||
"github.com/cli/cli/v2/pkg/httpmock"
|
||||
"github.com/stretchr/testify/assert"
|
||||
)
|
||||
|
||||
func TestLabelList_pagination(t *testing.T) {
|
||||
reg := &httpmock.Registry{}
|
||||
client := &http.Client{Transport: reg}
|
||||
|
||||
reg.Register(
|
||||
httpmock.GraphQL(`query LabelList\b`),
|
||||
httpmock.StringResponse(`
|
||||
{
|
||||
"data": {
|
||||
"repository": {
|
||||
"labels": {
|
||||
"totalCount": 2,
|
||||
"nodes": [
|
||||
{
|
||||
"name": "bug",
|
||||
"color": "d73a4a",
|
||||
"description": "This is a bug label"
|
||||
}
|
||||
],
|
||||
"pageInfo": {
|
||||
"hasNextPage": true,
|
||||
"endCursor": "Y3Vyc29yOnYyOpK5MjAxOS0xMC0xMVQwMTozODowMyswODowMM5f3HZq"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}`),
|
||||
)
|
||||
|
||||
reg.Register(
|
||||
httpmock.GraphQL(`query LabelList\b`),
|
||||
httpmock.StringResponse(`
|
||||
{
|
||||
"data": {
|
||||
"repository": {
|
||||
"labels": {
|
||||
"totalCount": 2,
|
||||
"nodes": [
|
||||
{
|
||||
"name": "docs",
|
||||
"color": "ffa8da",
|
||||
"description": "This is a docs label"
|
||||
}
|
||||
],
|
||||
"pageInfo": {
|
||||
"hasNextPage": false,
|
||||
"endCursor": "Y3Vyc29yOnYyOpK5MjAyMi0wMS0zMVQxODo1NTo1MiswODowMM7hiAL3"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}`),
|
||||
)
|
||||
|
||||
repo := ghrepo.New("OWNER", "REPO")
|
||||
labels, totalCount, err := listLabels(client, repo, 10)
|
||||
assert.NoError(t, err)
|
||||
|
||||
assert.Equal(t, 2, totalCount)
|
||||
assert.Equal(t, 2, len(labels))
|
||||
|
||||
assert.Equal(t, "bug", labels[0].Name)
|
||||
assert.Equal(t, "d73a4a", labels[0].Color)
|
||||
assert.Equal(t, "This is a bug label", labels[0].Description)
|
||||
|
||||
assert.Equal(t, "docs", labels[1].Name)
|
||||
assert.Equal(t, "ffa8da", labels[1].Color)
|
||||
assert.Equal(t, "This is a docs label", labels[1].Description)
|
||||
}
|
||||
126
pkg/cmd/label/list/list.go
Normal file
126
pkg/cmd/label/list/list.go
Normal file
|
|
@ -0,0 +1,126 @@
|
|||
package list
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"net/http"
|
||||
|
||||
"github.com/cli/cli/v2/internal/ghrepo"
|
||||
"github.com/cli/cli/v2/pkg/cmd/label/shared"
|
||||
"github.com/cli/cli/v2/pkg/cmdutil"
|
||||
"github.com/cli/cli/v2/pkg/iostreams"
|
||||
"github.com/cli/cli/v2/utils"
|
||||
"github.com/spf13/cobra"
|
||||
)
|
||||
|
||||
type browser interface {
|
||||
Browse(string) error
|
||||
}
|
||||
|
||||
type ListOptions struct {
|
||||
BaseRepo func() (ghrepo.Interface, error)
|
||||
Browser browser
|
||||
HttpClient func() (*http.Client, error)
|
||||
IO *iostreams.IOStreams
|
||||
|
||||
Limit int
|
||||
WebMode bool
|
||||
}
|
||||
|
||||
func NewCmdList(f *cmdutil.Factory, runF func(*ListOptions) error) *cobra.Command {
|
||||
opts := ListOptions{
|
||||
Browser: f.Browser,
|
||||
HttpClient: f.HttpClient,
|
||||
IO: f.IOStreams,
|
||||
}
|
||||
|
||||
cmd := &cobra.Command{
|
||||
Use: "list",
|
||||
Short: "List labels in a repository",
|
||||
Long: "Display labels in a GitHub repository.",
|
||||
Args: cobra.NoArgs,
|
||||
Aliases: []string{"ls"},
|
||||
RunE: func(c *cobra.Command, args []string) error {
|
||||
// support `-R, --repo` override
|
||||
opts.BaseRepo = f.BaseRepo
|
||||
|
||||
if opts.Limit < 1 {
|
||||
return cmdutil.FlagErrorf("invalid limit: %v", opts.Limit)
|
||||
}
|
||||
|
||||
if runF != nil {
|
||||
return runF(&opts)
|
||||
}
|
||||
return listRun(&opts)
|
||||
},
|
||||
}
|
||||
|
||||
cmd.Flags().BoolVarP(&opts.WebMode, "web", "w", false, "List labels in the web browser")
|
||||
cmd.Flags().IntVarP(&opts.Limit, "limit", "L", 30, "Maximum number of items to fetch")
|
||||
|
||||
return cmd
|
||||
}
|
||||
|
||||
func listRun(opts *ListOptions) error {
|
||||
httpClient, err := opts.HttpClient()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
baseRepo, err := opts.BaseRepo()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
if opts.WebMode {
|
||||
labelListURL := ghrepo.GenerateRepoURL(baseRepo, "labels")
|
||||
|
||||
if opts.IO.IsStdoutTTY() {
|
||||
fmt.Fprintf(opts.IO.ErrOut, "Opening %s in your browser.\n", utils.DisplayURL(labelListURL))
|
||||
}
|
||||
|
||||
return opts.Browser.Browse(labelListURL)
|
||||
}
|
||||
|
||||
opts.IO.StartProgressIndicator()
|
||||
labels, totalCount, err := listLabels(httpClient, baseRepo, opts.Limit)
|
||||
opts.IO.StopProgressIndicator()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
if opts.IO.IsStdoutTTY() {
|
||||
title := listHeader(ghrepo.FullName(baseRepo), len(labels), totalCount)
|
||||
fmt.Fprintf(opts.IO.Out, "\n%s\n\n", title)
|
||||
}
|
||||
|
||||
return printLabels(opts.IO, labels)
|
||||
}
|
||||
|
||||
func printLabels(io *iostreams.IOStreams, labels []shared.Label) error {
|
||||
cs := io.ColorScheme()
|
||||
table := utils.NewTablePrinter(io)
|
||||
|
||||
for _, label := range labels {
|
||||
labelName := ""
|
||||
if table.IsTTY() {
|
||||
labelName = cs.HexToRGB(label.Color, label.Name)
|
||||
} else {
|
||||
labelName = label.Name
|
||||
}
|
||||
|
||||
table.AddField(labelName, nil, nil)
|
||||
table.AddField(label.Description, nil, nil)
|
||||
|
||||
table.EndRow()
|
||||
}
|
||||
|
||||
return table.Render()
|
||||
}
|
||||
|
||||
func listHeader(repoName string, count int, totalCount int) string {
|
||||
if totalCount == 0 {
|
||||
return fmt.Sprintf("There are no %ss in %s", "label", repoName)
|
||||
}
|
||||
|
||||
return fmt.Sprintf("Showing %d of %s in %s", count, utils.Pluralize(totalCount, "label"), repoName)
|
||||
}
|
||||
210
pkg/cmd/label/list/list_test.go
Normal file
210
pkg/cmd/label/list/list_test.go
Normal file
|
|
@ -0,0 +1,210 @@
|
|||
package list
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"net/http"
|
||||
"testing"
|
||||
|
||||
"github.com/cli/cli/v2/internal/ghrepo"
|
||||
"github.com/cli/cli/v2/pkg/cmdutil"
|
||||
"github.com/cli/cli/v2/pkg/httpmock"
|
||||
"github.com/cli/cli/v2/pkg/iostreams"
|
||||
"github.com/google/shlex"
|
||||
"github.com/stretchr/testify/assert"
|
||||
)
|
||||
|
||||
func TestNewCmdList(t *testing.T) {
|
||||
tests := []struct {
|
||||
name string
|
||||
input string
|
||||
output ListOptions
|
||||
wantErr bool
|
||||
errMsg string
|
||||
}{
|
||||
{
|
||||
name: "no argument",
|
||||
input: "",
|
||||
output: ListOptions{Limit: 30},
|
||||
},
|
||||
{
|
||||
name: "limit flag",
|
||||
input: "--limit 10",
|
||||
output: ListOptions{Limit: 10},
|
||||
},
|
||||
{
|
||||
name: "invalid limit flag",
|
||||
input: "--limit 0",
|
||||
wantErr: true,
|
||||
errMsg: "invalid limit: 0",
|
||||
},
|
||||
{
|
||||
name: "web flag",
|
||||
input: "--web",
|
||||
output: ListOptions{Limit: 30, WebMode: true},
|
||||
},
|
||||
}
|
||||
|
||||
for _, tt := range tests {
|
||||
t.Run(tt.name, func(t *testing.T) {
|
||||
io, _, _, _ := iostreams.Test()
|
||||
f := &cmdutil.Factory{
|
||||
IOStreams: io,
|
||||
}
|
||||
argv, err := shlex.Split(tt.input)
|
||||
assert.NoError(t, err)
|
||||
var gotOpts *ListOptions
|
||||
cmd := NewCmdList(f, func(opts *ListOptions) error {
|
||||
gotOpts = opts
|
||||
return nil
|
||||
})
|
||||
cmd.SetArgs(argv)
|
||||
cmd.SetIn(&bytes.Buffer{})
|
||||
cmd.SetOut(&bytes.Buffer{})
|
||||
cmd.SetErr(&bytes.Buffer{})
|
||||
|
||||
_, err = cmd.ExecuteC()
|
||||
if tt.wantErr {
|
||||
assert.EqualError(t, err, tt.errMsg)
|
||||
return
|
||||
}
|
||||
|
||||
assert.NoError(t, err)
|
||||
assert.Equal(t, tt.output.Limit, gotOpts.Limit)
|
||||
assert.Equal(t, tt.output.WebMode, gotOpts.WebMode)
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
func TestListRun(t *testing.T) {
|
||||
tests := []struct {
|
||||
name string
|
||||
tty bool
|
||||
opts *ListOptions
|
||||
httpStubs func(*httpmock.Registry)
|
||||
wantStdout string
|
||||
wantStderr string
|
||||
}{
|
||||
{
|
||||
name: "lists labels",
|
||||
tty: true,
|
||||
opts: &ListOptions{},
|
||||
httpStubs: func(reg *httpmock.Registry) {
|
||||
reg.Register(
|
||||
httpmock.GraphQL(`query LabelList\b`),
|
||||
httpmock.StringResponse(`
|
||||
{
|
||||
"data": {
|
||||
"repository": {
|
||||
"labels": {
|
||||
"totalCount": 2,
|
||||
"nodes": [
|
||||
{
|
||||
"name": "bug",
|
||||
"color": "d73a4a",
|
||||
"description": "This is a bug label"
|
||||
},
|
||||
{
|
||||
"name": "docs",
|
||||
"color": "ffa8da",
|
||||
"description": "This is a docs label"
|
||||
}
|
||||
],
|
||||
"pageInfo": {
|
||||
"hasNextPage": false,
|
||||
"endCursor": "Y3Vyc29yOnYyOpK5MjAxOS0xMC0xMVQwMTozODowMyswODowMM5f3HZq"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}`,
|
||||
),
|
||||
)
|
||||
},
|
||||
wantStdout: "\nShowing 2 of 2 labels in OWNER/REPO\n\nbug This is a bug label\ndocs This is a docs label\n",
|
||||
},
|
||||
{
|
||||
name: "lists labels notty",
|
||||
tty: false,
|
||||
opts: &ListOptions{},
|
||||
httpStubs: func(reg *httpmock.Registry) {
|
||||
reg.Register(
|
||||
httpmock.GraphQL(`query LabelList\b`),
|
||||
httpmock.StringResponse(`
|
||||
{
|
||||
"data": {
|
||||
"repository": {
|
||||
"labels": {
|
||||
"totalCount": 2,
|
||||
"nodes": [
|
||||
{
|
||||
"name": "bug",
|
||||
"color": "d73a4a",
|
||||
"description": "This is a bug label"
|
||||
},
|
||||
{
|
||||
"name": "docs",
|
||||
"color": "ffa8da",
|
||||
"description": "This is a docs label"
|
||||
}
|
||||
],
|
||||
"pageInfo": {
|
||||
"hasNextPage": false,
|
||||
"endCursor": "Y3Vyc29yOnYyOpK5MjAxOS0xMC0xMVQwMTozODowMyswODowMM5f3HZq"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}`,
|
||||
),
|
||||
)
|
||||
},
|
||||
wantStdout: "bug\tThis is a bug label\ndocs\tThis is a docs label\n",
|
||||
},
|
||||
{
|
||||
name: "empty label list",
|
||||
tty: true,
|
||||
opts: &ListOptions{},
|
||||
httpStubs: func(reg *httpmock.Registry) {
|
||||
reg.Register(
|
||||
httpmock.GraphQL(`query LabelList\b`),
|
||||
httpmock.StringResponse(`
|
||||
{"data":{"repository":{"labels":{"totalCount":0,"nodes":[],"pageInfo":{"hasNextPage":false,"endCursor":null}}}}}`,
|
||||
),
|
||||
)
|
||||
},
|
||||
wantStdout: "\nThere are no labels in OWNER/REPO\n\n",
|
||||
},
|
||||
{
|
||||
name: "web mode",
|
||||
tty: true,
|
||||
opts: &ListOptions{WebMode: true},
|
||||
wantStderr: "Opening github.com/OWNER/REPO/labels in your browser.\n",
|
||||
},
|
||||
}
|
||||
|
||||
for _, tt := range tests {
|
||||
t.Run(tt.name, func(t *testing.T) {
|
||||
reg := &httpmock.Registry{}
|
||||
if tt.httpStubs != nil {
|
||||
tt.httpStubs(reg)
|
||||
}
|
||||
tt.opts.HttpClient = func() (*http.Client, error) {
|
||||
return &http.Client{Transport: reg}, nil
|
||||
}
|
||||
io, _, stdout, stderr := iostreams.Test()
|
||||
io.SetStdoutTTY(tt.tty)
|
||||
io.SetStdinTTY(tt.tty)
|
||||
io.SetStderrTTY(tt.tty)
|
||||
tt.opts.IO = io
|
||||
tt.opts.Browser = &cmdutil.TestBrowser{}
|
||||
tt.opts.BaseRepo = func() (ghrepo.Interface, error) {
|
||||
return ghrepo.New("OWNER", "REPO"), nil
|
||||
}
|
||||
defer reg.Verify(t)
|
||||
err := listRun(tt.opts)
|
||||
assert.NoError(t, err)
|
||||
assert.Equal(t, tt.wantStdout, stdout.String())
|
||||
assert.Equal(t, tt.wantStderr, stderr.String())
|
||||
})
|
||||
}
|
||||
}
|
||||
7
pkg/cmd/label/shared/shared.go
Normal file
7
pkg/cmd/label/shared/shared.go
Normal file
|
|
@ -0,0 +1,7 @@
|
|||
package shared
|
||||
|
||||
type Label struct {
|
||||
Name string
|
||||
Color string
|
||||
Description string
|
||||
}
|
||||
|
|
@ -36,7 +36,6 @@ type ListOptions struct {
|
|||
HeadBranch string
|
||||
Labels []string
|
||||
Author string
|
||||
AppAuthor string
|
||||
Assignee string
|
||||
Search string
|
||||
Draft string
|
||||
|
|
@ -50,6 +49,7 @@ func NewCmdList(f *cmdutil.Factory, runF func(*ListOptions) error) *cobra.Comman
|
|||
}
|
||||
|
||||
var draft bool
|
||||
var appAuthor string
|
||||
|
||||
cmd := &cobra.Command{
|
||||
Use: "list",
|
||||
|
|
@ -87,12 +87,12 @@ func NewCmdList(f *cmdutil.Factory, runF func(*ListOptions) error) *cobra.Comman
|
|||
opts.Draft = strconv.FormatBool(draft)
|
||||
}
|
||||
|
||||
if err := cmdutil.MutuallyExclusive(
|
||||
"specify only `--author` or `--app`",
|
||||
opts.Author != "",
|
||||
opts.AppAuthor != "",
|
||||
); err != nil {
|
||||
return err
|
||||
if cmd.Flags().Changed("author") && cmd.Flags().Changed("app") {
|
||||
return cmdutil.FlagErrorf("specify only `--author` or `--app`")
|
||||
}
|
||||
|
||||
if cmd.Flags().Changed("app") {
|
||||
opts.Author = fmt.Sprintf("app/%s", appAuthor)
|
||||
}
|
||||
|
||||
if runF != nil {
|
||||
|
|
@ -109,7 +109,7 @@ func NewCmdList(f *cmdutil.Factory, runF func(*ListOptions) error) *cobra.Comman
|
|||
cmd.Flags().StringVarP(&opts.HeadBranch, "head", "H", "", "Filter by head branch")
|
||||
cmd.Flags().StringSliceVarP(&opts.Labels, "label", "l", nil, "Filter by label")
|
||||
cmd.Flags().StringVarP(&opts.Author, "author", "A", "", "Filter by author")
|
||||
cmd.Flags().StringVar(&opts.AppAuthor, "app", "", "Filter by GitHub App author")
|
||||
cmd.Flags().StringVar(&appAuthor, "app", "", "Filter by GitHub App author")
|
||||
cmd.Flags().StringVarP(&opts.Assignee, "assignee", "a", "", "Filter by assignee")
|
||||
cmd.Flags().StringVarP(&opts.Search, "search", "S", "", "Search pull requests with `query`")
|
||||
cmd.Flags().BoolVarP(&draft, "draft", "d", false, "Filter by draft state")
|
||||
|
|
@ -174,10 +174,6 @@ func listRun(opts *ListOptions) error {
|
|||
return opts.Browser.Browse(openURL)
|
||||
}
|
||||
|
||||
if opts.AppAuthor != "" {
|
||||
filters.Author = fmt.Sprintf("app/%s", opts.AppAuthor)
|
||||
}
|
||||
|
||||
listResult, err := listPullRequests(httpClient, baseRepo, filters, opts.LimitResults)
|
||||
if err != nil {
|
||||
return err
|
||||
|
|
|
|||
|
|
@ -98,7 +98,7 @@ func viewRun(opts *ViewOptions) error {
|
|||
return err
|
||||
}
|
||||
|
||||
connectedToTerminal := opts.IO.IsStdoutTTY() && opts.IO.IsStderrTTY()
|
||||
connectedToTerminal := opts.IO.IsStdoutTTY()
|
||||
|
||||
if opts.BrowserMode {
|
||||
openURL := pr.URL
|
||||
|
|
|
|||
|
|
@ -47,8 +47,11 @@ var HelpTopics = map[string]map[string]string{
|
|||
|
||||
GH_BROWSER, BROWSER (in order of precedence): the web browser to use for opening links.
|
||||
|
||||
DEBUG: set to any value to enable verbose output to standard error. Include values "api"
|
||||
or "oauth" to print detailed information about HTTP requests or authentication flow.
|
||||
GH_DEBUG: set to a truthy value to enable verbose output on standard error. Set to "api"
|
||||
to additionally log details of HTTP traffic.
|
||||
|
||||
DEBUG (deprecated): set to "1", "true", or "yes" to enable verbose output on standard
|
||||
error.
|
||||
|
||||
GH_PAGER, PAGER (in order of precedence): a terminal paging program to send standard output
|
||||
to, e.g. "less".
|
||||
|
|
|
|||
|
|
@ -20,6 +20,7 @@ import (
|
|||
gistCmd "github.com/cli/cli/v2/pkg/cmd/gist"
|
||||
gpgKeyCmd "github.com/cli/cli/v2/pkg/cmd/gpg-key"
|
||||
issueCmd "github.com/cli/cli/v2/pkg/cmd/issue"
|
||||
labelCmd "github.com/cli/cli/v2/pkg/cmd/label"
|
||||
prCmd "github.com/cli/cli/v2/pkg/cmd/pr"
|
||||
releaseCmd "github.com/cli/cli/v2/pkg/cmd/release"
|
||||
repoCmd "github.com/cli/cli/v2/pkg/cmd/repo"
|
||||
|
|
@ -28,6 +29,7 @@ import (
|
|||
searchCmd "github.com/cli/cli/v2/pkg/cmd/search"
|
||||
secretCmd "github.com/cli/cli/v2/pkg/cmd/secret"
|
||||
sshKeyCmd "github.com/cli/cli/v2/pkg/cmd/ssh-key"
|
||||
statusCmd "github.com/cli/cli/v2/pkg/cmd/status"
|
||||
versionCmd "github.com/cli/cli/v2/pkg/cmd/version"
|
||||
workflowCmd "github.com/cli/cli/v2/pkg/cmd/workflow"
|
||||
"github.com/cli/cli/v2/pkg/cmdutil"
|
||||
|
|
@ -83,6 +85,7 @@ func NewCmdRoot(f *cmdutil.Factory, version, buildDate string) *cobra.Command {
|
|||
cmd.AddCommand(searchCmd.NewCmdSearch(f))
|
||||
cmd.AddCommand(secretCmd.NewCmdSecret(f))
|
||||
cmd.AddCommand(sshKeyCmd.NewCmdSSHKey(f))
|
||||
cmd.AddCommand(statusCmd.NewCmdStatus(f, nil))
|
||||
cmd.AddCommand(newCodespaceCmd(f))
|
||||
|
||||
// the `api` command should not inherit any extra HTTP headers
|
||||
|
|
@ -102,6 +105,7 @@ func NewCmdRoot(f *cmdutil.Factory, version, buildDate string) *cobra.Command {
|
|||
cmd.AddCommand(repoCmd.NewCmdRepo(&repoResolvingCmdFactory))
|
||||
cmd.AddCommand(runCmd.NewCmdRun(&repoResolvingCmdFactory))
|
||||
cmd.AddCommand(workflowCmd.NewCmdWorkflow(&repoResolvingCmdFactory))
|
||||
cmd.AddCommand(labelCmd.NewCmdLabel(&repoResolvingCmdFactory))
|
||||
|
||||
// Help topics
|
||||
cmd.AddCommand(NewHelpTopic("environment"))
|
||||
|
|
|
|||
|
|
@ -16,14 +16,9 @@ const (
|
|||
)
|
||||
|
||||
func extractZip(zr *zip.Reader, destDir string) error {
|
||||
destDirAbs, err := filepath.Abs(destDir)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
pathPrefix := destDirAbs + string(filepath.Separator)
|
||||
for _, zf := range zr.File {
|
||||
fpath := filepath.Join(destDirAbs, filepath.FromSlash(zf.Name))
|
||||
if !strings.HasPrefix(fpath, pathPrefix) {
|
||||
fpath := filepath.Join(destDir, filepath.FromSlash(zf.Name))
|
||||
if !filepathDescendsFrom(fpath, destDir) {
|
||||
continue
|
||||
}
|
||||
if err := extractZipFile(zf, fpath); err != nil {
|
||||
|
|
@ -67,3 +62,15 @@ func getPerm(m os.FileMode) os.FileMode {
|
|||
}
|
||||
return execMode
|
||||
}
|
||||
|
||||
func filepathDescendsFrom(p, dir string) bool {
|
||||
p = filepath.Clean(p)
|
||||
dir = filepath.Clean(dir)
|
||||
if dir == "." && !filepath.IsAbs(p) {
|
||||
return !strings.HasPrefix(p, ".."+string(filepath.Separator))
|
||||
}
|
||||
if !strings.HasSuffix(dir, string(filepath.Separator)) {
|
||||
dir += string(filepath.Separator)
|
||||
}
|
||||
return strings.HasPrefix(p, dir)
|
||||
}
|
||||
|
|
|
|||
|
|
@ -30,3 +30,119 @@ func Test_extractZip(t *testing.T) {
|
|||
_, err = os.Stat(filepath.Join("src", "main.go"))
|
||||
require.NoError(t, err)
|
||||
}
|
||||
|
||||
func Test_filepathDescendsFrom(t *testing.T) {
|
||||
type args struct {
|
||||
p string
|
||||
dir string
|
||||
}
|
||||
tests := []struct {
|
||||
name string
|
||||
args args
|
||||
want bool
|
||||
}{
|
||||
{
|
||||
name: "root child",
|
||||
args: args{
|
||||
p: filepath.FromSlash("/hoi.txt"),
|
||||
dir: filepath.FromSlash("/"),
|
||||
},
|
||||
want: true,
|
||||
},
|
||||
{
|
||||
name: "abs descendant",
|
||||
args: args{
|
||||
p: filepath.FromSlash("/var/logs/hoi.txt"),
|
||||
dir: filepath.FromSlash("/"),
|
||||
},
|
||||
want: true,
|
||||
},
|
||||
{
|
||||
name: "abs trailing slash",
|
||||
args: args{
|
||||
p: filepath.FromSlash("/var/logs/hoi.txt"),
|
||||
dir: filepath.FromSlash("/var/logs/"),
|
||||
},
|
||||
want: true,
|
||||
},
|
||||
{
|
||||
name: "abs mismatch",
|
||||
args: args{
|
||||
p: filepath.FromSlash("/var/logs/hoi.txt"),
|
||||
dir: filepath.FromSlash("/var/pids"),
|
||||
},
|
||||
want: false,
|
||||
},
|
||||
{
|
||||
name: "abs partial prefix",
|
||||
args: args{
|
||||
p: filepath.FromSlash("/var/logs/hoi.txt"),
|
||||
dir: filepath.FromSlash("/var/log"),
|
||||
},
|
||||
want: false,
|
||||
},
|
||||
{
|
||||
name: "rel child",
|
||||
args: args{
|
||||
p: filepath.FromSlash("hoi.txt"),
|
||||
dir: filepath.FromSlash("."),
|
||||
},
|
||||
want: true,
|
||||
},
|
||||
{
|
||||
name: "rel descendant",
|
||||
args: args{
|
||||
p: filepath.FromSlash("./log/hoi.txt"),
|
||||
dir: filepath.FromSlash("."),
|
||||
},
|
||||
want: true,
|
||||
},
|
||||
{
|
||||
name: "mixed rel styles",
|
||||
args: args{
|
||||
p: filepath.FromSlash("./log/hoi.txt"),
|
||||
dir: filepath.FromSlash("log"),
|
||||
},
|
||||
want: true,
|
||||
},
|
||||
{
|
||||
name: "rel clean",
|
||||
args: args{
|
||||
p: filepath.FromSlash("cats/../dogs/pug.txt"),
|
||||
dir: filepath.FromSlash("dogs"),
|
||||
},
|
||||
want: true,
|
||||
},
|
||||
{
|
||||
name: "rel mismatch",
|
||||
args: args{
|
||||
p: filepath.FromSlash("dogs/pug.txt"),
|
||||
dir: filepath.FromSlash("dog"),
|
||||
},
|
||||
want: false,
|
||||
},
|
||||
{
|
||||
name: "rel breakout",
|
||||
args: args{
|
||||
p: filepath.FromSlash("../escape.txt"),
|
||||
dir: filepath.FromSlash("."),
|
||||
},
|
||||
want: false,
|
||||
},
|
||||
{
|
||||
name: "rel sneaky breakout",
|
||||
args: args{
|
||||
p: filepath.FromSlash("dogs/../../escape.txt"),
|
||||
dir: filepath.FromSlash("dogs"),
|
||||
},
|
||||
want: false,
|
||||
},
|
||||
}
|
||||
for _, tt := range tests {
|
||||
t.Run(tt.name, func(t *testing.T) {
|
||||
if got := filepathDescendsFrom(tt.args.p, tt.args.dir); got != tt.want {
|
||||
t.Errorf("filepathDescendsFrom() = %v, want %v", got, tt.want)
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,8 @@
|
|||
package issues
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
|
||||
"github.com/MakeNowJust/heredoc"
|
||||
"github.com/cli/cli/v2/pkg/cmd/search/shared"
|
||||
"github.com/cli/cli/v2/pkg/cmdutil"
|
||||
|
|
@ -9,11 +11,10 @@ import (
|
|||
)
|
||||
|
||||
func NewCmdIssues(f *cmdutil.Factory, runF func(*shared.IssuesOptions) error) *cobra.Command {
|
||||
var includePrs bool
|
||||
var locked bool
|
||||
var locked, includePrs bool
|
||||
var noAssignee, noLabel, noMilestone, noProject bool
|
||||
var order string
|
||||
var sort string
|
||||
var order, sort string
|
||||
var appAuthor string
|
||||
opts := &shared.IssuesOptions{
|
||||
Browser: f.Browser,
|
||||
Entity: shared.Issues,
|
||||
|
|
@ -57,6 +58,12 @@ func NewCmdIssues(f *cmdutil.Factory, runF func(*shared.IssuesOptions) error) *c
|
|||
if opts.Query.Limit < 1 || opts.Query.Limit > shared.SearchMaxResults {
|
||||
return cmdutil.FlagErrorf("`--limit` must be between 1 and 1000")
|
||||
}
|
||||
if c.Flags().Changed("author") && c.Flags().Changed("app") {
|
||||
return cmdutil.FlagErrorf("specify only `--author` or `--app`")
|
||||
}
|
||||
if c.Flags().Changed("app") {
|
||||
opts.Query.Qualifiers.Author = fmt.Sprintf("app/%s", appAuthor)
|
||||
}
|
||||
if includePrs {
|
||||
opts.Entity = shared.Both
|
||||
opts.Query.Qualifiers.Type = ""
|
||||
|
|
@ -123,6 +130,7 @@ func NewCmdIssues(f *cmdutil.Factory, runF func(*shared.IssuesOptions) error) *c
|
|||
|
||||
// Query qualifier flags
|
||||
cmd.Flags().BoolVar(&includePrs, "include-prs", false, "Include pull requests in results")
|
||||
cmd.Flags().StringVar(&appAuthor, "app", "", "Filter by GitHub App author")
|
||||
cmdutil.NilBoolFlag(cmd, &opts.Query.Qualifiers.Archived, "archived", "", "Restrict search to archived repositories")
|
||||
cmd.Flags().StringVar(&opts.Query.Qualifiers.Assignee, "assignee", "", "Filter by assignee")
|
||||
cmd.Flags().StringVar(&opts.Query.Qualifiers.Author, "author", "", "Filter by author")
|
||||
|
|
|
|||
|
|
@ -101,6 +101,24 @@ func TestNewCmdIssues(t *testing.T) {
|
|||
},
|
||||
},
|
||||
},
|
||||
{
|
||||
name: "app flag",
|
||||
input: "--app dependabot",
|
||||
output: shared.IssuesOptions{
|
||||
Query: search.Query{
|
||||
Keywords: []string{},
|
||||
Kind: "issues",
|
||||
Limit: 30,
|
||||
Qualifiers: search.Qualifiers{Type: "issue", Author: "app/dependabot"},
|
||||
},
|
||||
},
|
||||
},
|
||||
{
|
||||
name: "invalid author and app flags",
|
||||
input: "--author test --app dependabot",
|
||||
wantErr: true,
|
||||
errMsg: "specify only `--author` or `--app`",
|
||||
},
|
||||
{
|
||||
name: "qualifier flags",
|
||||
input: `
|
||||
|
|
|
|||
|
|
@ -1,6 +1,8 @@
|
|||
package prs
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
|
||||
"github.com/MakeNowJust/heredoc"
|
||||
"github.com/cli/cli/v2/pkg/cmd/search/shared"
|
||||
"github.com/cli/cli/v2/pkg/cmdutil"
|
||||
|
|
@ -9,11 +11,10 @@ import (
|
|||
)
|
||||
|
||||
func NewCmdPrs(f *cmdutil.Factory, runF func(*shared.IssuesOptions) error) *cobra.Command {
|
||||
var locked bool
|
||||
var merged bool
|
||||
var locked, merged bool
|
||||
var noAssignee, noLabel, noMilestone, noProject bool
|
||||
var order string
|
||||
var sort string
|
||||
var order, sort string
|
||||
var appAuthor string
|
||||
opts := &shared.IssuesOptions{
|
||||
Browser: f.Browser,
|
||||
Entity: shared.Issues,
|
||||
|
|
@ -57,6 +58,12 @@ func NewCmdPrs(f *cmdutil.Factory, runF func(*shared.IssuesOptions) error) *cobr
|
|||
if opts.Query.Limit < 1 || opts.Query.Limit > shared.SearchMaxResults {
|
||||
return cmdutil.FlagErrorf("`--limit` must be between 1 and 1000")
|
||||
}
|
||||
if c.Flags().Changed("author") && c.Flags().Changed("app") {
|
||||
return cmdutil.FlagErrorf("specify only `--author` or `--app`")
|
||||
}
|
||||
if c.Flags().Changed("app") {
|
||||
opts.Query.Qualifiers.Author = fmt.Sprintf("app/%s", appAuthor)
|
||||
}
|
||||
if c.Flags().Changed("order") {
|
||||
opts.Query.Order = order
|
||||
}
|
||||
|
|
@ -125,6 +132,7 @@ func NewCmdPrs(f *cmdutil.Factory, runF func(*shared.IssuesOptions) error) *cobr
|
|||
}, "Sort fetched results")
|
||||
|
||||
// Issue query qualifier flags
|
||||
cmd.Flags().StringVar(&appAuthor, "app", "", "Filter by GitHub App author")
|
||||
cmdutil.NilBoolFlag(cmd, &opts.Query.Qualifiers.Archived, "archived", "", "Restrict search to archived repositories")
|
||||
cmd.Flags().StringVar(&opts.Query.Qualifiers.Assignee, "assignee", "", "Filter by assignee")
|
||||
cmd.Flags().StringVar(&opts.Query.Qualifiers.Author, "author", "", "Filter by author")
|
||||
|
|
|
|||
|
|
@ -89,6 +89,24 @@ func TestNewCmdPrs(t *testing.T) {
|
|||
wantErr: true,
|
||||
errMsg: "invalid argument \"invalid\" for \"--order\" flag: valid values are {asc|desc}",
|
||||
},
|
||||
{
|
||||
name: "app flag",
|
||||
input: "--app dependabot",
|
||||
output: shared.IssuesOptions{
|
||||
Query: search.Query{
|
||||
Keywords: []string{},
|
||||
Kind: "issues",
|
||||
Limit: 30,
|
||||
Qualifiers: search.Qualifiers{Type: "pr", Author: "app/dependabot"},
|
||||
},
|
||||
},
|
||||
},
|
||||
{
|
||||
name: "invalid author and app flags",
|
||||
input: "--author test --app dependabot",
|
||||
wantErr: true,
|
||||
errMsg: "specify only `--author` or `--app`",
|
||||
},
|
||||
{
|
||||
name: "qualifier flags",
|
||||
input: `
|
||||
|
|
|
|||
188
pkg/cmd/status/fixtures/events.json
Normal file
188
pkg/cmd/status/fixtures/events.json
Normal file
|
|
@ -0,0 +1,188 @@
|
|||
[
|
||||
{
|
||||
"type": "PullRequestEvent",
|
||||
"repo": {
|
||||
"name": "rpd/todo"
|
||||
},
|
||||
"payload": {
|
||||
"action": "opened",
|
||||
"number": 5326,
|
||||
"pull_request": {
|
||||
"number": 5326,
|
||||
"title": "Only write UTF-8 BOM on Windows where it is needed"
|
||||
}
|
||||
},
|
||||
"created_at": "2022-03-17T15:42:28Z",
|
||||
"org": {
|
||||
"login": "rpd"
|
||||
}
|
||||
},
|
||||
{
|
||||
"type": "IssueCommentEvent",
|
||||
"repo": {
|
||||
"name": "vilmibm/testing"
|
||||
},
|
||||
"payload": {
|
||||
"action": "created",
|
||||
"issue": {
|
||||
"number": 5325,
|
||||
"title": "Ability to search \"not\" thing"
|
||||
},
|
||||
"comment": {
|
||||
"html_url": "https://github.com/vilmibm/testing/issues/5325#issuecomment-1070868636",
|
||||
"body": "We are working on dedicated `search` functionality and might be exploring some syntax for denoting \"NOT\" qualifiers. However, until something like this is added, you can always make \"NOT\" searches by using the `--search` flag:\r\n```\r\ngh pr list --search \"-author:app/dependabot\"\r\n```\r\n/cc @samcoe "
|
||||
}
|
||||
},
|
||||
"created_at": "2022-03-17T12:36:31Z"
|
||||
},
|
||||
{
|
||||
"type": "DeleteEvent",
|
||||
"repo": {
|
||||
"name": "cli/cli"
|
||||
},
|
||||
"payload": {
|
||||
"ref": "dependabot/go_modules/github.com/stretchr/testify-1.7.1",
|
||||
"ref_type": "branch",
|
||||
"pusher_type": "user"
|
||||
},
|
||||
"created_at": "2022-03-16T14:41:30Z",
|
||||
"org": {
|
||||
"login": "cli",
|
||||
"avatar_url": "https://avatars.githubusercontent.com/u/59704711?"
|
||||
}
|
||||
},
|
||||
{
|
||||
"type": "CreateEvent",
|
||||
"repo": {
|
||||
"name": "cli/cli"
|
||||
},
|
||||
"payload": {
|
||||
"ref": "dependabot/go_modules/github.com/stretchr/testify-1.7.1",
|
||||
"ref_type": "branch",
|
||||
"master_branch": "trunk",
|
||||
"description": "GitHub’s official command line tool",
|
||||
"pusher_type": "user"
|
||||
},
|
||||
"created_at": "2022-03-16T14:25:19Z",
|
||||
"org": {
|
||||
"login": "cli",
|
||||
"avatar_url": "https://avatars.githubusercontent.com/u/59704711?"
|
||||
}
|
||||
},
|
||||
{
|
||||
"type": "PullRequestReviewCommentEvent",
|
||||
"repo": {
|
||||
"name": "cli/cli"
|
||||
},
|
||||
"payload": {
|
||||
"action": "created",
|
||||
"comment": {
|
||||
"body": "Wondering if we shouldn't name this something more generic and use it everywhere else to DRY things up a bit?",
|
||||
"html_url": "https://github.com/cli/cli/pull/5319#discussion_r827935007"
|
||||
},
|
||||
"pull_request": {
|
||||
"number": 5319,
|
||||
"title": "[Codespaces] Disallow some operations on codespaces that have a pending operation"
|
||||
}
|
||||
},
|
||||
"created_at": "2022-03-16T12:08:02Z",
|
||||
"org": {
|
||||
"login": "cli"
|
||||
}
|
||||
},
|
||||
{
|
||||
"type": "CommitCommentEvent",
|
||||
"repo": {
|
||||
"name": "cli/cli"
|
||||
},
|
||||
"payload": {
|
||||
"comment": {
|
||||
"html_url": "https://github.com/cli/cli/commit/1b50852b2dfecd17ca5d3a2a12eb5c16df9fe46b#r68794505",
|
||||
"body": "spam"
|
||||
}
|
||||
},
|
||||
"created_at": "2022-03-16T03:32:59Z",
|
||||
"org": {
|
||||
"login": "cli"
|
||||
}
|
||||
},
|
||||
{
|
||||
"type": "PushEvent",
|
||||
"repo": {
|
||||
"name": "cli/cli"
|
||||
},
|
||||
"payload": {
|
||||
"push_id": 9359833428,
|
||||
"size": 1,
|
||||
"distinct_size": 1,
|
||||
"ref": "refs/heads/jg/event-handling",
|
||||
"head": "7d07249150fe1a24b2b49b3ff7c55e2152446a5e",
|
||||
"before": "06f1f6eb527a34af1222ca03807a9205a17d6e90",
|
||||
"commits": [
|
||||
{
|
||||
"sha": "7d07249150fe1a24b2b49b3ff7c55e2152446a5e",
|
||||
"author": {
|
||||
"email": "68619889+bchuecos@users.noreply.github.com",
|
||||
"name": "Bernardo"
|
||||
},
|
||||
"message": "review suggestions",
|
||||
"distinct": true,
|
||||
"url": "https://api.github.com/repos/cli/cli/commits/7d07249150fe1a24b2b49b3ff7c55e2152446a5e"
|
||||
}
|
||||
]
|
||||
},
|
||||
"created_at": "2022-03-15T18:22:41Z",
|
||||
"org": {
|
||||
"login": "cli"
|
||||
}
|
||||
},
|
||||
{
|
||||
"type": "WatchEvent",
|
||||
"repo": {
|
||||
"name": "fengari-lua/fengari",
|
||||
"url": "https://api.github.com/repos/fengari-lua/fengari"
|
||||
},
|
||||
"payload": {
|
||||
"action": "started"
|
||||
},
|
||||
"created_at": "2022-03-14T13:03:51Z",
|
||||
"org": {
|
||||
"login": "fengari-lua",
|
||||
"avatar_url": "https://avatars.githubusercontent.com/u/28658472?"
|
||||
}
|
||||
},
|
||||
{
|
||||
"type": "IssuesEvent",
|
||||
"repo": {
|
||||
"name": "cli/cli"
|
||||
},
|
||||
"payload": {
|
||||
"action": "closed",
|
||||
"issue": {
|
||||
"number": 5301,
|
||||
"title": "wheee"
|
||||
}
|
||||
},
|
||||
"created_at": "2022-03-14T12:21:59Z",
|
||||
"org": {
|
||||
"login": "cli"
|
||||
}
|
||||
},
|
||||
{
|
||||
"type": "IssuesEvent",
|
||||
"repo": {
|
||||
"name": "cli/cli"
|
||||
},
|
||||
"payload": {
|
||||
"action": "opened",
|
||||
"issue": {
|
||||
"number": 5300,
|
||||
"title": "Terminal bell when a running task is done"
|
||||
}
|
||||
},
|
||||
"created_at": "2022-03-14T12:21:59Z",
|
||||
"org": {
|
||||
"login": "cli"
|
||||
}
|
||||
}
|
||||
]
|
||||
138
pkg/cmd/status/fixtures/notifications.json
Normal file
138
pkg/cmd/status/fixtures/notifications.json
Normal file
|
|
@ -0,0 +1,138 @@
|
|||
[
|
||||
{
|
||||
"reason": "team_mention",
|
||||
"subject": {
|
||||
"title": "Tracking: Close an issue as either resolved or unresolved",
|
||||
"url": "https://api.github.com/repos/vilmibm/testing/issues/594",
|
||||
"latest_comment_url": "https://api.github.com/repos/vilmibm/testing/issues/comments/1070788734",
|
||||
"type": "Issue"
|
||||
},
|
||||
"repository": {
|
||||
"full_name": "vilmibm/testing",
|
||||
"owner": {
|
||||
"login": "vilmibm"
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"reason": "comment",
|
||||
"subject": {
|
||||
"title": "Unclear message about base repository when creating a PR",
|
||||
"url": "https://api.github.com/repos/cli/cli/issues/2090",
|
||||
"latest_comment_url": "https://api.github.com/repos/cli/cli/issues/comments/1069309546",
|
||||
"type": "Issue"
|
||||
},
|
||||
"repository": {
|
||||
"full_name": "cli/cli",
|
||||
"owner": {
|
||||
"login": "cli"
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"reason": "mention",
|
||||
"subject": {
|
||||
"title": "Good",
|
||||
"url": "https://api.github.com/repos/rpd/todo/issues/110",
|
||||
"latest_comment_url": "https://api.github.com/repos/rpd/todo/issues/110",
|
||||
"type": "Issue"
|
||||
},
|
||||
"repository": {
|
||||
"full_name": "rpd/todo",
|
||||
"owner": {
|
||||
"login": "rpd"
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"reason": "mention",
|
||||
"subject": {
|
||||
"title": "Fire Irons",
|
||||
"url": "https://api.github.com/repos/rpd/todo/issues/4113",
|
||||
"latest_comment_url": "https://api.github.com/repos/rpd/todo/issues/4113",
|
||||
"type": "Issue"
|
||||
},
|
||||
"repository": {
|
||||
"full_name": "rpd/todo",
|
||||
"owner": {
|
||||
"login": "rpd"
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"reason": "mention",
|
||||
"subject": {
|
||||
"title": "PR merge should switch to the base branch instead of the default branch.",
|
||||
"url": "https://api.github.com/repos/cli/cli/issues/1096",
|
||||
"latest_comment_url": "https://api.github.com/repos/cli/cli/issues/1096",
|
||||
"type": "Issue"
|
||||
},
|
||||
"repository": {
|
||||
"full_name": "cli/cli",
|
||||
"owner": {
|
||||
"login": "cli"
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"reason": "mention",
|
||||
"subject": {
|
||||
"title": "Find bolt cutter",
|
||||
"url": "https://api.github.com/repos/rpd/todo/issues/116",
|
||||
"latest_comment_url": "https://api.github.com/repos/rpd/todo/issues/comments/1065",
|
||||
"type": "Issue"
|
||||
},
|
||||
"repository": {
|
||||
"full_name": "rpd/todo",
|
||||
"owner": {
|
||||
"login": "rpd"
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"reason": "mention",
|
||||
"subject": {
|
||||
"title": "use the action to precompile",
|
||||
"url": "https://api.github.com/repos/vilmibm/gh-screensaver/issues/15",
|
||||
"latest_comment_url": "https://api.github.com/repos/vilmibm/gh-screensaver/issues/comments/10",
|
||||
"type": "Issue"
|
||||
},
|
||||
"repository": {
|
||||
"full_name": "vilmibm/gh-screensaver",
|
||||
"owner": {
|
||||
"login": "vilmibm"
|
||||
},
|
||||
"url": "https://api.github.com/repos/vilmibm/gh-screensaver"
|
||||
}
|
||||
},
|
||||
{
|
||||
"reason": "author",
|
||||
"subject": {
|
||||
"title": "asodijasodji",
|
||||
"url": "https://api.github.com/repos/vilmibm/testing/issues/150",
|
||||
"latest_comment_url": "https://api.github.com/repos/vilmibm/testing/issues/comments/1064534165",
|
||||
"type": "Issue"
|
||||
},
|
||||
"repository": {
|
||||
"full_name": "vilmibm/testing",
|
||||
"owner": {
|
||||
"login": "vilmibm"
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"reason": "review_requested",
|
||||
"subject": {
|
||||
"title": "Update LICENSE",
|
||||
"url": "https://api.github.com/repos/cli/cli/pulls/5277",
|
||||
"latest_comment_url": null,
|
||||
"type": "PullRequest"
|
||||
},
|
||||
"repository": {
|
||||
"full_name": "cli/cli",
|
||||
"owner": {
|
||||
"login": "cli"
|
||||
}
|
||||
}
|
||||
}
|
||||
]
|
||||
188
pkg/cmd/status/fixtures/search.json
Normal file
188
pkg/cmd/status/fixtures/search.json
Normal file
|
|
@ -0,0 +1,188 @@
|
|||
{
|
||||
"data": {
|
||||
"assignments": {
|
||||
"edges": [
|
||||
{
|
||||
"node": {
|
||||
"updatedAt": "2022-03-15T17:10:25Z",
|
||||
"__typename": "PullRequest",
|
||||
"title": "Pin extensions",
|
||||
"number": 5272,
|
||||
"repository": {
|
||||
"nameWithOwner": "cli/cli"
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"node": {
|
||||
"updatedAt": "2022-03-01T17:10:25Z",
|
||||
"__typename": "PullRequest",
|
||||
"title": "Board up RPD windows",
|
||||
"number": 73,
|
||||
"repository": {
|
||||
"nameWithOwner": "rpd/todo"
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"node": {
|
||||
"__typename": "Issue",
|
||||
"updatedAt": "2022-03-10T21:33:57Z",
|
||||
"title": "yolo",
|
||||
"number": 157,
|
||||
"repository": {
|
||||
"nameWithOwner": "vilmibm/testing"
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"node": {
|
||||
"updatedAt": "2022-01-06T05:05:12Z",
|
||||
"__typename": "PullRequest",
|
||||
"title": "Issue Frecency",
|
||||
"number": 4768,
|
||||
"repository": {
|
||||
"nameWithOwner": "cli/cli"
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"node": {
|
||||
"__typename": "Issue",
|
||||
"updatedAt": "2021-08-05T20:03:07Z",
|
||||
"title": "Reducing zombie threat in Raccoon City",
|
||||
"number": 514,
|
||||
"repository": {
|
||||
"nameWithOwner": "rpd/todo"
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"node": {
|
||||
"__typename": "Issue",
|
||||
"updatedAt": "2021-10-16T23:20:35Z",
|
||||
"title": "Repo garden for Windows",
|
||||
"number": 3223,
|
||||
"repository": {
|
||||
"nameWithOwner": "cli/cli"
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"node": {
|
||||
"__typename": "Issue",
|
||||
"updatedAt": "2020-11-10T23:07:37Z",
|
||||
"title": "welp",
|
||||
"number": 74,
|
||||
"repository": {
|
||||
"nameWithOwner": "vilmibm/testing"
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"node": {
|
||||
"__typename": "Issue",
|
||||
"updatedAt": "2019-07-20T01:30:01Z",
|
||||
"title": "Ability to send emails from helpdesk UI",
|
||||
"number": 42,
|
||||
"repository": {
|
||||
"nameWithOwner": "tildetown/tildetown-admin"
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"node": {
|
||||
"__typename": "Issue",
|
||||
"updatedAt": "2019-07-22T19:37:45Z",
|
||||
"title": "complete move to class based views",
|
||||
"number": 22,
|
||||
"repository": {
|
||||
"nameWithOwner": "adreyer/arkestrator"
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"node": {
|
||||
"__typename": "Issue",
|
||||
"updatedAt": "2019-02-20T17:54:24Z",
|
||||
"title": "`(every)` macro",
|
||||
"number": 145,
|
||||
"repository": {
|
||||
"nameWithOwner": "vilmibm/tildemush"
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"node": {
|
||||
"__typename": "Issue",
|
||||
"updatedAt": "2019-02-20T18:10:53Z",
|
||||
"title": "audit move rules",
|
||||
"number": 79,
|
||||
"repository": {
|
||||
"nameWithOwner": "vilmibm/tildemush"
|
||||
}
|
||||
}
|
||||
}
|
||||
]
|
||||
},
|
||||
"reviewRequested": {
|
||||
"edges": [
|
||||
{
|
||||
"node": {
|
||||
"updatedAt": "2022-03-15T17:10:25Z",
|
||||
"__typename": "PullRequest",
|
||||
"title": "Pin extensions",
|
||||
"number": 5272,
|
||||
"repository": {
|
||||
"nameWithOwner": "cli/cli"
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"node": {
|
||||
"updatedAt": "2022-02-18T19:38:20Z",
|
||||
"__typename": "PullRequest",
|
||||
"title": "Foobar",
|
||||
"number": 1234,
|
||||
"repository": {
|
||||
"nameWithOwner": "vilmibm/testing"
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"node": {
|
||||
"updatedAt": "2022-02-04T06:56:48Z",
|
||||
"__typename": "PullRequest",
|
||||
"title": "Welcome party for Leon",
|
||||
"number": 50,
|
||||
"repository": {
|
||||
"nameWithOwner": "rpd/todo"
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"node": {
|
||||
"updatedAt": "2021-12-20T10:30:39Z",
|
||||
"__typename": "PullRequest",
|
||||
"title": "Haircut for Leon",
|
||||
"number": 49,
|
||||
"repository": {
|
||||
"nameWithOwner": "rpd/todo"
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"node": {
|
||||
"updatedAt": "2021-12-20T16:43:15Z",
|
||||
"__typename": "PullRequest",
|
||||
"title": "This pull request adds support for json output the to `gh pr checks` …",
|
||||
"number": 4671,
|
||||
"repository": {
|
||||
"nameWithOwner": "cli/cli"
|
||||
}
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
}
|
||||
619
pkg/cmd/status/status.go
Normal file
619
pkg/cmd/status/status.go
Normal file
|
|
@ -0,0 +1,619 @@
|
|||
package status
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"errors"
|
||||
"fmt"
|
||||
"net/http"
|
||||
"net/url"
|
||||
"sort"
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
"github.com/MakeNowJust/heredoc"
|
||||
"github.com/charmbracelet/lipgloss"
|
||||
"github.com/cli/cli/v2/api"
|
||||
"github.com/cli/cli/v2/internal/ghinstance"
|
||||
"github.com/cli/cli/v2/pkg/cmdutil"
|
||||
"github.com/cli/cli/v2/pkg/iostreams"
|
||||
"github.com/cli/cli/v2/utils"
|
||||
"github.com/spf13/cobra"
|
||||
"golang.org/x/sync/errgroup"
|
||||
)
|
||||
|
||||
type StatusOptions struct {
|
||||
HttpClient func() (*http.Client, error)
|
||||
CachedClient func(*http.Client, time.Duration) *http.Client
|
||||
IO *iostreams.IOStreams
|
||||
Org string
|
||||
Exclude []string
|
||||
}
|
||||
|
||||
func NewCmdStatus(f *cmdutil.Factory, runF func(*StatusOptions) error) *cobra.Command {
|
||||
opts := &StatusOptions{
|
||||
CachedClient: func(c *http.Client, ttl time.Duration) *http.Client {
|
||||
return api.NewCachedClient(c, ttl)
|
||||
},
|
||||
}
|
||||
opts.HttpClient = f.HttpClient
|
||||
opts.IO = f.IOStreams
|
||||
cmd := &cobra.Command{
|
||||
Use: "status",
|
||||
Short: "Print information about relevant issues, pull requests, and notifications across repositories",
|
||||
Long: heredoc.Doc(`
|
||||
The status command prints information about your work on GitHub across all the repositories you're subscribed to, including:
|
||||
|
||||
- Assigned Issues
|
||||
- Assigned Pull Requests
|
||||
- Review Requests
|
||||
- Mentions
|
||||
- Repository Activity (new issues/pull requests, comments)
|
||||
`),
|
||||
Example: heredoc.Doc(`
|
||||
$ gh status -e cli/cli -e cli/go-gh # Exclude multiple repositories
|
||||
$ gh status -o cli # Limit results to a single organization
|
||||
`),
|
||||
RunE: func(cmd *cobra.Command, args []string) error {
|
||||
if runF != nil {
|
||||
return runF(opts)
|
||||
}
|
||||
|
||||
return statusRun(opts)
|
||||
},
|
||||
}
|
||||
|
||||
cmd.Flags().StringVarP(&opts.Org, "org", "o", "", "Report status within an organization")
|
||||
cmd.Flags().StringSliceVarP(&opts.Exclude, "exclude", "e", []string{}, "Comma separated list of repos to exclude in owner/name format")
|
||||
|
||||
return cmd
|
||||
}
|
||||
|
||||
type Notification struct {
|
||||
Reason string
|
||||
Subject struct {
|
||||
Title string
|
||||
LatestCommentURL string `json:"latest_comment_url"`
|
||||
URL string
|
||||
Type string
|
||||
}
|
||||
Repository struct {
|
||||
Owner struct {
|
||||
Login string
|
||||
}
|
||||
FullName string `json:"full_name"`
|
||||
}
|
||||
}
|
||||
|
||||
type StatusItem struct {
|
||||
Repository string // owner/repo
|
||||
Identifier string // eg cli/cli#1234 or just 1234
|
||||
preview string // eg This is the truncated body of something...
|
||||
Reason string // only used in repo activity
|
||||
}
|
||||
|
||||
func (s StatusItem) Preview() string {
|
||||
return strings.ReplaceAll(strings.ReplaceAll(s.preview, "\r", ""), "\n", " ")
|
||||
}
|
||||
|
||||
type IssueOrPR struct {
|
||||
Number int
|
||||
Title string
|
||||
}
|
||||
|
||||
type Event struct {
|
||||
Type string
|
||||
Org struct {
|
||||
Login string
|
||||
}
|
||||
CreatedAt time.Time `json:"created_at"`
|
||||
Repo struct {
|
||||
Name string // owner/repo
|
||||
}
|
||||
Payload struct {
|
||||
Action string
|
||||
Issue IssueOrPR
|
||||
PullRequest IssueOrPR `json:"pull_request"`
|
||||
Comment struct {
|
||||
Body string
|
||||
HTMLURL string `json:"html_url"`
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
type SearchResult struct {
|
||||
Type string `json:"__typename"`
|
||||
UpdatedAt time.Time
|
||||
Title string
|
||||
Number int
|
||||
Repository struct {
|
||||
NameWithOwner string
|
||||
}
|
||||
}
|
||||
|
||||
type Results []SearchResult
|
||||
|
||||
func (rs Results) Len() int {
|
||||
return len(rs)
|
||||
}
|
||||
|
||||
func (rs Results) Less(i, j int) bool {
|
||||
return rs[i].UpdatedAt.After(rs[j].UpdatedAt)
|
||||
}
|
||||
|
||||
func (rs Results) Swap(i, j int) {
|
||||
rs[i], rs[j] = rs[j], rs[i]
|
||||
}
|
||||
|
||||
type StatusGetter struct {
|
||||
Client *http.Client
|
||||
cachedClient func(*http.Client, time.Duration) *http.Client
|
||||
Org string
|
||||
Exclude []string
|
||||
AssignedPRs []StatusItem
|
||||
AssignedIssues []StatusItem
|
||||
Mentions []StatusItem
|
||||
ReviewRequests []StatusItem
|
||||
RepoActivity []StatusItem
|
||||
}
|
||||
|
||||
func NewStatusGetter(client *http.Client, opts *StatusOptions) *StatusGetter {
|
||||
return &StatusGetter{
|
||||
Client: client,
|
||||
Org: opts.Org,
|
||||
Exclude: opts.Exclude,
|
||||
cachedClient: opts.CachedClient,
|
||||
}
|
||||
}
|
||||
|
||||
func (s *StatusGetter) CachedClient(ttl time.Duration) *http.Client {
|
||||
return s.cachedClient(s.Client, ttl)
|
||||
}
|
||||
|
||||
func (s *StatusGetter) ShouldExclude(repo string) bool {
|
||||
for _, exclude := range s.Exclude {
|
||||
if repo == exclude {
|
||||
return true
|
||||
}
|
||||
}
|
||||
return false
|
||||
}
|
||||
|
||||
func (s *StatusGetter) CurrentUsername() (string, error) {
|
||||
cachedClient := s.CachedClient(time.Hour * 48)
|
||||
cachingAPIClient := api.NewClientFromHTTP(cachedClient)
|
||||
currentUsername, err := api.CurrentLoginName(cachingAPIClient, ghinstance.Default())
|
||||
if err != nil {
|
||||
return "", fmt.Errorf("failed to get current username: %w", err)
|
||||
}
|
||||
|
||||
return currentUsername, nil
|
||||
}
|
||||
|
||||
func (s *StatusGetter) ActualMention(n Notification) (string, error) {
|
||||
currentUsername, err := s.CurrentUsername()
|
||||
if err != nil {
|
||||
return "", err
|
||||
}
|
||||
|
||||
// long cache period since once a comment is looked up, it never needs to be
|
||||
// consulted again.
|
||||
cachedClient := s.CachedClient(time.Hour * 24 * 30)
|
||||
c := api.NewClientFromHTTP(cachedClient)
|
||||
resp := struct {
|
||||
Body string
|
||||
}{}
|
||||
if err := c.REST(ghinstance.Default(), "GET", n.Subject.LatestCommentURL, nil, &resp); err != nil {
|
||||
return "", err
|
||||
}
|
||||
|
||||
var ret string
|
||||
|
||||
if strings.Contains(resp.Body, "@"+currentUsername) {
|
||||
ret = resp.Body
|
||||
}
|
||||
|
||||
return ret, nil
|
||||
}
|
||||
|
||||
// These are split up by endpoint since it is along that boundary we parallelize
|
||||
// work
|
||||
|
||||
// Populate .Mentions
|
||||
func (s *StatusGetter) LoadNotifications() error {
|
||||
perPage := 100
|
||||
c := api.NewClientFromHTTP(s.Client)
|
||||
query := url.Values{}
|
||||
query.Add("per_page", fmt.Sprintf("%d", perPage))
|
||||
query.Add("participating", "true")
|
||||
query.Add("all", "true")
|
||||
|
||||
// this sucks, having to fetch so much :/ but it was the only way in my
|
||||
// testing to really get enough mentions. I would love to be able to just
|
||||
// filter for mentions but it does not seem like the notifications API can
|
||||
// do that. I'd switch to the GraphQL version, but to my knowledge that does
|
||||
// not work with PATs right now.
|
||||
var ns []Notification
|
||||
var resp []Notification
|
||||
pages := 0
|
||||
p := fmt.Sprintf("notifications?%s", query.Encode())
|
||||
for pages < 3 {
|
||||
next, err := c.RESTWithNext(ghinstance.Default(), "GET", p, nil, &resp)
|
||||
if err != nil {
|
||||
var httpErr api.HTTPError
|
||||
if !errors.As(err, &httpErr) || httpErr.StatusCode != 404 {
|
||||
return fmt.Errorf("could not get notifications: %w", err)
|
||||
}
|
||||
}
|
||||
ns = append(ns, resp...)
|
||||
|
||||
if next == "" || len(resp) < perPage {
|
||||
break
|
||||
}
|
||||
|
||||
pages++
|
||||
p = next
|
||||
}
|
||||
|
||||
s.Mentions = []StatusItem{}
|
||||
|
||||
for _, n := range ns {
|
||||
if n.Reason != "mention" {
|
||||
continue
|
||||
}
|
||||
|
||||
if s.Org != "" && n.Repository.Owner.Login != s.Org {
|
||||
continue
|
||||
}
|
||||
|
||||
if s.ShouldExclude(n.Repository.FullName) {
|
||||
continue
|
||||
}
|
||||
|
||||
if actual, err := s.ActualMention(n); actual != "" && err == nil {
|
||||
// I'm so sorry
|
||||
split := strings.Split(n.Subject.URL, "/")
|
||||
s.Mentions = append(s.Mentions, StatusItem{
|
||||
Repository: n.Repository.FullName,
|
||||
Identifier: fmt.Sprintf("%s#%s", n.Repository.FullName, split[len(split)-1]),
|
||||
preview: actual,
|
||||
})
|
||||
} else if err != nil {
|
||||
return fmt.Errorf("could not fetch comment: %w", err)
|
||||
}
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
func (s *StatusGetter) buildSearchQuery() string {
|
||||
q := `
|
||||
query AssignedSearch {
|
||||
assignments: search(first: 25, type: ISSUE, query:"%s") {
|
||||
edges {
|
||||
node {
|
||||
...on Issue {
|
||||
__typename
|
||||
updatedAt
|
||||
title
|
||||
number
|
||||
repository {
|
||||
nameWithOwner
|
||||
}
|
||||
}
|
||||
...on PullRequest {
|
||||
updatedAt
|
||||
__typename
|
||||
title
|
||||
number
|
||||
repository {
|
||||
nameWithOwner
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
reviewRequested: search(first: 25, type: ISSUE, query:"%s") {
|
||||
edges {
|
||||
node {
|
||||
...on PullRequest {
|
||||
updatedAt
|
||||
__typename
|
||||
title
|
||||
number
|
||||
repository {
|
||||
nameWithOwner
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}`
|
||||
assignmentsQ := `assignee:@me state:open%s%s`
|
||||
requestedQ := `state:open review-requested:@me%s%s`
|
||||
|
||||
orgFilter := ""
|
||||
if s.Org != "" {
|
||||
orgFilter = " org:" + s.Org
|
||||
}
|
||||
excludeFilter := ""
|
||||
for _, repo := range s.Exclude {
|
||||
excludeFilter += " -repo:" + repo
|
||||
}
|
||||
assignmentsQ = fmt.Sprintf(assignmentsQ, orgFilter, excludeFilter)
|
||||
requestedQ = fmt.Sprintf(requestedQ, orgFilter, excludeFilter)
|
||||
|
||||
return fmt.Sprintf(q, assignmentsQ, requestedQ)
|
||||
}
|
||||
|
||||
// Populate .AssignedPRs, .AssignedIssues, .ReviewRequests
|
||||
func (s *StatusGetter) LoadSearchResults() error {
|
||||
q := s.buildSearchQuery()
|
||||
c := api.NewClientFromHTTP(s.Client)
|
||||
|
||||
var resp struct {
|
||||
Assignments struct {
|
||||
Edges []struct {
|
||||
Node SearchResult
|
||||
}
|
||||
}
|
||||
ReviewRequested struct {
|
||||
Edges []struct {
|
||||
Node SearchResult
|
||||
}
|
||||
}
|
||||
}
|
||||
err := c.GraphQL(ghinstance.Default(), q, nil, &resp)
|
||||
if err != nil {
|
||||
return fmt.Errorf("could not search for assignments: %w", err)
|
||||
}
|
||||
|
||||
prs := []SearchResult{}
|
||||
issues := []SearchResult{}
|
||||
reviewRequested := []SearchResult{}
|
||||
|
||||
for _, e := range resp.Assignments.Edges {
|
||||
if e.Node.Type == "Issue" {
|
||||
issues = append(issues, e.Node)
|
||||
} else if e.Node.Type == "PullRequest" {
|
||||
prs = append(prs, e.Node)
|
||||
} else {
|
||||
panic("you shouldn't be here")
|
||||
}
|
||||
}
|
||||
|
||||
for _, e := range resp.ReviewRequested.Edges {
|
||||
reviewRequested = append(reviewRequested, e.Node)
|
||||
}
|
||||
|
||||
sort.Sort(Results(issues))
|
||||
sort.Sort(Results(prs))
|
||||
sort.Sort(Results(reviewRequested))
|
||||
|
||||
s.AssignedIssues = []StatusItem{}
|
||||
s.AssignedPRs = []StatusItem{}
|
||||
s.ReviewRequests = []StatusItem{}
|
||||
|
||||
for _, i := range issues {
|
||||
s.AssignedIssues = append(s.AssignedIssues, StatusItem{
|
||||
Repository: i.Repository.NameWithOwner,
|
||||
Identifier: fmt.Sprintf("%s#%d", i.Repository.NameWithOwner, i.Number),
|
||||
preview: i.Title,
|
||||
})
|
||||
}
|
||||
|
||||
for _, pr := range prs {
|
||||
s.AssignedPRs = append(s.AssignedPRs, StatusItem{
|
||||
Repository: pr.Repository.NameWithOwner,
|
||||
Identifier: fmt.Sprintf("%s#%d", pr.Repository.NameWithOwner, pr.Number),
|
||||
preview: pr.Title,
|
||||
})
|
||||
}
|
||||
|
||||
for _, r := range reviewRequested {
|
||||
s.ReviewRequests = append(s.ReviewRequests, StatusItem{
|
||||
Repository: r.Repository.NameWithOwner,
|
||||
Identifier: fmt.Sprintf("%s#%d", r.Repository.NameWithOwner, r.Number),
|
||||
preview: r.Title,
|
||||
})
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
// Populate .RepoActivity
|
||||
func (s *StatusGetter) LoadEvents() error {
|
||||
perPage := 100
|
||||
c := api.NewClientFromHTTP(s.Client)
|
||||
query := url.Values{}
|
||||
query.Add("per_page", fmt.Sprintf("%d", perPage))
|
||||
|
||||
currentUsername, err := s.CurrentUsername()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
var events []Event
|
||||
var resp []Event
|
||||
pages := 0
|
||||
p := fmt.Sprintf("users/%s/received_events?%s", currentUsername, query.Encode())
|
||||
for pages < 2 {
|
||||
next, err := c.RESTWithNext(ghinstance.Default(), "GET", p, nil, &resp)
|
||||
if err != nil {
|
||||
var httpErr api.HTTPError
|
||||
if !errors.As(err, &httpErr) || httpErr.StatusCode != 404 {
|
||||
return fmt.Errorf("could not get events: %w", err)
|
||||
}
|
||||
}
|
||||
events = append(events, resp...)
|
||||
if next == "" || len(resp) < perPage {
|
||||
break
|
||||
}
|
||||
|
||||
pages++
|
||||
p = next
|
||||
}
|
||||
|
||||
s.RepoActivity = []StatusItem{}
|
||||
|
||||
for _, e := range events {
|
||||
if s.Org != "" && e.Org.Login != s.Org {
|
||||
continue
|
||||
}
|
||||
if s.ShouldExclude(e.Repo.Name) {
|
||||
continue
|
||||
}
|
||||
si := StatusItem{}
|
||||
var number int
|
||||
switch e.Type {
|
||||
case "IssuesEvent":
|
||||
if e.Payload.Action != "opened" {
|
||||
continue
|
||||
}
|
||||
si.Reason = "new issue"
|
||||
si.preview = e.Payload.Issue.Title
|
||||
number = e.Payload.Issue.Number
|
||||
case "PullRequestEvent":
|
||||
if e.Payload.Action != "opened" {
|
||||
continue
|
||||
}
|
||||
si.Reason = "new PR"
|
||||
si.preview = e.Payload.PullRequest.Title
|
||||
number = e.Payload.PullRequest.Number
|
||||
case "PullRequestReviewCommentEvent":
|
||||
si.Reason = "comment on " + e.Payload.PullRequest.Title
|
||||
si.preview = e.Payload.Comment.Body
|
||||
number = e.Payload.PullRequest.Number
|
||||
case "IssueCommentEvent":
|
||||
si.Reason = "comment on " + e.Payload.Issue.Title
|
||||
si.preview = e.Payload.Comment.Body
|
||||
number = e.Payload.Issue.Number
|
||||
default:
|
||||
continue
|
||||
}
|
||||
si.Repository = e.Repo.Name
|
||||
si.Identifier = fmt.Sprintf("%s#%d", e.Repo.Name, number)
|
||||
s.RepoActivity = append(s.RepoActivity, si)
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
func statusRun(opts *StatusOptions) error {
|
||||
client, err := opts.HttpClient()
|
||||
if err != nil {
|
||||
return fmt.Errorf("could not create client: %w", err)
|
||||
}
|
||||
|
||||
sg := NewStatusGetter(client, opts)
|
||||
|
||||
// TODO break out sections into individual subcommands
|
||||
|
||||
g := new(errgroup.Group)
|
||||
opts.IO.StartProgressIndicator()
|
||||
g.Go(func() error {
|
||||
err := sg.LoadNotifications()
|
||||
if err != nil {
|
||||
err = fmt.Errorf("could not load notifications: %w", err)
|
||||
}
|
||||
return err
|
||||
})
|
||||
|
||||
g.Go(func() error {
|
||||
err := sg.LoadEvents()
|
||||
if err != nil {
|
||||
err = fmt.Errorf("could not load events: %w", err)
|
||||
}
|
||||
return err
|
||||
})
|
||||
|
||||
g.Go(func() error {
|
||||
err := sg.LoadSearchResults()
|
||||
if err != nil {
|
||||
err = fmt.Errorf("failed to search: %w", err)
|
||||
}
|
||||
return err
|
||||
})
|
||||
|
||||
err = g.Wait()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
opts.IO.StopProgressIndicator()
|
||||
|
||||
cs := opts.IO.ColorScheme()
|
||||
out := opts.IO.Out
|
||||
fullWidth := opts.IO.TerminalWidth()
|
||||
halfWidth := (fullWidth / 2) - 2
|
||||
|
||||
idStyle := cs.Cyan
|
||||
leftHalfStyle := lipgloss.NewStyle().Width(halfWidth).Padding(0).MarginRight(1).BorderRight(true).BorderStyle(lipgloss.NormalBorder())
|
||||
rightHalfStyle := lipgloss.NewStyle().Width(halfWidth).Padding(0)
|
||||
|
||||
section := func(header string, items []StatusItem, width, rowLimit int) (string, error) {
|
||||
tableOut := &bytes.Buffer{}
|
||||
fmt.Fprintln(tableOut, cs.Bold(header))
|
||||
tp := utils.NewTablePrinterWithOptions(opts.IO, utils.TablePrinterOptions{
|
||||
IsTTY: opts.IO.IsStdoutTTY(),
|
||||
MaxWidth: width,
|
||||
Out: tableOut,
|
||||
})
|
||||
if len(items) == 0 {
|
||||
tp.AddField("Nothing here ^_^", nil, nil)
|
||||
tp.EndRow()
|
||||
} else {
|
||||
for i, si := range items {
|
||||
if i == rowLimit {
|
||||
break
|
||||
}
|
||||
tp.AddField(si.Identifier, nil, idStyle)
|
||||
if si.Reason != "" {
|
||||
tp.AddField(si.Reason, nil, nil)
|
||||
}
|
||||
tp.AddField(si.Preview(), nil, nil)
|
||||
tp.EndRow()
|
||||
}
|
||||
}
|
||||
|
||||
err := tp.Render()
|
||||
if err != nil {
|
||||
return "", err
|
||||
}
|
||||
|
||||
return tableOut.String(), nil
|
||||
}
|
||||
|
||||
mSection, err := section("Mentions", sg.Mentions, halfWidth, 5)
|
||||
if err != nil {
|
||||
return fmt.Errorf("failed to render 'Mentions': %w", err)
|
||||
}
|
||||
mSection = rightHalfStyle.Render(mSection)
|
||||
|
||||
rrSection, err := section("Review Requests", sg.ReviewRequests, halfWidth, 5)
|
||||
if err != nil {
|
||||
return fmt.Errorf("failed to render 'Review Requests': %w", err)
|
||||
}
|
||||
rrSection = leftHalfStyle.Render(rrSection)
|
||||
|
||||
prSection, err := section("Assigned Pull Requests", sg.AssignedPRs, halfWidth, 5)
|
||||
if err != nil {
|
||||
return fmt.Errorf("failed to render 'Assigned Pull Requests': %w", err)
|
||||
}
|
||||
prSection = rightHalfStyle.Render(prSection)
|
||||
|
||||
issueSection, err := section("Assigned Issues", sg.AssignedIssues, halfWidth, 5)
|
||||
if err != nil {
|
||||
return fmt.Errorf("failed to render 'Assigned Issues': %w", err)
|
||||
}
|
||||
issueSection = leftHalfStyle.Render(issueSection)
|
||||
|
||||
raSection, err := section("Repository Activity", sg.RepoActivity, fullWidth, 10)
|
||||
if err != nil {
|
||||
return fmt.Errorf("failed to render 'Repository Activity': %w", err)
|
||||
}
|
||||
|
||||
fmt.Fprintln(out, lipgloss.JoinHorizontal(lipgloss.Top, issueSection, prSection))
|
||||
fmt.Fprintln(out, lipgloss.JoinHorizontal(lipgloss.Top, rrSection, mSection))
|
||||
fmt.Fprintln(out, raSection)
|
||||
|
||||
return nil
|
||||
}
|
||||
336
pkg/cmd/status/status_test.go
Normal file
336
pkg/cmd/status/status_test.go
Normal file
|
|
@ -0,0 +1,336 @@
|
|||
package status
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"net/http"
|
||||
"testing"
|
||||
"time"
|
||||
|
||||
"github.com/cli/cli/v2/pkg/cmdutil"
|
||||
"github.com/cli/cli/v2/pkg/httpmock"
|
||||
"github.com/cli/cli/v2/pkg/iostreams"
|
||||
"github.com/google/shlex"
|
||||
"github.com/stretchr/testify/assert"
|
||||
)
|
||||
|
||||
func TestNewCmdStatus(t *testing.T) {
|
||||
tests := []struct {
|
||||
name string
|
||||
cli string
|
||||
wants StatusOptions
|
||||
}{
|
||||
{
|
||||
name: "defaults",
|
||||
},
|
||||
{
|
||||
name: "org",
|
||||
cli: "-o cli",
|
||||
wants: StatusOptions{
|
||||
Org: "cli",
|
||||
},
|
||||
},
|
||||
{
|
||||
name: "exclude",
|
||||
cli: "-e cli/cli,cli/go-gh",
|
||||
wants: StatusOptions{
|
||||
Exclude: []string{"cli/cli", "cli/go-gh"},
|
||||
},
|
||||
},
|
||||
}
|
||||
|
||||
for _, tt := range tests {
|
||||
io, _, _, _ := iostreams.Test()
|
||||
io.SetStdinTTY(true)
|
||||
io.SetStdoutTTY(true)
|
||||
|
||||
if tt.wants.Exclude == nil {
|
||||
tt.wants.Exclude = []string{}
|
||||
}
|
||||
|
||||
f := &cmdutil.Factory{
|
||||
IOStreams: io,
|
||||
}
|
||||
t.Run(tt.name, func(t *testing.T) {
|
||||
argv, err := shlex.Split(tt.cli)
|
||||
assert.NoError(t, err)
|
||||
|
||||
var gotOpts *StatusOptions
|
||||
cmd := NewCmdStatus(f, func(opts *StatusOptions) error {
|
||||
gotOpts = opts
|
||||
return nil
|
||||
})
|
||||
cmd.SetArgs(argv)
|
||||
cmd.SetIn(&bytes.Buffer{})
|
||||
_, err = cmd.ExecuteC()
|
||||
assert.NoError(t, err)
|
||||
|
||||
assert.Equal(t, tt.wants.Org, gotOpts.Org)
|
||||
assert.Equal(t, tt.wants.Exclude, gotOpts.Exclude)
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
func TestStatusRun(t *testing.T) {
|
||||
tests := []struct {
|
||||
name string
|
||||
httpStubs func(*httpmock.Registry)
|
||||
opts *StatusOptions
|
||||
wantOut string
|
||||
wantErrMsg string
|
||||
}{
|
||||
{
|
||||
name: "nothing",
|
||||
httpStubs: func(reg *httpmock.Registry) {
|
||||
reg.Register(
|
||||
httpmock.GraphQL("UserCurrent"),
|
||||
httpmock.StringResponse(`{"data": {"viewer": {"login": "jillvalentine"}}}`))
|
||||
reg.Register(
|
||||
httpmock.GraphQL("AssignedSearch"),
|
||||
httpmock.StringResponse(`{"data": { "assignments": {"edges": [] }, "reviewRequested": {"edges": []}}}`))
|
||||
reg.Register(
|
||||
httpmock.REST("GET", "notifications"),
|
||||
httpmock.StringResponse(`[]`))
|
||||
reg.Register(
|
||||
httpmock.REST("GET", "users/jillvalentine/received_events"),
|
||||
httpmock.StringResponse(`[]`))
|
||||
},
|
||||
opts: &StatusOptions{},
|
||||
wantOut: "Assigned Issues │ Assigned Pull Requests \nNothing here ^_^ │ Nothing here ^_^ \n │ \nReview Requests │ Mentions \nNothing here ^_^ │ Nothing here ^_^ \n │ \nRepository Activity\nNothing here ^_^\n\n",
|
||||
},
|
||||
{
|
||||
name: "something",
|
||||
httpStubs: func(reg *httpmock.Registry) {
|
||||
reg.Register(
|
||||
httpmock.GraphQL("UserCurrent"),
|
||||
httpmock.StringResponse(`{"data": {"viewer": {"login": "jillvalentine"}}}`))
|
||||
reg.Register(
|
||||
httpmock.GraphQL("UserCurrent"),
|
||||
httpmock.StringResponse(`{"data": {"viewer": {"login": "jillvalentine"}}}`))
|
||||
reg.Register(
|
||||
httpmock.GraphQL("UserCurrent"),
|
||||
httpmock.StringResponse(`{"data": {"viewer": {"login": "jillvalentine"}}}`))
|
||||
reg.Register(
|
||||
httpmock.GraphQL("UserCurrent"),
|
||||
httpmock.StringResponse(`{"data": {"viewer": {"login": "jillvalentine"}}}`))
|
||||
reg.Register(
|
||||
httpmock.GraphQL("UserCurrent"),
|
||||
httpmock.StringResponse(`{"data": {"viewer": {"login": "jillvalentine"}}}`))
|
||||
reg.Register(
|
||||
httpmock.REST("GET", "repos/rpd/todo/issues/110"),
|
||||
httpmock.StringResponse(`{"body":"hello @jillvalentine how are you"}`))
|
||||
reg.Register(
|
||||
httpmock.REST("GET", "repos/rpd/todo/issues/4113"),
|
||||
httpmock.StringResponse(`{"body":"this is a comment"}`))
|
||||
reg.Register(
|
||||
httpmock.REST("GET", "repos/cli/cli/issues/1096"),
|
||||
httpmock.StringResponse(`{"body":"@jillvalentine hi"}`))
|
||||
reg.Register(
|
||||
httpmock.REST("GET", "repos/rpd/todo/issues/comments/1065"),
|
||||
httpmock.StringResponse(`{"body":"not a real mention"}`))
|
||||
reg.Register(
|
||||
httpmock.REST("GET", "repos/vilmibm/gh-screensaver/issues/comments/10"),
|
||||
httpmock.StringResponse(`{"body":"a message for @jillvalentine"}`))
|
||||
reg.Register(
|
||||
httpmock.GraphQL("UserCurrent"),
|
||||
httpmock.StringResponse(`{"data": {"viewer": {"login": "jillvalentine"}}}`))
|
||||
reg.Register(
|
||||
httpmock.GraphQL("AssignedSearch"),
|
||||
httpmock.FileResponse("./fixtures/search.json"))
|
||||
reg.Register(
|
||||
httpmock.REST("GET", "notifications"),
|
||||
httpmock.FileResponse("./fixtures/notifications.json"))
|
||||
reg.Register(
|
||||
httpmock.REST("GET", "users/jillvalentine/received_events"),
|
||||
httpmock.FileResponse("./fixtures/events.json"))
|
||||
},
|
||||
opts: &StatusOptions{},
|
||||
wantOut: "Assigned Issues │ Assigned Pull Requests \nvilmibm/testing#157 yolo │ cli/cli#5272 Pin extensions \ncli/cli#3223 Repo garden...│ rpd/todo#73 Board up RPD windows \nrpd/todo#514 Reducing zo...│ cli/cli#4768 Issue Frecency \nvilmibm/testing#74 welp │ \nadreyer/arkestrator#22 complete mo...│ \n │ \nReview Requests │ Mentions \ncli/cli#5272 Pin extensions │ rpd/todo#110 hello @j...\nvilmibm/testing#1234 Foobar │ cli/cli#1096 @jillval...\nrpd/todo#50 Welcome party...│ vilmibm/gh-screensaver#15 a messag...\ncli/cli#4671 This pull req...│ \nrpd/todo#49 Haircut for Leon│ \n │ \nRepository Activity\nrpd/todo#5326 new PR Only write UTF-8 BOM on W...\nvilmibm/testing#5325 comment on Ability to sea... We are working on dedicat...\ncli/cli#5319 comment on [Codespaces] D... Wondering if we shouldn't...\ncli/cli#5300 new issue Terminal bell when a runn...\n\n",
|
||||
},
|
||||
{
|
||||
name: "exclude a repository",
|
||||
httpStubs: func(reg *httpmock.Registry) {
|
||||
reg.Register(
|
||||
httpmock.GraphQL("UserCurrent"),
|
||||
httpmock.StringResponse(`{"data": {"viewer": {"login": "jillvalentine"}}}`))
|
||||
reg.Register(
|
||||
httpmock.GraphQL("UserCurrent"),
|
||||
httpmock.StringResponse(`{"data": {"viewer": {"login": "jillvalentine"}}}`))
|
||||
reg.Register(
|
||||
httpmock.GraphQL("UserCurrent"),
|
||||
httpmock.StringResponse(`{"data": {"viewer": {"login": "jillvalentine"}}}`))
|
||||
reg.Register(
|
||||
httpmock.GraphQL("UserCurrent"),
|
||||
httpmock.StringResponse(`{"data": {"viewer": {"login": "jillvalentine"}}}`))
|
||||
reg.Register(
|
||||
httpmock.REST("GET", "repos/rpd/todo/issues/110"),
|
||||
httpmock.StringResponse(`{"body":"hello @jillvalentine how are you"}`))
|
||||
reg.Register(
|
||||
httpmock.REST("GET", "repos/rpd/todo/issues/4113"),
|
||||
httpmock.StringResponse(`{"body":"this is a comment"}`))
|
||||
reg.Register(
|
||||
httpmock.REST("GET", "repos/rpd/todo/issues/comments/1065"),
|
||||
httpmock.StringResponse(`{"body":"not a real mention"}`))
|
||||
reg.Register(
|
||||
httpmock.REST("GET", "repos/vilmibm/gh-screensaver/issues/comments/10"),
|
||||
httpmock.StringResponse(`{"body":"a message for @jillvalentine"}`))
|
||||
reg.Register(
|
||||
httpmock.GraphQL("UserCurrent"),
|
||||
httpmock.StringResponse(`{"data": {"viewer": {"login": "jillvalentine"}}}`))
|
||||
reg.Register(
|
||||
httpmock.GraphQL("AssignedSearch"),
|
||||
httpmock.FileResponse("./fixtures/search.json"))
|
||||
reg.Register(
|
||||
httpmock.REST("GET", "notifications"),
|
||||
httpmock.FileResponse("./fixtures/notifications.json"))
|
||||
reg.Register(
|
||||
httpmock.REST("GET", "users/jillvalentine/received_events"),
|
||||
httpmock.FileResponse("./fixtures/events.json"))
|
||||
},
|
||||
opts: &StatusOptions{
|
||||
Exclude: []string{"cli/cli"},
|
||||
},
|
||||
// NOTA BENE: you'll see cli/cli in search results because that happens
|
||||
// server side and the fixture doesn't account for that
|
||||
wantOut: "Assigned Issues │ Assigned Pull Requests \nvilmibm/testing#157 yolo │ cli/cli#5272 Pin extensions \ncli/cli#3223 Repo garden...│ rpd/todo#73 Board up RPD windows \nrpd/todo#514 Reducing zo...│ cli/cli#4768 Issue Frecency \nvilmibm/testing#74 welp │ \nadreyer/arkestrator#22 complete mo...│ \n │ \nReview Requests │ Mentions \ncli/cli#5272 Pin extensions │ rpd/todo#110 hello @j...\nvilmibm/testing#1234 Foobar │ vilmibm/gh-screensaver#15 a messag...\nrpd/todo#50 Welcome party...│ \ncli/cli#4671 This pull req...│ \nrpd/todo#49 Haircut for Leon│ \n │ \nRepository Activity\nrpd/todo#5326 new PR Only write UTF-8 BOM on W...\nvilmibm/testing#5325 comment on Ability to sea... We are working on dedicat...\n\n",
|
||||
},
|
||||
{
|
||||
name: "exclude repositories",
|
||||
httpStubs: func(reg *httpmock.Registry) {
|
||||
reg.Register(
|
||||
httpmock.GraphQL("UserCurrent"),
|
||||
httpmock.StringResponse(`{"data": {"viewer": {"login": "jillvalentine"}}}`))
|
||||
reg.Register(
|
||||
httpmock.REST("GET", "repos/vilmibm/gh-screensaver/issues/comments/10"),
|
||||
httpmock.StringResponse(`{"body":"a message for @jillvalentine"}`))
|
||||
reg.Register(
|
||||
httpmock.GraphQL("UserCurrent"),
|
||||
httpmock.StringResponse(`{"data": {"viewer": {"login": "jillvalentine"}}}`))
|
||||
reg.Register(
|
||||
httpmock.GraphQL("AssignedSearch"),
|
||||
httpmock.FileResponse("./fixtures/search.json"))
|
||||
reg.Register(
|
||||
httpmock.REST("GET", "notifications"),
|
||||
httpmock.FileResponse("./fixtures/notifications.json"))
|
||||
reg.Register(
|
||||
httpmock.REST("GET", "users/jillvalentine/received_events"),
|
||||
httpmock.FileResponse("./fixtures/events.json"))
|
||||
},
|
||||
opts: &StatusOptions{
|
||||
Exclude: []string{"cli/cli", "rpd/todo"},
|
||||
},
|
||||
// NOTA BENE: you'll see cli/cli in search results because that happens
|
||||
// server side and the fixture doesn't account for that
|
||||
wantOut: "Assigned Issues │ Assigned Pull Requests \nvilmibm/testing#157 yolo │ cli/cli#5272 Pin extensions \ncli/cli#3223 Repo garden...│ rpd/todo#73 Board up RPD windows \nrpd/todo#514 Reducing zo...│ cli/cli#4768 Issue Frecency \nvilmibm/testing#74 welp │ \nadreyer/arkestrator#22 complete mo...│ \n │ \nReview Requests │ Mentions \ncli/cli#5272 Pin extensions │ vilmibm/gh-screensaver#15 a messag...\nvilmibm/testing#1234 Foobar │ \nrpd/todo#50 Welcome party...│ \ncli/cli#4671 This pull req...│ \nrpd/todo#49 Haircut for Leon│ \n │ \nRepository Activity\nvilmibm/testing#5325 comment on Ability to sea... We are working on dedicat...\n\n",
|
||||
},
|
||||
{
|
||||
name: "filter to an org",
|
||||
httpStubs: func(reg *httpmock.Registry) {
|
||||
reg.Register(
|
||||
httpmock.GraphQL("UserCurrent"),
|
||||
httpmock.StringResponse(`{"data": {"viewer": {"login": "jillvalentine"}}}`))
|
||||
reg.Register(
|
||||
httpmock.GraphQL("UserCurrent"),
|
||||
httpmock.StringResponse(`{"data": {"viewer": {"login": "jillvalentine"}}}`))
|
||||
reg.Register(
|
||||
httpmock.GraphQL("UserCurrent"),
|
||||
httpmock.StringResponse(`{"data": {"viewer": {"login": "jillvalentine"}}}`))
|
||||
reg.Register(
|
||||
httpmock.REST("GET", "repos/rpd/todo/issues/110"),
|
||||
httpmock.StringResponse(`{"body":"hello @jillvalentine how are you"}`))
|
||||
reg.Register(
|
||||
httpmock.REST("GET", "repos/rpd/todo/issues/4113"),
|
||||
httpmock.StringResponse(`{"body":"this is a comment"}`))
|
||||
reg.Register(
|
||||
httpmock.REST("GET", "repos/rpd/todo/issues/comments/1065"),
|
||||
httpmock.StringResponse(`{"body":"not a real mention"}`))
|
||||
reg.Register(
|
||||
httpmock.GraphQL("UserCurrent"),
|
||||
httpmock.StringResponse(`{"data": {"viewer": {"login": "jillvalentine"}}}`))
|
||||
reg.Register(
|
||||
httpmock.GraphQL("AssignedSearch"),
|
||||
httpmock.FileResponse("./fixtures/search.json"))
|
||||
reg.Register(
|
||||
httpmock.REST("GET", "notifications"),
|
||||
httpmock.FileResponse("./fixtures/notifications.json"))
|
||||
reg.Register(
|
||||
httpmock.REST("GET", "users/jillvalentine/received_events"),
|
||||
httpmock.FileResponse("./fixtures/events.json"))
|
||||
},
|
||||
opts: &StatusOptions{
|
||||
Org: "rpd",
|
||||
},
|
||||
wantOut: "Assigned Issues │ Assigned Pull Requests \nvilmibm/testing#157 yolo │ cli/cli#5272 Pin extensions \ncli/cli#3223 Repo garden...│ rpd/todo#73 Board up RPD windows \nrpd/todo#514 Reducing zo...│ cli/cli#4768 Issue Frecency \nvilmibm/testing#74 welp │ \nadreyer/arkestrator#22 complete mo...│ \n │ \nReview Requests │ Mentions \ncli/cli#5272 Pin extensions │ rpd/todo#110 hello @jillvalentine ...\nvilmibm/testing#1234 Foobar │ \nrpd/todo#50 Welcome party...│ \ncli/cli#4671 This pull req...│ \nrpd/todo#49 Haircut for Leon│ \n │ \nRepository Activity\nrpd/todo#5326 new PR Only write UTF-8 BOM on Windows where it is needed\n\n",
|
||||
},
|
||||
}
|
||||
|
||||
for _, tt := range tests {
|
||||
reg := &httpmock.Registry{}
|
||||
tt.httpStubs(reg)
|
||||
tt.opts.HttpClient = func() (*http.Client, error) {
|
||||
return &http.Client{Transport: reg}, nil
|
||||
}
|
||||
tt.opts.CachedClient = func(c *http.Client, _ time.Duration) *http.Client {
|
||||
return c
|
||||
}
|
||||
io, _, stdout, _ := iostreams.Test()
|
||||
io.SetStdoutTTY(true)
|
||||
tt.opts.IO = io
|
||||
|
||||
t.Run(tt.name, func(t *testing.T) {
|
||||
err := statusRun(tt.opts)
|
||||
if tt.wantErrMsg != "" {
|
||||
assert.Equal(t, tt.wantErrMsg, err.Error())
|
||||
return
|
||||
}
|
||||
|
||||
assert.NoError(t, err)
|
||||
|
||||
assert.Equal(t, tt.wantOut, stdout.String())
|
||||
reg.Verify(t)
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
func Test_buildSearchQuery(t *testing.T) {
|
||||
tests := []struct {
|
||||
name string
|
||||
sg StatusGetter
|
||||
wantReviewQ string
|
||||
wantAssignedQ string
|
||||
}{
|
||||
{
|
||||
name: "nothing",
|
||||
wantReviewQ: "first: 25, type: ISSUE, query:\"state:open review-requested:@me",
|
||||
wantAssignedQ: "assignee:@me state:open",
|
||||
},
|
||||
{
|
||||
name: "exclude one",
|
||||
sg: StatusGetter{
|
||||
Exclude: []string{"cli/cli"},
|
||||
},
|
||||
wantReviewQ: "first: 25, type: ISSUE, query:\"state:open review-requested:@me -repo:cli/cli",
|
||||
wantAssignedQ: "assignee:@me state:open",
|
||||
},
|
||||
{
|
||||
name: "exclude several",
|
||||
sg: StatusGetter{
|
||||
Exclude: []string{"cli/cli", "vilmibm/testing"},
|
||||
},
|
||||
wantReviewQ: "first: 25, type: ISSUE, query:\"state:open review-requested:@me -repo:cli/cli -repo:vilmibm/testing",
|
||||
wantAssignedQ: "assignee:@me state:open",
|
||||
},
|
||||
{
|
||||
name: "org filter",
|
||||
sg: StatusGetter{
|
||||
Org: "cli",
|
||||
},
|
||||
wantReviewQ: "first: 25, type: ISSUE, query:\"state:open review-requested:@me org:cli",
|
||||
wantAssignedQ: "assignee:@me state:open org:cli",
|
||||
},
|
||||
}
|
||||
|
||||
for _, tt := range tests {
|
||||
assert.Contains(t, tt.sg.buildSearchQuery(), tt.wantReviewQ)
|
||||
assert.Contains(t, tt.sg.buildSearchQuery(), tt.wantAssignedQ)
|
||||
}
|
||||
}
|
||||
|
|
@ -21,7 +21,6 @@ func MinimumArgs(n int, msg string) cobra.PositionalArgs {
|
|||
}
|
||||
|
||||
func ExactArgs(n int, msg string) cobra.PositionalArgs {
|
||||
|
||||
return func(cmd *cobra.Command, args []string) error {
|
||||
if len(args) > n {
|
||||
return FlagErrorf("too many arguments")
|
||||
|
|
|
|||
|
|
@ -19,16 +19,17 @@ type Extension interface {
|
|||
Name() string // Extension Name without gh-
|
||||
Path() string // Path to executable
|
||||
URL() string
|
||||
IsLocal() bool
|
||||
CurrentVersion() string
|
||||
IsPinned() bool
|
||||
UpdateAvailable() bool
|
||||
IsBinary() bool
|
||||
IsLocal() bool
|
||||
}
|
||||
|
||||
//go:generate moq -rm -out manager_mock.go . ExtensionManager
|
||||
type ExtensionManager interface {
|
||||
List(includeMetadata bool) []Extension
|
||||
Install(ghrepo.Interface) error
|
||||
Install(ghrepo.Interface, string) error
|
||||
InstallLocal(dir string) error
|
||||
Upgrade(name string, force bool) error
|
||||
Remove(name string) error
|
||||
|
|
|
|||
|
|
@ -26,12 +26,18 @@ var _ Extension = &ExtensionMock{}
|
|||
// IsLocalFunc: func() bool {
|
||||
// panic("mock out the IsLocal method")
|
||||
// },
|
||||
// IsPinnedFunc: func() bool {
|
||||
// panic("mock out the IsPinned method")
|
||||
// },
|
||||
// NameFunc: func() string {
|
||||
// panic("mock out the Name method")
|
||||
// },
|
||||
// PathFunc: func() string {
|
||||
// panic("mock out the Path method")
|
||||
// },
|
||||
// PinFunc: func() string {
|
||||
// panic("mock out the Pin method")
|
||||
// },
|
||||
// URLFunc: func() string {
|
||||
// panic("mock out the URL method")
|
||||
// },
|
||||
|
|
@ -54,12 +60,18 @@ type ExtensionMock struct {
|
|||
// IsLocalFunc mocks the IsLocal method.
|
||||
IsLocalFunc func() bool
|
||||
|
||||
// IsPinnedFunc mocks the IsPinned method.
|
||||
IsPinnedFunc func() bool
|
||||
|
||||
// NameFunc mocks the Name method.
|
||||
NameFunc func() string
|
||||
|
||||
// PathFunc mocks the Path method.
|
||||
PathFunc func() string
|
||||
|
||||
// PinFunc mocks the Pin method.
|
||||
PinFunc func() string
|
||||
|
||||
// URLFunc mocks the URL method.
|
||||
URLFunc func() string
|
||||
|
||||
|
|
@ -77,12 +89,18 @@ type ExtensionMock struct {
|
|||
// IsLocal holds details about calls to the IsLocal method.
|
||||
IsLocal []struct {
|
||||
}
|
||||
// IsPinned holds details about calls to the IsPinned method.
|
||||
IsPinned []struct {
|
||||
}
|
||||
// Name holds details about calls to the Name method.
|
||||
Name []struct {
|
||||
}
|
||||
// Path holds details about calls to the Path method.
|
||||
Path []struct {
|
||||
}
|
||||
// Pin holds details about calls to the Pin method.
|
||||
Pin []struct {
|
||||
}
|
||||
// URL holds details about calls to the URL method.
|
||||
URL []struct {
|
||||
}
|
||||
|
|
@ -93,8 +111,10 @@ type ExtensionMock struct {
|
|||
lockCurrentVersion sync.RWMutex
|
||||
lockIsBinary sync.RWMutex
|
||||
lockIsLocal sync.RWMutex
|
||||
lockIsPinned sync.RWMutex
|
||||
lockName sync.RWMutex
|
||||
lockPath sync.RWMutex
|
||||
lockPin sync.RWMutex
|
||||
lockURL sync.RWMutex
|
||||
lockUpdateAvailable sync.RWMutex
|
||||
}
|
||||
|
|
@ -177,6 +197,32 @@ func (mock *ExtensionMock) IsLocalCalls() []struct {
|
|||
return calls
|
||||
}
|
||||
|
||||
// IsPinned calls IsPinnedFunc.
|
||||
func (mock *ExtensionMock) IsPinned() bool {
|
||||
if mock.IsPinnedFunc == nil {
|
||||
panic("ExtensionMock.IsPinnedFunc: method is nil but Extension.IsPinned was just called")
|
||||
}
|
||||
callInfo := struct {
|
||||
}{}
|
||||
mock.lockIsPinned.Lock()
|
||||
mock.calls.IsPinned = append(mock.calls.IsPinned, callInfo)
|
||||
mock.lockIsPinned.Unlock()
|
||||
return mock.IsPinnedFunc()
|
||||
}
|
||||
|
||||
// IsPinnedCalls gets all the calls that were made to IsPinned.
|
||||
// Check the length with:
|
||||
// len(mockedExtension.IsPinnedCalls())
|
||||
func (mock *ExtensionMock) IsPinnedCalls() []struct {
|
||||
} {
|
||||
var calls []struct {
|
||||
}
|
||||
mock.lockIsPinned.RLock()
|
||||
calls = mock.calls.IsPinned
|
||||
mock.lockIsPinned.RUnlock()
|
||||
return calls
|
||||
}
|
||||
|
||||
// Name calls NameFunc.
|
||||
func (mock *ExtensionMock) Name() string {
|
||||
if mock.NameFunc == nil {
|
||||
|
|
@ -229,6 +275,32 @@ func (mock *ExtensionMock) PathCalls() []struct {
|
|||
return calls
|
||||
}
|
||||
|
||||
// Pin calls PinFunc.
|
||||
func (mock *ExtensionMock) Pin() string {
|
||||
if mock.PinFunc == nil {
|
||||
panic("ExtensionMock.PinFunc: method is nil but Extension.Pin was just called")
|
||||
}
|
||||
callInfo := struct {
|
||||
}{}
|
||||
mock.lockPin.Lock()
|
||||
mock.calls.Pin = append(mock.calls.Pin, callInfo)
|
||||
mock.lockPin.Unlock()
|
||||
return mock.PinFunc()
|
||||
}
|
||||
|
||||
// PinCalls gets all the calls that were made to Pin.
|
||||
// Check the length with:
|
||||
// len(mockedExtension.PinCalls())
|
||||
func (mock *ExtensionMock) PinCalls() []struct {
|
||||
} {
|
||||
var calls []struct {
|
||||
}
|
||||
mock.lockPin.RLock()
|
||||
calls = mock.calls.Pin
|
||||
mock.lockPin.RUnlock()
|
||||
return calls
|
||||
}
|
||||
|
||||
// URL calls URLFunc.
|
||||
func (mock *ExtensionMock) URL() string {
|
||||
if mock.URLFunc == nil {
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@ var _ ExtensionManager = &ExtensionManagerMock{}
|
|||
// DispatchFunc: func(args []string, stdin io.Reader, stdout io.Writer, stderr io.Writer) (bool, error) {
|
||||
// panic("mock out the Dispatch method")
|
||||
// },
|
||||
// InstallFunc: func(interfaceMoqParam ghrepo.Interface) error {
|
||||
// InstallFunc: func(interfaceMoqParam ghrepo.Interface, s string) error {
|
||||
// panic("mock out the Install method")
|
||||
// },
|
||||
// InstallLocalFunc: func(dir string) error {
|
||||
|
|
@ -54,7 +54,7 @@ type ExtensionManagerMock struct {
|
|||
DispatchFunc func(args []string, stdin io.Reader, stdout io.Writer, stderr io.Writer) (bool, error)
|
||||
|
||||
// InstallFunc mocks the Install method.
|
||||
InstallFunc func(interfaceMoqParam ghrepo.Interface) error
|
||||
InstallFunc func(interfaceMoqParam ghrepo.Interface, s string) error
|
||||
|
||||
// InstallLocalFunc mocks the InstallLocal method.
|
||||
InstallLocalFunc func(dir string) error
|
||||
|
|
@ -92,6 +92,8 @@ type ExtensionManagerMock struct {
|
|||
Install []struct {
|
||||
// InterfaceMoqParam is the interfaceMoqParam argument value.
|
||||
InterfaceMoqParam ghrepo.Interface
|
||||
// S is the s argument value.
|
||||
S string
|
||||
}
|
||||
// InstallLocal holds details about calls to the InstallLocal method.
|
||||
InstallLocal []struct {
|
||||
|
|
@ -204,19 +206,21 @@ func (mock *ExtensionManagerMock) DispatchCalls() []struct {
|
|||
}
|
||||
|
||||
// Install calls InstallFunc.
|
||||
func (mock *ExtensionManagerMock) Install(interfaceMoqParam ghrepo.Interface) error {
|
||||
func (mock *ExtensionManagerMock) Install(interfaceMoqParam ghrepo.Interface, s string) error {
|
||||
if mock.InstallFunc == nil {
|
||||
panic("ExtensionManagerMock.InstallFunc: method is nil but ExtensionManager.Install was just called")
|
||||
}
|
||||
callInfo := struct {
|
||||
InterfaceMoqParam ghrepo.Interface
|
||||
S string
|
||||
}{
|
||||
InterfaceMoqParam: interfaceMoqParam,
|
||||
S: s,
|
||||
}
|
||||
mock.lockInstall.Lock()
|
||||
mock.calls.Install = append(mock.calls.Install, callInfo)
|
||||
mock.lockInstall.Unlock()
|
||||
return mock.InstallFunc(interfaceMoqParam)
|
||||
return mock.InstallFunc(interfaceMoqParam, s)
|
||||
}
|
||||
|
||||
// InstallCalls gets all the calls that were made to Install.
|
||||
|
|
@ -224,9 +228,11 @@ func (mock *ExtensionManagerMock) Install(interfaceMoqParam ghrepo.Interface) er
|
|||
// len(mockedExtensionManager.InstallCalls())
|
||||
func (mock *ExtensionManagerMock) InstallCalls() []struct {
|
||||
InterfaceMoqParam ghrepo.Interface
|
||||
S string
|
||||
} {
|
||||
var calls []struct {
|
||||
InterfaceMoqParam ghrepo.Interface
|
||||
S string
|
||||
}
|
||||
mock.lockInstall.RLock()
|
||||
calls = mock.calls.Install
|
||||
|
|
|
|||
|
|
@ -30,10 +30,7 @@ func REST(method, p string) Matcher {
|
|||
if !strings.EqualFold(req.Method, method) {
|
||||
return false
|
||||
}
|
||||
if req.URL.Path != "/"+p {
|
||||
return false
|
||||
}
|
||||
return true
|
||||
return req.URL.Path == "/"+p
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -18,7 +18,9 @@ type TablePrinter interface {
|
|||
}
|
||||
|
||||
type TablePrinterOptions struct {
|
||||
IsTTY bool
|
||||
IsTTY bool
|
||||
MaxWidth int
|
||||
Out io.Writer
|
||||
}
|
||||
|
||||
func NewTablePrinter(io *iostreams.IOStreams) TablePrinter {
|
||||
|
|
@ -27,21 +29,29 @@ func NewTablePrinter(io *iostreams.IOStreams) TablePrinter {
|
|||
})
|
||||
}
|
||||
|
||||
func NewTablePrinterWithOptions(io *iostreams.IOStreams, opts TablePrinterOptions) TablePrinter {
|
||||
func NewTablePrinterWithOptions(ios *iostreams.IOStreams, opts TablePrinterOptions) TablePrinter {
|
||||
var out io.Writer
|
||||
if opts.Out != nil {
|
||||
out = opts.Out
|
||||
} else {
|
||||
out = ios.Out
|
||||
}
|
||||
if opts.IsTTY {
|
||||
var maxWidth int
|
||||
if io.IsStdoutTTY() {
|
||||
maxWidth = io.TerminalWidth()
|
||||
if opts.MaxWidth > 0 {
|
||||
maxWidth = opts.MaxWidth
|
||||
} else if ios.IsStdoutTTY() {
|
||||
maxWidth = ios.TerminalWidth()
|
||||
} else {
|
||||
maxWidth = io.ProcessTerminalWidth()
|
||||
maxWidth = ios.ProcessTerminalWidth()
|
||||
}
|
||||
return &ttyTablePrinter{
|
||||
out: io.Out,
|
||||
out: out,
|
||||
maxWidth: maxWidth,
|
||||
}
|
||||
}
|
||||
return &tsvTablePrinter{
|
||||
out: io.Out,
|
||||
out: out,
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@ package utils
|
|||
import (
|
||||
"fmt"
|
||||
"net/url"
|
||||
"os"
|
||||
"strings"
|
||||
"time"
|
||||
)
|
||||
|
|
@ -92,3 +93,24 @@ func StringInSlice(a string, slice []string) bool {
|
|||
}
|
||||
return false
|
||||
}
|
||||
|
||||
func IsDebugEnabled() (bool, string) {
|
||||
debugValue, isDebugSet := os.LookupEnv("GH_DEBUG")
|
||||
legacyDebugValue := os.Getenv("DEBUG")
|
||||
|
||||
if !isDebugSet {
|
||||
switch legacyDebugValue {
|
||||
case "true", "1", "yes", "api":
|
||||
return true, legacyDebugValue
|
||||
default:
|
||||
return false, legacyDebugValue
|
||||
}
|
||||
}
|
||||
|
||||
switch debugValue {
|
||||
case "false", "0", "no", "":
|
||||
return false, debugValue
|
||||
default:
|
||||
return true, debugValue
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue