Refactoring, cleanup

cli/domain/local.js

@@ -14,7 +14,7 @@ var path = require('path');
 var settings = require('../../resources/settings');
 var Targz = require('tar.gz');
 var uglifyJs = require('uglify-js');
-var validator = require('../../registry/domain/validator');
+var validator = require('../../registry/domain/validators');
 var _ = require('underscore');
 
 module.exports = function(){
@@ -119,11 +119,20 @@ module.exports = function(){
         var components = fs.readdirSync(componentsDir).filter(function(file){
 
           var filePath = path.resolve(componentsDir, file),
-              isDir = fs.lstatSync(filePath).isDirectory();
+              isDir = fs.lstatSync(filePath).isDirectory(),
+              packagePath = path.join(filePath, 'package.json');
 
-          return isDir ? (fs.readdirSync(filePath).filter(function(file){
-            return file === 'package.json';
-          }).length === 1) : false;
+          if(!isDir || !fs.existsSync(packagePath)){
+            return false;
+          }
+
+          var content = fs.readJsonSync(packagePath);
+
+          if(!content.oc || !!content.oc.packaged){
+            return false;
+          }
+
+          return true;
         });
 
         var fullPathComponents = _.map(components, function(component){
@@ -278,6 +287,7 @@ module.exports = function(){
 
       delete component.oc.files.client;
       component.oc.version = ocInfo.version;
+      component.oc.packaged = true;
 
       if(!!component.oc.files.data){
         var dataPath = path.join(componentPath, component.oc.files.data),

cli/facade/dev.js

@@ -73,7 +73,7 @@ module.exports = function(dependencies){
 
         if(!packaging){
           packaging = true;
-          logger.log('Packaging components...'.yellow);
+          logger.logNoNewLine('Packaging components...'.yellow);
 
           async.eachSeries(componentsDirs, function(dir, cb){
             local.package(dir, false, function(err){
@@ -85,15 +85,15 @@ module.exports = function(dependencies){
           }, function(error){
             if(!!error){
               var errorDescription = ((error instanceof SyntaxError) || !!error.message) ? error.message : error;
-              logger.log(format('An error happened while packaging {0}: {1}', componentsDirs[i], errorDescription.red));
-              logger.log('retrying in 10 seconds...'.yellow);
+              logger.log(format('an error happened while packaging {0}: {1}', componentsDirs[i], errorDescription.red));
+              logger.log('Retrying in 10 seconds...'.yellow);
               setTimeout(function(){
                 packaging = false;
                 packageComponents(componentsDirs);
               }, 10000);
             } else {
               packaging = false;
-              logger.log('complete'.green);
+              logger.log('OK'.green);
               if(_.isFunction(callback)){
                 callback();
               }
@@ -103,7 +103,7 @@ module.exports = function(dependencies){
       };
 
       var loadDependencies = function(components, cb){
-        logger.log('Ensuring dependencies are loaded'.yellow);
+        logger.logNoNewLine('Ensuring dependencies are loaded...'.yellow);
 
         var dependencies = getDepsFromComponents(components),
             missing = [];
@@ -131,12 +131,13 @@ module.exports = function(dependencies){
               });
             });
           } else {
+            logger.log('OK'.green);
             cb(dependencies);
           }
         });
       };
 
-      logger.log('Looking for components...'.yellow);
+      logger.logNoNewLine('Looking for components...'.yellow);
       local.getComponentsByDir(componentsDir, function(err, components){
 
         if(err){
@@ -145,9 +146,14 @@ module.exports = function(dependencies){
           return logger.log(format(errors.DEV_FAIL, errors.COMPONENTS_NOT_FOUND).red);
         }
 
+        logger.log('OK'.green);
+        _.forEach(components, function(component){
+          logger.log('>> '.green + component);
+        });
+
         loadDependencies(components, function(dependencies){
           packageComponents(components, function(){
-            logger.log('Starting dev registry on localhost:' + port);
+            logger.logNoNewLine(format('Starting dev registry on localhost:{0}...', port).yellow);
 
             var conf = {
               local: true,

cli/index.js

@@ -8,7 +8,12 @@ var _ = require('underscore');
 
 var dependencies = {
   local: new Local(),
-  logger: console,
+  logger: {
+    log: console.log,
+    logNoNewLine: function(msg){
+      return process.stdout.write(msg.toString());
+    }
+  },
   registry: new Registry()
 };
 

components/oc-client/_package/package.json

@@ -21,6 +21,7 @@
         "src": "server.js"
       }
     },
-    "version": "0.15.3"
+    "version": "0.15.3",
+    "packaged": true
   }
 }