move preparecmd and Runnable to its own package · cli/cli@5187ad4 · GitHub
Skip to content

Commit 5187ad4

Browse files
vilmibmvilmibm
committed
move preparecmd and Runnable to its own package
1 parent 633ccdd commit 5187ad4

12 files changed

Lines changed: 75 additions & 74 deletions

File tree

‎command/issue_test.go‎

Lines changed: 7 additions & 7 deletions

‎command/pr_checkout.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"os/exec"
88

99
"github.com/cli/cli/git"
10-
"github.com/cli/cli/utils"
10+
"github.com/cli/cli/internal/run"
1111
"github.com/spf13/cobra"
1212
)
1313

@@ -91,7 +91,7 @@ func prCheckout(cmd *cobra.Command, args []string) error {
9191
cmd := exec.Command(args[0], args[1:]...)
9292
cmd.Stdout = os.Stdout
9393
cmd.Stderr = os.Stderr
94-
if err := utils.PrepareCmd(cmd).Run(); err != nil {
94+
if err := run.PrepareCmd(cmd).Run(); err != nil {
9595
return err
9696
}
9797
}

‎command/pr_checkout_test.go‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ import (
77
"testing"
88

99
"github.com/cli/cli/context"
10+
"github.com/cli/cli/internal/run"
1011
"github.com/cli/cli/test"
11-
"github.com/cli/cli/utils"
1212
)
1313

1414
func TestPRCheckout_sameRepo(t *testing.T) {
@@ -41,7 +41,7 @@ func TestPRCheckout_sameRepo(t *testing.T) {
4141
`))
4242

4343
ranCommands := [][]string{}
44-
restoreCmd := utils.SetPrepareCmd(func(cmd *exec.Cmd) utils.Runnable {
44+
restoreCmd := run.SetPrepareCmd(func(cmd *exec.Cmd) run.Runnable {
4545
switch strings.Join(cmd.Args, " ") {
4646
case "git show-ref --verify --quiet refs/heads/feature":
4747
return &errorStub{"exit status: 1"}
@@ -93,7 +93,7 @@ func TestPRCheckout_urlArg(t *testing.T) {
9393
`))
9494

9595
ranCommands := [][]string{}
96-
restoreCmd := utils.SetPrepareCmd(func(cmd *exec.Cmd) utils.Runnable {
96+
restoreCmd := run.SetPrepareCmd(func(cmd *exec.Cmd) run.Runnable {
9797
switch strings.Join(cmd.Args, " ") {
9898
case "git show-ref --verify --quiet refs/heads/feature":
9999
return &errorStub{"exit status: 1"}
@@ -142,7 +142,7 @@ func TestPRCheckout_branchArg(t *testing.T) {
142142
`))
143143

144144
ranCommands := [][]string{}
145-
restoreCmd := utils.SetPrepareCmd(func(cmd *exec.Cmd) utils.Runnable {
145+
restoreCmd := run.SetPrepareCmd(func(cmd *exec.Cmd) run.Runnable {
146146
switch strings.Join(cmd.Args, " ") {
147147
case "git show-ref --verify --quiet refs/heads/feature":
148148
return &errorStub{"exit status: 1"}
@@ -191,7 +191,7 @@ func TestPRCheckout_existingBranch(t *testing.T) {
191191
`))
192192

193193
ranCommands := [][]string{}
194-
restoreCmd := utils.SetPrepareCmd(func(cmd *exec.Cmd) utils.Runnable {
194+
restoreCmd := run.SetPrepareCmd(func(cmd *exec.Cmd) run.Runnable {
195195
switch strings.Join(cmd.Args, " ") {
196196
case "git show-ref --verify --quiet refs/heads/feature":
197197
return &test.OutputStub{}
@@ -243,7 +243,7 @@ func TestPRCheckout_differentRepo_remoteExists(t *testing.T) {
243243
`))
244244

245245
ranCommands := [][]string{}
246-
restoreCmd := utils.SetPrepareCmd(func(cmd *exec.Cmd) utils.Runnable {
246+
restoreCmd := run.SetPrepareCmd(func(cmd *exec.Cmd) run.Runnable {
247247
switch strings.Join(cmd.Args, " ") {
248248
case "git show-ref --verify --quiet refs/heads/feature":
249249
return &errorStub{"exit status: 1"}
@@ -295,7 +295,7 @@ func TestPRCheckout_differentRepo(t *testing.T) {
295295
`))
296296

297297
ranCommands := [][]string{}
298-
restoreCmd := utils.SetPrepareCmd(func(cmd *exec.Cmd) utils.Runnable {
298+
restoreCmd := run.SetPrepareCmd(func(cmd *exec.Cmd) run.Runnable {
299299
switch strings.Join(cmd.Args, " ") {
300300
case "git config branch.feature.merge":
301301
return &errorStub{"exit status 1"}
@@ -347,7 +347,7 @@ func TestPRCheckout_differentRepo_existingBranch(t *testing.T) {
347347
`))
348348

349349
ranCommands := [][]string{}
350-
restoreCmd := utils.SetPrepareCmd(func(cmd *exec.Cmd) utils.Runnable {
350+
restoreCmd := run.SetPrepareCmd(func(cmd *exec.Cmd) run.Runnable {
351351
switch strings.Join(cmd.Args, " ") {
352352
case "git config branch.feature.merge":
353353
return &test.OutputStub{[]byte("refs/heads/feature\n")}
@@ -397,7 +397,7 @@ func TestPRCheckout_differentRepo_currentBranch(t *testing.T) {
397397
`))
398398

399399
ranCommands := [][]string{}
400-
restoreCmd := utils.SetPrepareCmd(func(cmd *exec.Cmd) utils.Runnable {
400+
restoreCmd := run.SetPrepareCmd(func(cmd *exec.Cmd) run.Runnable {
401401
switch strings.Join(cmd.Args, " ") {
402402
case "git config branch.feature.merge":
403403
return &test.OutputStub{[]byte("refs/heads/feature\n")}
@@ -447,7 +447,7 @@ func TestPRCheckout_maintainerCanModify(t *testing.T) {
447447
`))
448448

449449
ranCommands := [][]string{}
450-
restoreCmd := utils.SetPrepareCmd(func(cmd *exec.Cmd) utils.Runnable {
450+
restoreCmd := run.SetPrepareCmd(func(cmd *exec.Cmd) run.Runnable {
451451
switch strings.Join(cmd.Args, " ") {
452452
case "git config branch.feature.merge":
453453
return &errorStub{"exit status 1"}

‎command/pr_test.go‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ import (
1111
"strings"
1212
"testing"
1313

14+
"github.com/cli/cli/internal/run"
1415
"github.com/cli/cli/test"
15-
"github.com/cli/cli/utils"
1616
"github.com/google/shlex"
1717
"github.com/spf13/cobra"
1818
"github.com/spf13/pflag"
@@ -108,7 +108,7 @@ func TestPRStatus_fork(t *testing.T) {
108108
defer jsonFile.Close()
109109
http.StubResponse(200, jsonFile)
110110

111-
defer utils.SetPrepareCmd(func(cmd *exec.Cmd) utils.Runnable {
111+
defer run.SetPrepareCmd(func(cmd *exec.Cmd) run.Runnable {
112112
switch strings.Join(cmd.Args, " ") {
113113
case `git config --get-regexp ^branch\.blueberries\.(remote|merge)$`:
114114
return &test.OutputStub{[]byte(`branch.blueberries.remote origin
@@ -439,7 +439,7 @@ func TestPRView_previewCurrentBranch(t *testing.T) {
439439
defer jsonFile.Close()
440440
http.StubResponse(200, jsonFile)
441441

442-
restoreCmd := utils.SetPrepareCmd(func(cmd *exec.Cmd) utils.Runnable {
442+
restoreCmd := run.SetPrepareCmd(func(cmd *exec.Cmd) run.Runnable {
443443
return &test.OutputStub{}
444444
})
445445
defer restoreCmd()
@@ -474,7 +474,7 @@ func TestPRView_previewCurrentBranchWithEmptyBody(t *testing.T) {
474474
defer jsonFile.Close()
475475
http.StubResponse(200, jsonFile)
476476

477-
restoreCmd := utils.SetPrepareCmd(func(cmd *exec.Cmd) utils.Runnable {
477+
restoreCmd := run.SetPrepareCmd(func(cmd *exec.Cmd) run.Runnable {
478478
return &test.OutputStub{}
479479
})
480480
defer restoreCmd()
@@ -509,7 +509,7 @@ func TestPRView_currentBranch(t *testing.T) {
509509
http.StubResponse(200, jsonFile)
510510

511511
var seenCmd *exec.Cmd
512-
restoreCmd := utils.SetPrepareCmd(func(cmd *exec.Cmd) utils.Runnable {
512+
restoreCmd := run.SetPrepareCmd(func(cmd *exec.Cmd) run.Runnable {
513513
switch strings.Join(cmd.Args, " ") {
514514
case `git config --get-regexp ^branch\.blueberries\.(remote|merge)$`:
515515
return &test.OutputStub{}
@@ -547,7 +547,7 @@ func TestPRView_noResultsForBranch(t *testing.T) {
547547
http.StubResponse(200, jsonFile)
548548

549549
var seenCmd *exec.Cmd
550-
restoreCmd := utils.SetPrepareCmd(func(cmd *exec.Cmd) utils.Runnable {
550+
restoreCmd := run.SetPrepareCmd(func(cmd *exec.Cmd) run.Runnable {
551551
switch strings.Join(cmd.Args, " ") {
552552
case `git config --get-regexp ^branch\.blueberries\.(remote|merge)$`:
553553
return &test.OutputStub{}
@@ -580,7 +580,7 @@ func TestPRView_numberArg(t *testing.T) {
580580
`))
581581

582582
var seenCmd *exec.Cmd
583-
restoreCmd := utils.SetPrepareCmd(func(cmd *exec.Cmd) utils.Runnable {
583+
restoreCmd := run.SetPrepareCmd(func(cmd *exec.Cmd) run.Runnable {
584584
seenCmd = cmd
585585
return &test.OutputStub{}
586586
})
@@ -612,7 +612,7 @@ func TestPRView_numberArgWithHash(t *testing.T) {
612612
`))
613613

614614
var seenCmd *exec.Cmd
615-
restoreCmd := utils.SetPrepareCmd(func(cmd *exec.Cmd) utils.Runnable {
615+
restoreCmd := run.SetPrepareCmd(func(cmd *exec.Cmd) run.Runnable {
616616
seenCmd = cmd
617617
return &test.OutputStub{}
618618
})
@@ -644,7 +644,7 @@ func TestPRView_urlArg(t *testing.T) {
644644
`))
645645

646646
var seenCmd *exec.Cmd
647-
restoreCmd := utils.SetPrepareCmd(func(cmd *exec.Cmd) utils.Runnable {
647+
restoreCmd := run.SetPrepareCmd(func(cmd *exec.Cmd) run.Runnable {
648648
seenCmd = cmd
649649
return &test.OutputStub{}
650650
})
@@ -678,7 +678,7 @@ func TestPRView_branchArg(t *testing.T) {
678678
`))
679679

680680
var seenCmd *exec.Cmd
681-
restoreCmd := utils.SetPrepareCmd(func(cmd *exec.Cmd) utils.Runnable {
681+
restoreCmd := run.SetPrepareCmd(func(cmd *exec.Cmd) run.Runnable {
682682
seenCmd = cmd
683683
return &test.OutputStub{}
684684
})
@@ -713,7 +713,7 @@ func TestPRView_branchWithOwnerArg(t *testing.T) {
713713
`))
714714

715715
var seenCmd *exec.Cmd
716-
restoreCmd := utils.SetPrepareCmd(func(cmd *exec.Cmd) utils.Runnable {
716+
restoreCmd := run.SetPrepareCmd(func(cmd *exec.Cmd) run.Runnable {
717717
seenCmd = cmd
718718
return &test.OutputStub{}
719719
})

‎command/repo.go‎

Lines changed: 6 additions & 5 deletions

0 commit comments

Comments
 (0)