Merge branch 'nickknissen-use-yarn'

Author: krausest

README.md

@@ -8,14 +8,16 @@ Thanks to Baptiste Augrain for making the benchmarks more sophisticated and addi
 
 ## Prerequsites
 
-Have *node.js (>=6.0)* installed . If you want to do yourself a favour use nvm for that. The benchmark has been tested with node 6.0.
+Have *node.js (>=6.0)* installed. If you want to do yourself a favour use nvm for that and install yarn. The benchmark has been tested with node 6.0.
 You will also need *java* (>=6, e.g. openjdk-8-jre on ubuntu) for the google closure compiler, currently used in kivi.
 
 ## Building
 
 * To build the benchmarks for all frameworks:
 
 `npm install`
+or 
+`yarn`
 
 `npm run build`
 
@@ -26,6 +28,8 @@ The latter calls npm build-prod in each subproject.
 `cd aurelia`
 
 `npm install`
+or 
+`yarn`
 
 `npm run build-prod`
 

ember-v2.6.1/package.json

@@ -17,6 +17,7 @@
   "author": "",
   "license": "MIT",
   "devDependencies": {
+    "bower": "^1.7.9",
     "broccoli-asset-rev": "2.4.2",
     "ember-ajax": "2.0.1",
     "ember-cli": "2.6.2",

install.js

@@ -1,12 +1,20 @@
 var _ = require('lodash');
 var exec = require('child_process').execSync;
 var fs = require('fs');
+var commandExists = require('command-exists');
 
-_.each(fs.readdirSync('.'), function(name) {
-	if(fs.statSync(name).isDirectory() && name[0] !== '.' && name !== 'css' && name !== 'node_modules') {
-		exec('npm install', {
-			cwd: name,
-			stdio: 'inherit'
-		});
-	}
-});
+var instalCommand = 'npm install';
+
+commandExists('yarn', function(err, commandExists) {
+
+	instalCommand = commandExists ? 'yarn' : 'npm install';
+
+	_.each(fs.readdirSync('.'), function(name) {
+		if(fs.statSync(name).isDirectory() && name[0] !== '.' && name !== 'css' && name !== 'node_modules') {
+			exec(instalCommand, {
+				cwd: name,
+				stdio: 'inherit'
+			});
+		}
+	});
+});

package.json

@@ -25,6 +25,7 @@
   "license": "ISC",
   "homepage": "https://github.com/krausest/js-framework-benchmark",
   "dependencies": {
+    "command-exists": "^1.0.2",
     "fs-extra": "^0.30.0",
     "http-server": "^0.9.0",
     "lodash": "^4.15.0"