Skip to content

Commit c2d9c1b

Browse files
mascimasci
authored
Rearrange protobuf files (#251)
* move protobuf definitions under rpc/commands * move commands daemon into commands folder * make client a test case * run protoc as part of the testing pipeline
1 parent 5cca8e2 commit c2d9c1b

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

64 files changed

+919
-761
lines changed

Diff for: ‎.travis.yml

+8-3
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ go:
44
- 1.12.x
55

66
env:
7-
- GO111MODULE=on
7+
- GO111MODULE=on PATH=$HOME/protobuf/bin:$PATH
88

99
# Anything in before_script that returns a nonzero exit code will flunk the
1010
# build and immediately stop. It's sorta like having set -e enabled in bash.
@@ -13,17 +13,22 @@ install:
1313
- curl -sL https://taskfile.dev/install.sh | sh
1414
- go get github.com/golangci/govet
1515
- go get golang.org/x/lint/golint
16+
- go get -u github.com/golang/protobuf/protoc-gen-go
17+
- |
18+
mkdir -p $HOME/protobuf && pushd $HOME/protobuf &&
19+
curl -LO 'https://github.com/google/protobuf/releases/download/v3.8.0/protoc-3.8.0-linux-x86_64.zip' &&
20+
unzip protoc-3.8.0-linux-x86_64.zip &&
21+
popd
1622
1723
script:
1824
# Check if the code is formatted and run linter
1925
- ./bin/task check
2026
# Build and test
27+
- ./bin/task protoc
2128
- ./bin/task build
2229
- ./bin/task test
2330
- ./bin/task test-legacy
2431

2532
after_success:
2633
- bash <(curl -s https://codecov.io/bash) -cF unit -f '*_unit.txt'
2734
- bash <(curl -s https://codecov.io/bash) -cF integ -f '*_integ.txt'
28-
29-

Diff for: ‎Taskfile.yml

100644100755
+11-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
version: '2'
22

33
tasks:
4+
protoc:
5+
desc: Compile protobuf definitions
6+
cmds:
7+
- protoc --proto_path=rpc --go_out=plugins=grpc,paths=source_relative:rpc ./rpc/commands/*.proto
8+
49
build:
510
desc: Build the project
611
cmds:
@@ -45,6 +50,11 @@ tasks:
4550
- test -z $(go fmt ./legacy/...)
4651
- go vet ./legacy/...
4752

53+
rpc-client:
54+
desc: Run the rpc client test routine (server must be already started)
55+
cmds:
56+
- go test -run TestWithClientE2E ./commands/daemon
57+
4858
vars:
4959
# all modules of this project except for "legacy/..." module
5060
DEFAULT_TARGETS:
@@ -67,4 +77,4 @@ vars:
6777
-X github.com/arduino/arduino-cli/version.commit={{.TEST_COMMIT}}'
6878
6979
# check-lint vars
70-
GOLINTFLAGS: "-min_confidence 0.8 -set_exit_status"
80+
GOLINTFLAGS: "-min_confidence 0.8 -set_exit_status"

Diff for: ‎cli/board/attach.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import (
2424
"github.com/arduino/arduino-cli/cli"
2525
"github.com/arduino/arduino-cli/commands/board"
2626
"github.com/arduino/arduino-cli/common/formatter"
27-
"github.com/arduino/arduino-cli/rpc"
27+
rpc "github.com/arduino/arduino-cli/rpc/commands"
2828
"github.com/spf13/cobra"
2929
)
3030

Diff for: ‎cli/board/details.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import (
2626
"github.com/arduino/arduino-cli/commands/board"
2727
"github.com/arduino/arduino-cli/common/formatter"
2828
"github.com/arduino/arduino-cli/output"
29-
"github.com/arduino/arduino-cli/rpc"
29+
rpc "github.com/arduino/arduino-cli/rpc/commands"
3030
"github.com/spf13/cobra"
3131
)
3232

Diff for: ‎cli/board/list.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ import (
2828
"github.com/arduino/arduino-cli/commands/board"
2929
"github.com/arduino/arduino-cli/common/formatter"
3030
"github.com/arduino/arduino-cli/output"
31-
"github.com/arduino/arduino-cli/rpc"
31+
rpc "github.com/arduino/arduino-cli/rpc/commands"
3232
"github.com/spf13/cobra"
3333
)
3434

Diff for: ‎cli/board/listall.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import (
2727
"github.com/arduino/arduino-cli/commands/board"
2828
"github.com/arduino/arduino-cli/common/formatter"
2929
"github.com/arduino/arduino-cli/output"
30-
"github.com/arduino/arduino-cli/rpc"
30+
rpc "github.com/arduino/arduino-cli/rpc/commands"
3131
"github.com/spf13/cobra"
3232
)
3333

Diff for: ‎cli/cli.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ import (
3131
"github.com/arduino/arduino-cli/commands"
3232
"github.com/arduino/arduino-cli/common/formatter"
3333
"github.com/arduino/arduino-cli/configs"
34-
"github.com/arduino/arduino-cli/rpc"
34+
rpc "github.com/arduino/arduino-cli/rpc/commands"
3535
"github.com/arduino/arduino-cli/version"
3636
"github.com/arduino/go-paths-helper"
3737
"github.com/sirupsen/logrus"

Diff for: ‎cli/compile/compile.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import (
2424
"github.com/arduino/arduino-cli/cli"
2525
"github.com/arduino/arduino-cli/commands/compile"
2626
"github.com/arduino/arduino-cli/common/formatter"
27-
"github.com/arduino/arduino-cli/rpc"
27+
rpc "github.com/arduino/arduino-cli/rpc/commands"
2828
"github.com/arduino/go-paths-helper"
2929
"github.com/spf13/cobra"
3030
)

Diff for: ‎cli/core/download.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import (
2424
"github.com/arduino/arduino-cli/cli"
2525
"github.com/arduino/arduino-cli/commands/core"
2626
"github.com/arduino/arduino-cli/common/formatter"
27-
"github.com/arduino/arduino-cli/rpc"
27+
rpc "github.com/arduino/arduino-cli/rpc/commands"
2828
"github.com/sirupsen/logrus"
2929
"github.com/spf13/cobra"
3030
)

Diff for: ‎cli/core/install.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import (
2424
"github.com/arduino/arduino-cli/cli"
2525
"github.com/arduino/arduino-cli/commands/core"
2626
"github.com/arduino/arduino-cli/common/formatter"
27-
"github.com/arduino/arduino-cli/rpc"
27+
rpc "github.com/arduino/arduino-cli/rpc/commands"
2828
"github.com/sirupsen/logrus"
2929
"github.com/spf13/cobra"
3030
)

Diff for: ‎cli/core/list.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import (
2727
"github.com/arduino/arduino-cli/commands/core"
2828
"github.com/arduino/arduino-cli/common/formatter"
2929
"github.com/arduino/arduino-cli/output"
30-
"github.com/arduino/arduino-cli/rpc"
30+
rpc "github.com/arduino/arduino-cli/rpc/commands"
3131
"github.com/sirupsen/logrus"
3232
"github.com/spf13/cobra"
3333
)

Diff for: ‎cli/core/search.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ import (
2828
"github.com/arduino/arduino-cli/commands/core"
2929
"github.com/arduino/arduino-cli/common/formatter"
3030
"github.com/arduino/arduino-cli/output"
31-
"github.com/arduino/arduino-cli/rpc"
31+
rpc "github.com/arduino/arduino-cli/rpc/commands"
3232
"github.com/sirupsen/logrus"
3333
"github.com/spf13/cobra"
3434
)

Diff for: ‎cli/core/uninstall.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import (
2525
"github.com/arduino/arduino-cli/commands/core"
2626
"github.com/arduino/arduino-cli/common/formatter"
2727
"github.com/arduino/arduino-cli/output"
28-
"github.com/arduino/arduino-cli/rpc"
28+
rpc "github.com/arduino/arduino-cli/rpc/commands"
2929
"github.com/sirupsen/logrus"
3030
"github.com/spf13/cobra"
3131
)

Diff for: ‎cli/core/update_index.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import (
2424
"github.com/arduino/arduino-cli/cli"
2525
"github.com/arduino/arduino-cli/commands"
2626
"github.com/arduino/arduino-cli/common/formatter"
27-
"github.com/arduino/arduino-cli/rpc"
27+
rpc "github.com/arduino/arduino-cli/rpc/commands"
2828
"github.com/sirupsen/logrus"
2929
"github.com/spf13/cobra"
3030
)

Diff for: ‎cli/core/upgrade.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import (
2424
"github.com/arduino/arduino-cli/cli"
2525
"github.com/arduino/arduino-cli/commands/core"
2626
"github.com/arduino/arduino-cli/common/formatter"
27-
"github.com/arduino/arduino-cli/rpc"
27+
rpc "github.com/arduino/arduino-cli/rpc/commands"
2828
"github.com/sirupsen/logrus"
2929
"github.com/spf13/cobra"
3030
)

Diff for: ‎cli/daemon/daemon.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ import (
2525
"runtime"
2626

2727
"github.com/arduino/arduino-cli/cli"
28-
"github.com/arduino/arduino-cli/daemon"
29-
"github.com/arduino/arduino-cli/rpc"
28+
"github.com/arduino/arduino-cli/commands/daemon"
29+
rpc "github.com/arduino/arduino-cli/rpc/commands"
3030
"github.com/spf13/cobra"
3131
"google.golang.org/grpc"
3232
)

Diff for: ‎cli/lib/download.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import (
2525
"github.com/arduino/arduino-cli/cli"
2626
"github.com/arduino/arduino-cli/commands/lib"
2727
"github.com/arduino/arduino-cli/common/formatter"
28-
"github.com/arduino/arduino-cli/rpc"
28+
rpc "github.com/arduino/arduino-cli/rpc/commands"
2929
"github.com/spf13/cobra"
3030
)
3131

Diff for: ‎cli/lib/install.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import (
2525
"github.com/arduino/arduino-cli/cli"
2626
"github.com/arduino/arduino-cli/commands/lib"
2727
"github.com/arduino/arduino-cli/common/formatter"
28-
"github.com/arduino/arduino-cli/rpc"
28+
rpc "github.com/arduino/arduino-cli/rpc/commands"
2929
"github.com/spf13/cobra"
3030
)
3131

Diff for: ‎cli/lib/list.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import (
2424
"github.com/arduino/arduino-cli/cli"
2525
"github.com/arduino/arduino-cli/commands/lib"
2626
"github.com/arduino/arduino-cli/common/formatter"
27-
"github.com/arduino/arduino-cli/rpc"
27+
rpc "github.com/arduino/arduino-cli/rpc/commands"
2828
"github.com/gosuri/uitable"
2929
"github.com/sirupsen/logrus"
3030
"github.com/spf13/cobra"

Diff for: ‎cli/lib/search.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import (
2727
"github.com/arduino/arduino-cli/cli"
2828
"github.com/arduino/arduino-cli/commands/lib"
2929
"github.com/arduino/arduino-cli/common/formatter"
30-
"github.com/arduino/arduino-cli/rpc"
30+
rpc "github.com/arduino/arduino-cli/rpc/commands"
3131
"github.com/sirupsen/logrus"
3232
"github.com/spf13/cobra"
3333
semver "go.bug.st/relaxed-semver"

Diff for: ‎cli/lib/uninstall.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import (
2525
"github.com/arduino/arduino-cli/cli"
2626
"github.com/arduino/arduino-cli/commands/lib"
2727
"github.com/arduino/arduino-cli/common/formatter"
28-
"github.com/arduino/arduino-cli/rpc"
28+
rpc "github.com/arduino/arduino-cli/rpc/commands"
2929
"github.com/sirupsen/logrus"
3030
"github.com/spf13/cobra"
3131
)

Diff for: ‎cli/lib/update_index.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import (
2424
"github.com/arduino/arduino-cli/cli"
2525
"github.com/arduino/arduino-cli/commands"
2626
"github.com/arduino/arduino-cli/common/formatter"
27-
"github.com/arduino/arduino-cli/rpc"
27+
rpc "github.com/arduino/arduino-cli/rpc/commands"
2828
"github.com/spf13/cobra"
2929
)
3030

Diff for: ‎cli/lib/upgrade.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import (
2323
"github.com/arduino/arduino-cli/cli"
2424
"github.com/arduino/arduino-cli/commands/lib"
2525
"github.com/arduino/arduino-cli/common/formatter"
26-
"github.com/arduino/arduino-cli/rpc"
26+
rpc "github.com/arduino/arduino-cli/rpc/commands"
2727
"github.com/sirupsen/logrus"
2828
"github.com/spf13/cobra"
2929
"golang.org/x/net/context"

Diff for: ‎cli/output.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import (
2525
"github.com/arduino/arduino-cli/commands"
2626
"github.com/arduino/arduino-cli/common/formatter"
2727
"github.com/arduino/arduino-cli/output"
28-
"github.com/arduino/arduino-cli/rpc"
28+
rpc "github.com/arduino/arduino-cli/rpc/commands"
2929
)
3030

3131
// OutputJSONOrElse outputs the JSON encoding of v if the JSON output format has been

Diff for: ‎cli/upload/upload.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import (
2424
"github.com/arduino/arduino-cli/cli"
2525
"github.com/arduino/arduino-cli/commands/upload"
2626
"github.com/arduino/arduino-cli/common/formatter"
27-
"github.com/arduino/arduino-cli/rpc"
27+
rpc "github.com/arduino/arduino-cli/rpc/commands"
2828
"github.com/arduino/go-paths-helper"
2929
"github.com/spf13/cobra"
3030
)

Diff for: ‎commands/board/attach.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import (
2929
"github.com/arduino/arduino-cli/arduino/cores/packagemanager"
3030
"github.com/arduino/arduino-cli/arduino/sketches"
3131
"github.com/arduino/arduino-cli/commands"
32-
"github.com/arduino/arduino-cli/rpc"
32+
rpc "github.com/arduino/arduino-cli/rpc/commands"
3333
discovery "github.com/arduino/board-discovery"
3434
paths "github.com/arduino/go-paths-helper"
3535
)

Diff for: ‎commands/board/details.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import (
2424

2525
"github.com/arduino/arduino-cli/arduino/cores"
2626
"github.com/arduino/arduino-cli/commands"
27-
"github.com/arduino/arduino-cli/rpc"
27+
rpc "github.com/arduino/arduino-cli/rpc/commands"
2828
)
2929

3030
// Details FIXMEDOC

Diff for: ‎commands/board/list.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import (
2323
"fmt"
2424

2525
"github.com/arduino/arduino-cli/commands"
26-
"github.com/arduino/arduino-cli/rpc"
26+
rpc "github.com/arduino/arduino-cli/rpc/commands"
2727
)
2828

2929
// List FIXMEDOC

Diff for: ‎commands/board/listall.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import (
2323
"strings"
2424

2525
"github.com/arduino/arduino-cli/commands"
26-
"github.com/arduino/arduino-cli/rpc"
26+
rpc "github.com/arduino/arduino-cli/rpc/commands"
2727
)
2828

2929
// ListAll FIXMEDOC

Diff for: ‎commands/bundled_tools.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import (
2323

2424
"github.com/arduino/arduino-cli/arduino/cores"
2525
"github.com/arduino/arduino-cli/arduino/cores/packagemanager"
26-
"github.com/arduino/arduino-cli/rpc"
26+
rpc "github.com/arduino/arduino-cli/rpc/commands"
2727
)
2828

2929
// DownloadToolRelease downloads a ToolRelease

Diff for: ‎commands/compile/compile.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ import (
3434
"github.com/arduino/arduino-cli/legacy/builder"
3535
"github.com/arduino/arduino-cli/legacy/builder/i18n"
3636
"github.com/arduino/arduino-cli/legacy/builder/types"
37-
"github.com/arduino/arduino-cli/rpc"
37+
rpc "github.com/arduino/arduino-cli/rpc/commands"
3838
paths "github.com/arduino/go-paths-helper"
3939
properties "github.com/arduino/go-properties-orderedmap"
4040
"github.com/sirupsen/logrus"

Diff for: ‎commands/core/download.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import (
2626
"github.com/arduino/arduino-cli/arduino/cores"
2727
"github.com/arduino/arduino-cli/arduino/cores/packagemanager"
2828
"github.com/arduino/arduino-cli/commands"
29-
"github.com/arduino/arduino-cli/rpc"
29+
rpc "github.com/arduino/arduino-cli/rpc/commands"
3030
)
3131

3232
// PlatformDownload FIXMEDOC

Diff for: ‎commands/core/install.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import (
2626
"github.com/arduino/arduino-cli/arduino/cores"
2727
"github.com/arduino/arduino-cli/arduino/cores/packagemanager"
2828
"github.com/arduino/arduino-cli/commands"
29-
"github.com/arduino/arduino-cli/rpc"
29+
rpc "github.com/arduino/arduino-cli/rpc/commands"
3030
)
3131

3232
// PlatformInstall FIXMEDOC

Diff for: ‎commands/core/list.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222
"errors"
2323

2424
"github.com/arduino/arduino-cli/commands"
25-
"github.com/arduino/arduino-cli/rpc"
25+
rpc "github.com/arduino/arduino-cli/rpc/commands"
2626
)
2727

2828
// PlatformList FIXMEDOC

Diff for: ‎commands/core/search.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import (
2525

2626
"github.com/arduino/arduino-cli/arduino/cores"
2727
"github.com/arduino/arduino-cli/commands"
28-
"github.com/arduino/arduino-cli/rpc"
28+
rpc "github.com/arduino/arduino-cli/rpc/commands"
2929
)
3030

3131
// PlatformSearch FIXMEDOC

Diff for: ‎commands/core/uninstall.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import (
2525
"github.com/arduino/arduino-cli/arduino/cores"
2626
"github.com/arduino/arduino-cli/arduino/cores/packagemanager"
2727
"github.com/arduino/arduino-cli/commands"
28-
"github.com/arduino/arduino-cli/rpc"
28+
rpc "github.com/arduino/arduino-cli/rpc/commands"
2929
)
3030

3131
// PlatformUninstall FIXMEDOC

Diff for: ‎commands/core/upgrade.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import (
2525

2626
"github.com/arduino/arduino-cli/arduino/cores/packagemanager"
2727
"github.com/arduino/arduino-cli/commands"
28-
"github.com/arduino/arduino-cli/rpc"
28+
rpc "github.com/arduino/arduino-cli/rpc/commands"
2929
)
3030

3131
// PlatformUpgrade FIXMEDOC

0 commit comments

Comments
 (0)