Merge branch 'master' into translate

Author: remi Taylor

.travis.yml

@@ -15,8 +15,7 @@
 sudo: false
 language: ruby
 rvm:
-- 2.2.3
-- 2.0.0
+- 2.3.1
 
 branches:
   only:
@@ -29,7 +28,6 @@ cache:
 
 env:
   global:
-  - PATH=$PATH:$HOME/gcloud/google-cloud-sdk/bin
   - GOOGLE_APPLICATION_CREDENTIALS=$TRAVIS_BUILD_DIR/client_secrets.json
   matrix:
   - TEST_DIR=storage
@@ -41,30 +39,8 @@ env:
   - TEST_DIR=appengine/endpoints
 
 before_install:
-#ENCRYPT YOUR PRIVATE KEY (If you need authentication)
-# 1. Install and login to the Travis CLI:
-#       $ gem install travis
-#       $ travis login
-# 2. Move your json private key to client_secrets.json
-# 3. Run:
-#       $ travis encrypt-file client_secrets.json --add
-# 4. Commit changes:
-#       $ git add client_secrets.json.enc
-#       $ git commit client_secrets.json.enc .travis.yml
 - openssl aes-256-cbc -K $encrypted_aeb4e2af7332_key -iv $encrypted_aeb4e2af7332_iv
   -in client_secrets.json.enc -out client_secrets.json -d
-- if [ ! -d $HOME/gcloud/google-cloud-sdk ]; then
-  mkdir -p $HOME/gcloud &&
-  wget https://dl.google.com/dl/cloudsdk/release/google-cloud-sdk.tar.gz --directory-prefix=$HOME/gcloud &&
-  cd $HOME/gcloud &&
-  tar xzf google-cloud-sdk.tar.gz &&
-  printf '\ny\n\ny\ny\n' | ./google-cloud-sdk/install.sh &&
-  cd $TRAVIS_BUILD_DIR;
-  fi
-- gcloud -q components update
-- if [ -a client_secrets.json ]; then
-  gcloud -q auth activate-service-account --key-file client_secrets.json;
-  fi
 
 install:
 - cd $TEST_DIR

appengine/endpoints/.gitignore

@@ -0,0 +1 @@
+endpoints/

appengine/endpoints/.rspec

@@ -0,0 +1 @@
+--tty --color --format documentation --order random

appengine/endpoints/Gemfile.lock

@@ -2,21 +2,23 @@ GEM
   remote: https://rubygems.org/
   specs:
     addressable (2.4.0)
-    ast (2.2.0)
+    ast (2.3.0)
     diff-lcs (1.2.5)
-    domain_name (0.5.20160310)
+    domain_name (0.5.20160615)
       unf (>= 0.0.5, < 1.0.0)
     faraday (0.9.2)
       multipart-post (>= 1.2, < 3)
     http-cookie (1.0.2)
       domain_name (~> 0.5)
-    json (1.8.3)
+    json (2.0.2)
     jwt (1.5.4)
-    mime-types (2.99.1)
-    multi_json (1.11.2)
+    mime-types (3.1)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2016.0521)
+    multi_json (1.12.1)
     multipart-post (2.0.0)
     netrc (0.11.0)
-    parser (2.3.0.7)
+    parser (2.3.1.2)
       ast (~> 2.2)
     powerpack (0.1.1)
     rack (1.6.4)
@@ -25,32 +27,32 @@ GEM
     rack-test (0.6.3)
       rack (>= 1.0)
     rainbow (2.1.0)
-    rake (11.1.2)
-    rest-client (1.8.0)
+    rake (11.2.2)
+    rest-client (2.0.0)
       http-cookie (>= 1.0.2, < 2.0)
-      mime-types (>= 1.16, < 3.0)
-      netrc (~> 0.7)
-    rspec (3.4.0)
-      rspec-core (~> 3.4.0)
-      rspec-expectations (~> 3.4.0)
-      rspec-mocks (~> 3.4.0)
-    rspec-core (3.4.4)
-      rspec-support (~> 3.4.0)
-    rspec-expectations (3.4.0)
+      mime-types (>= 1.16, < 4.0)
+      netrc (~> 0.8)
+    rspec (3.5.0)
+      rspec-core (~> 3.5.0)
+      rspec-expectations (~> 3.5.0)
+      rspec-mocks (~> 3.5.0)
+    rspec-core (3.5.2)
+      rspec-support (~> 3.5.0)
+    rspec-expectations (3.5.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.4.0)
-    rspec-mocks (3.4.1)
+      rspec-support (~> 3.5.0)
+    rspec-mocks (3.5.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.4.0)
-    rspec-support (3.4.1)
-    rubocop (0.39.0)
-      parser (>= 2.3.0.7, < 3.0)
+      rspec-support (~> 3.5.0)
+    rspec-support (3.5.0)
+    rubocop (0.42.0)
+      parser (>= 2.3.1.1, < 3.0)
       powerpack (~> 0.1)
       rainbow (>= 1.99.1, < 3.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (~> 1.0, >= 1.0.1)
-    ruby-progressbar (1.7.5)
-    signet (0.7.2)
+    ruby-progressbar (1.8.1)
+    signet (0.7.3)
       addressable (~> 2.3)
       faraday (~> 0.9)
       jwt (~> 1.5)
@@ -59,11 +61,11 @@ GEM
       rack (~> 1.5)
       rack-protection (~> 1.4)
       tilt (>= 1.3, < 3)
-    tilt (2.0.2)
+    tilt (2.0.5)
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.7.2)
-    unicode-display_width (1.0.3)
+    unicode-display_width (1.1.0)
 
 PLATFORMS
   ruby
@@ -79,4 +81,4 @@ DEPENDENCIES
   sinatra
 
 BUNDLED WITH
-   1.11.2
+   1.12.5

appengine/endpoints/README.md

@@ -1,7 +1,9 @@
 # Google Cloud Endpoints & App Engine Flexible Environment & Ruby
 
 This sample demonstrates how to use Google Cloud Endpoints on
-Google App Engine flexible environment using Ruby.
+Google App Engine flexible environment using Ruby. This sample requires that you
+have [Ruby](https://www.ruby-lang.org/en/documentation/installation/) 2.0.0 or
+newer installed.
 
 This sample consists of two parts:
 
@@ -27,7 +29,7 @@ In your web browser, go to the following address: http://localhost:8080.
 With the app running locally, you can execute the simple echo client using:
 
     $ bundle exec ruby clients/echo_client.rb \
-        --host https://localhost:8080 \
+        --host http://localhost:8080 \
         --api_key APIKEY \
         --message "message to echo"
 
@@ -40,7 +42,7 @@ Open the `swagger.yaml` file and in the `host` property, replace
 
 Then, deploy the sample using `gcloud`:
 
-    gcloud app deploy app.yaml
+    gcloud beta app deploy
 
 Once deployed, you can access the application at https://YOUR-PROJECT-ID.appspot.com/.
 

appengine/endpoints/clients/echo_client.rb

@@ -14,6 +14,7 @@
 
 # Example of calling a simple Google Cloud Endpoint API.
 
+require "json"
 require "optparse"
 require "rest-client"
 

appengine/endpoints/clients/google_id_token_client.rb

@@ -73,7 +73,8 @@
   redirect_uri:         "urn:ietf:wg:oauth:2.0:oob"
 )
 
-`open "#{oauth.authorization_uri}"`
+puts "Open the following URI in your browser to get the authorization code:"
+puts oauth.authorization_uri
 
 print "Enter authorization code: "
 

appengine/endpoints/swagger.yaml

@@ -102,5 +102,4 @@ securityDefinitions:
     authorizationUrl: ""
     flow: "implicit"
     type: "oauth2"
-    x-issuer: "accounts.google.com"
-    x-jwks_uri: "https://www.googleapis.com/oauth2/v1/certs"
+    x-issuer: "https://accounts.google.com"

bigquery/.rspec

@@ -0,0 +1 @@
+--tty --color --format documentation --order random

datastore/.rspec

@@ -0,0 +1 @@
+--tty --color --format documentation