Skip to content

Commit

Permalink
Upgraded dependencies, no longer testing on Node v0.10, switched to C…
Browse files Browse the repository at this point in the history
…odecov
  • Loading branch information
jmdobry committed Apr 13, 2016
1 parent 4d15ea0 commit dc24c7c
Show file tree
Hide file tree
Showing 15 changed files with 23 additions and 24 deletions.
1 change: 0 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ language: node_js
node_js:
- "stable"
- "0.12"
- "0.10"

cache:
directories:
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
This repository holds Node.js samples used throughout [cloud.google.com]().

[![Build Status](https://travis-ci.org/GoogleCloudPlatform/nodejs-docs-samples.svg)](https://travis-ci.org/GoogleCloudPlatform/nodejs-docs-samples)
[![Coverage Status](https://coveralls.io/repos/github/GoogleCloudPlatform/nodejs-docs-samples/badge.svg?branch=master)](https://coveralls.io/github/GoogleCloudPlatform/nodejs-docs-samples?branch=master)
[![Coverage Status](https://codecov.io/github/GoogleCloudPlatform/nodejs-getting-started/coverage.svg?branch=master)](https://codecov.io/github/GoogleCloudPlatform/nodejs-getting-started?branch=master)

## Table of Contents

Expand Down
2 changes: 1 addition & 1 deletion appengine/datastore/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ var crypto = require('crypto');
var app = express();
app.enable('trust proxy');

var dataset = gcloud.datastore.dataset({
var dataset = gcloud.datastore({
// This environment variable is set by app.yaml when running on GAE, but will
// need to be manually set when running locally.
projectId: process.env.GCLOUD_PROJECT
Expand Down
2 changes: 1 addition & 1 deletion appengine/datastore/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@
},
"dependencies": {
"express": "^4.13.4",
"gcloud": "^0.27.0"
"gcloud": "^0.30.3"
}
}
2 changes: 1 addition & 1 deletion appengine/pubsub/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"dependencies": {
"body-parser": "^1.14.2",
"express": "^4.13.4",
"gcloud": "^0.27.0",
"gcloud": "^0.30.3",
"jade": "^1.11.0"
}
}
2 changes: 1 addition & 1 deletion appengine/storage/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"dependencies": {
"body-parser": "^1.14.2",
"express": "^4.13.4",
"gcloud": "^0.27.0",
"gcloud": "^0.30.3",
"jade": "^1.11.0",
"multer": "^1.1.0"
}
Expand Down
2 changes: 1 addition & 1 deletion bigquery/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
},
"dependencies": {
"async": "^1.5.2",
"gcloud": "^0.29.0",
"gcloud": "^0.30.3",
"request": "^2.69.0"
}
}
2 changes: 1 addition & 1 deletion computeengine/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"vms_api": "node vms_api.js"
},
"dependencies": {
"gcloud": "^0.30.2",
"gcloud": "^0.30.3",
"googleapis": "^4.0.0",
"sendgrid": "^2.0.0"
}
Expand Down
10 changes: 5 additions & 5 deletions datastore/concepts.js
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ function Entity(projectId) {
if (keyFile) {
options.keyFilename = keyFile;
}
this.datastore = gcloud.datastore.dataset(options);
this.datastore = gcloud.datastore(options);

// To create the keys, we have to use this instance of Datastore.
datastore.key = this.datastore.key;
Expand Down Expand Up @@ -444,7 +444,7 @@ function Index(projectId) {
if (keyFile) {
options.keyFilename = keyFile;
}
this.datastore = gcloud.datastore.dataset(options);
this.datastore = gcloud.datastore(options);
}

Index.prototype.testUnindexedPropertyQuery = function(callback) {
Expand Down Expand Up @@ -494,7 +494,7 @@ function Metadata(projectId) {
if (keyFile) {
options.keyFilename = keyFile;
}
this.datastore = gcloud.datastore.dataset(options);
this.datastore = gcloud.datastore(options);
}

Metadata.prototype.testNamespaceRunQuery = function(callback) {
Expand Down Expand Up @@ -632,7 +632,7 @@ function Query(projectId) {
if (keyFile) {
options.keyFilename = keyFile;
}
this.datastore = gcloud.datastore.dataset(options);
this.datastore = gcloud.datastore(options);

this.basicQuery = this.getBasicQuery();
this.projectionQuery = this.getProjectionQuery();
Expand Down Expand Up @@ -1066,7 +1066,7 @@ function Transaction(projectId) {
if (keyFile) {
options.keyFilename = keyFile;
}
this.datastore = gcloud.datastore.dataset(options);
this.datastore = gcloud.datastore(options);

this.fromKey = this.datastore.key(['Bank', 1, 'Account', 1]);
this.toKey = this.datastore.key(['Bank', 1, 'Account', 2]);
Expand Down
2 changes: 1 addition & 1 deletion datastore/error.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

var gcloud = require('gcloud');

var dataset = gcloud.datastore.dataset({
var dataset = gcloud.datastore({
projectId: process.env.GCLOUD_PROJECT
});

Expand Down
2 changes: 1 addition & 1 deletion datastore/tasks.js
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ if (keyFile) {
options.keyFilename = keyFile;
}

var datastore = gcloud.datastore.dataset(options);
var datastore = gcloud.datastore(options);
// [END build_service]

/*
Expand Down
2 changes: 1 addition & 1 deletion logging/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@
"export": "node export.js"
},
"dependencies": {
"gcloud": "^0.27.0"
"gcloud": "^0.30.3"
}
}
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"ava": "ava --match='!*: dependencies should install*'",
"ava:deps": "npm run deps_appengine && npm run ava",
"cover": "npm run deps_appengine && nyc ava --match='!*: dependencies should install*'",
"report": "nyc report --reporter=text-lcov | ./node_modules/.bin/coveralls",
"report": "nyc report --reporter=lcov | codecov",
"report-html": "nyc report --reporter=html",
"deps_gce": "cd computeengine; npm i; cd ../",
"deps_bigquery": "cd bigquery; npm i; cd ../",
Expand All @@ -52,11 +52,11 @@
"devDependencies": {
"async": "^1.5.2",
"ava": "^0.13.0",
"coveralls": "^2.11.9",
"codecov": "^1.0.1",
"jshint": "~2.9.1",
"nyc": "^6.1.1",
"proxyquire": "^1.7.4",
"request": "^2.69.0",
"supertest": "^1.1.0"
"request": "^2.70.0",
"supertest": "^1.2.0"
}
}
2 changes: 1 addition & 1 deletion pubsub/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@
"subscription": "node subscription.js"
},
"dependencies": {
"gcloud": "^0.27.0"
"gcloud": "^0.30.3"
}
}
6 changes: 3 additions & 3 deletions test/appengine/all.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -79,14 +79,14 @@ var sampleTests = [
cmd: 'node',
args: ['./bin/www'],
msg: 'Hello World! Express.js on Google App Engine.',
TRAVIS_NODE_VERSION: '0.10'
TRAVIS_NODE_VERSION: '0.12'
},
{
dir: 'appengine/express-memcached-session',
cmd: 'node',
args: ['server.js'],
msg: 'Viewed',
TRAVIS_NODE_VERSION: '0.10'
TRAVIS_NODE_VERSION: '0.12'
},
{
dir: 'appengine/geddy',
Expand Down Expand Up @@ -212,7 +212,7 @@ var sampleTests = [
}
];

if (process.env.TRAVIS_NODE_VERSION === '0.10') {
if (process.env.TRAVIS_NODE_VERSION === '0.12') {
// For some reason the "npm install" step for the Sails sample doesn't work on
// Travis when using Node.js stable. It works locally, however.
sampleTests.push({
Expand Down

0 comments on commit dc24c7c

Please sign in to comment.