From 11f75faf4daa3b20ceccd99964dacaaa1d6077a5 Mon Sep 17 00:00:00 2001 From: Tim Emiola <temiola@google.com> Date: Fri, 30 Jan 2015 23:54:39 -0800 Subject: [PATCH] Ensures the auth modules are available with just require 'grpc' - Also fixes some lint issues --- src/ruby/lib/grpc.rb | 2 ++ src/ruby/lib/grpc/auth/signet.rb | 1 + src/ruby/spec/auth/apply_auth_examples.rb | 1 - 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/ruby/lib/grpc.rb b/src/ruby/lib/grpc.rb index 81c67ec859..758ac0c2d1 100644 --- a/src/ruby/lib/grpc.rb +++ b/src/ruby/lib/grpc.rb @@ -27,6 +27,8 @@ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +require 'grpc/auth/compute_engine.rb' +require 'grpc/auth/service_account.rb' require 'grpc/errors' require 'grpc/grpc' require 'grpc/logconfig' diff --git a/src/ruby/lib/grpc/auth/signet.rb b/src/ruby/lib/grpc/auth/signet.rb index ba1a3a8d8f..1a2e5644e2 100644 --- a/src/ruby/lib/grpc/auth/signet.rb +++ b/src/ruby/lib/grpc/auth/signet.rb @@ -30,6 +30,7 @@ require 'signet/oauth_2/client' module Signet + # Signet::OAuth2 supports OAuth2 authentication. module OAuth2 AUTH_METADATA_KEY = :Authorization # Signet::OAuth2::Client creates an OAuth2 client diff --git a/src/ruby/spec/auth/apply_auth_examples.rb b/src/ruby/spec/auth/apply_auth_examples.rb index f626c54410..09b393026f 100644 --- a/src/ruby/spec/auth/apply_auth_examples.rb +++ b/src/ruby/spec/auth/apply_auth_examples.rb @@ -43,7 +43,6 @@ end WANTED_AUTH_KEY = :Authorization shared_examples 'apply/apply! are OK' do - # tests that use these examples need to define # # @client which should be an auth client -- GitLab