From bb825f92d1561a52dfc2148887070c0305b40f45 Mon Sep 17 00:00:00 2001 From: afc163 Date: Mon, 11 Aug 2014 14:06:18 +0800 Subject: [PATCH] improve performance of command line --- bin/spm-build | 9 ++++----- bin/spm-doc | 6 +++--- bin/spm-info | 9 ++++----- bin/spm-install | 7 +++---- bin/spm-login | 5 ++--- bin/spm-publish | 12 ++++++------ bin/spm-search | 9 ++++----- bin/spm-test | 4 ++-- bin/spm-tree | 15 ++++++--------- bin/spm-unpublish | 9 ++++----- index.js | 1 - lib/doc.js | 4 ++-- lib/test.js | 4 ++-- 13 files changed, 42 insertions(+), 52 deletions(-) diff --git a/bin/spm-build b/bin/spm-build index b4296723..0b62e6fb 100755 --- a/bin/spm-build +++ b/bin/spm-build @@ -3,10 +3,9 @@ require('colorful').colorful(); var path = require('path'); var commander = require('commander'); -var spm = require('..'); -var build = spm.build; -var file = spm.sdk.file; -var log = spm.log; +var build = require('../lib/build'); +var file = require('../lib/sdk/file'); +var log = require('../lib/utils/log'); commander.usage('[options]'); @@ -28,7 +27,7 @@ if (commander.verbose) { log.level = 'debug'; } -spm.log.config(commander); +log.config(commander); console.log(); var cwd = path.join(process.cwd(), commander.inputDirectory || ''); diff --git a/bin/spm-doc b/bin/spm-doc index c59faad0..6ed54657 100755 --- a/bin/spm-doc +++ b/bin/spm-doc @@ -1,7 +1,7 @@ #!/usr/bin/env node var commander = require('commander'); -var spm = require('..'); +var doc = require('../lib/doc'); var file = require('../lib/sdk/file'); var log = require('../lib/utils/log'); require('colorful').colorful(); @@ -37,7 +37,7 @@ commander.on('--help', function() { commander.parse(process.argv); -spm.log.config(commander); +log.config(commander); if (!process.argv[2]) { commander.help(); @@ -52,4 +52,4 @@ if (!pkg || !pkg.spm) { console.log(); -spm.doc(commander); +doc(commander); diff --git a/bin/spm-info b/bin/spm-info index d9d42a73..dba73176 100755 --- a/bin/spm-info +++ b/bin/spm-info @@ -2,11 +2,10 @@ require('colorful').colorful(); var commander = require('commander'); -var spm = require('..'); -var log = spm.log; -var info = spm.client.info; -var iduri = spm.sdk.iduri; -var print = spm.print; +var log = require('../lib/utils/log'); +var info = require('../lib/client').info; +var iduri = require('../lib/sdk/iduri'); +var print = require('../lib/utils/print'); commander .usage('[options] name[@version]') diff --git a/bin/spm-install b/bin/spm-install index 06ba1cde..9db42627 100755 --- a/bin/spm-install +++ b/bin/spm-install @@ -2,9 +2,8 @@ require('colorful').colorful(); var commander = require('commander'); -var spm = require('..'); -var install = spm.client.install; -var log = spm.log; +var install = require('../lib/client').install; +var log = require('../lib/utils/log'); commander .usage('[options] name[@version]') @@ -33,7 +32,7 @@ commander.on('--help', function() { commander.parse(process.argv); console.log(); -spm.log.config(commander); +log.config(commander); install({ registry: commander.registry, diff --git a/bin/spm-login b/bin/spm-login index 08760f71..4df09bea 100755 --- a/bin/spm-login +++ b/bin/spm-login @@ -4,9 +4,8 @@ require('colorful').colorful(); var commander = require('commander'); var inquirer = require('inquirer'); var spmrc = require('spmrc'); -var spm = require('..'); -var log = spm.log; -var login = spm.client.login; +var log = require('../lib/utils/log'); +var login = require('../lib/client').login; commander .usage('[options]') diff --git a/bin/spm-publish b/bin/spm-publish index 8dc8f994..c485867e 100755 --- a/bin/spm-publish +++ b/bin/spm-publish @@ -2,10 +2,10 @@ require('colorful').colorful(); var commander = require('commander'); -var spm = require('..'); -var log = spm.log; -var publish = spm.client.publish; - +var log = require('../lib/utils/log'); +var client = require('../lib/client'); +var publish = require('../lib/client').publish; +var upload = require('../lib/upload'); var file = require('../lib/sdk/file'); commander @@ -45,12 +45,12 @@ if (commander.doc) { log.error('miss', 'package.json or "spm" key'); process.exit(2); } - spm.upload(commander, pkg); + upload(commander, pkg); return; } log.info('publish', process.cwd()); -log.info('target', spm.client.config().registry); +log.info('target', client.config().registry); publish({ cwd: commander.inputDirectory, tag: commander.tag, diff --git a/bin/spm-search b/bin/spm-search index db002a2f..c4f86f70 100755 --- a/bin/spm-search +++ b/bin/spm-search @@ -2,10 +2,9 @@ require('colorful').colorful(); var commander = require('commander'); -var spm = require('..'); -var log = spm.log; -var print = spm.print; -var search = spm.client.search; +var log = require('../lib/utils/log'); +var print = require('../lib/utils/print'); +var search = require('../lib/client').search; commander .usage('[options] ') @@ -30,7 +29,7 @@ if (!commander.args[0]) { } console.log(); -spm.log.config(commander); +log.config(commander); search({ name: commander.args[0] diff --git a/bin/spm-test b/bin/spm-test index 99180733..3e16092f 100755 --- a/bin/spm-test +++ b/bin/spm-test @@ -1,7 +1,7 @@ #!/usr/bin/env node var commander = require('commander'); -var spm = require('..'); +var test = require('../lib/test'); require('colorful').colorful(); require('nico/lib/sdk/log').quiet = true; @@ -24,4 +24,4 @@ if (!process.argv[1]) { commander.help(); } -spm.test(commander); +test(commander); diff --git a/bin/spm-tree b/bin/spm-tree index 5a2679e5..1dc46820 100755 --- a/bin/spm-tree +++ b/bin/spm-tree @@ -1,15 +1,14 @@ #!/usr/bin/env node +require('colorful').colorful(); var path = require('path'); var resolve = path.resolve; var commander = require('commander'); var archy = require('archy'); var spmrc = require('spmrc'); var log = require('../lib/utils/log'); - -require('colorful').colorful(); -var spm = require('..'); var file = require('../lib/sdk/file'); +var install = require('../lib/client').install; commander .option('-d, --depth ', 'set the depth to ', Infinity) @@ -18,19 +17,17 @@ commander commander.parse(process.argv); // color -spm.log.config(commander); +log.config(commander); var cache = {}; -var file = spm.sdk.file; - var query = commander.args[0]; // handle "spm tree class" if (query) { // don't show spm install log message log.quiet = true; - spm.install.fetch(query, function(err, dest) { - spm.install({ + install.fetch(query, function(err, dest) { + install({ source: commander.source, destination: dest + '/sea-modules/', force: commander.force, @@ -128,7 +125,7 @@ function lookup(paths, pkg) { } }); if (!pkgfile) { - spm.log.error('package', pkg.name + '@' + pkg.version + ' not found'); + log.error('package', pkg.name + '@' + pkg.version + ' not found'); return null; } return pkgfile; diff --git a/bin/spm-unpublish b/bin/spm-unpublish index 2e5784f2..1408ca60 100755 --- a/bin/spm-unpublish +++ b/bin/spm-unpublish @@ -3,10 +3,9 @@ require('colorful').colorful(); var commander = require('commander'); var inquirer = require('inquirer'); -var spm = require('..'); -var client = spm.client; -var iduri = spm.sdk.iduri; -var log = spm.log; +var client = require('../lib/client'); +var iduri = require('../lib/sdk/iduri'); +var log = require('../lib/utils/log'); commander .usage('[options] name[@version]') @@ -33,7 +32,7 @@ if (!commander.args[0]) { } console.log(); -spm.log.config(commander); +log.config(commander); var pkg = iduri.resolve(commander.args[0]); if (!pkg) { diff --git a/index.js b/index.js index f626b503..0874f2f2 100644 --- a/index.js +++ b/index.js @@ -1,7 +1,6 @@ var util = require('util'); var EventEmitter = require('events').EventEmitter; util.inherits(module.exports, EventEmitter); - exports = module.exports; exports.version = require('./package').version; diff --git a/lib/doc.js b/lib/doc.js index ac6d4596..9f689596 100755 --- a/lib/doc.js +++ b/lib/doc.js @@ -1,5 +1,5 @@ var path = require('path'); -var spm = require('..'); +var upload = require('./upload'); var spawn = require('win-spawn'); var nico = require('nico'); var DOC_PATH = '_site'; @@ -32,7 +32,7 @@ module.exports = function(commander, callback) { if (commander.publish) { cleanDoc(); nico.build(commander); - spm.upload({ + upload({ doc: DOC_PATH, registry: commander.registry }); diff --git a/lib/test.js b/lib/test.js index 9b2adeec..e748fd60 100644 --- a/lib/test.js +++ b/lib/test.js @@ -2,7 +2,7 @@ var exeq = require('exeq'); var path = require('path'); var output = '_site/coverage.html'; var outputJSON = '_site/coverage.json'; -var spm = require('..'); +var doc = require('./doc'); var mochaBrowser = require('mocha-browser-for-spm'); var mo = require('../lib/sdk/module'); var file = require('../lib/sdk/file'); @@ -23,7 +23,7 @@ module.exports = function(config) { console.log(); console.log(' Starting service for test runner ...'.to.cyan.color); - spm.doc({ + doc({ server: true, port: port }, function() {