aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Tim Emiola <temiola@google.com>2015-01-30 23:54:39 -0800
committerGravatar Tim Emiola <temiola@google.com>2015-01-31 18:12:17 -0800
commit11f75faf4daa3b20ceccd99964dacaaa1d6077a5 (patch)
tree07402649a56edf53e686a78666dad039da00e68f
parent4694df3c4e8fb68c3b327070d25dcc4524b6badb (diff)
Ensures the auth modules are available with just require 'grpc'
- Also fixes some lint issues
-rw-r--r--src/ruby/lib/grpc.rb2
-rw-r--r--src/ruby/lib/grpc/auth/signet.rb1
-rw-r--r--src/ruby/spec/auth/apply_auth_examples.rb1
3 files changed, 3 insertions, 1 deletions
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