Merge pull request grpc#15356 from ganmacs/grpc-ruby-does-not-depends…

…-on-googleauth Grpc ruby does not need to depend on googleauth
sheenaqotj · Jun 2, 2018 · 17f682d · 17f682d
2 parents 7b50c55 + 64ab899
commit 17f682d
Show file tree

Hide file tree

Showing 8 changed files with 27 additions and 4 deletions.
diff --git a/examples/ruby/pubsub/.gitignore b/examples/ruby/pubsub/.gitignore
@@ -0,0 +1,15 @@
+/.bundle/
+/.yardoc
+/Gemfile.lock
+/_yardoc/
+/coverage/
+/doc/
+/pkg/
+/spec/reports/
+/tmp/
+*.bundle
+*.so
+*.o
+*.a
+mkmf.log
+vendor
diff --git a/examples/ruby/pubsub/Gemfile b/examples/ruby/pubsub/Gemfile
@@ -0,0 +1,4 @@
+source 'https://rubygems.org/'
+
+gem 'grpc', '~> 1.0'
+gem 'googleauth', '>= 0.5.1', '< 0.7'
diff --git a/src/ruby/bin/apis/google/protobuf/empty.rb → ...ples/ruby/pubsub/google/protobuf/empty.rb b/src/ruby/bin/apis/google/protobuf/empty.rb → ...ples/ruby/pubsub/google/protobuf/empty.rb
diff --git a/src/ruby/bin/apis/pubsub_demo.rb → examples/ruby/pubsub/pubsub_demo.rb b/src/ruby/bin/apis/pubsub_demo.rb → examples/ruby/pubsub/pubsub_demo.rb
diff --git a/...ruby/bin/apis/tech/pubsub/proto/pubsub.rb → ...s/ruby/pubsub/tech/pubsub/proto/pubsub.rb b/...ruby/bin/apis/tech/pubsub/proto/pubsub.rb → ...s/ruby/pubsub/tech/pubsub/proto/pubsub.rb
diff --git a/...apis/tech/pubsub/proto/pubsub_services.rb → ...bsub/tech/pubsub/proto/pubsub_services.rb b/...apis/tech/pubsub/proto/pubsub_services.rb → ...bsub/tech/pubsub/proto/pubsub_services.rb
diff --git a/grpc.gemspec b/grpc.gemspec
@@ -20,15 +20,16 @@ Gem::Specification.new do |s|
   s.files += Dir.glob('src/ruby/bin/**/*')
   s.files += Dir.glob('src/ruby/ext/**/*')
   s.files += Dir.glob('src/ruby/lib/**/*')
-  s.files += Dir.glob('src/ruby/pb/**/*')
+  s.files += Dir.glob('src/ruby/pb/**/*').reject do |f|
+    f.match(%r{^src/ruby/pb/test})
+  end
   s.files += Dir.glob('include/grpc/**/*')
   s.test_files = Dir.glob('src/ruby/spec/**/*')
   s.bindir = 'src/ruby/bin'
   s.require_paths = %w( src/ruby/lib src/ruby/bin src/ruby/pb )
   s.platform      = Gem::Platform::RUBY
 
   s.add_dependency 'google-protobuf', '~> 3.1'
-  s.add_dependency 'googleauth',      '>= 0.5.1', '< 0.7'
   s.add_dependency 'googleapis-common-protos-types', '~> 1.0.0'
 
   s.add_development_dependency 'bundler',            '~> 1.9'
@@ -41,6 +42,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rspec',              '~> 3.6'
   s.add_development_dependency 'rubocop',            '~> 0.49.1'
   s.add_development_dependency 'signet',             '~> 0.7.0'
+  s.add_development_dependency 'googleauth',         '>= 0.5.1', '< 0.7'
 
   s.extensions = %w(src/ruby/ext/grpc/extconf.rb)
 

diff --git a/templates/grpc.gemspec.template b/templates/grpc.gemspec.template
@@ -22,15 +22,16 @@
     s.files += Dir.glob('src/ruby/bin/**/*')
     s.files += Dir.glob('src/ruby/ext/**/*')
     s.files += Dir.glob('src/ruby/lib/**/*')
-    s.files += Dir.glob('src/ruby/pb/**/*')
+    s.files += Dir.glob('src/ruby/pb/**/*').reject do |f|
+      f.match(%r{^src/ruby/pb/test})
+    end
     s.files += Dir.glob('include/grpc/**/*')
     s.test_files = Dir.glob('src/ruby/spec/**/*')
     s.bindir = 'src/ruby/bin'
     s.require_paths = %w( src/ruby/lib src/ruby/bin src/ruby/pb )
     s.platform      = Gem::Platform::RUBY
 
     s.add_dependency 'google-protobuf', '~> 3.1'
-    s.add_dependency 'googleauth',      '>= 0.5.1', '< 0.7'
     s.add_dependency 'googleapis-common-protos-types', '~> 1.0.0'
 
     s.add_development_dependency 'bundler',            '~> 1.9'
@@ -43,6 +44,7 @@
     s.add_development_dependency 'rspec',              '~> 3.6'
     s.add_development_dependency 'rubocop',            '~> 0.49.1'
     s.add_development_dependency 'signet',             '~> 0.7.0'
+    s.add_development_dependency 'googleauth',         '>= 0.5.1', '< 0.7'
 
     s.extensions = %w(src/ruby/ext/grpc/extconf.rb)