Merge pull request #938 from afc163/master

improve performance of command line
spmjs · Aug 11, 2014 · 8ee512f · 8ee512f
2 parents eb1dce1 + bb825f9
commit 8ee512f
Show file tree

Hide file tree

Showing 13 changed files with 42 additions and 52 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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] <query>')
@@ -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
@@ -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
@@ -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 <n>', 'set the depth to <n>', 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
@@ -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
@@ -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
@@ -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
@@ -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() {