v1.6.0. Close #7

.editorconfig

@@ -1,4 +1,4 @@
-# 2017 August 2
+# 2018 January 24
 # https://github.com/bevry/base
 
 root = true
@@ -21,3 +21,6 @@ indent_size = 4
 [{*.json,*.yml,*.bowerrc,*.babelrc}]
 indent_style = space
 indent_size = 2
+
+[*.json]
+insert_final_newline = true

.travis.yml

@@ -19,7 +19,7 @@ after_success:
 - eval "$(curl -s https://raw.githubusercontent.com/bevry/awesome-travis/ef794235b7094de5e49fb64e226da032ce135ecd/scripts/node-publish.bash)"
 notifications:
   slack:
-    secure: OT/AU89wKB4QzWSfHm3epj7SvfKMAHclYl1XP0A/QN5MT1yGJ14fOLhICuKp04JmEoC1IDGrkApHMRIue0oToQmhYkia0WxHNVnaThOY0lXtwy62vSMUJnju6ubBHUQ9OPFjfp2kVbDA4w376LeX40pHEtjr+TzshXsjp8JJNq7WwXBMZaPjeBH/fvDRuMLdCcxiL5YvkKBKPHE8coxHvuEWjxAls9mx6vviPRZ40gDscRwpdWWIglkvOUmTuWSP5QCU2LhWDul5LtFqbU1Ut08P34KfPyyHMSckc7tQb9phHMaQ325PXCm9sQGdue/jqQQ/cWipduPyBRrUXmDpPOW8UPaFOUp4PK1JoOVqIjodblucFlrkOuc0crEGAUnNYfXvAZTjGw74F3Qu9qe+ku/zHxO/5f4wNgB+ZZNeUAq7hSSeOyhb8ITHC+BkF/sC4ZGp2i07wg5D6PQPmWV1Wm2ru4/N7ODGVpw04AUZuh36KxkAqhGHqAxyUEo8ctjSzM0BG+R7GXcCXuxRF6cAvtjPjXYlzz20vNbkv8+ngYy9Vb82dJm/4+Nw0hxzolwntRfjnNIkZJwRZaQEXqBBk0dCnWbtK/zSXk3MtNlelZ+VNQ4UvUCVdWf2yQfscbMefDZ1VyyFZseCh6NB0G+R9qxG05SMJf5fgFTrq9J60iE=
+    secure: skKuh1YNPF2164YJ9DqfY7Ke5LSmxZ9eCZlkNNMxi/2oxjl6hT6V2V2syiODgb+Rq0SslyH48XTBMrpb3AlAh3WzKqDll9MQu4k0XK21r5959Q9D/EwhsbiRgcsPjW8xHlttaRJH8vBu13m6A3cqDc6qogZ9Z6/N4ryU3/3hu2WZZ561uFu9vPSIjt6rnUKShb9SfY9eo06ukK7y4O/eQfBU6S3DtOQchaEqK5XsSqh/DzfvP95GYlpjXmDIBDiMToWQTnIkdySG8nV34mYpEnOX6jxWiSOeTQ5oT9RGirAgTxBxUSt1YVtTeLb812Lp+aeteu3KvRgefqJClrgtEcaS1+4Sqk3FdZiVupAexPLgskmxKerQ0L7nePiYw6qddJlAU0otl8bBYSrtze31G1dD7y51dxp9ak+IkyTBLXdVYDcBvCU7pjTbpoY9XruGyaw/iec6ePPryTVbVdbdkeWKETW+01HtzyTxB2d+cGHGrMv8ZXXRByp8knjkUB1zrQk+ND+wYkm6nQpb+nm9fl2KyVbq2dIMJeRU+4NTVmQsEIfRnNx3ftCS4HG98hw53PQh8nVmBEoaMXcW16NtTsZeEgW1P1VJsE6hrF4N4xEbue+g9vHr6zNLbUc/02LZ2rgZIUMvDi0Us8kUYK5xW0x4FhEl7fA8pza7M+kn368=
   email:
     recipients:
-      secure: rbF6t5qJRyXYtes4hMd71LfONGYcYHWqPgdHfjJMh/i6V0Hda/cZXdMZMFhcIwEo3IqkbJW8RV+2nmI52BJWoP0Zn7bsvNg1ZIR8GgXJBh+T98uVE7dLN8xN7D4fJOfeSkkgQAtB5EFzHl03SEU26RAW2AMiejZAA47VBgzalfbjtGBGROOq3bD2cYH0JxBbHxRFrgUYWdUeLWQJWuKjbYIV8/eKz+mnnawA2HHXmXc8YCJ0WP47evlAgftSdQ4zwexzLM7cr/dAyanVqq0ecWusn5gSKJplawKKq1aVaD2d+0qQqatouyMzMjnIQvzsHS4VsL59p/myf10x8pXRb98dOA2cjfsb9wL6csdMBK+dmPuCHaJjnSXn+iL3yXyMuXtem0M08RYMSXG79YDwBE80MBSrP1AEcOoQLqJerLGCZsN5D5cl1NBqj56qiEYOZKhOq5o83JWWFl1QvJMhCuvMFW6AJl/ZYTnpK9JuDkObhsfRcf0KyuBOPyD2ZKogBy/5PhAJKp58fpxP1+8AzwP8kxDZuEcK1mXhmwHdUUgmvWh0839zMPzcEDfHovJrWH6BcmEdvebjEETjguD0I0JY7Sk9kdQnSH4FJLBt5WhuBL24u4ydjCZqpHJGeL0OwzcNiJppNmNEvV3DWVzJMUKUIDbF9vFXxKsWIzjJeDM=
+      secure: vH0XVm8JBG3l3sJ07vSwGuTREj0H2XSndrywlKa7rCL7X0z9a9u56WlMk0xggCnPQrkna5xlhILKMOXRjFwY2JtUs5x0iqLH5Wg/uoX6G6N9cyXZXHO7by3Cq70Mr5to+FKToTmmnG9QVEXbGDgYfYpsJE22MJclUb4RMttcHqFF/kVjXxFmHMOcfCP9hPb0GUwD2YZ4rRO+CvxCbVVJUt+Xb2fIWIAzQxR1vTzMVExUdLA2t2nFOxn1M0tOK9vHK+lmIEOnbOudyrE6OQacfCJ28Kdyp58uIjVFjFzH6rn+89g14Pd6sZwc2EJvGUb9h4gpVGDksj91Pc/J4XLsketErDRTXdix8wX59HsJz5Z3/5WIQgLu/QYofav77lyq3cKDoOKhQOecZhmowkcta8s62R9XUj26JUfkCtQyVEcRfj+HZ8uy8JmSCCn8Fz2ogEwZi1jmZzT75va6V91tmJSZQ4zuGhndsaC+BK86fmpBrFgpCNtuKAK8An9DHo0XNfnpxF3Lm4ul2g8YH2V8dEkhZuBJWZEiXFq0adtKfQEszoOEIFY2tyilUlzuy9zxnfWC5St8V8QZJ048BY5KTU6pSq/qFeJY6hTTrBKUN+4O5EWNKxc3kq09Bbbs7EyODs1kqW5aB3vR7X6DMsfYHU1JCvvzSK2K9c7ItypRx/s=

HISTORY.md

@@ -1,5 +1,11 @@
 # History
 
+## v1.6.0 2018 January 24
+- Keep and merge package scripts that are prefixed with `my:`
+    - Closes [issue #7](https://github.com/bevry/based/issues/7)
+- Unset surge env vars on travis if not needed
+- Updated base files
+
 ## v1.5.2 2018 January 24
 - Ask for the desired node version instead of guessing it
 - Updated base files

package.json

@@ -1,6 +1,6 @@
 {
   "name": "bevry-base",
-  "version": "1.5.2",
+  "version": "1.6.0",
   "description": "Automatic application of the Bevry base files /bevry/base",
   "homepage": "https://github.com/bevry/based",
   "license": "MIT",

source/index.js

@@ -290,9 +290,9 @@ function getPackageAuthor () {
 }
 */
 
-function mergeScript (packageData, script) {
-	packageData.scripts[script] = Object.keys(packageData.scripts)
-		.filter((key) => key.indexOf(`${script}:`) === 0 && packageData.scripts[key])
+function mergeScript (packageData, name, match) {
+	packageData.scripts[name] = Object.keys(packageData.scripts)
+		.filter((key) => match.test(key) && packageData.scripts[key])
 		.map((key) => `npm run ${key}`)
 		.join(' && ') || NO_NEED_SCRIPT
 }
@@ -531,6 +531,13 @@ async function init () {
 
 	// setup the package data variables
 	const packageDataLocal = getPackage()
+	const customPackageScripts = {}
+	Object.keys(packageDataLocal.scripts).forEach(function (key) {
+		if (key.indexOf('my:') === 0) {
+			const value = packageDataLocal.scripts[key]
+			customPackageScripts[key] = value
+		}
+	})
 	const packageData = Object.assign(
 		{
 			license: 'MIT',
@@ -581,7 +588,7 @@ async function init () {
 					slackinURL: 'https://slack.bevry.me'
 				}
 			},
-			scripts: {
+			scripts: Object.assign({
 				'our:setup': '',
 				'our:setup:npm': 'npm install',
 				'our:setup:docpad': '',
@@ -606,7 +613,7 @@ async function init () {
 				'our:release:tag': "export MESSAGE=$(cat ./HISTORY.md | sed -n \"/## v$npm_package_version/,/##/p\" | sed 's/## //' | awk 'NR>1{print buf}{buf = $0}') && test \"$MESSAGE\" || (echo 'proper changelog entry not found' && exit -1) && git tag v$npm_package_version -am \"$MESSAGE\"",
 				'our:release:push': 'git push origin master && git push origin --tags',
 				'test': 'node --harmony ./test.js --joe-reporter=console'
-			}
+			}, customPackageScripts)
 		}
 	)
 
@@ -882,6 +889,9 @@ async function init () {
 				`eval "$(curl -s https://raw.githubusercontent.com/bevry/awesome-travis/${awesomeTravisCommit}/scripts/surge.bash)"`
 			)
 		}
+		else {
+			await util.spawn(['travis', 'env', 'unset', 'SURGE_LOGIN', 'SURGE_TOKEN'])
+		}
 		if (answers.publish) {
 			if (answers.npmAuthToken) {
 				await util.spawn(['travis', 'env', 'set', 'NPM_AUTHTOKEN', answers.npmAuthToken])
@@ -933,10 +943,11 @@ async function init () {
 			packageData.scripts['our:verify:flow'] = 'flow check'
 		}
 	}
-	mergeScript(packageData, 'our:setup')
-	mergeScript(packageData, 'our:compile')
-	mergeScript(packageData, 'our:meta')
-	mergeScript(packageData, 'our:verify')
+	mergeScript(packageData, 'our:setup', /^(our|my):setup/)
+	mergeScript(packageData, 'our:compile', /^(our|my):compile/)
+	mergeScript(packageData, 'our:meta', /^(our|my):meta/)
+	mergeScript(packageData, 'our:verify', /^(our|my):verify/)
+	// test is a special instance, so do not do it on test
 	Object.keys(packageData.scripts).forEach(function (key) {
 		if (packageData.scripts[key] === '') {
 			delete packageData.scripts[key]