qa-control 0.5.0 → 0.6.1

package/bin/{0.3.0 → definition}/first-lines-both.txt

@@ -1,25 +1,25 @@
-"use strict";
-
-(function codenautasModuleDefinition(root, name, factory) {
-    /* global define */
-    /* istanbul ignore next */
-    if(typeof root.globalModuleName !== 'string'){
-        root.globalModuleName = name;
-    }
-    /* istanbul ignore next */
-    if(typeof exports === 'object' && typeof module === 'object'){
-        module.exports = factory();
-    }else if(typeof define === 'function' && define.amd){
-        define(factory);
-    }else if(typeof exports === 'object'){
-        exports[root.globalModuleName] = factory();
-    }else{
-        root[root.globalModuleName] = factory();
-    }
-    root.globalModuleName = null;
-})(/*jshint -W040 */this, 'nombreDelModulo', function() {
-/*jshint +W040 */
-
-/*jshint -W004 */
-var nombreDelModulo = {};
-/*jshint +W004 */
+"use strict";
+
+(function codenautasModuleDefinition(root, name, factory) {
+    /* global define */
+    /* istanbul ignore next */
+    if(typeof root.globalModuleName !== 'string'){
+        root.globalModuleName = name;
+    }
+    /* istanbul ignore next */
+    if(typeof exports === 'object' && typeof module === 'object'){
+        module.exports = factory();
+    }else if(typeof define === 'function' && define.amd){
+        define(factory);
+    }else if(typeof exports === 'object'){
+        exports[root.globalModuleName] = factory();
+    }else{
+        root[root.globalModuleName] = factory();
+    }
+    root.globalModuleName = null;
+})(/*jshint -W040 */this, 'nombreDelModulo', function() {
+/*jshint +W040 */
+
+/*jshint -W004 */
+var nombreDelModulo = {};
+/*jshint +W004 */

package/bin/definition/first-lines-client.txt

@@ -0,0 +1,3 @@
+"use strict";
+
+var nombreDelModulo = {};

package/bin/{0.3.0 → definition}/first-lines-server-app.txt

@@ -1,3 +1,3 @@
-"use strict";
-
+"use strict";
+
 // APP

package/bin/{0.3.0 → definition}/first-lines-server-cmd-tool.txt

@@ -1,3 +1,3 @@
-"use strict";
-
+"use strict";
+
 // CMD-TOOL

package/bin/{0.3.0 → definition}/first-lines-server.txt

@@ -1,3 +1,3 @@
-"use strict";
-
-var nombreDelModulo = {};
+"use strict";
+
+var nombreDelModulo = {};

package/bin/definition/first-lines-web.txt

@@ -0,0 +1,3 @@
+"use strict";
+
+var nombreDelModulo = {};

package/bin/qa-control.js

@@ -25,14 +25,10 @@ function forEach(obj, func) {
 
 qaControl.msgs={
     en:{
-        deprecated_qa_control_version: 'deprecated qa-control version',
         repository_name_not_found: 'packageJson.repository must be in format /{[-a-zA-Z0-9_.]+}\/[-a-zA-Z0-9_.]+/'
     },
     es:{
-        no_test_in_last_node: 'falta probar para la última versión de node .travis.yaml',
-        deprecated_qa_control_version: 'la versión de qa-control es vieja',
         deprecated_version: 'la version es demasiado vieja',
-        invalid_qa_control_version: 'la sección "package-version" en qa-control contiene un valor incorrecto',
         invalid_value_1_in_parameter_2: 'valor invalido "$1" para el parametro "$2" en la sección qa-control',
         lack_of_mandatory_file_1: 'falta el archivo obligatorio "$1"',
         //lack_of_mandatory_parameter_1: 'falta el parámetro obligatorio "$1"',
@@ -40,13 +36,12 @@ qaControl.msgs={
         no_qa_control_section_in_codenautas_project: 'falta la sección "qa-control" en package.json y aparenta ser un proyecto codenautas',
         no_multilang_section_in_1: 'falta la sección multilang en el archivo $1',
         no_package_json: 'falta el archivo package.json',
-        no_package_version_in_qa_control_section: 'falta la sección "package-version" en la sección qa-control',
         no_qa_control_section_in_package_json: 'falta la sección qa-control en package.json',
-        no_version_in_section_codenautas: 'falta la entrada para "package-version" en la sección codenautas del package.json',
         //unparseable_package_json: 'existe package.json pero no puede parsearse',
         lack_of_cucarda_marker_in_readme:'falta la sección "cucardas" en README.md',
         lack_of_mandatory_cucarda_1: 'falta la cucarda oblicatoria $1',
         wrong_format_in_cucarda_1: 'la cucarda "$1" tiene formato incorrecto',
+        forbidden_cucarda_1: 'la cucarda "$1" no debe usarse en README.md',
         lack_of_mandatory_line_1_in_file_2: 'falta la linea obligatoria $1 en el archivo $2',
         file_1_does_not_match_custom_2: '$1 no respeta la custombre $2',
         first_lines_does_not_match_in_file_1: 'las primeras líneas no coinciden en $1',
@@ -65,10 +60,7 @@ qaControl.msgs={
         lack_of_files_section_in_package_json: 'Falta la sección "files" en package.json',
         invalid_files_section_in_package_json: 'La sección "files" en package.json es inválida',
         incorrect_ecmascript_versions_in_package_json: 'Las versiones de ECMAScript utilizadas en package.json son incorrectas',
-        older_version_of_qa_control_in_package_json: 'La versión de qa-control en el package.json es vieja',
         unexpected_jshintconfig_section_in_package_json: 'No se esperaba la sección jshintConfig en package.json',
-        lack_of_travis_check_for_node_version_1: 'Falta el checkeo de node versión $1 en .travis.yml',
-        not_allowed_travis_failure_for_node_version_1: 'No se permite la falla de node versión $1 en .travis.yml',
         non_recomended_dependency_1_in_package_json: 'Dependencia no recomendada "$1" en package.json'
     }
 };
@@ -129,6 +121,7 @@ qaControl.generateCucardas = function generateCucardas(cucardas, packageJson) {
     /*eslint-disable guard-for-in */
     for(var nombreCucarda in cucardas) {
         var cucarda = cucardas[nombreCucarda];
+        if(cucarda.forbidden) { continue; }
         if(!cucarda.check || cucarda.check(packageJson)) {
             var cucaStr = cucarda.md.replace(/\bxxx\b/g,repo).replace(/\byyy\b/g,modulo);
             cucaFileContent += cucaStr +'\n';
@@ -186,20 +179,12 @@ qaControl.nodeVerInTravisRE = /[678]/;
 
 qaControl.verbose = false;
 qaControl.cucardas_always = false;
-qaControl.projectDefinition = {};
-qaControl.projectDefinition['0.0.1'] = require("./0.0.1/definition.js")(qaControl);
-qaControl.projectDefinition['0.0.2'] = require("./0.0.2/definition.js")(qaControl);
-qaControl.projectDefinition['0.1.3'] = require("./0.1.3/definition.js")(qaControl);
-qaControl.projectDefinition['0.1.4'] = require("./0.1.4/definition.js")(qaControl);
-qaControl.projectDefinition['0.2.0'] = require("./0.2.0/definition.js")(qaControl);
-qaControl.projectDefinition['0.3.0'] = require("./0.3.0/definition.js")(qaControl);
+qaControl.definition = require("./definition/definition.js")(qaControl);
 
 qaControl.lang = process.env.qa_control_lang || 'en';
-qaControl.deprecatedVersions = '< 0.0.1';
-qaControl.currentVersion = '0.3.0';
 
 qaControl.mainDoc = function mainDoc() {
-    return qaControl.projectDefinition[qaControl.currentVersion].fileNameMainDoc;
+    return qaControl.definition.fileNameMainDoc;
 };
 
 qaControl.fixMessages = function fixMessages(messagesToFix) {
@@ -226,22 +211,23 @@ qaControl.jsProjectName = function jsProjectName(projectName) {
 };
 
 qaControl.configReady=false;
-var configReading=Promise.all(map(qaControl.projectDefinition,function(definition, version){
+var configReading=(function(){
+    var definition = qaControl.definition;
     definition.firstLines=definition.firstLines||{};
     return Promise.all(map(definition.sections['run-in'].values,function(runInProperties, runInValue){
         return Promise.all(map(definition.sections.type.values,function(typeProperties, typeValue){
-            return fs.readFile(Path.join(__dirname,version,'first-lines-'+runInValue+'-'+typeValue+'.txt'),{encoding: 'utf8'}).catch(function(err){
+            return fs.readFile(Path.join(__dirname,'definition','first-lines-'+runInValue+'-'+typeValue+'.txt'),{encoding: 'utf8'}).catch(function(err){
                 if(err.code!=='ENOENT'){
                     throw err;
                 }
-                return fs.readFile(Path.join(__dirname,version,'first-lines-'+runInValue+'.txt'),{encoding: 'utf8'});
+                return fs.readFile(Path.join(__dirname,'definition','first-lines-'+runInValue+'.txt'),{encoding: 'utf8'});
             }).then(function(content){
                 definition.firstLines[runInValue]=definition.firstLines[runInValue]||{};
                 definition.firstLines[runInValue][typeValue]=content;
             });
         }));
     }));
-})).then(function(){
+})().then(function(){
     return qaControl.fixMessages(qaControl.msgs.en);
 }).then(function(){
     // only for test, in production this sleep must gone
@@ -275,6 +261,7 @@ qaControl.loadProject = function loadProject(projectDir) {
         return fs.readdir(projectDir);
     }).then(function(files) {
         info.files = {};
+        files = files.filter(function(f){ return f !== 'cucardas.log'; });
          /*jshint forin: false */
          /*eslint-disable guard-for-in */
         for(var f in files) { info.files[files[f]] = {}; }
@@ -321,18 +308,8 @@ qaControl.loadProject = function loadProject(projectDir) {
                     });
                 }            
             }
-        }).then(function() {
-            if(info.files['.travis.yml']){
-                info.dotTravis = yaml.load(info.files['.travis.yml'].content);
-            }
         });
     }).then(function() {
-        var verCheck = ((info.packageJson || {})['qa-control'] || {})['package-version'];
-        //console.log("verCheck", verCheck)
-        if(verCheck && ! (verCheck in qaControl.projectDefinition)) {
-            throw new Error("inexistent qa-control version: "+verCheck);
-        }
-        info.usedDefinition = (verCheck in qaControl.projectDefinition) ? verCheck : qaControl.currentVersion;
         return info;
     });
 };
@@ -341,8 +318,8 @@ qaControl.controlInfo=function controlInfo(info, opts){
     var resultWarnings=[];
     var existingWarnings={};
     var cmsgs = qaControl.cmdMsgs[qaControl.lang];
-    var rules = qaControl.projectDefinition[info.usedDefinition].rules;
-    if(qaControl.verbose) { process.stdout.write(cmsgs.msg_controlling+info.usedDefinition+"...\n"); }
+    var rules = qaControl.definition.rules;
+    var silenced = ((info.packageJson || {})['qa-control'] || {}).silenced || [];
     var cadenaDePromesas = Promise.resolve().then();
     info.scoring = opts && opts.scoring;
     forEach(rules, function(rule, ruleName) {
@@ -354,10 +331,11 @@ qaControl.controlInfo=function controlInfo(info, opts){
                 if(qaControl.verbose) { process.stdout.write(cmsgs.msg_checking+" '"+ruleName+"'...\n"); }
                 return checkInfo.warnings(info);
             }).then(function(warningsOfThisRule) {
-                if(warningsOfThisRule.length) {
-                    resultWarnings=resultWarnings.concat(warningsOfThisRule);
-                    warningsOfThisRule.forEach(function(warning){
-                        existingWarnings[warning.warning]=true; 
+                var activeWarnings = warningsOfThisRule.filter(function(w){ return silenced.indexOf(w.warning) === -1; });
+                if(activeWarnings.length) {
+                    resultWarnings=resultWarnings.concat(activeWarnings);
+                    activeWarnings.forEach(function(warning){
+                        existingWarnings[warning.warning]=true;
                     });
                     if(rule.shouldAbort) { throw new Error("ruleIsAborting"); }
                 }
@@ -370,9 +348,6 @@ qaControl.controlInfo=function controlInfo(info, opts){
             throw err;
         }
     }).then(function(){
-        if(info.usedDefinition !== qaControl.currentVersion) {
-            resultWarnings.push({warning:'older_version_of_qa_control_in_package_json', scoring:{notice:1}});
-        }
         return resultWarnings;
     });
     return cadenaDePromesas;

package/bin/qac-init.js

@@ -282,24 +282,6 @@ qacInit.configParams = [
         name:'jshintConfig', def:'', noPrompt:true, init: function(ctx) { this.def = ctx.input.qacJson['jshintConfig']; }
     },{
         name:'eslintConfig', def:'', noPrompt:true, init: function(ctx) { this.def = ctx.input.qacJson['eslintConfig']; }
-    },{
-        name:'qa-control-version', prompt: 'qa-control package-version', def:'',
-        init: function(ctx) { this.def = ctx.input.qacJson['qa-control']['package-version']; },
-        post: function(ctx) {
-            var contributors = ctx.input.existingJson.contributors || [];
-            var ver = ctx.result[this.name];
-            var qacData = ctx.input.qacJson['qa-control'];
-            qacData['package-version'] = ver;
-            return ver;
-        },
-        valid: function(ver) {
-            if(semver.valid(ver)) {
-                for(var v in qaControl.projectDefinition) {
-                    if(semver.satisfies(ver, v)) { return true; }
-                }
-            }
-            return false;
-        }
     },{
         name:'qa-control', def:'', noPrompt:true, init: function(ctx) { this.def = ctx.input.qacJson['qa-control']; }
     }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "qa-control",
   "description": "QA control of things that nobody controls",
-  "version": "0.5.0",
+  "version": "0.6.1",
   "author": "Codenautas <codenautas@googlegroups.com>",
   "license": "MIT",
   "repository": "codenautas/qa-control",