@@ -18,27 +18,54 @@ type TestDevbox struct {
18
18
devboxJsonPath string
19
19
}
20
20
21
- func (td * TestDevbox ) Info (pkg string , markdown bool ) (string , error ) {
22
- cmd := boxcli .InfoCmd ()
23
- output , err := runCmd (cmd , []string {pkg }, false )
21
+ func (td * TestDevbox ) SetDevboxJson (path string ) error {
22
+ td .devboxJsonPath = path
23
+ return nil
24
+ }
25
+
26
+ func (td * TestDevbox ) GetDevboxJson () (* impl.Config , error ) {
27
+ file , err := os .ReadFile (td .devboxJsonPath )
28
+ if err != nil {
29
+ return nil , errors .WithStack (err )
30
+ }
31
+ data := & impl.Config {}
32
+ err = json .Unmarshal (file , & data )
33
+ if err != nil {
34
+ return nil , errors .WithStack (err )
35
+ }
36
+ return data , nil
37
+ }
38
+
39
+ func (td * TestDevbox ) Add (pkgs ... string ) (string , error ) {
40
+ cmd := boxcli .AddCmd ()
41
+ output , err := runCmd (cmd , pkgs )
24
42
if err != nil {
25
43
return "" , errors .WithStack (err )
26
44
}
27
45
return string (output ), nil
28
46
}
29
47
30
- func (td * TestDevbox ) Version ( ) (string , error ) {
31
- cmd := boxcli .VersionCmd ()
32
- output , err := runCmd (cmd , nil , false )
48
+ func (td * TestDevbox ) Generate ( subcommand string ) (string , error ) {
49
+ cmd := boxcli .GenerateCmd ()
50
+ output , err := runCmd (cmd , [] string { subcommand } )
33
51
if err != nil {
34
52
return "" , errors .WithStack (err )
35
53
}
36
54
return string (output ), nil
37
55
}
38
56
39
- func (td * TestDevbox ) Add (pkgs ... string ) (string , error ) {
40
- cmd := boxcli .AddCmd ()
41
- output , err := runCmd (cmd , pkgs , false )
57
+ func (td * TestDevbox ) Info (pkg string , markdown bool ) (string , error ) {
58
+ cmd := boxcli .InfoCmd ()
59
+ output , err := runCmd (cmd , []string {pkg })
60
+ if err != nil {
61
+ return "" , errors .WithStack (err )
62
+ }
63
+ return string (output ), nil
64
+ }
65
+
66
+ func (td * TestDevbox ) Init () (string , error ) {
67
+ cmd := boxcli .InitCmd ()
68
+ output , err := runCmd (cmd , nil )
42
69
if err != nil {
43
70
return "" , errors .WithStack (err )
44
71
}
@@ -47,7 +74,7 @@ func (td *TestDevbox) Add(pkgs ...string) (string, error) {
47
74
48
75
func (td * TestDevbox ) Rm (pkgs ... string ) (string , error ) {
49
76
cmd := boxcli .RemoveCmd ()
50
- output , err := runCmd (cmd , pkgs , false )
77
+ output , err := runCmd (cmd , pkgs )
51
78
if err != nil {
52
79
return "" , errors .WithStack (err )
53
80
}
@@ -56,7 +83,7 @@ func (td *TestDevbox) Rm(pkgs ...string) (string, error) {
56
83
57
84
func (td * TestDevbox ) Run (script string ) (string , error ) {
58
85
cmd := boxcli .RunCmd ()
59
- output , err := runCmd (cmd , []string {script }, true )
86
+ output , err := runCmd (cmd , []string {script })
60
87
if err != nil {
61
88
return "" , errors .WithStack (err )
62
89
}
@@ -65,45 +92,27 @@ func (td *TestDevbox) Run(script string) (string, error) {
65
92
66
93
func (td * TestDevbox ) Shell () (string , error ) {
67
94
cmd := boxcli .ShellCmd ()
68
- output , err := runCmd (cmd , nil , false )
95
+ output , err := runCmd (cmd , nil )
69
96
if err != nil {
70
97
return "" , errors .WithStack (err )
71
98
}
72
99
return string (output ), nil
73
100
}
74
101
75
- func (td * TestDevbox ) Generate ( subcommand string ) (string , error ) {
76
- cmd := boxcli .GenerateCmd ()
77
- output , err := runCmd (cmd , [] string { subcommand }, false )
102
+ func (td * TestDevbox ) Version ( ) (string , error ) {
103
+ cmd := boxcli .VersionCmd ()
104
+ output , err := runCmd (cmd , nil )
78
105
if err != nil {
79
106
return "" , errors .WithStack (err )
80
107
}
81
108
return string (output ), nil
82
109
}
83
110
84
- func (td * TestDevbox ) SetDevboxJson (path string ) error {
85
- td .devboxJsonPath = path
86
- return nil
87
- }
88
-
89
- func (td * TestDevbox ) GetDevboxJson () (* impl.Config , error ) {
90
- file , err := os .ReadFile (td .devboxJsonPath )
91
- if err != nil {
92
- return nil , errors .WithStack (err )
93
- }
94
- data := & impl.Config {}
95
- err = json .Unmarshal (file , & data )
96
- if err != nil {
97
- return nil , errors .WithStack (err )
98
- }
99
- return data , nil
100
- }
101
-
102
111
func Open () * TestDevbox {
103
112
return & TestDevbox {}
104
113
}
105
114
106
- func runCmd (cmd * cobra.Command , args []string , useStderr bool ) (string , error ) {
115
+ func runCmd (cmd * cobra.Command , args []string ) (string , error ) {
107
116
b := bytes .NewBufferString ("" )
108
117
cmd .SetErr (b )
109
118
cmd .SetOut (b )
0 commit comments