Merge pull request #48 from GoogleCloudPlatform/fix-travis

Remove explicit installation of Google Cloud SDK

Author: remi Taylor

.travis.yml

@@ -28,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
@@ -39,30 +38,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/.rspec

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

bigquery/.rspec

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

datastore/.rspec

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

datastore/Gemfile

@@ -15,7 +15,7 @@
 source "https://rubygems.org"
 
 gem "sinatra"
-gem "gcloud", "~> 0.9.0"
+gem "gcloud", "~> 0.12.2"
 
 group :test do
   gem "rake"

datastore/Gemfile.lock

@@ -1,41 +1,29 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (4.2.6)
-      i18n (~> 0.7)
-      json (~> 1.7, >= 1.7.7)
-      minitest (~> 5.1)
-      thread_safe (~> 0.3, >= 0.3.4)
-      tzinfo (~> 1.1)
     addressable (2.4.0)
     ast (2.2.0)
-    autoparse (0.3.3)
-      addressable (>= 2.3.1)
-      extlib (>= 0.9.15)
-      multi_json (>= 1.0.0)
     diff-lcs (1.2.5)
     digest-crc (0.4.1)
-    extlib (0.9.16)
     faraday (0.9.2)
       multipart-post (>= 1.2, < 3)
-    gcloud (0.9.0)
+    gcloud (0.12.2)
       digest-crc (~> 0.4)
-      google-api-client (~> 0.8.3)
-      google-protobuf (~> 3.0.0.alpha.5.0.5)
-      grpc (~> 0.13.1)
-      mime-types (~> 2.4)
+      google-api-client (~> 0.9.11)
+      google-protobuf (= 3.0.0.alpha.5.0.5.1)
+      grpc (= 1.0.0.pre1)
+      mime-types (>= 2.4, < 4.0)
       zonefile (~> 1.04)
-    google-api-client (0.8.6)
-      activesupport (>= 3.2)
+    google-api-client (0.9.12)
       addressable (~> 2.3)
-      autoparse (~> 0.3)
-      extlib (~> 0.9)
-      faraday (~> 0.9)
-      googleauth (~> 0.3)
-      launchy (~> 2.4)
-      multi_json (~> 1.10)
-      retriable (~> 1.4)
-      signet (~> 0.6)
+      googleauth (~> 0.5)
+      httpclient (~> 2.7)
+      hurley (~> 0.1)
+      memoist (~> 0.11)
+      mime-types (>= 1.6)
+      representable (~> 2.3.0)
+      retriable (~> 2.0)
+      thor (~> 0.19)
     google-protobuf (3.0.0.alpha.5.0.5.1)
     googleauth (0.5.1)
       faraday (~> 0.9)
@@ -45,21 +33,20 @@ GEM
       multi_json (~> 1.11)
       os (~> 0.9)
       signet (~> 0.7)
-    grpc (0.13.1)
+    grpc (1.0.0.pre1)
       google-protobuf (~> 3.0.0.alpha.5.0.3)
       googleauth (~> 0.5.1)
-    i18n (0.7.0)
-    json (1.8.3)
+    httpclient (2.8.2.3)
+    hurley (0.2)
     jwt (1.5.4)
-    launchy (2.4.3)
-      addressable (~> 2.3)
     little-plugger (1.1.4)
     logging (2.1.0)
       little-plugger (~> 1.1)
       multi_json (~> 1.10)
-    memoist (0.14.0)
-    mime-types (2.99.2)
-    minitest (5.9.0)
+    memoist (0.15.0)
+    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)
     os (0.9.6)
@@ -73,7 +60,9 @@ GEM
       rack (>= 1.0)
     rainbow (2.1.0)
     rake (11.1.2)
-    retriable (1.4.1)
+    representable (2.3.0)
+      uber (~> 0.0.7)
+    retriable (2.1.0)
     rspec (3.4.0)
       rspec-core (~> 3.4.0)
       rspec-expectations (~> 3.4.0)
@@ -94,7 +83,7 @@ GEM
       ruby-progressbar (~> 1.7)
       unicode-display_width (~> 1.0, >= 1.0.1)
     ruby-progressbar (1.8.1)
-    signet (0.7.2)
+    signet (0.7.3)
       addressable (~> 2.3)
       faraday (~> 0.9)
       jwt (~> 1.5)
@@ -103,23 +92,22 @@ GEM
       rack (~> 1.5)
       rack-protection (~> 1.4)
       tilt (>= 1.3, < 3)
-    thread_safe (0.3.5)
+    thor (0.19.1)
     tilt (2.0.4)
-    tzinfo (1.2.2)
-      thread_safe (~> 0.1)
+    uber (0.0.15)
     unicode-display_width (1.0.5)
     zonefile (1.04)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  gcloud (~> 0.9.0)
+  gcloud (~> 0.12.2)
   rack-test
   rake
   rspec
   rubocop
   sinatra
 
 BUNDLED WITH
-   1.11.2
+   1.12.5

datastore/sample.rb

@@ -91,6 +91,8 @@ def properties
     t.exclude_from_indexes! "description", true
   end
   # [END properties]
+
+  task
 end
 
 def array_value

datastore/spec/sample_spec.rb

@@ -45,7 +45,7 @@
 
   def create_task task_key
     task = datastore.entity task_key do |t|
-      t["type"] = "Personal"
+      t["category"] = "Personal"
       t["created"] = Time.utc(1999, 12, 31)
       t["done"] = false
       t["priority"] = 4
@@ -175,7 +175,7 @@ def delete_accounts
 
     expect(task.persisted?).to be(true)
     expect(task.properties.to_h.size).to eq(4)
-    expect(task["type"]).to eq("Personal")
+    expect(task["category"]).to eq("Personal")
     expect(task["done"]).to be(false)
     expect(task["priority"]).to eq(5)
     expect(task["description"]).to eq("Learn Cloud Datastore")
@@ -307,7 +307,7 @@ def delete_accounts
 
     expect(tasks.empty?).to be(false)
     expect(tasks.first.key.kind).to eq("Task")
-    expect(tasks.first["type"]).to eq("Personal")
+    expect(tasks.first["category"]).to eq("Personal")
     expect(tasks.first["priority"]).to eq(4)
     expect(tasks.first.properties.to_h.size).to eq(2)
   end
@@ -318,7 +318,7 @@ def delete_accounts
 
     expect(tasks.empty?).to be(false)
     expect(tasks.first.key.kind).to eq("Task")
-    expect(tasks.first["type"]).to eq("Personal")
+    expect(tasks.first["category"]).to eq("Personal")
     expect(tasks.first["priority"]).to eq(4)
     expect(tasks.first.properties.to_h.size).to eq(2)
   end
@@ -506,16 +506,16 @@ def delete_accounts
     representations = property_by_kind_run_query
 
     expect(representations.empty?).to be(false)
-    expect(representations.first.first).to eq("created")
-    expect(representations.first.last).to eq(["INT64"])
+    expect(representations["created"]).to eq(["INT64"])
+    expect(representations["category"]).to eq(["STRING"])
   end
 
   it "supports property_filtering_run_query" do
     properties_by_kind = property_filtering_run_query
 
     expect(properties_by_kind.empty?).to be(false)
-    expect(properties_by_kind.first.first).to eq("Task")
-    expect(properties_by_kind.first.last).to eq(["priority", "tag", "type"])
+    expect(properties_by_kind["Task"]).to include "priority"
+    expect(properties_by_kind["Task"]).to include "tag"
   end
 
   it "supports gql_run_query" do
@@ -560,7 +560,7 @@ def delete_accounts
 
   def expect_basic_task task
     expect(task.key.kind).to eq("Task")
-    expect(task["type"]).to eq("Personal")
+    expect(task["category"]).to eq("Personal")
     expect(task["done"]).to be(false)
   end
 end

logging/.rspec

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

pubsub/.rspec

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