Skip to content

Commit

Permalink
Merge branch 'master' into tmc.better_eof_handling
Browse files Browse the repository at this point in the history
  • Loading branch information
tmc authored Jul 18, 2016
2 parents efdf877 + f52d055 commit b069c86
Show file tree
Hide file tree
Showing 59 changed files with 351 additions and 353 deletions.
10 changes: 5 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,16 @@ before_install:
- go get github.com/golang/lint/golint
- go get github.com/dghubble/sling
install:
- go get github.com/gengo/grpc-gateway/protoc-gen-grpc-gateway
- go get github.com/gengo/grpc-gateway/runtime
- go get github.com/gengo/grpc-gateway/examples
- go get github.com/gengo/grpc-gateway/examples/server
- go get github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway
- go get github.com/grpc-ecosystem/grpc-gateway/runtime
- go get github.com/grpc-ecosystem/grpc-gateway/examples
- go get github.com/grpc-ecosystem/grpc-gateway/examples/server
before_script:
- sh -c 'cd examples/browser && npm install'
script:
- make realclean && make examples SWAGGER_CODEGEN="java -jar $HOME/local/swagger-codegen-cli.jar"
- if ! go version | grep devel; then test -z "$(git status --porcelain)" || (git status; git diff; exit 1); fi
- env GLOG_logtostderr=1 go test -race -v github.com/gengo/grpc-gateway/...
- env GLOG_logtostderr=1 go test -race -v github.com/grpc-ecosystem/grpc-gateway/...
- make lint
- sh -c 'cd examples/browser && gulp'
env:
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# You don't have to rebuild these targets by yourself unless you develop
# grpc-gateway itself.

PKG=github.com/gengo/grpc-gateway
PKG=github.com/grpc-ecosystem/grpc-gateway
GO_PLUGIN=bin/protoc-gen-go
GO_PLUGIN_PKG=github.com/golang/protobuf/protoc-gen-go
SWAGGER_PLUGIN=bin/protoc-gen-swagger
Expand Down
22 changes: 11 additions & 11 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# grpc-gateway

[![Build Status](https://travis-ci.org/gengo/grpc-gateway.svg?branch=master)](https://travis-ci.org/gengo/grpc-gateway)
[![Build Status](https://travis-ci.org/grpc-ecosystem/grpc-gateway.svg?branch=master)](https://travis-ci.org/grpc-ecosystem/grpc-gateway)

grpc-gateway is a plugin of [protoc](http://github.com/google/protobuf).
It reads [gRPC](http://github.com/grpc/grpc-common) service definition,
Expand Down Expand Up @@ -38,8 +38,8 @@ sudo make install
Then, `go get -u` as usual.

```sh
go get -u github.com/gengo/grpc-gateway/protoc-gen-grpc-gateway
go get -u github.com/gengo/grpc-gateway/protoc-gen-swagger
go get -u github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway
go get -u github.com/grpc-ecosystem/grpc-gateway/protoc-gen-swagger
go get -u github.com/golang/protobuf/protoc-gen-go
```

Expand Down Expand Up @@ -88,8 +88,8 @@ Make sure that your `$GOPATH/bin` is in your `$PATH`.
```sh
protoc -I/usr/local/include -I. \
-I$GOPATH/src \
-I$GOPATH/src/github.com/gengo/grpc-gateway/third_party/googleapis \
--go_out=Mgoogle/api/annotations.proto=github.com/gengo/grpc-gateway/third_party/googleapis/google/api,plugins=grpc:. \
-I$GOPATH/src/github.com/grpc-ecosystem/grpc-gateway/third_party/googleapis \
--go_out=Mgoogle/api/annotations.proto=github.com/grpc-ecosystem/grpc-gateway/third_party/googleapis/google/api,plugins=grpc:. \
path/to/your_service.proto
```

Expand All @@ -101,13 +101,13 @@ Make sure that your `$GOPATH/bin` is in your `$PATH`.
```sh
protoc -I/usr/local/include -I. \
-I$GOPATH/src \
-I$GOPATH/src/github.com/gengo/grpc-gateway/third_party/googleapis \
-I$GOPATH/src/github.com/grpc-ecosystem/grpc-gateway/third_party/googleapis \
--ruby_out=. \
path/to/your/service_proto

protoc -I/usr/local/include -I. \
-I$GOPATH/src \
-I$GOPATH/src/github.com/gengo/grpc-gateway/third_party/googleapis \
-I$GOPATH/src/github.com/grpc-ecosystem/grpc-gateway/third_party/googleapis \
--plugin=protoc-gen-grpc-ruby=grpc_ruby_plugin \
--grpc-ruby_out=. \
path/to/your/service.proto
Expand All @@ -118,7 +118,7 @@ Make sure that your `$GOPATH/bin` is in your `$PATH`.
```sh
protoc -I/usr/local/include -I. \
-I$GOPATH/src \
-I$GOPATH/src/github.com/gengo/grpc-gateway/third_party/googleapis \
-I$GOPATH/src/github.com/grpc-ecosystem/grpc-gateway/third_party/googleapis \
--grpc-gateway_out=logtostderr=true:. \
path/to/your_service.proto
```
Expand All @@ -135,7 +135,7 @@ Make sure that your `$GOPATH/bin` is in your `$PATH`.

"github.com/golang/glog"
"golang.org/x/net/context"
"github.com/gengo/grpc-gateway/runtime"
"github.com/grpc-ecosystem/grpc-gateway/runtime"
"google.golang.org/grpc"

gw "path/to/your_service_package"
Expand Down Expand Up @@ -176,7 +176,7 @@ Make sure that your `$GOPATH/bin` is in your `$PATH`.
```sh
protoc -I/usr/local/include -I. \
-I$GOPATH/src \
-I$GOPATH/src/github.com/gengo/grpc-gateway/third_party/googleapis \
-I$GOPATH/src/github.com/grpc-ecosystem/grpc-gateway/third_party/googleapis \
--swagger_out=logtostderr=true:. \
path/to/your_service.proto
```
Expand Down Expand Up @@ -221,4 +221,4 @@ But patch is welcome.

# License
grpc-gateway is licensed under the BSD 3-Clause License.
See [LICENSE.txt](https://github.com/gengo/grpc-gateway/blob/master/LICENSE.txt) for more details.
See [LICENSE.txt](https://github.com/grpc-ecosystem/grpc-gateway/blob/master/LICENSE.txt) for more details.
2 changes: 1 addition & 1 deletion examples/browser/bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"Yuki Yugui Sonoda <[email protected]>"
],
"license": "SEE LICENSE IN LICENSE file",
"homepage": "https://github.com/gengo/grpc-gateway",
"homepage": "https://github.com/grpc-ecosystem/grpc-gateway",
"private": true,
"dependencies": {
"swagger-js": "~> 2.1"
Expand Down
4 changes: 2 additions & 2 deletions examples/browser/gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ gulp.task('bower', function(){
});

gulp.task('server', shell.task([
'go build -o bin/example-server github.com/gengo/grpc-gateway/examples/server',
'go build -o bin/example-server github.com/grpc-ecosystem/grpc-gateway/examples/server',
]));

gulp.task('gateway', shell.task([
'go build -o bin/example-gw github.com/gengo/grpc-gateway/examples',
'go build -o bin/example-gw github.com/grpc-ecosystem/grpc-gateway/examples',
]));

gulp.task('serve-server', ['server'], function(){
Expand Down
4 changes: 2 additions & 2 deletions examples/client_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"reflect"
"testing"

"github.com/gengo/grpc-gateway/examples/clients/abe"
"github.com/gengo/grpc-gateway/examples/clients/echo"
"github.com/grpc-ecosystem/grpc-gateway/examples/clients/abe"
"github.com/grpc-ecosystem/grpc-gateway/examples/clients/echo"
)

func TestClientIntegration(t *testing.T) {
Expand Down
Loading

0 comments on commit b069c86

Please sign in to comment.