Skip to content

Commit 3e48878

Browse files
nhatthmnhatthm
authored
Bump dependencies (#11)
1 parent 1772f0b commit 3e48878

File tree

4 files changed

+48
-39
lines changed

4 files changed

+48
-39
lines changed

‎cursor_test.go

+18-6
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,25 @@ package surveyexpect
33
import (
44
"testing"
55

6+
"github.com/Netflix/go-expect"
7+
pseudotty "github.com/creack/pty"
68
"github.com/hinshun/vt10x"
79
"github.com/stretchr/testify/require"
810
)
911

1012
func TestWaitForCursor(t *testing.T) {
1113
t.Parallel()
1214

13-
console, _, err := vt10x.NewVT10XConsole()
15+
pty, tty, err := pseudotty.Open()
1416
require.NoError(t, err)
1517

16-
_ = console.Tty().Close() // nolint: errcheck
17-
_ = console.Close() // nolint: errcheck
18+
term := vt10x.New(vt10x.WithWriter(tty))
19+
20+
console, err := expect.NewConsole(expect.WithStdin(pty), expect.WithStdout(term), expect.WithCloser(pty, tty))
21+
require.NoError(t, err)
22+
23+
_ = console.Close() // nolint: errcheck
24+
_ = tty.Close() // nolint: errcheck
1825

1926
err = waitForCursor(console)
2027
require.Error(t, err)
@@ -23,11 +30,16 @@ func TestWaitForCursor(t *testing.T) {
2330
func TestWaitForCursorTwice(t *testing.T) {
2431
t.Parallel()
2532

26-
console, _, err := vt10x.NewVT10XConsole()
33+
pty, tty, err := pseudotty.Open()
34+
require.NoError(t, err)
35+
36+
term := vt10x.New(vt10x.WithWriter(tty))
37+
38+
console, err := expect.NewConsole(expect.WithStdin(pty), expect.WithStdout(term), expect.WithCloser(pty, tty))
2739
require.NoError(t, err)
2840

29-
_ = console.Tty().Close() // nolint: errcheck
30-
_ = console.Close() // nolint: errcheck
41+
_ = console.Close() // nolint: errcheck
42+
_ = tty.Close() // nolint: errcheck
3143

3244
err = waitForCursorTwice(console)
3345
require.Error(t, err)

‎go.mod

+5-6
Original file line numberDiff line numberDiff line change
@@ -3,22 +3,21 @@ module github.com/nhatthm/surveyexpect
33
go 1.17
44

55
require (
6-
github.com/AlecAivazis/survey/v2 v2.3.2
7-
github.com/Netflix/go-expect v0.0.0-20211003183012-e1a7c020ce25
8-
github.com/hinshun/vt10x v0.0.0-20180809195222-d55458df857c
6+
github.com/AlecAivazis/survey/v2 v2.3.3
7+
github.com/Netflix/go-expect v0.0.0-20220104043353-73e0943537d2
8+
github.com/hinshun/vt10x v0.0.0-20220301184237-5011da428d02
99
github.com/stretchr/testify v1.7.1
1010
)
1111

1212
require (
1313
github.com/creack/pty v1.1.17 // indirect
1414
github.com/davecgh/go-spew v1.1.1 // indirect
1515
github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect
16-
github.com/kr/pty v1.1.8 // indirect
17-
github.com/mattn/go-colorable v0.1.11 // indirect
16+
github.com/mattn/go-colorable v0.1.12 // indirect
1817
github.com/mattn/go-isatty v0.0.14 // indirect
1918
github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d // indirect
2019
github.com/pmezard/go-difflib v1.0.0 // indirect
21-
golang.org/x/sys v0.0.0-20211117180635-dee7805ff2e1 // indirect
20+
golang.org/x/sys v0.0.0-20220319134239-a9b59b0215f8 // indirect
2221
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
2322
golang.org/x/text v0.3.7 // indirect
2423
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect

‎go.sum

+11-25
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,20 @@
1-
github.com/AlecAivazis/survey/v2 v2.3.2 h1:TqTB+aDDCLYhf9/bD2TwSO8u8jDSmMUd2SUVO4gCnU8=
2-
github.com/AlecAivazis/survey/v2 v2.3.2/go.mod h1:TH2kPCDU3Kqq7pLbnCWwZXDBjnhZtmsCle5EiYDJ2fg=
3-
github.com/Netflix/go-expect v0.0.0-20180615182759-c93bf25de8e8/go.mod h1:oX5x61PbNXchhh0oikYAH+4Pcfw5LKv21+Jnpr6r6Pc=
4-
github.com/Netflix/go-expect v0.0.0-20211003183012-e1a7c020ce25 h1:hWfsqBaNZUHztXA78g7Y2Jj3rDQaTCZhhFwz43i2VlA=
5-
github.com/Netflix/go-expect v0.0.0-20211003183012-e1a7c020ce25/go.mod h1:68ORG0HSEWDuH5Eh73AFbYWZ1zT4Y+b0vhOa+vZRUdI=
6-
github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY=
1+
github.com/AlecAivazis/survey/v2 v2.3.3 h1:Ph4ISZiROO27yClM7LTVd+5UH1vxOYfWq/WifbSFerQ=
2+
github.com/AlecAivazis/survey/v2 v2.3.3/go.mod h1:hrV6Y/kQCLhIZXGcriDCUBtB3wnN7156gMXJ3+b23xM=
3+
github.com/Netflix/go-expect v0.0.0-20220104043353-73e0943537d2 h1:+vx7roKuyA63nhn5WAunQHLTznkw5W8b1Xc0dNjp83s=
4+
github.com/Netflix/go-expect v0.0.0-20220104043353-73e0943537d2/go.mod h1:HBCaDeC1lPdgDeDbhX8XFpy1jqjK0IBG8W5K+xYqA0w=
75
github.com/creack/pty v1.1.17 h1:QeVUsEDNrLBW4tMgZHvxy18sKtr6VI492kBhUfhDJNI=
86
github.com/creack/pty v1.1.17/go.mod h1:MOBLtS5ELjhRRrroQr9kyvTxUAFNvYEK993ew/Vr4O4=
97
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
108
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
119
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
12-
github.com/hinshun/vt10x v0.0.0-20180616224451-1954e6464174/go.mod h1:DqJ97dSdRW1W22yXSB90986pcOyQ7r45iio1KN2ez1A=
13-
github.com/hinshun/vt10x v0.0.0-20180809195222-d55458df857c h1:kp3AxgXgDOmIJFR7bIwqFhwJ2qWar8tEQSE5XXhCfVk=
14-
github.com/hinshun/vt10x v0.0.0-20180809195222-d55458df857c/go.mod h1:DqJ97dSdRW1W22yXSB90986pcOyQ7r45iio1KN2ez1A=
10+
github.com/hinshun/vt10x v0.0.0-20220119200601-820417d04eec/go.mod h1:Q48J4R4DvxnHolD5P8pOtXigYlRuPLGl6moFx3ulM68=
11+
github.com/hinshun/vt10x v0.0.0-20220301184237-5011da428d02 h1:AgcIVYPa6XJnU3phs104wLj8l5GEththEw6+F79YsIY=
12+
github.com/hinshun/vt10x v0.0.0-20220301184237-5011da428d02/go.mod h1:Q48J4R4DvxnHolD5P8pOtXigYlRuPLGl6moFx3ulM68=
1513
github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 h1:Z9n2FFNUXsshfwJMBgNA0RU6/i7WVaAegv3PtuIHPMs=
1614
github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51/go.mod h1:CzGEWj7cYgsdH8dAjBGEr58BoE7ScuLd+fwFZ44+/x8=
17-
github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
18-
github.com/kr/pty v1.1.4/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
19-
github.com/kr/pty v1.1.8 h1:AkaSdXYQOWeaO3neb8EM634ahkXXe3jYbVh/F9lq+GI=
20-
github.com/kr/pty v1.1.8/go.mod h1:O1sed60cT9XZ5uDucP5qwvh+TE3NnUj51EiZO/lmSfw=
2115
github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
22-
github.com/mattn/go-colorable v0.1.11 h1:nQ+aFkoE2TMGc0b68U2OKSexC+eq46+XwZzWXHRmPYs=
23-
github.com/mattn/go-colorable v0.1.11/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4=
16+
github.com/mattn/go-colorable v0.1.12 h1:jF+Du6AlPIjs2BiUiQlKOX0rt3SujHxPnksPKZbaA40=
17+
github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4=
2418
github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
2519
github.com/mattn/go-isatty v0.0.14 h1:yVuAays6BHfxijgZPzw+3Zlu5yQgKGP2/hcQbHb7S9Y=
2620
github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
@@ -30,27 +24,19 @@ github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d/go.mod h1:01TrycV0kFyex
3024
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
3125
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
3226
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
33-
github.com/stretchr/testify v1.2.1/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
3427
github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
3528
github.com/stretchr/testify v1.7.1 h1:5TQK59W5E3v0r2duFAb7P95B6hEeOyEnHRa8MjYSMTY=
3629
github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
37-
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
38-
golang.org/x/crypto v0.0.0-20190530122614-20be4c3c3ed5 h1:8dUaAV7K4uHsF56JQWkprecIQKdPHtR9jCHF5nB8uzc=
39-
golang.org/x/crypto v0.0.0-20190530122614-20be4c3c3ed5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
40-
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
41-
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
4230
golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
43-
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
4431
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
4532
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
4633
golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
4734
golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
48-
golang.org/x/sys v0.0.0-20211117180635-dee7805ff2e1 h1:kwrAHlwJ0DUBZwQ238v+Uod/3eZ8B2K5rYsUHBQvzmI=
49-
golang.org/x/sys v0.0.0-20211117180635-dee7805ff2e1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
35+
golang.org/x/sys v0.0.0-20220319134239-a9b59b0215f8 h1:OH54vjqzRWmbJ62fjuhxy7AxFFgoHN0/DPc/UrL8cAs=
36+
golang.org/x/sys v0.0.0-20220319134239-a9b59b0215f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
5037
golang.org/x/term v0.0.0-20210503060354-a79de5458b56/go.mod h1:tfny5GFUkzUvx4ps4ajbZsCe5lw1metzhBm9T3x7oIY=
5138
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 h1:JGgROgKl9N8DuW20oFS5gxc+lE67/N3FcwmBPMe7ArY=
5239
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
53-
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
5440
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
5541
golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
5642
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=

‎survey.go

+14-2
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import (
1010

1111
"github.com/AlecAivazis/survey/v2/terminal"
1212
"github.com/Netflix/go-expect"
13+
pseudotty "github.com/creack/pty"
1314
"github.com/hinshun/vt10x"
1415
"github.com/stretchr/testify/require"
1516
)
@@ -215,9 +216,20 @@ func (s *Survey) Start(fn func(stdio terminal.Stdio)) {
215216
s.startMu.Lock()
216217
defer s.startMu.Unlock()
217218

219+
pty, tty, err := pseudotty.Open()
220+
require.NoError(s.test, err)
221+
222+
term := vt10x.New(vt10x.WithWriter(tty))
223+
218224
// Setup a console.
219225
buf := new(Buffer)
220-
console, state, err := vt10x.NewVT10XConsole(expect.WithStdout(buf))
226+
227+
console, err := expect.NewConsole(
228+
expect.WithStdin(pty),
229+
expect.WithStdout(term),
230+
expect.WithStdout(buf),
231+
expect.WithCloser(pty, tty),
232+
)
221233
require.NoError(s.test, err)
222234

223235
// Run the survey in background and close console when it is done.
@@ -231,7 +243,7 @@ func (s *Survey) Start(fn func(stdio terminal.Stdio)) {
231243
s.test.Logf("Raw output: %q\n", buf.String())
232244

233245
// Dump the terminal's screen.
234-
s.test.Logf("%s\n", expect.StripTrailingEmptyLines(state.String()))
246+
s.test.Logf("%s\n", expect.StripTrailingEmptyLines(term.String()))
235247
}
236248

237249
// ExpectationsWereMet checks whether all queued expectations were met in order.

0 commit comments

Comments
 (0)