Run Grunt programmatically with the {gruntfile: false} option. Closes g…

…h-1108.
gruntjs · Jul 10, 2014 · 77155e3 · dnozay · Nov 14, 2014 · dnozay
1 parent 4ca015b
commit 77155e3
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 10 deletions.
diff --git a/lib/grunt.js b/lib/grunt.js
@@ -117,7 +117,7 @@ grunt.tasks = function(tasks, options, done) {
   tasks = task.parseArgs([tasksSpecified ? tasks : 'default']);
 
   // Initialize tasks.
-  task.init(tasks, {nogruntfile: !!options.nogruntfile});
+  task.init(tasks, options);
 
   verbose.writeln();
   if (!tasksSpecified) {

diff --git a/lib/grunt/cli.js b/lib/grunt/cli.js
@@ -58,10 +58,6 @@ var optlist = cli.optlist = {
     info: 'Specify an alternate Gruntfile. By default, grunt looks in the current or parent directories for the nearest Gruntfile.js or Gruntfile.coffee file.',
     type: path
   },
-  nogruntfile: {
-    info: 'Disable the Gruntfile.js or Gruntfile.coffee file. Useful when using Grunt programmatically from JavaScript.',
-    type: path
-  },
   debug: {
     short: 'd',
     info: 'Enable debugging mode for tasks that support it.',

diff --git a/lib/grunt/task.js b/lib/grunt/task.js
@@ -425,19 +425,26 @@ task.init = function(tasks, options) {
 
   // Get any local Gruntfile or tasks that might exist. Use --gruntfile override
   // if specified, otherwise search the current directory or any parent.
-  var gruntfile = allInit ? null : grunt.option('gruntfile') ||
-    grunt.file.findup('Gruntfile.{js,coffee}', {nocase: true});
+  var gruntfile, msg;
+  if (allInit || options.gruntfile === false) {
+    gruntfile = null;
+  } else {
+    gruntfile = grunt.option('gruntfile') ||
+      grunt.file.findup('Gruntfile.{js,coffee}', {nocase: true});
+    msg = 'Reading "' + (gruntfile ? path.basename(gruntfile) : '???') + '" Gruntfile...';
+  }
 
-  var msg = 'Reading "' + (gruntfile ? path.basename(gruntfile) : '???') + '" Gruntfile...';
-  if (gruntfile && grunt.file.exists(gruntfile)) {
+  if (options.gruntfile === false) {
+    // Grunt was run as a lib with {gruntfile: false}.
+  } else if (gruntfile && grunt.file.exists(gruntfile)) {
     grunt.verbose.writeln().write(msg).ok();
     // Change working directory so that all paths are relative to the
     // Gruntfile's location (or the --base option, if specified).
     process.chdir(grunt.option('base') || path.dirname(gruntfile));
     // Load local tasks, if the file exists.
     loadTasksMessage('Gruntfile');
     loadTask(gruntfile);
-  } else if (options.help || options.nogruntfile || allInit) {
+  } else if (options.help || allInit) {
     // Don't complain about missing Gruntfile.
   } else if (grunt.option('gruntfile')) {
     // If --config override was specified and it doesn't exist, complain.