Merge pull request #82 from erizocosmico/fix/multiple-packages

add proto folder path to proto_path

cli/proteus/main.go

@@ -143,12 +143,13 @@ func genAll(c *cli.Context) error {
 	return genRPCServer(c)
 }
 
-func protocExec(protocPath, pck, outPath, protoFile string) error {
+func protocExec(protocPath, pkg, outPath, protoFile string) error {
 	protocArgs := fmt.Sprintf(
-		"--proto_path=%s:%s:%s:.",
+		"--proto_path=%s:%s:%s:%s:.",
 		goSrc,
+		path,
 		filepath.Join(protobufSrc, "protobuf"),
-		filepath.Join(path, pck),
+		filepath.Join(path, pkg),
 	)
 
 	report.Info("executing protoc: %s %s", protocPath, protocArgs)

example/Makefile

@@ -1,7 +1,7 @@
 regenerate:
 	- make -C $(GOPATH)/src/gopkg.in/src-d/proteus.v1 reinstall
-	- proteus -p gopkg.in/src-d/proteus.v1/example -f $(GOPATH)/src/gopkg.in/src-d/proteus.v1/example/protos --verbose
+	- proteus -p gopkg.in/src-d/proteus.v1/example -p gopkg.in/src-d/proteus.v1/example/categories -f $(GOPATH)/src/gopkg.in/src-d/proteus.v1/example/protos --verbose
 	# Need to generate twice to avoid bug where rpc would detect the
 	# autogenerated methods as real ones, not generating them if proteus was
 	# called again.
-	- proteus -p gopkg.in/src-d/proteus.v1/example -f $(GOPATH)/src/gopkg.in/src-d/proteus.v1/example/protos --verbose
+	- proteus -p gopkg.in/src-d/proteus.v1/example -p gopkg.in/src-d/proteus.v1/example/categories -f $(GOPATH)/src/gopkg.in/src-d/proteus.v1/example/protos --verbose

example/categories/categories.go

@@ -0,0 +1,8 @@
+package categories
+
+// CategoryOptions is not marked for generations, but it is used in another
+// structs, so it will be generated because of it.
+type CategoryOptions struct {
+	ShowPrices bool
+	CanBuy     bool
+}