diff -Nru node-jake-0.7.9/debian/changelog node-jake-0.7.4/debian/changelog --- node-jake-0.7.9/debian/changelog 2014-03-22 14:33:15.000000000 +0000 +++ node-jake-0.7.4/debian/changelog 2014-09-23 10:52:23.000000000 +0000 @@ -1,15 +1,8 @@ -node-jake (0.7.9-1) unstable; urgency=low +node-jake (0.7.4-1~precise1~ppa1) precise; urgency=medium - * New upstream release. + * Backport from trusty. No changes. - -- Laszlo Boszormenyi (GCS) Sat, 22 Mar 2014 15:32:45 +0100 - -node-jake (0.7.7-1) unstable; urgency=low - - * New upstream release. - * Update watch file. - - -- Laszlo Boszormenyi (GCS) Mon, 17 Feb 2014 14:17:26 +0000 + -- Oliver Sauder Tue, 23 Sep 2014 13:52:00 +0300 node-jake (0.7.4-1) unstable; urgency=low diff -Nru node-jake-0.7.9/debian/watch node-jake-0.7.4/debian/watch --- node-jake-0.7.9/debian/watch 2014-02-17 17:58:07.000000000 +0000 +++ node-jake-0.7.4/debian/watch 2012-09-20 10:10:05.000000000 +0000 @@ -1,3 +1,3 @@ version=3 -opts=uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha|b|a)\d*)$/$1~$2/,dversionmangle=s/\+(debian|dfsg|ds|deb)\d*$// \ -https://github.com/mde/jake/tags .*/v?(\d.*)\.(?:tgz|tbz2|txz|tar\.(?:gz|bz2|xz)) +https://alioth.debian.org/~dapal/npmjs.php?id=jake \ + http://registry.npmjs.org/jake/-/jake-(\d+.*)\.tgz diff -Nru node-jake-0.7.9/lib/api.js node-jake-0.7.4/lib/api.js --- node-jake-0.7.9/lib/api.js 2014-03-08 07:20:35.000000000 +0000 +++ node-jake-0.7.4/lib/api.js 2013-11-13 02:56:25.000000000 +0000 @@ -353,13 +353,8 @@ return new jake.WatchTask(taskNames, definition); }; - this.testTask = function () { - var ctor = function () {} - , t; - ctor.prototype = jake.TestTask.prototype; - t = new ctor(); - jake.TestTask.apply(t, arguments); - return t; + this.testTask = function (name, definition) { + return new jake.TestTask(name, definition); }; })(); diff -Nru node-jake-0.7.9/lib/jake.js node-jake-0.7.4/lib/jake.js --- node-jake-0.7.9/lib/jake.js 2014-03-08 07:20:35.000000000 +0000 +++ node-jake-0.7.4/lib/jake.js 2013-11-13 02:56:25.000000000 +0000 @@ -310,13 +310,8 @@ else { opts = program.opts; // Load Jakefile and jakelibdir files - var jakefileLoaded = loader.loadFile(opts.jakefile); - var jakelibdirLoaded = loader.loadDirectory(opts.jakelibdir); - - if(!jakefileLoaded && !jakelibdirLoaded) { - fail('No Jakefile. Specify a valid path with -f/--jakefile, ' + - 'or place one in the current directory.'); - } + loader.loadFile(opts.jakefile); + loader.loadDirectory(opts.jakelibdir); program.run(); } diff -Nru node-jake-0.7.9/lib/loader.js node-jake-0.7.4/lib/loader.js --- node-jake-0.7.9/lib/loader.js 2014-03-08 07:20:35.000000000 +0000 +++ node-jake-0.7.4/lib/loader.js 2013-11-13 02:56:25.000000000 +0000 @@ -45,8 +45,7 @@ // Dear God, why? , isCoffee = false // Warning, recursive - , exists - , oldCwd = process.cwd(); + , exists; exists = function () { var cwd = process.cwd(); @@ -57,8 +56,6 @@ if (!fileSpecified) { process.chdir(".."); if (cwd === process.cwd()) { - // Restore the working directory on failure - process.chdir(oldCwd); return false; } return exists(); @@ -66,7 +63,8 @@ }; if (!exists()) { - return false; + fail('No Jakefile. Specify a valid path with -f/--jakefile, ' + + 'or place one in the current directory.'); } isCoffee = existsSync(jakefile + '.coffee'); @@ -74,7 +72,6 @@ CoffeeScript = _requireCoffee(); } require(utils.file.absolutize(jakefile)); - return true; }; this.loadDirectory = function (d) { @@ -91,10 +88,7 @@ require(path.join(dirname, filePath)); } }); - return true; } - - return false; }; }; diff -Nru node-jake-0.7.9/lib/npm_publish_task.js node-jake-0.7.4/lib/npm_publish_task.js --- node-jake-0.7.9/lib/npm_publish_task.js 2014-03-08 07:20:35.000000000 +0000 +++ node-jake-0.7.4/lib/npm_publish_task.js 2013-11-13 02:56:25.000000000 +0000 @@ -202,7 +202,7 @@ jake.exec(cmds, function () { console.log('Published to NPM'); complete(); - }, {printStdout: true, printStderr: true}); + }, {stdout: true}); }, 5000); }); diff -Nru node-jake-0.7.9/lib/test_task.js node-jake-0.7.4/lib/test_task.js --- node-jake-0.7.9/lib/test_task.js 2014-03-08 07:20:35.000000000 +0000 +++ node-jake-0.7.4/lib/test_task.js 2013-11-13 02:56:25.000000000 +0000 @@ -44,12 +44,8 @@ }); */ -var TestTask = function () { - var self = this - , args = Array.prototype.slice.call(arguments) - , name = args.shift() - , definition = args.pop() - , prereqs = args.pop() || []; +var TestTask = function (name, definition) { + var self = this; /** @name jake.TestTask#testNam @@ -83,15 +79,7 @@ if (this.showDescription) { desc('Run the tests for ' + name); } - - task(this.testName, prereqs, {async: true}, function () { - var t = jake.Task[self.testName + ':run']; - t.on('complete', function () { - complete(); - }); - // Pass args to the namespaced test - t.invoke.apply(t, arguments); - }); + task(this.testName, [self.testName + ':run'], function () {}); namespace(self.testName, function () { diff -Nru node-jake-0.7.9/package.json node-jake-0.7.4/package.json --- node-jake-0.7.9/package.json 2014-03-08 07:20:35.000000000 +0000 +++ node-jake-0.7.4/package.json 2013-11-13 02:56:25.000000000 +0000 @@ -7,7 +7,7 @@ "make", "rake" ], - "version": "0.7.9", + "version": "0.7.4", "author": "Matthew Eernisse (http://fleegix.org)", "bin": { "jake": "./bin/cli.js" diff -Nru node-jake-0.7.9/README.md node-jake-0.7.4/README.md --- node-jake-0.7.9/README.md 2014-03-08 07:20:35.000000000 +0000 +++ node-jake-0.7.4/README.md 2013-11-13 02:56:25.000000000 +0000 @@ -914,14 +914,13 @@ When you create a TestTask, it programmically creates a simple task for running tests for your project. The first argument of the constructor is the -project-name (used in the description of the task), the second (optional) -argument is a list of prerequisite tasks to run before the tests, and the final -argument is a function that defines the task. It allows you to specifify what -files to run as tests, and what to name the task that gets created (defaults to -"test" if unset). +project-name (used in the description of the task), and the second argument is a +function that defines the task. It allows you to specifify what files to run as +tests, and what to name the task that gets created (defaults to "test" if +unset). ```javascript -testTask('fonebone', ['asdf', 'qwer'], function () { +testTask('fonebone', function () { var fileList = [ 'tests/*' , 'lib/adapters/**/test.js' @@ -946,9 +945,6 @@ 'before' and 'after' will only run once per test module -- *not* before and after each test. -If you name your test 'beforeEach', it will run before each test. You can also -name a test 'afterEach' for a test that runs after each test. - Here's an example test-file: ```javascript @@ -962,12 +958,6 @@ , 'after': function () { // Do some teardown here } -, 'beforeEach': function () { - // Something to do before every test - } -, 'afterEach': function () { - // Something to do after every test - } , 'sync test': function () { // Assert something assert.ok(true);