From 1f2c8df5fac5fbdfe37a0124df8bcf66d3c41c60 Mon Sep 17 00:00:00 2001 From: Jeremy Ashkenas Date: Sun, 21 Feb 2010 14:06:01 -0500 Subject: [PATCH] updating to latest Node (0.1.3) API -- callbacks, not promises --- Cakefile | 6 +++--- lib/cake.js | 2 +- lib/command_line.js | 4 ++-- src/cake.coffee | 2 +- src/command_line.coffee | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Cakefile b/Cakefile index b22ce5e0..193e967b 100644 --- a/Cakefile +++ b/Cakefile @@ -17,7 +17,7 @@ task 'install', 'install CoffeeScript into /usr/local', -> task 'build', 'build the CoffeeScript language from source', -> - fs.readdir('src').addCallback (files) -> + fs.readdir 'src', (err, files) -> files: 'src/' + file for file in files when file.match(/\.coffee$/) run ['-o', 'lib'].concat(files) @@ -50,8 +50,8 @@ task 'test', 'run the CoffeeScript language test suite', -> process.addListener 'exit', -> time: ((new Date() - start_time) / 1000).toFixed(2) puts '\033[0;32mpassed ' + test_count + ' tests in ' + time + ' seconds\033[0m' - fs.readdir('test').addCallback (files) -> + fs.readdir 'test', (err, files) -> for file in files - fs.readFile('test/' + file).addCallback (source) -> + fs.readFile 'test/' + file, (err, source) -> js: coffee.compile source process.compile js, file \ No newline at end of file diff --git a/lib/cake.js b/lib/cake.js index f9345c01..b9027c64 100755 --- a/lib/cake.js +++ b/lib/cake.js @@ -57,7 +57,7 @@ throw new Error('Cakefile not found in ' + process.cwd()); } args = process.ARGV.slice(2, process.ARGV.length); - return fs.readFile('Cakefile').addCallback(function(source) { + return fs.readFile('Cakefile', function(err, source) { var _a, _b, _c, arg; eval(coffee.compile(source)); if (!(args.length)) { diff --git a/lib/command_line.js b/lib/command_line.js index 0f4781a5..8a4b7e32 100644 --- a/lib/command_line.js +++ b/lib/command_line.js @@ -52,7 +52,7 @@ if (!((source = sources.shift()))) { return null; } - return fs.readFile(source).addCallback(function(code) { + return fs.readFile(source, function(err, code) { compile_script(source, code); return compile_scripts(); }); @@ -104,7 +104,7 @@ if (curr.mtime.getTime() === prev.mtime.getTime()) { return null; } - return fs.readFile(source).addCallback(function(code) { + return fs.readFile(source, function(err, code) { return compile_script(source, code); }); })); diff --git a/src/cake.coffee b/src/cake.coffee index 5fb2cfa8..6e3ecd83 100644 --- a/src/cake.coffee +++ b/src/cake.coffee @@ -36,7 +36,7 @@ exports.run: -> path.exists 'Cakefile', (exists) -> throw new Error('Cakefile not found in ' + process.cwd()) unless exists args: process.ARGV[2...process.ARGV.length] - fs.readFile('Cakefile').addCallback (source) -> + fs.readFile 'Cakefile', (err, source) -> eval coffee.compile source return print_tasks() unless args.length for arg in args diff --git a/src/command_line.coffee b/src/command_line.coffee index 829fbcff..028edd6b 100644 --- a/src/command_line.coffee +++ b/src/command_line.coffee @@ -59,7 +59,7 @@ version: -> # or JSLint results. compile_scripts: -> return unless source: sources.shift() - fs.readFile(source).addCallback (code) -> + fs.readFile source, (err, code) -> compile_script(source, code) compile_scripts() @@ -86,7 +86,7 @@ watch_scripts: -> for source in sources process.watchFile source, {persistent: true, interval: 500}, (curr, prev) -> return if curr.mtime.getTime() is prev.mtime.getTime() - fs.readFile(source).addCallback (code) -> compile_script(source, code) + fs.readFile source, (err, code) -> compile_script(source, code) # Write out a JavaScript source file with the compiled code. write_js: (source, js) ->