Skip to content

Commit 75b91ac

Browse files
committed
Implemented Version grpc command
1 parent 32fb018 commit 75b91ac

File tree

7 files changed

+217
-115
lines changed

7 files changed

+217
-115
lines changed

cli/root/root.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ import (
3232
"github.com/arduino/arduino-cli/commands/config"
3333
"github.com/arduino/arduino-cli/commands/generatedocs"
3434
"github.com/arduino/arduino-cli/commands/sketch"
35-
"github.com/arduino/arduino-cli/commands/version"
35+
"github.com/arduino/arduino-cli/cli/version"
3636
"github.com/arduino/arduino-cli/common/formatter"
3737
"github.com/arduino/arduino-cli/configs"
3838
paths "github.com/arduino/go-paths-helper"
@@ -42,7 +42,7 @@ import (
4242
"golang.org/x/crypto/ssh/terminal"
4343
)
4444

45-
// Init prepares the cobra root command.
45+
// Init prepares the cobra root command.
4646
func Init() *cobra.Command {
4747
command := &cobra.Command{
4848
Use: "arduino-cli",

commands/version/version.go renamed to cli/version/version.go

+13-8
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,9 @@
1818
package version
1919

2020
import (
21+
"fmt"
22+
2123
"github.com/arduino/arduino-cli/cli"
22-
"github.com/arduino/arduino-cli/common/formatter"
23-
"github.com/arduino/arduino-cli/common/formatter/output"
24-
"github.com/sirupsen/logrus"
2524
"github.com/spf13/cobra"
2625
)
2726

@@ -38,11 +37,17 @@ func InitCommand() *cobra.Command {
3837
return versionCommand
3938
}
4039

40+
type versionOutput struct {
41+
Command string `json:"command"`
42+
Version string `json:"version"`
43+
}
44+
4145
func run(cmd *cobra.Command, args []string) {
42-
logrus.Info("Calling version command on `arduino`")
43-
versionInfo := output.VersionResult{
44-
CommandName: cmd.Parent().Name(),
45-
Version: cli.Version,
46+
res := &versionOutput{
47+
Command: cmd.Parent().Name(),
48+
Version: cli.Version,
49+
}
50+
if cli.OutputJSONOrElse(res) {
51+
fmt.Printf("%s version %s\n", res.Command, res.Version)
4652
}
47-
formatter.Print(versionInfo)
4853
}

common/formatter/output/lib_structs.go

-30
This file was deleted.

daemon/client/client.go

+9
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,15 @@ func main() {
4444
client := rpc.NewArduinoCoreClient(conn)
4545
fmt.Println()
4646

47+
// VERSION
48+
fmt.Println("=== calling Version")
49+
versionResp, err := client.Version(context.Background(), &rpc.VersionReq{})
50+
if err != nil {
51+
fmt.Printf("Error getting version: %s\n", err)
52+
os.Exit(1)
53+
}
54+
fmt.Printf("---> %+v\n\v", versionResp)
55+
4756
// INIT
4857
fmt.Println("=== calling Init")
4958
initRespStream, err := client.Init(context.Background(), &rpc.InitReq{

daemon/daemon.go

+5
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ import (
2626
"log"
2727
"net"
2828

29+
"github.com/arduino/arduino-cli/cli"
2930
"github.com/arduino/arduino-cli/commands"
3031
"github.com/arduino/arduino-cli/commands/board"
3132
"github.com/arduino/arduino-cli/commands/compile"
@@ -119,6 +120,10 @@ func (s *ArduinoCoreServerImpl) Init(req *rpc.InitReq, stream rpc.ArduinoCore_In
119120
return stream.Send(resp)
120121
}
121122

123+
func (s *ArduinoCoreServerImpl) Version(ctx context.Context, req *rpc.VersionReq) (*rpc.VersionResp, error) {
124+
return &rpc.VersionResp{Version: cli.Version}, nil
125+
}
126+
122127
func (s *ArduinoCoreServerImpl) Compile(req *rpc.CompileReq, stream rpc.ArduinoCore_CompileServer) error {
123128
resp, err := compile.Compile(
124129
stream.Context(), req,

0 commit comments

Comments
 (0)