Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Small fixes and throwing grunt options to executable tasks #3

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Small fixes and throwing grunt options to executable tasks #3

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6e5a7cf
Small fixes.
tenorok Mar 11, 2015
d9c49a4
Throwing grunt options to executable tasks.
tenorok Mar 11, 2015
db8e366
Correct resolving path to files.
tenorok Mar 17, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 12 additions & 6 deletions tasks/serve.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ var connect = require('connect'),
fs = require('fs'),
dot = require('dot'),
paths = require('path'),
url = require('url'),
contentTypes = require('../data/content_types.js');

// load all template files
Expand All @@ -34,7 +35,7 @@ var loadTemplate = function(name) {
*/
module.exports = function(grunt) {
// register serve task
grunt.registerTask('serve', 'Starts a http server that can be called to run tasks.', function() {
grunt.registerMultiTask('serve', 'Starts a http server that can be called to run tasks.', function() {
// control when the task should end
var done = this.async();

Expand Down Expand Up @@ -70,16 +71,15 @@ module.exports = function(grunt) {
grunt.log.write('Server is running on port '+options.port+'...\n');
grunt.log.write('Press CTRL+C at any time to terminate it.\n');
});
}
};

/**
* Handles all requests to the server.
* Each call with trigger a call to the following function.
*/
function handleRequest(request, response, grunt, options) {
// get url from request
var url = require('url').parse(request.url),
path = unescape(url.pathname);
// get url path from request
var path = decodeURI(url.parse(request.url).pathname);

// main page request?
if (path == '/') {
Expand Down Expand Up @@ -145,7 +145,7 @@ function handleRequest(request, response, grunt, options) {
*/
function executeTasks(request, response, grunt, options, tasks, output, contentType) {
// execute tasks
childProcess.exec('grunt '+tasks.join(' '), function(error, stdout, stderr) {
childProcess.exec('grunt '+tasks.join(' ')+' '+grunt.option.flags().join(' '), function(error, stdout, stderr) {
try {
// should we print the stdout?
if (!options.silently) {
Expand Down Expand Up @@ -176,6 +176,12 @@ function executeTasks(request, response, grunt, options, tasks, output, contentT
});

} else {
output = paths.resolve(
options.serve.path,
url.parse(request.url).pathname.replace(/^\//, ''),
output
);

// requested output file exists?
if (grunt.file.exists(output)) {
// write file
Expand Down