Skip to content

Commit 9a11dfa

Browse files
frankynfrankyn
authored
Merge pull request #65 from GoogleCloudPlatform/use-new-google-cloud-libraries
gcloud --> google-cloud-[product]
2 parents 1a329eb + eff1a4d commit 9a11dfa

File tree

23 files changed

+249
-379
lines changed

23 files changed

+249
-379
lines changed

‎appengine/datastore/Gemfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
source "https://rubygems.org"
1717

1818
gem "sinatra"
19-
gem "gcloud"
19+
gem "google-cloud-datastore"
2020
# [END dependencies]
2121

2222
group :test do

‎appengine/datastore/Gemfile.lock‎

Lines changed: 17 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,20 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
activesupport (4.2.6)
5-
i18n (~> 0.7)
6-
json (~> 1.7, >= 1.7.7)
7-
minitest (~> 5.1)
8-
thread_safe (~> 0.3, >= 0.3.4)
9-
tzinfo (~> 1.1)
104
addressable (2.4.0)
11-
autoparse (0.3.3)
12-
addressable (>= 2.3.1)
13-
extlib (>= 0.9.15)
14-
multi_json (>= 1.0.0)
15-
beefcake (1.1.0)
165
diff-lcs (1.2.5)
17-
digest-crc (0.4.1)
18-
extlib (0.9.16)
196
faraday (0.9.2)
207
multipart-post (>= 1.2, < 3)
21-
gcloud (0.7.2)
22-
beefcake (~> 1.0)
23-
digest-crc (~> 0.4)
24-
google-api-client (~> 0.8.3)
25-
grpc (~> 0.13.1)
26-
mime-types (~> 2.4)
27-
zonefile (~> 1.04)
28-
google-api-client (0.8.6)
29-
activesupport (>= 3.2)
30-
addressable (~> 2.3)
31-
autoparse (~> 0.3)
32-
extlib (~> 0.9)
33-
faraday (~> 0.9)
34-
googleauth (~> 0.3)
35-
launchy (~> 2.4)
36-
multi_json (~> 1.10)
37-
retriable (~> 1.4)
38-
signet (~> 0.6)
39-
google-protobuf (3.0.0.alpha.5.0.4)
8+
google-cloud-core (0.20.1)
9+
google-cloud-datastore (0.20.1)
10+
google-cloud-core (~> 0.20.0)
11+
google-protobuf (~> 3.0)
12+
googleapis-common-protos (~> 1.2)
13+
grpc (~> 1.0)
14+
google-protobuf (3.0.2)
15+
googleapis-common-protos (1.3.1)
16+
google-protobuf (~> 3.0)
17+
grpc (~> 1.0)
4018
googleauth (0.5.1)
4119
faraday (~> 0.9)
4220
jwt (~> 1.4)
@@ -45,28 +23,21 @@ GEM
4523
multi_json (~> 1.11)
4624
os (~> 0.9)
4725
signet (~> 0.7)
48-
grpc (0.13.1)
49-
google-protobuf (~> 3.0.0.alpha.5.0.3)
26+
grpc (1.0.0)
27+
google-protobuf (~> 3.0)
5028
googleauth (~> 0.5.1)
51-
i18n (0.7.0)
52-
json (1.8.3)
53-
jwt (1.5.4)
54-
launchy (2.4.3)
55-
addressable (~> 2.3)
29+
jwt (1.5.6)
5630
little-plugger (1.1.4)
5731
logging (2.1.0)
5832
little-plugger (~> 1.1)
5933
multi_json (~> 1.10)
60-
memoist (0.14.0)
61-
mime-types (2.99.1)
62-
minitest (5.8.4)
63-
multi_json (1.11.2)
34+
memoist (0.15.0)
35+
multi_json (1.12.1)
6436
multipart-post (2.0.0)
6537
os (0.9.6)
6638
rack (1.6.4)
6739
rack-protection (1.5.3)
6840
rack
69-
retriable (1.4.1)
7041
rspec (3.4.0)
7142
rspec-core (~> 3.4.0)
7243
rspec-expectations (~> 3.4.0)
@@ -80,7 +51,7 @@ GEM
8051
diff-lcs (>= 1.2.0, < 2.0)
8152
rspec-support (~> 3.4.0)
8253
rspec-support (3.4.1)
83-
signet (0.7.2)
54+
signet (0.7.3)
8455
addressable (~> 2.3)
8556
faraday (~> 0.9)
8657
jwt (~> 1.5)
@@ -89,17 +60,13 @@ GEM
8960
rack (~> 1.5)
9061
rack-protection (~> 1.4)
9162
tilt (>= 1.3, < 3)
92-
thread_safe (0.3.5)
9363
tilt (2.0.2)
94-
tzinfo (1.2.2)
95-
thread_safe (~> 0.1)
96-
zonefile (1.04)
9764

9865
PLATFORMS
9966
ruby
10067

10168
DEPENDENCIES
102-
gcloud
69+
google-cloud-datastore
10370
rspec
10471
sinatra
10572

‎appengine/datastore/app.rb‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515
#[START all]
1616
require "digest/sha2"
1717
require "sinatra"
18-
require "gcloud"
18+
require "google/cloud"
1919

20-
gcloud = Gcloud.new
20+
gcloud = Google::Cloud.new
2121
dataset = gcloud.datastore
2222

2323
get "/" do

‎appengine/pubsub/Gemfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ source "https://rubygems.org"
1717
gem "sinatra"
1818
gem "slim"
1919
gem "json"
20-
gem "gcloud"
20+
gem "google-cloud-pubsub"
2121

2222
group :test do
2323
gem "rspec"

‎appengine/pubsub/Gemfile.lock‎

Lines changed: 17 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,20 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
activesupport (4.2.6)
5-
i18n (~> 0.7)
6-
json (~> 1.7, >= 1.7.7)
7-
minitest (~> 5.1)
8-
thread_safe (~> 0.3, >= 0.3.4)
9-
tzinfo (~> 1.1)
104
addressable (2.4.0)
11-
autoparse (0.3.3)
12-
addressable (>= 2.3.1)
13-
extlib (>= 0.9.15)
14-
multi_json (>= 1.0.0)
15-
beefcake (1.1.0)
165
diff-lcs (1.2.5)
17-
digest-crc (0.4.1)
18-
extlib (0.9.16)
196
faraday (0.9.2)
207
multipart-post (>= 1.2, < 3)
21-
gcloud (0.7.2)
22-
beefcake (~> 1.0)
23-
digest-crc (~> 0.4)
24-
google-api-client (~> 0.8.3)
25-
grpc (~> 0.13.1)
26-
mime-types (~> 2.4)
27-
zonefile (~> 1.04)
28-
google-api-client (0.8.6)
29-
activesupport (>= 3.2)
30-
addressable (~> 2.3)
31-
autoparse (~> 0.3)
32-
extlib (~> 0.9)
33-
faraday (~> 0.9)
34-
googleauth (~> 0.3)
35-
launchy (~> 2.4)
36-
multi_json (~> 1.10)
37-
retriable (~> 1.4)
38-
signet (~> 0.6)
39-
google-protobuf (3.0.0.alpha.5.0.4)
8+
google-cloud-core (0.20.1)
9+
google-cloud-pubsub (0.20.0)
10+
google-cloud-core (~> 0.20.0)
11+
google-protobuf (~> 3.0)
12+
googleapis-common-protos (~> 1.2)
13+
grpc (~> 1.0)
14+
google-protobuf (3.0.2)
15+
googleapis-common-protos (1.3.1)
16+
google-protobuf (~> 3.0)
17+
grpc (~> 1.0)
4018
googleauth (0.5.1)
4119
faraday (~> 0.9)
4220
jwt (~> 1.4)
@@ -45,28 +23,22 @@ GEM
4523
multi_json (~> 1.11)
4624
os (~> 0.9)
4725
signet (~> 0.7)
48-
grpc (0.13.1)
49-
google-protobuf (~> 3.0.0.alpha.5.0.3)
26+
grpc (1.0.0)
27+
google-protobuf (~> 3.0)
5028
googleauth (~> 0.5.1)
51-
i18n (0.7.0)
5229
json (1.8.3)
53-
jwt (1.5.4)
54-
launchy (2.4.3)
55-
addressable (~> 2.3)
30+
jwt (1.5.6)
5631
little-plugger (1.1.4)
5732
logging (2.1.0)
5833
little-plugger (~> 1.1)
5934
multi_json (~> 1.10)
60-
memoist (0.14.0)
61-
mime-types (2.99.1)
62-
minitest (5.8.4)
63-
multi_json (1.11.2)
35+
memoist (0.15.0)
36+
multi_json (1.12.1)
6437
multipart-post (2.0.0)
6538
os (0.9.6)
6639
rack (1.6.4)
6740
rack-protection (1.5.3)
6841
rack
69-
retriable (1.4.1)
7042
rspec (3.4.0)
7143
rspec-core (~> 3.4.0)
7244
rspec-expectations (~> 3.4.0)
@@ -80,7 +52,7 @@ GEM
8052
diff-lcs (>= 1.2.0, < 2.0)
8153
rspec-support (~> 3.4.0)
8254
rspec-support (3.4.1)
83-
signet (0.7.2)
55+
signet (0.7.3)
8456
addressable (~> 2.3)
8557
faraday (~> 0.9)
8658
jwt (~> 1.5)
@@ -93,17 +65,13 @@ GEM
9365
temple (~> 0.7.3)
9466
tilt (>= 1.3.3, < 2.1)
9567
temple (0.7.6)
96-
thread_safe (0.3.5)
9768
tilt (2.0.2)
98-
tzinfo (1.2.2)
99-
thread_safe (~> 0.1)
100-
zonefile (1.04)
10169

10270
PLATFORMS
10371
ruby
10472

10573
DEPENDENCIES
106-
gcloud
74+
google-cloud-pubsub
10775
json
10876
rspec
10977
sinatra

‎appengine/pubsub/app.rb‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616
require "slim"
1717
require "json"
1818
require "base64"
19-
require "gcloud"
19+
require "google/cloud"
2020

21-
gcloud = Gcloud.new
21+
gcloud = Google::Cloud.new
2222
pubsub = gcloud.pubsub
2323

2424
# [START envvars]

‎appengine/pubsub/spec/pubsub_spec.rb‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@
1515
require File.expand_path("../../../../spec/e2e", __FILE__)
1616
require "rspec"
1717
require "net/http"
18-
require "gcloud"
18+
require "google/cloud"
1919

2020
RSpec.describe "PubSub E2E test" do
2121
before :all do
2222
@topic_name = "flexible-topic"
2323

24-
gcloud = Gcloud.new
24+
gcloud = Google::Cloud.new
2525
@pubsub = gcloud.pubsub
2626
topic = @pubsub.topic @topic_name
2727
@pubsub.create_topic @topic_name unless topic

‎appengine/storage/Gemfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
source "https://rubygems.org"
1717

1818
gem "sinatra"
19-
gem "gcloud"
19+
gem "google-cloud-storage"
2020
# [END dependencies]
2121

2222
group :test do

0 commit comments

Comments
 (0)