Permalink
Browse files

Update to CoffeeScript 1.4 and a bunch of other dependencies.

  • Loading branch information...
1 parent 9ca5d62 commit 91f695c3337821298e9e301c6991e6d5d23cf8b9 @airhorns committed Jan 27, 2013
Showing with 17 additions and 18 deletions.
  1. +5 −5 lib/muffin.js
  2. +7 −8 package.json
  3. +5 −5 src/muffin.coffee
View
10 lib/muffin.js
@@ -476,7 +476,7 @@
});
for (_i = 0, _len = promises.length; _i < _len; _i++) {
promise = promises[_i];
- promise.end();
+ promise.done();
}
return q.all(promises);
};
@@ -619,12 +619,12 @@
return _results;
});
});
- }).end();
+ }).done();
} else {
fields = options.fields || ['filename', 'filetype', 'sloc', 'size'];
return _statFiles(files, options).then(function(results) {
return printTable(fields, results);
- }).end();
+ }).done();
}
};
@@ -698,7 +698,7 @@
if (args.after) {
return args.after();
}
- }).end();
+ }).done();
});
};
for (_i = 0, _len = _ref3.length; _i < _len; _i++) {
@@ -715,7 +715,7 @@
return args.after();
}
});
- }).end();
+ }).done();
};
_ref2 = {
View
15 package.json
@@ -16,15 +16,14 @@
"node": "~>0.6.0 || ~>0.8.0"
},
"dependencies": {
- "q": "~>0.8.6",
- "q-fs": "0.1.24",
- "docco": "~0.3.0",
- "coffee-script": "~1.3.3",
- "glob": "~>3.0.1",
+ "q": "~>0.8.12",
+ "q-fs": "0.1.36",
+ "coffee-script": "~1.4.0",
+ "glob": "~>3.1.17",
"uglify-js": "~>1.2",
- "prompt": "~>0.1.3",
- "temp": "~>0.4.0",
- "snockets": "~>1.3.5"
+ "prompt": "~>0.2.9",
+ "temp": "~>0.5.0",
+ "snockets": "~>1.3.8"
},
"devDependencies": {},
"optionalDependencies": {}
View
10 src/muffin.coffee
@@ -358,7 +358,7 @@ _statFiles = (files, options = {}) ->
# Ensure any errors thrown during the join of the statting aren't swallowed by marking the promises as no longer
# chainable.
- promise.end() for promise in promises
+ promise.done() for promise in promises
# For every file's stats (or promise thereof), print out the row in the table. Do this by first figuring out
# what the widest value in each column is, and then printing while padding all the shorter values out until they
@@ -460,12 +460,12 @@ statFiles = (files, options = {}) ->
for ref in [refA, refB]
tableFields.push "#{field} at #{ref}"
)
- ).end()
+ ).done()
else
fields = options.fields || ['filename', 'filetype', 'sloc', 'size']
_statFiles(files, options).then((results) ->
printTable(fields, results)
- ).end()
+ ).done()
addWatchDependency = (file) ->
return unless muffin._watchDependencies
@@ -523,13 +523,13 @@ run = (args) ->
q.fcall(before)
.then(-> map.action(matches))
.then((result) -> args.after() if args.after)
- .end()
+ .done()
delete muffin._watchDependencies
q.all(actionPromises).then(->
args.after() if args.after
)
- ).end()
+ ).done()
for k, v of {run, copyFile, doccoFile, notify, minifyScript, readFile, writeFile, compileString, compileScript, compileTree, exec, extend, statFiles, mkdir_p, addWatchDependency}
exports[k] = v

0 comments on commit 91f695c

Please sign in to comment.