diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 764023a..1e9364e 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -11,7 +11,7 @@ Features and bugfixes are managed through Github's Issues and Pull Requests. Con * Run Go tests (test code generation): `cd protoc-gen-twirp_ruby` then `go test ./...` * Run example code (see [example/README.md](example/README.md)). -## Make a new release (for authors only) +## Make a new release (authors only) Once enough new features are added, a new release is drafted. @@ -19,9 +19,10 @@ Once enough new features are added, a new release is drafted. * Update VERSION with semantinc versioning in: * `lib/twirp/version.rb` and * `protoc-gen-twirp_ruby/version.go` - * Update the example code with new features (if needed), and re-generate code (see [example/README.md](example/README.md)). Make sure that you are using the latest version of `protoc-gen-twirp_ruby`, if the repo is in `$GOPATH/src/github.com/twitchtv/twirp-ruby`, then you only need to do `go install github.com/twitchtv/twirp-ruby/protoc-gen-twirp_ruby` before running the `protoc` command to generate code. The generated code should be annotated with the new version. * Run `bundle install` to update the `Gemfile.lock` file with the new version. - * Run tests. + * Run `rake` to run tests. + * Re-generate code (see [example/README.md](example/README.md)). Make sure to use the latest version of `protoc-gen-twirp_ruby`; if the repo is in `$GOPATH/src/github.com/twitchtv/twirp-ruby`, then you only need to do `go install github.com/twitchtv/twirp-ruby/protoc-gen-twirp_ruby` before running the `protoc` command to generate code. The generated code should be annotated with the new version. + * Update example code and README if needed with new features. * Commit changes for the new version in master and push to remote. * [Draft a new release](https://github.com/twitchtv/twirp-ruby/releases) in Github. Create a new tag with the version. Add release notes (see previous releases to keep the same format). * Build the gem: `gem build twirp.gemspec` and then push the new .gem file to Ruby Gems: `gem push twirp-X.X.X.gem`. You can delete the .gem file after that. diff --git a/Gemfile.lock b/Gemfile.lock index 6f35c1c..6a6d840 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,7 @@ PATH remote: . specs: - twirp (1.4.1) + twirp (1.5.0) faraday (< 2) google-protobuf (~> 3.0, >= 3.0.0) diff --git a/example/Gemfile.lock b/example/Gemfile.lock index e8ba06c..c5e32db 100644 --- a/example/Gemfile.lock +++ b/example/Gemfile.lock @@ -1,17 +1,17 @@ PATH remote: .. specs: - twirp (1.1.0) - faraday (~> 0) + twirp (1.5.0) + faraday (< 2) google-protobuf (~> 3.0, >= 3.0.0) GEM remote: https://rubygems.org/ specs: - faraday (0.14.0) + faraday (1.0.1) multipart-post (>= 1.2, < 3) - google-protobuf (3.5.1.2) - multipart-post (2.0.0) + google-protobuf (3.11.4) + multipart-post (2.1.1) rack (2.0.8) PLATFORMS @@ -22,4 +22,4 @@ DEPENDENCIES twirp! BUNDLED WITH - 1.16.1 + 1.17.2 diff --git a/example/hello_world/service_pb.rb b/example/hello_world/service_pb.rb index 0fdd466..10de1c1 100644 --- a/example/hello_world/service_pb.rb +++ b/example/hello_world/service_pb.rb @@ -16,7 +16,7 @@ module Example module HelloWorld - HelloRequest = Google::Protobuf::DescriptorPool.generated_pool.lookup("example.hello_world.HelloRequest").msgclass - HelloResponse = Google::Protobuf::DescriptorPool.generated_pool.lookup("example.hello_world.HelloResponse").msgclass + HelloRequest = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("example.hello_world.HelloRequest").msgclass + HelloResponse = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("example.hello_world.HelloResponse").msgclass end end diff --git a/example/hello_world/service_twirp.rb b/example/hello_world/service_twirp.rb index 834e9a3..a72ef39 100644 --- a/example/hello_world/service_twirp.rb +++ b/example/hello_world/service_twirp.rb @@ -1,4 +1,4 @@ -# Code generated by protoc-gen-twirp_ruby 1.3.0, DO NOT EDIT. +# Code generated by protoc-gen-twirp_ruby 1.4.1, DO NOT EDIT. require 'twirp' require_relative 'service_pb.rb' diff --git a/lib/twirp/version.rb b/lib/twirp/version.rb index cff86a6..da6869a 100644 --- a/lib/twirp/version.rb +++ b/lib/twirp/version.rb @@ -12,5 +12,5 @@ # permissions and limitations under the License. module Twirp - VERSION = "1.4.1" + VERSION = "1.5.0" end diff --git a/protoc-gen-twirp_ruby/version.go b/protoc-gen-twirp_ruby/version.go index d835fce..79f237e 100644 --- a/protoc-gen-twirp_ruby/version.go +++ b/protoc-gen-twirp_ruby/version.go @@ -15,4 +15,4 @@ package main // Version is the same version in the ruby gem: lib/twirp/version.rb // It helps identify what version of the code generator was used. -const Version = "1.4.1" +const Version = "1.5.0"