Merge pull request reactjs#45 from freeformz/heroku_button

zpao · zpao · commit a91501df3806 · 2015-04-02T12:31:14.000-07:00
Heroku button
diff --git a/README.md b/README.md
@@ -1,3 +1,5 @@
+[![Deploy](https://www.herokucdn.com/deploy/button.png)](https://heroku.com/deploy)
+
 # React Tutorial
 
 This is the React comment box example from [the React tutorial](http://facebook.github.io/react/docs/tutorial.html).
diff --git a/app.json b/app.json
@@ -0,0 +1,12 @@
+{
+  "name": "React Tutorial Server",
+  "description": "Code from the React tutorial",
+  "keywords": [ "react", "reactjs", "tutorial" ],
+  "repository": "https://github.com/reactjs/react-tutorial",
+  "website": "http://facebook.github.io/react/docs/tutorial.html",
+  "success_url": "/",
+  "env" : {
+    "BUILDPACK_URL": "https://github.com/heroku/heroku-buildpack-nodejs.git"
+  }
+}
+
diff --git a/package.json b/package.json
@@ -26,5 +26,8 @@
   "bugs": {
     "url": "https://github.com/reactjs/react-tutorial/issues"
   },
-  "homepage": "https://github.com/reactjs/react-tutorial"
+  "homepage": "https://github.com/reactjs/react-tutorial",
+  "engines" : {
+    "node" : "0.12.x"
+  }
 }
diff --git a/server.go b/server.go
@@ -85,8 +85,12 @@ func handleComments(w http.ResponseWriter, r *http.Request) {
 }
 
 func main() {
+	port := os.Getenv("PORT")
+	if port == "" {
+		port = "3000"
+	}
 	http.HandleFunc("/comments.json", handleComments)
 	http.Handle("/", http.FileServer(http.Dir("./public")))
-	log.Println("Server started: http://localhost:3000")
-	log.Fatal(http.ListenAndServe(":3000", nil))
+	log.Println("Server started: http://localhost:" + port)
+	log.Fatal(http.ListenAndServe(":"+port, nil))
 }
diff --git a/server.js b/server.js
@@ -16,6 +16,8 @@ var express = require('express');
 var bodyParser = require('body-parser');
 var app = express();
 
+app.set('port', (process.env.PORT || 3000));
+
 app.use('/', express.static(path.join(__dirname, 'public')));
 app.use(bodyParser.json());
 app.use(bodyParser.urlencoded({extended: true}));
@@ -39,6 +41,7 @@ app.post('/comments.json', function(req, res) {
   });
 });
 
-app.listen(3000);
 
-console.log('Server started: http://localhost:3000/');
+app.listen(app.get('port'), function() {
+  console.log('Server started: http://localhost:' + app.get('port') + '/');
+});
diff --git a/server.php b/server.php
@@ -3,8 +3,13 @@
     isset($_SERVER['argv'][0]) && $_SERVER['argv'][0] === 'server.php';
 
 if($scriptInvokedFromCli) {
-    echo 'starting server on port 3000' . PHP_EOL;
-    exec('php -S localhost:3000 -t public server.php');
+    $port = getenv('PORT');
+    if (empty($port)) {
+        $port = "3000";
+    }
+
+    echo 'starting server on port '. $port . PHP_EOL;
+    exec('php -S localhost:'. $port . ' -t public server.php');
 } else {
     return routeRequest();
 }
diff --git a/server.py b/server.py
@@ -9,6 +9,7 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 import json
+import os
 from flask import Flask, Response, request
 
 app = Flask(__name__, static_url_path='', static_folder='public')
@@ -29,4 +30,4 @@ def comments_handler():
     return Response(json.dumps(comments), mimetype='application/json', headers={'Cache-Control': 'no-cache'})
 
 if __name__ == '__main__':
-    app.run(port=3000)
+    app.run(port=int(os.environ.get("PORT",3000)))
diff --git a/server.rb b/server.rb
@@ -11,10 +11,12 @@
 require 'webrick'
 require 'json'
 
-puts 'Server started: http://localhost:3000/'
+port = ENV['PORT'].nil? ? 3000 : ENV['PORT'].to_i
+
+puts "Server started: http://localhost:#{port}/"
 
 root = File.expand_path './public'
-server = WEBrick::HTTPServer.new :Port => 3000, :DocumentRoot => root
+server = WEBrick::HTTPServer.new :Port => port, :DocumentRoot => root
 
 server.mount_proc '/comments.json' do |req, res|
   comments = JSON.parse(File.read('./comments.json'))

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+[![Deploy](https://www.herokucdn.com/deploy/button.png)](https://heroku.com/deploy)`
	`2`	`+`
`1`	`3`	`# React Tutorial`
`2`	`4`
`3`	`5`	`This is the React comment box example from [the React tutorial](http://facebook.github.io/react/docs/tutorial.html).`
Original file line number	Diff line number	Diff line change
`@@ -85,8 +85,12 @@ func handleComments(w http.ResponseWriter, r *http.Request) {`
`85`	`85`	`}`
`86`	`86`
`87`	`87`	`func main() {`
	`88`	`+ port := os.Getenv("PORT")`
	`89`	`+ if port == "" {`
	`90`	`+ port = "3000"`
	`91`	`+ }`
`88`	`92`	`http.HandleFunc("/comments.json", handleComments)`
`89`	`93`	`http.Handle("/", http.FileServer(http.Dir("./public")))`
`90`		`- log.Println("Server started: http://localhost:3000")`
`91`		`- log.Fatal(http.ListenAndServe(":3000", nil))`
	`94`	`+ log.Println("Server started: http://localhost:" + port)`
	`95`	`+ log.Fatal(http.ListenAndServe(":"+port, nil))`
`92`	`96`	`}`