Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Refactor #57

Merged
merged 20 commits into from Jan 14, 2013
Merged

Refactor #57

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
c802fea
use console.log instead of util.puts
fb55 Sep 7, 2012
5d32a73
added a analyzer.path method that calls the appropriate function for …
fb55 Sep 7, 2012
e432496
use .path inside .dir (replaces findit)
fb55 Sep 7, 2012
b12e72d
removed findit from dependencies
fb55 Sep 7, 2012
f74cfd3
some minor changes
fb55 Sep 7, 2012
e1aa6b0
removed two unnecessary functions
fb55 Sep 7, 2012
f08e5fc
[fix] still accessed property before checking it with `in`
fb55 Sep 7, 2012
55faa29
[fix] passed filenames instead of paths to .path
fb55 Sep 7, 2012
a7c35d1
forward errors from prerunners in runAnalyze
fb55 Sep 7, 2012
d9c45eb
use Function#bind when it's appropriate, use single quotes
fb55 Sep 8, 2012
48a34e0
Revert "forward errors from prerunners in runAnalyze"
fb55 Sep 8, 2012
7ede462
always return an object in npmAnalyze
fb55 Sep 8, 2012
b3e2bb9
[fix] move upwards in findModulesDir
fb55 Sep 8, 2012
49b2d44
removed senseless check in analyzer.dir
fb55 Sep 8, 2012
16f22f9
added analyzer.findNextDir function
fb55 Sep 8, 2012
eeebe3a
set 1 as the maxDepth of read-installed
fb55 Sep 8, 2012
873a641
[fix] call callback when a node_modules folder is present
fb55 Sep 8, 2012
e169c9e
simplified mergeDependencies & .package
fb55 Sep 8, 2012
4968886
removed some garbage in .package
fb55 Sep 8, 2012
2352c31
[fix] call .findNextDir recursively
fb55 Sep 8, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
19 changes: 9 additions & 10 deletions bin/require-analyzer
View file
Open in desktop
Expand Up @@ -2,7 +2,6 @@

var fs = require('fs'),
path = require('path'),
util = require('util'),
colors = require('colors'),
winston = require('winston'),
argv = require('optimist').argv,
Expand All @@ -24,7 +23,7 @@ var help = [
].join('\n');

if (argv.h || argv.help) {
return util.puts(help);
return console.log(help);
}

//
Expand Down Expand Up @@ -71,16 +70,16 @@ function listDependencies (pkg, msgs) {
list = list.replace(/\{\s/, '{ \n')
.replace(/\}/, '\n}')
.replace('\033[90m', ' \033[90m')
.replace(/, /ig, ',\n ')
.replace(/, /ig, ',\n ');
}
else {
list = list.replace(/\n\s{4}/ig, '\n ');
}

winston.info(msgs.success)
winston.info(msgs.success);
list.split('\n').forEach(function (line) {
winston.data(line);
})
});
}

var dir = process.cwd(),
Expand All @@ -96,7 +95,7 @@ pkgFile = path.join(dir, argv.f || argv.file || 'package.json');
winston.info('require-analyzer starting in ' + dir.magenta);
fs.readFile(pkgFile, function (err, data) {
if (err) {
if (err.errno === 34 && err.code == 'ENOENT') {
if (err.errno === 34 && err.code === 'ENOENT') {
data = "{}";
}
else {
Expand Down Expand Up @@ -146,7 +145,7 @@ fs.readFile(pkgFile, function (err, data) {
winston.error('Error analyzing dependencies'.red);
err.message.split('\n').forEach(function (line) {
winston.error(line);
})
});
return;
}
});
Expand Down Expand Up @@ -180,8 +179,8 @@ fs.readFile(pkgFile, function (err, data) {
// file in the target `dir`.
//
if (argv.safe) {
winston.info('did not update package.json')
return
winston.info('did not update package.json');
return;
}
if (Object.keys(newpkg.dependencies).length > 0) {
winston.info('Updating ' + pkgFile.magenta);
Expand All @@ -194,7 +193,7 @@ fs.readFile(pkgFile, function (err, data) {
}

winston.info('require-analyzer updated package.json dependencies');
})
});
}
});
});