Merge pull request #40 from GoogleCloudPlatform/simplify

Simplify app.yaml files, reduce # of e2e tests, and cleanup for webpa…

Author: jmdobry

appengine/express-memcached-session/app.yaml

@@ -14,5 +14,4 @@
 runtime: nodejs
 vm: true
 env_variables:
-  PORT: 8080
-  MEMCACHE_URL: localhost:11211
+  MEMCACHE_URL: localhost:11211

appengine/express/app.yaml

@@ -14,6 +14,4 @@
 # [START app_yaml]
 runtime: nodejs
 vm: true
-env_variables:
-  PORT: 8080
-# [END app_yaml]
+# [END app_yaml]

appengine/geddy/app.yaml

@@ -14,6 +14,4 @@
 # [START app_yaml]
 runtime: nodejs
 vm: true
-env_variables:
-  PORT: 8080
-# [END app_yaml]
+# [END app_yaml]

appengine/grunt/app.yaml

@@ -14,6 +14,4 @@
 # [START app_yaml]
 runtime: nodejs
 vm: true
-env_variables:
-  PORT: 8080
-# [END app_yaml]
+# [END app_yaml]

appengine/hapi/app.yaml

@@ -14,6 +14,4 @@
 # [START app_yaml]
 runtime: nodejs
 vm: true
-env_variables:
-  PORT: 8080
-# [END app_yaml]
+# [END app_yaml]

appengine/koa/app.yaml

@@ -14,6 +14,4 @@
 # [START app_yaml]
 runtime: nodejs
 vm: true
-env_variables:
-  PORT: 8080
-# [END app_yaml]
+# [END app_yaml]

appengine/kraken/app.yaml

@@ -14,6 +14,4 @@
 # [START app_yaml]
 runtime: nodejs
 vm: true
-env_variables:
-  PORT: 8080
-# [END app_yaml]
+# [END app_yaml]

appengine/loopback/app.yaml

@@ -14,6 +14,4 @@
 # [START app_yaml]
 runtime: nodejs
 vm: true
-env_variables:
-  PORT: 8080
-# [END app_yaml]
+# [END app_yaml]

appengine/mailgun/app.yaml

@@ -15,6 +15,5 @@
 runtime: nodejs
 vm: true
 env_variables:
-  PORT: 8080
   MAILGUN_API_KEY: <your-mailgun-api-key>
-# [END app_yaml]
+# [END app_yaml]

appengine/mongo/app.yaml

@@ -14,6 +14,4 @@
 # [START app_yaml]
 runtime: nodejs
 vm: true
-env_variables:
-  PORT: 8080
-# [END app_yaml]
+# [END app_yaml]

appengine/redis/app.yaml

@@ -14,6 +14,4 @@
 # [START app_yaml]
 runtime: nodejs
 vm: true
-env_variables:
-  PORT: 8080
-# [END app_yaml]
+# [END app_yaml]

appengine/restify/app.yaml

@@ -14,6 +14,4 @@
 # [START app_yaml]
 runtime: nodejs
 vm: true
-env_variables:
-  PORT: 8080
-# [END app_yaml]
+# [END app_yaml]

appengine/sails/app.yaml

@@ -14,6 +14,4 @@
 # [START app_yaml]
 runtime: nodejs
 vm: true
-env_variables:
-  PORT: 8080
-# [END app_yaml]
+# [END app_yaml]

appengine/webpack/app.yaml

@@ -10,5 +10,8 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+#
+# [START app_yaml]
 runtime: nodejs
 vm: true
+# [END app_yaml]

appengine/webpack/public/app.js

@@ -14,6 +14,8 @@
 /* global document:true */
 'use strict';
 
+// [START load_module]
 var foo = require('./foo.js');
+// [END load_module]
 
 document.getElementById('module-name').innerText = foo.name;

appengine/webpack/public/foo.js

@@ -13,6 +13,8 @@
 
 'use strict';
 
+// [START module]
 module.exports = {
   name: 'foo'
 };
+// [END module]

appengine/webpack/server.js

@@ -14,7 +14,6 @@
 'use strict';
 
 var express = require('express');
-var path = require('path');
 
 var app = express();
 

appengine/webpack/webpack.config.js

@@ -1,6 +1,21 @@
+// Copyright 2015, Google, Inc.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//    http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// [START webpack]
 module.exports = {
   entry: './public/app.js',
   output: {
     filename: './dist/app.js'
   }
 };
+// [END webpack]

test/appengine/all.test.js

@@ -43,11 +43,9 @@ var sampleTests = [
   },
   {
     dir: 'geddy',
-    deploy: true,
     cmd: 'node',
     args: ['node_modules/geddy/bin/cli.js'],
-    msg: 'Hello, World! Geddy.js on Google App Engine.',
-    TRAVIS_NODE_VERSION: '0.10'
+    msg: 'Hello, World! Geddy.js on Google App Engine.'
   },
   {
     dir: 'grunt',
@@ -59,29 +57,23 @@ var sampleTests = [
   },
   {
     dir: 'hapi',
-    deploy: true,
     cmd: 'node',
     args: ['index.js'],
-    msg: 'Hello World! Hapi.js on Google App Engine.',
-    TRAVIS_NODE_VERSION: '0.12'
+    msg: 'Hello World! Hapi.js on Google App Engine.'
   },
   {
     dir: 'kraken',
-    deploy: true,
     cmd: 'node',
     args: ['server.js'],
     msg: 'Hello World! Kraken.js on Google App Engine.',
-    code: 304,
-    TRAVIS_NODE_VERSION: '0.12'
+    code: 304
   },
   {
     dir: 'loopback',
-    deploy: true,
     cmd: 'node',
     args: ['server/server.js'],
     msg: 'LoopBack.js on Google App Engine.',
-    code: 304,
-    TRAVIS_NODE_VERSION: 'stable'
+    code: 304
   },
   {
     dir: 'mailgun',
@@ -97,15 +89,12 @@ var sampleTests = [
   },
   {
     dir: 'restify',
-    deploy: true,
     cmd: 'node',
     args: ['server.js'],
-    msg: 'Hello World! Restify.js on Google App Engine.',
-    TRAVIS_NODE_VERSION: 'stable'
+    msg: 'Hello World! Restify.js on Google App Engine.'
   },
   {
     dir: 'webpack',
-    deploy: false,
     cmd: 'node',
     args: ['server.js'],
     msg: 'Loaded module <span>foo</span> via Webpack.'
@@ -117,12 +106,10 @@ if (process.env.TRAVIS_NODE_VERSION === '0.10') {
   // Travis when using Node.js stable. It works locally, however.
   sampleTests.push({
     dir: 'sails',
-    deploy: true,
     cmd: 'node',
     args: ['app.js'],
     msg: 'Hello World! Sails.js on Google App Engine.',
-    timeout: 240000,
-    TRAVIS_NODE_VERSION: '0.10'
+    timeout: 240000
   });
 }