Merge pull request #12 from A21z/2.0.0

Version 2.0.0

Author: A21z

.eslintrc

@@ -0,0 +1,5 @@
+{
+  "extends": [
+    "standard"
+  ]
+}

.gitignore

@@ -13,4 +13,7 @@ results
 
 node_modules
 npm-debug.log
-node-cd.sh
+node-cd.sh
+
+.idea/
+.nvmrc

.travis.yml

@@ -1,6 +1,6 @@
 language: node_js
 node_js:
-  - 0.6
-  - 0.8
-  - 0.10.30
-script: "cd src && npm install"
+  - 4.2.2
+  - 5.0.0
+script: "npm test"
+sudo: false

README.md

@@ -1,24 +1,27 @@
 node-cd
 =======
 
-**Featherweight Github/Bitbucket Continuous Deployment**
+**Featherweight Github/Bitbucket/Contentful Continuous Deployment**
 
-Continuously deploy any code from Github to your server.  
+Continuously deploy any code from Github/Bitbucket/Contentful to your server.
 
-node-cd is a simple node.js app handling Github's and Bitbucket's post-receive hooks.  
-It can execute any script you want on your server: deployment, testing, etc.  
+node-cd is a simple node.js app handling Github's, Bitbucket's and Contentful's post-receive hooks.
+It can execute any script you want on your server: deployment, testing, etc.
 
 ## Installation
 
 	git clone https://github.com/A21z/node-cd.git
-	cd node-cd/src
 	npm install
 
 ## Usage
 
-* `cp node-cd.template.sh node-cd.sh`
-* Edit the `node-cd.sh` file to execute whatever you like after your commits (ex: stop server, git pull, start server)
+* Edit the `bitbucket.sh`, `contentful.sh` or `github.sh` file to execute whatever you like after your commits (ex: stop server, git pull, start server)
 * **For GitHub**: Set your post-receive hook as described [here](https://help.github.com/articles/post-receive-hooks) with the url `http://yourserver.com:61440/github`
 * **For Bitbucket**:  Set your post-receive hook as described [here](https://confluence.atlassian.com/display/BITBUCKET/POST+hook+management) with the url `http://yourserver.com:61440/bitbucket`
+* **For Contentful**: Set your webhook in your Settings > Webhooks with the url `http://yourserver.com:61440/contentful`
+* Add execution permission on scripts
+	`chmod +x bitbucket.sh contentful.sh github.sh`
 * Run the app
-	`WWW_PORT=61440 node node-cd.js`
+	`WWW_PORT=61440 node src/index.js`
+
+[![Build Status](https://travis-ci.org/A21z/node-cd.svg)](https://travis-ci.org/A21z/node-cd)

bitbucket.sh

@@ -0,0 +1,2 @@
+echo "Updating Template"
+echo "====================================="

config.js

@@ -1,37 +1,40 @@
-Private = {
-	server: {port: "61440"}, // Port is overriden by env var "WWW_PORT"
-	security: {		
-		authorizedIps:[
-			'127.0.0.1',
-			'localhost',
-      // Bitbucket IPs
-      // 131.103.20.165,
-      // 131.103.20.166
-			// Github's IPs
-			// '207.97.227.253',
-			// '50.57.128.197',
-			// '204.232.175.75',
-			// '108.171.174.178'
-		],
-		bitbucketIps: [
-			'131.103.20.165',
-      		'131.103.20.166'
-		],
-		githubIps: [
-			'207.97.227.253',
-			'50.57.128.197',
-			'204.232.175.75',
-			'108.171.174.178'
-		],
-		authorizedSubnet:[
-			'204.232.175.64/27',
-			'192.30.252.0/22'
-		]
-	},
-	repository: {
-		branch: 'refs/heads/master',
-	},
-	action: {exec: "../node-cd.sh"}
-};
+var Private = {
+  server: {port: '61440'}, // Port is overriden by env var 'WWW_PORT'
+  security: {
+    authorizedIps: [
+      '127.0.0.1',
+      'localhost'
+    ],
+    bitbucketIps: [
+      '131.103.20.160',
+      '131.103.20.27',
+      '131.103.20.165',
+      '165.254.145.0',
+      '165.254.145.26',
+      '104.192.143.0',
+      '104.192.143.24'
+    ],
+    githubIps: [
+      '207.97.227.253',
+      '50.57.128.197',
+      '204.232.175.75',
+      '108.171.174.178'
+    ],
+    githubAuthorizedSubnets: [
+      '204.232.175.64/27',
+      '192.30.252.0/22'
+    ]
+  },
+  repository: {
+    branch: 'master'
+  },
+  action: {
+    exec: {
+      github: './github.sh',
+      bitbucket: './bitbucket.sh',
+      contentful: './contentful.sh'
+    }
+  }
+}
 
-module.exports = Private;
+module.exports = Private

contentful.sh

@@ -0,0 +1,3 @@
+echo "Updating Content"
+echo "====================================="
+

github.sh

@@ -0,0 +1,23 @@
+{
+  "name": "node-cd",
+  "version": "2.0.0-rc",
+  "private": true,
+  "scripts": {
+    "start": "node src/index",
+    "test": "standard && tape test/**/*.js"
+  },
+  "dependencies": {
+    "express": "4.13.3",
+    "body-parser": "^1.6.3",
+    "morgan": "^1.5.0",
+    "netmask": "0.0.2",
+    "underscore": ""
+  },
+  "devDependencies": {
+    "eslint": "^1.10.1",
+    "eslint-config-standard": "^4.4.0",
+    "eslint-plugin-standard": "^1.3.1",
+    "standard": "^3.0.0",
+    "tape": "^4.2.2"
+  }
+}