From e19ab7887f1005008f0eec688000e4604678e7fd Mon Sep 17 00:00:00 2001
From: Marcin Kurczewski <mkurczew@gmail.com>
Date: Sun, 12 Oct 2014 19:30:30 +0200
Subject: [PATCH] Switched grunt-shell to shelljs

---
 gruntfile.js | 49 +++++++++++++++++++++----------------------------
 package.json |  2 +-
 2 files changed, 22 insertions(+), 29 deletions(-)

diff --git a/gruntfile.js b/gruntfile.js
index 5d7f9f79..398349dc 100644
--- a/gruntfile.js
+++ b/gruntfile.js
@@ -2,6 +2,7 @@ var path = require('path');
 var fs = require('fs');
 var ini = require('ini');
 var rmdir = require('rimraf');
+require('shelljs/global');
 
 var phpCheckStyleConfigPath = path.join(path.resolve(), 'phpcheckstyle.cfg');
 var phpSourcesDir = path.join(path.resolve(), 'src');
@@ -71,28 +72,6 @@ module.exports = function(grunt) {
 			},
 		},
 
-		shell: {
-			options: {
-				stdin: false
-			},
-
-			phpcheckstyle: {
-				command: 'php vendor/jbrooksuk/phpcheckstyle/run.php --config <%= phpCheckStyleConfigPath %> --src <%= phpSourcesDir %> --exclude di.php --format console',
-			},
-
-			tests: {
-				command: 'php vendor/phpunit/phpunit/phpunit -v --strict --bootstrap src/Bootstrap.php tests/',
-			},
-
-			upgrade: {
-				command: 'php scripts/upgrade.php',
-			},
-
-			optimizeComposer: {
-				command: 'composer dumpautoload -o'
-			},
-		},
-
 		copy: {
 			dist: {
 				files: [
@@ -156,11 +135,22 @@ module.exports = function(grunt) {
 	grunt.loadNpmTasks('grunt-contrib-cssmin');
 	grunt.loadNpmTasks('grunt-contrib-copy');
 
-	grunt.registerTask('default', ['copy:dist', 'checkstyle', 'tests']);
-	grunt.registerTask('checkstyle', ['jshint', 'shell:phpcheckstyle']);
-	grunt.registerTask('tests', ['shell:tests']);
-	grunt.registerTask('update', ['shell:upgrade']);
-	grunt.registerTask('upgrade', ['shell:upgrade']);
+	grunt.registerTask('phpcheckstyle', function() {
+		exec('php vendor/jbrooksuk/phpcheckstyle/run.php --config ' + phpCheckStyleConfigPath + ' --src ' + phpSourcesDir + ' --exclude di.php --format console');
+	});
+
+	grunt.registerTask('tests', function() {
+		exec('php vendor/phpunit/phpunit/phpunit -v --strict --bootstrap src/Bootstrap.php tests/');
+	});
+
+	grunt.registerTask('update', ['upgrade']);
+	grunt.registerTask('update', function() {
+		exec('php scripts/upgrade.php');
+	});
+
+	grunt.registerTask('optimizeComposer', function() {
+		exec('composer dumpautoload -o');
+	});
 
 	grunt.registerTask('clean', function() {
 		fs.unlink('public_html/app.min.html');
@@ -168,6 +158,9 @@ module.exports = function(grunt) {
 		fs.unlink('public_html/app.min.js.map');
 		fs.unlink('public_html/app.min.css');
 	});
-	grunt.registerTask('build', ['clean', 'shell:optimizeComposer', 'copy:dist', 'uglify', 'cssmin', 'processhtml']);
+
+	grunt.registerTask('build', ['clean', 'optimizeComposer', 'copy:dist', 'uglify', 'cssmin', 'processhtml']);
+	grunt.registerTask('checkstyle', ['jshint', 'phpcheckstyle']);
+	grunt.registerTask('default', ['copy:dist', 'checkstyle', 'tests']);
 
 };
diff --git a/package.json b/package.json
index 8dc89d20..32ddd549 100644
--- a/package.json
+++ b/package.json
@@ -16,8 +16,8 @@
 		"grunt-contrib-cssmin": "*",
 		"grunt-contrib-jshint": "~0.10.0",
 		"grunt-contrib-copy": "*",
-		"grunt-shell": "~1.1.1",
 		"grunt-cli": "*",
+		"shelljs": "~0.3.0",
 		"rimraf": "~2.1"
 	}
 }