Skip to content

Commit a20f7b8

Browse files
author
remi Taylor
committed
Merge master into new-storage-samples
- storage/Rakefile was removed - gcloud dependency was updated to google-cloud-storage
2 parents 8eb78d6 + 070bfb2 commit a20f7b8

101 files changed

Lines changed: 1546 additions & 1469 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.rubocop.yml

Lines changed: 0 additions & 112 deletions
This file was deleted.

.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ env:
3939
- TEST_DIR=translate
4040
- TEST_DIR=language
4141
- TEST_DIR=appengine/endpoints
42+
- TEST_DIR=vision
4243

4344
before_install:
4445
- openssl aes-256-cbc -K $encrypted_aeb4e2af7332_key -iv $encrypted_aeb4e2af7332_iv
@@ -49,5 +50,4 @@ install:
4950
- bundle install --deployment --path ../vendor/bundle --jobs=3 --retry=3
5051

5152
script:
52-
- bundle exec rake rubocop
53-
- bundle exec rake spec
53+
- bundle exec rspec

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ scaffolding for other frameworks and use cases.
2323
1. Run the tests from the command line.
2424
```
2525
bundle install
26-
bundle exec rake spec
26+
bundle exec rspec
2727
```
2828

2929
## Contributing changes

appengine/analytics/Gemfile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@ source "https://rubygems.org"
1717
gem "sinatra"
1818

1919
group :test do
20-
gem "rake"
21-
gem "rubocop"
2220
gem "rspec"
2321
gem "capybara"
2422
gem "poltergeist"

appengine/analytics/Gemfile.lock

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ GEM
22
remote: https://rubygems.org/
33
specs:
44
addressable (2.4.0)
5-
ast (2.2.0)
65
capybara (2.7.0)
76
addressable
87
mime-types (>= 1.16)
@@ -19,21 +18,16 @@ GEM
1918
multi_json (1.11.2)
2019
nokogiri (1.6.7.2)
2120
mini_portile2 (~> 2.0.0.rc2)
22-
parser (2.3.0.7)
23-
ast (~> 2.2)
2421
poltergeist (1.9.0)
2522
capybara (~> 2.1)
2623
cliver (~> 0.3.1)
2724
multi_json (~> 1.0)
2825
websocket-driver (>= 0.2.0)
29-
powerpack (0.1.1)
3026
rack (1.6.4)
3127
rack-protection (1.5.3)
3228
rack
3329
rack-test (0.6.3)
3430
rack (>= 1.0)
35-
rainbow (2.1.0)
36-
rake (11.1.2)
3731
rspec (3.4.0)
3832
rspec-core (~> 3.4.0)
3933
rspec-expectations (~> 3.4.0)
@@ -47,19 +41,11 @@ GEM
4741
diff-lcs (>= 1.2.0, < 2.0)
4842
rspec-support (~> 3.4.0)
4943
rspec-support (3.4.1)
50-
rubocop (0.39.0)
51-
parser (>= 2.3.0.7, < 3.0)
52-
powerpack (~> 0.1)
53-
rainbow (>= 1.99.1, < 3.0)
54-
ruby-progressbar (~> 1.7)
55-
unicode-display_width (~> 1.0, >= 1.0.1)
56-
ruby-progressbar (1.7.5)
5744
sinatra (1.4.7)
5845
rack (~> 1.5)
5946
rack-protection (~> 1.4)
6047
tilt (>= 1.3, < 3)
6148
tilt (2.0.2)
62-
unicode-display_width (1.0.3)
6349
websocket-driver (0.6.3)
6450
websocket-extensions (>= 0.1.0)
6551
websocket-extensions (0.1.2)
@@ -72,10 +58,8 @@ PLATFORMS
7258
DEPENDENCIES
7359
capybara
7460
poltergeist
75-
rake
7661
rspec
77-
rubocop
7862
sinatra
7963

8064
BUNDLED WITH
81-
1.11.2
65+
1.12.5

appengine/analytics/Rakefile

Lines changed: 0 additions & 21 deletions
This file was deleted.

appengine/cloudsql/Gemfile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@ gem "sinatra"
2222
gem "sequel"
2323

2424
group :test do
25-
gem "rake"
26-
gem "rubocop"
2725
gem "rspec"
2826
gem "capybara"
2927
gem "poltergeist"

appengine/cloudsql/Gemfile.lock

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ GEM
22
remote: https://rubygems.org/
33
specs:
44
addressable (2.4.0)
5-
ast (2.2.0)
65
capybara (2.7.0)
76
addressable
87
mime-types (>= 1.16)
@@ -20,21 +19,16 @@ GEM
2019
mysql2 (0.4.3)
2120
nokogiri (1.6.7.2)
2221
mini_portile2 (~> 2.0.0.rc2)
23-
parser (2.3.0.7)
24-
ast (~> 2.2)
2522
poltergeist (1.9.0)
2623
capybara (~> 2.1)
2724
cliver (~> 0.3.1)
2825
multi_json (~> 1.0)
2926
websocket-driver (>= 0.2.0)
30-
powerpack (0.1.1)
3127
rack (1.6.4)
3228
rack-protection (1.5.3)
3329
rack
3430
rack-test (0.6.3)
3531
rack (>= 1.0)
36-
rainbow (2.1.0)
37-
rake (11.1.2)
3832
rspec (3.4.0)
3933
rspec-core (~> 3.4.0)
4034
rspec-expectations (~> 3.4.0)
@@ -48,20 +42,12 @@ GEM
4842
diff-lcs (>= 1.2.0, < 2.0)
4943
rspec-support (~> 3.4.0)
5044
rspec-support (3.4.1)
51-
rubocop (0.39.0)
52-
parser (>= 2.3.0.7, < 3.0)
53-
powerpack (~> 0.1)
54-
rainbow (>= 1.99.1, < 3.0)
55-
ruby-progressbar (~> 1.7)
56-
unicode-display_width (~> 1.0, >= 1.0.1)
57-
ruby-progressbar (1.7.5)
5845
sequel (4.32.0)
5946
sinatra (1.4.7)
6047
rack (~> 1.5)
6148
rack-protection (~> 1.4)
6249
tilt (>= 1.3, < 3)
6350
tilt (2.0.2)
64-
unicode-display_width (1.0.3)
6551
websocket-driver (0.6.3)
6652
websocket-extensions (>= 0.1.0)
6753
websocket-extensions (0.1.2)
@@ -75,11 +61,9 @@ DEPENDENCIES
7561
capybara
7662
mysql2
7763
poltergeist
78-
rake
7964
rspec
80-
rubocop
8165
sequel
8266
sinatra
8367

8468
BUNDLED WITH
85-
1.11.2
69+
1.12.5

appengine/cloudsql/Rakefile

Lines changed: 0 additions & 21 deletions
This file was deleted.

appengine/datastore/Gemfile

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,9 @@
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
23-
gem "rake"
24-
gem "rubocop"
2523
gem "rspec"
2624
end

0 commit comments

Comments
 (0)