.eslintrc.json

@@ -0,0 +1,43 @@
+{
+  "extends": "eslint:recommended",
+  "parserOptions": {
+    "ecmaVersion": 6,
+    "ecmaFeatures": {
+      "blockBindings": true,
+      "jsx": true,
+      "experimentalObjectRestSpread": true
+    },
+    "sourceType": "module"
+  },
+  "globals": {
+    "after": true,
+    "afterEach": true,
+    "before": true,
+    "beforeEach": true,
+    "describe": true,
+    "expect": true,
+    "it": true,
+    "ga": true
+  },
+  "env": {
+    "browser": true,
+    "node": true
+  },
+  "plugins": [
+    "react"
+  ],
+  "rules": {
+    "no-console": 0,
+    "new-cap": 0,
+    "strict": 0,
+    "no-underscore-dangle": 0,
+    "no-use-before-define": 0,
+    "no-unused-vars": [2, {"args": "after-used", "argsIgnorePattern": "^_"}],
+    "eol-last": 0,
+    "quotes": [2, "single"],
+    "jsx-quotes": 1,
+    "react/jsx-no-undef": 1,
+    "react/jsx-uses-react": 1,
+    "react/jsx-uses-vars": 1
+  }
+}

README.md

@@ -42,6 +42,7 @@ new CronJob('* * * * * *', function() {
 }, null, true, 'America/Los_Angeles');
 ```
 
+Note - You need to explictly start a job in order to make it run. This gives a little more control over running your jobs.
 
 Available Cron patterns:
 ==========

lib/cron.js

@@ -1,11 +1,20 @@
-var exports,
+(function (root, factory) {
+	if (typeof define === 'function' && define.amd) {
+		define(['moment-timezone'], factory);
+	} else if (typeof exports === 'object') {
+		module.exports = factory(require('moment-timezone'), require('child_process'));
+	} else {
+		root.Cron = factory(root.moment);
+	}
+}(this, function (moment, child_process) {
+
+var exports = {},
 		timeUnits = ['second', 'minute', 'hour', 'dayOfMonth', 'month', 'dayOfWeek'],
-		spawn = require('child_process').spawn,
-		moment = require('moment-timezone');
+		spawn = child_process && child_process.spawn;
 
 function CronTime(source, zone) {
 	this.source = source;
-	
+
 	if (zone) {
 		if (moment.tz.names().indexOf(zone) === -1) {
 			throw new Error('Invalid timezone.');
@@ -24,8 +33,7 @@ function CronTime(source, zone) {
 		this.realDate = true;
 	} else {
 		this._parse();
-		if (!this._verifyParse())
-			throw Error("Could not verify a valid date. Please verify your parameters.");
+		this._verifyParse();
 	}
 }
 
@@ -90,18 +98,15 @@ CronTime.prototype = {
 			}
 
 			if (!ok) {
-				console.error("Month '" + m + "' is limited to '" + con + "' days.");
-				return false;
+				console.warn('Month \'' + m + '\' is limited to \'' + con + '\' days.');
 			}
 		}
-
-		return true;
 	},
 
 	/**
 	 * calculates the next send time
 	 */
-	sendAt: function() {
+	sendAt: function(i) {
 		var date = this.realDate ? this.source : moment();
 		// Set the timezone if given (http://momentjs.com/timezone/docs/#/using-timezones/parsing-in-zone/)
 		if (this.zone)
@@ -121,9 +126,21 @@ CronTime.prototype = {
 			date = date.add(1, 's');
 		}
 
-		date = this._getNextDateFrom(date);
-
-		return date;
+		//If the i argument is not given, return the next send time
+		if(isNaN(i) || i < 0){
+			date = this._getNextDateFrom(date);
+			return date;
+		}
+		//Else return the next i send times
+		else{
+			var dates = [];
+			for(;i>0;i--){
+				date = this._getNextDateFrom(date);
+				dates.push(moment(date));
+				if(i>1) date.add(1,'s');
+			}
+			return dates;
+		}
 	},
 
 	/**
@@ -156,15 +173,15 @@ CronTime.prototype = {
 	_getNextDateFrom: function(start) {
 		var date = moment(start);
 		if (date.toString() == 'Invalid date') {
-			console.log("ERROR: You specified an invalid date.");
+			console.log('ERROR: You specified an invalid date.');
 			return date;
 		}
 		if (this.realDate && start < new Date())
-			console.log("WARNING: Date in past. Will never be fired.");
+			console.log('WARNING: Date in past. Will never be fired.');
 		if (this.realDate) return date;
 
 		//sanity check
-		while (1) {
+		while (true) {
 			var diff = date - start,
 				origDate = new Date(date);
 
@@ -236,8 +253,7 @@ CronTime.prototype = {
 	 * get next date that is a valid DST date
 	 */
 	_findDST: function(date) {
-		var newDate = moment(date),
-		addSeconds = 1;
+		var newDate = moment(date);
 		while (newDate <= date)
 			newDate.add(1, 's');
 
@@ -294,55 +310,56 @@ CronTime.prototype = {
 	},
 
 	_parseField: function(field, type, constraints) {
-		 var rangePattern = /^(\d+)(?:-(\d+))?(?:\/(\d+))?$/g,
-		 typeObj = this[type],
-		 diff, pointer,
-		 low = constraints[0],
-		 high = constraints[1];
-
-		 // * is a shortcut to [lower-upper] range
-		 field = field.replace(/\*/g, low + '-' + high);
-
-		 //commas separate information, so split based on those
-		 var allRanges = field.split(',');
-
-		 for (var i = 0; i < allRanges.length; i++) {
-			 if (allRanges[i].match(rangePattern)) {
-				 allRanges[i].replace(rangePattern, function($0, lower, upper, step) {
-					 step = parseInt(step) || 1;
-					 // Positive integer higher than constraints[0]
-					 lower = Math.min(Math.max(low, ~~Math.abs(lower)), high);
-
-					 // Positive integer lower than constraints[1]
-					 upper = upper ? Math.min(high, ~~Math.abs(upper)) : lower;
-
-					 // Count from the lower barrier to the upper
-					 pointer = lower;
-
-					 do {
-						 typeObj[pointer] = true
-					 pointer += step;
-					 } while (pointer <= upper);
-				 });
-			 } else {
-				 throw new Error('Field (' + field + ') cannot be parsed');
-			 }
-		 }
-	 }
+		var rangePattern = /^(\d+)(?:-(\d+))?(?:\/(\d+))?$/g,
+		typeObj = this[type],
+		pointer,
+		low = constraints[0],
+		high = constraints[1];
+
+		// * is a shortcut to [lower-upper] range
+		field = field.replace(/\*/g, low + '-' + high);
+
+		//commas separate information, so split based on those
+		var allRanges = field.split(',');
+
+		for (var i = 0; i < allRanges.length; i++) {
+			if (allRanges[i].match(rangePattern)) {
+				allRanges[i].replace(rangePattern, function($0, lower, upper, step) {
+					step = parseInt(step) || 1;
+					// Positive integer higher than constraints[0]
+					lower = Math.min(Math.max(low, ~~Math.abs(lower)), high);
+
+					// Positive integer lower than constraints[1]
+					upper = upper ? Math.min(high, ~~Math.abs(upper)) : lower;
+
+					// Count from the lower barrier to the upper
+					pointer = lower;
+
+					do {
+						typeObj[pointer] = true
+						pointer += step;
+					} while (pointer <= upper);
+				});
+			} else {
+				throw new Error('Field (' + field + ') cannot be parsed');
+			}
+		}
+	}
 };
 
 function command2function(cmd) {
+	var command, args;
 	switch (typeof cmd) {
 		case 'string':
-			var args = cmd.split(' ');
-			var command = args.shift();
+			args = cmd.split(' ');
+			command = args.shift();
 
 			cmd = spawn.bind(undefined, command, args);
 			break;
 		case 'object':
-			var command = cmd && cmd.command;
+			command = cmd && cmd.command;
 			if (command) {
-				var args = cmd.args;
+				args = cmd.args;
 				var options = cmd.options;
 
 				cmd = spawn.bind(undefined, command, args, options);
@@ -355,7 +372,7 @@ function command2function(cmd) {
 
 function CronJob(cronTime, onTick, onComplete, startNow, timeZone, context, runOnInit) {
 	var _cronTime = cronTime;
-	if (typeof cronTime != "string" && arguments.length == 1) {
+	if (typeof cronTime != 'string' && arguments.length == 1) {
 		//crontime is an object...
 		onTick = cronTime.onTick;
 		onComplete = cronTime.onComplete;
@@ -400,20 +417,41 @@ var fireOnTick = function() {
 }
 CronJob.prototype.fireOnTick = fireOnTick;
 
+CronJob.prototype.nextDates = function(i) {
+	return this.cronTime.sendAt(i);
+}
+
 var start = function() {
 	if (this.running) return;
 
 	var MAXDELAY = 2147483647; // The maximum number of milliseconds setTimeout will wait.
 	var self = this;
 	var timeout = this.cronTime.getTimeout();
 	var remaining = 0;
+	var startTime;
 
 	if (this.cronTime.realDate) this.runOnce = true;
 
+	function _setTimeout(timeout) {
+		startTime = Date.now();
+		self._timeout = setTimeout(callbackWrapper, timeout);
+	}
+
 	// The callback wrapper checks if it needs to sleep another period or not
 	// and does the real callback logic when it's time.
 
 	function callbackWrapper() {
+		var diff = startTime + timeout - Date.now();
+
+		if (diff > 0) {
+			var newTimeout = self.cronTime.getTimeout();
+
+			if (newTimeout > diff) {
+				newTimeout = diff;
+			}
+
+			remaining += newTimeout;
+		}
 
 		// If there is sleep time remaining, calculate how long and go to sleep
 		// again. This processing might make us miss the deadline by a few ms
@@ -430,7 +468,7 @@ var start = function() {
 				remaining = 0;
 			}
 
-			self._timeout = setTimeout(callbackWrapper, timeout);
+			_setTimeout(timeout);
 		} else {
 
 			// We have arrived at the correct point in time.
@@ -456,7 +494,7 @@ var start = function() {
 			timeout = MAXDELAY;
 		}
 
-		this._timeout = setTimeout(callbackWrapper, timeout);
+		_setTimeout(timeout);
 	} else {
 		this.stop();
 	}
@@ -478,23 +516,25 @@ CronJob.prototype.stop = function() {
 	if (typeof this.onComplete == 'function') this.onComplete();
 }
 
-if (exports) {
-	exports.job = function(cronTime, onTick, onComplete) {
-		return new CronJob(cronTime, onTick, onComplete);
-	}
-
-	exports.time = function(cronTime, timeZone) {
-		return new CronTime(cronTime, timeZone);
-	}
+exports.job = function(cronTime, onTick, onComplete) {
+	return new CronJob(cronTime, onTick, onComplete);
+}
 
-	exports.sendAt = function(cronTime) {
-		return exports.time(cronTime).sendAt();
-	}
+exports.time = function(cronTime, timeZone) {
+	return new CronTime(cronTime, timeZone);
+}
 
-	exports.timeout = function(cronTime) {
-		return exports.time(cronTime).getTimeout();
-	}
+exports.sendAt = function(cronTime) {
+	return exports.time(cronTime).sendAt();
+}
 
-	exports.CronJob = CronJob;
-	exports.CronTime = CronTime;
+exports.timeout = function(cronTime) {
+	return exports.time(cronTime).getTimeout();
 }
+
+exports.CronJob = CronJob;
+exports.CronTime = CronTime;
+
+return exports;
+
+}));

package.json

@@ -1,7 +1,7 @@
 {
   "name": "cron",
   "description": "Cron jobs for your node",
-  "version": "1.1.1",
+  "version": "1.2.0",
   "author": "Nick Campbell <nicholas.j.campbell@gmail.com> (http://github.com/ncb000gt)",
   "bugs" : {
     "url" : "http://github.com/ncb000gt/node-cron/issues"