Revert "Issue 177/rule names inconsistent with the standard es lint r…

…uleset"
EmmanuelDemey · Aug 29, 2015 · 1ce94d3 · 1ce94d3
1 parent 7bae674
commit 1ce94d3
Show file tree

Hide file tree

Showing 90 changed files with 182 additions and 192 deletions.
diff --git a/index.js b/index.js
@@ -1,51 +1,96 @@
-(function () {
-    'use strict';
+(function(){
+      'use strict';
 
-    var rulesConfiguration = require('./rules/utils/rulesConfiguration.js')
-
-    rulesConfiguration.addRule('angularelement', 1);
-    rulesConfiguration.addRule('controller-as', 2);
-    rulesConfiguration.addRule('controller-as-route', 2);
-    rulesConfiguration.addRule('controller-as-vm', [2, 'vm']);
-    rulesConfiguration.addRule('controller-name', [2, /[A-Z].*Controller$/]);
-    rulesConfiguration.addRule('deferred', 0);
-    rulesConfiguration.addRule('definedundefined', 2);
-    rulesConfiguration.addRule('di', [2, 'function']);
-    rulesConfiguration.addRule('di-order', 0);
-    rulesConfiguration.addRule('di-unused', 0);
-    rulesConfiguration.addRule('directive-name', 0);
-    rulesConfiguration.addRule('document-service', 2);
-    rulesConfiguration.addRule('empty-controller', 0);
-    rulesConfiguration.addRule('foreach', 0);
-    rulesConfiguration.addRule('file-name', 0);
-    rulesConfiguration.addRule('filter-name', 0);
-    rulesConfiguration.addRule('function-type', 0);
-    rulesConfiguration.addRule('interval-service', 2);
-    rulesConfiguration.addRule('json-functions', 2);
-    rulesConfiguration.addRule('module-getter', 2);
-    rulesConfiguration.addRule('module-name', 0);
-    rulesConfiguration.addRule('module-setter', 2);
-    rulesConfiguration.addRule('no-angular-mock', 0);
-    rulesConfiguration.addRule('no-controller', 0);
-    rulesConfiguration.addRule('no-cookiestore', 2);
-    rulesConfiguration.addRule('no-digest', 0);
-    rulesConfiguration.addRule('no-jquery-angularelement', 2);
-    rulesConfiguration.addRule('no-private-call', 2);
-    rulesConfiguration.addRule('no-services', [2, ['$http', '$resource', 'Restangular', '$q']]);
-    rulesConfiguration.addRule('no-service-method', 2);
-    rulesConfiguration.addRule('on-watch', 2);
-    rulesConfiguration.addRule('rest-service', 0);
-    rulesConfiguration.addRule('service-name', 0);
-    rulesConfiguration.addRule('timeout-service', 2);
-    rulesConfiguration.addRule('typecheck-array', 2);
-    rulesConfiguration.addRule('typecheck-date', 2);
-    rulesConfiguration.addRule('typecheck-function', 2);
-    rulesConfiguration.addRule('typecheck-number', 2);
-    rulesConfiguration.addRule('typecheck-object', 2);
-    rulesConfiguration.addRule('typecheck-regexp', 2);
-    rulesConfiguration.addRule('typecheck-string', 2);
-    rulesConfiguration.addRule('watchers-execution', [0, '$destroy']);
-    rulesConfiguration.addRule('window-service', 2);
-
-    module.exports = rulesConfiguration.moduleExports();
+      module.exports = {
+            rules: {
+                  'ng_angularelement': require('./rules/ng_angularelement'),
+                  'ng_controller_as': require('./rules/ng_controller_as'),
+                  'ng_controller_as_route': require('./rules/ng_controller_as_route'),
+                  'ng_controller_as_vm': require('./rules/ng_controller_as_vm'),
+                  'ng_controller_name': require('./rules/ng_controller_name'),
+                  'ng_deferred': require('./rules/ng_deferred'),
+                  'ng_definedundefined': require('./rules/ng_definedundefined'),
+                  'ng_di': require('./rules/ng_di'),
+                  'ng_di_order': require('./rules/ng_di_order'),
+                  'ng_di_unused': require('./rules/ng_di_unused'),
+                  'ng_directive_name': require('./rules/ng_directive_name'),
+                  'ng_document_service': require('./rules/ng_document_service'),
+                  'ng_empty_controller': require('./rules/ng_empty_controller'),
+                  'ng_file_name': require('./rules/ng_file_name'),
+                  'ng_filter_name': require('./rules/ng_filter_name'),
+                  'ng_foreach': require('./rules/ng_foreach'),
+                  'ng_function_type': require('./rules/ng_function_type'),
+                  'ng_interval_service': require('./rules/ng_interval_service'),
+                  'ng_json_functions': require('./rules/ng_json_functions'),
+                  'ng_module_getter': require('./rules/ng_module_getter'),
+                  'ng_module_name': require('./rules/ng_module_name'),
+                  'ng_module_setter': require('./rules/ng_module_setter'),
+                  'ng_no_angular_mock': require('./rules/ng_no_angular_mock'),
+                  'ng_no_controller': require('./rules/ng_no_controller'),
+                  'ng_no_cookiestore': require('./rules/ng_no_cookiestore'),
+                  'ng_no_digest': require('./rules/ng_no_digest'),
+                  'ng_no_jquery_angularelement': require('./rules/ng_no_jquery_angularelement'),
+                  'ng_no_private_call': require('./rules/ng_no_private_call'),
+                  'ng_no_services': require('./rules/ng_no_services'),
+                  'ng_no_service_method': require('./rules/ng_no_service_method'),
+                  'ng_on_watch': require('./rules/ng_on_watch'),
+                  'ng_rest_service': require('./rules/ng_rest_service'),
+                  'ng_service_name': require('./rules/ng_service_name'),
+                  'ng_timeout_service': require('./rules/ng_timeout_service'),
+                  'ng_typecheck_array': require('./rules/ng_typecheck_array'),
+                  'ng_typecheck_date': require('./rules/ng_typecheck_date'),
+                  'ng_typecheck_function': require('./rules/ng_typecheck_function'),
+                  'ng_typecheck_number': require('./rules/ng_typecheck_number'),
+                  'ng_typecheck_object': require('./rules/ng_typecheck_object'),
+                  'ng_typecheck_regexp': require('./rules/ng_typecheck_regexp'),
+                  'ng_typecheck_string': require('./rules/ng_typecheck_string'),
+                  'ng_watchers_execution': require('./rules/ng_watchers_execution'),
+                  'ng_window_service': require('./rules/ng_window_service')
+            },
+            rulesConfig: {
+                  'ng_angularelement': 1,
+                  'ng_controller_as': 2,
+                  'ng_controller_as_route': 2,
+                  'ng_controller_as_vm': [2, 'vm'],
+                  'ng_controller_name': [2, /[A-Z].*Controller$/],
+                  'ng_deferred': 0,
+                  'ng_definedundefined': 2,
+                  'ng_di': [2, 'function'],
+                  'ng_di_order': 0,
+                  'ng_di_unused': 0,
+                  'ng_directive_name': 0,
+                  'ng_document_service': 2,
+                  'ng_empty_controller': 0,
+                  'ng_foreach': 0,
+                  'ng_file_name': 0,
+                  'ng_filter_name': 0,
+                  'ng_function_type': 0,
+                  'ng_interval_service': 2,
+                  'ng_json_functions': 2,
+                  'ng_module_getter': 2,
+                  'ng_module_name': 0,
+                  'ng_module_setter': 2,
+                  'ng_no_angular_mock': 0,
+                  'ng_no_controller': 0,
+                  'ng_no_cookiestore': 2,
+                  'ng_no_digest': 0,
+                  'ng_no_jquery_angularelement': 2,
+                  'ng_no_private_call': 2,
+                  'ng_no_services': [2, ['$http', '$resource', 'Restangular', '$q']],
+                  'ng_no_service_method': 2,
+                  'ng_on_watch': 2,
+                  'ng_rest_service': 0,
+                  'ng_service_name': 0,
+                  'ng_timeout_service': 2,
+                  'ng_typecheck_array': 2,
+                  'ng_typecheck_date': 2,
+                  'ng_typecheck_function': 2,
+                  'ng_typecheck_number': 2,
+                  'ng_typecheck_object': 2,
+                  'ng_typecheck_regexp': 2,
+                  'ng_typecheck_string': 2,
+                  'ng_watchers_execution': [0, '$destroy'],
+                  'ng_window_service': 2
+            }
+      };
 })();
diff --git a/rules/angularelement.js → rules/ng_angularelement.js b/rules/angularelement.js → rules/ng_angularelement.js
diff --git a/rules/controller-as.js → rules/ng_controller_as.js b/rules/controller-as.js → rules/ng_controller_as.js
diff --git a/rules/controller-as-route.js → rules/ng_controller_as_route.js b/rules/controller-as-route.js → rules/ng_controller_as_route.js
diff --git a/rules/controller-as-vm.js → rules/ng_controller_as_vm.js b/rules/controller-as-vm.js → rules/ng_controller_as_vm.js
diff --git a/rules/controller-name.js → rules/ng_controller_name.js b/rules/controller-name.js → rules/ng_controller_name.js
diff --git a/rules/deferred.js → rules/ng_deferred.js b/rules/deferred.js → rules/ng_deferred.js
diff --git a/rules/definedundefined.js → rules/ng_definedundefined.js b/rules/definedundefined.js → rules/ng_definedundefined.js
diff --git a/rules/di.js → rules/ng_di.js b/rules/di.js → rules/ng_di.js
diff --git a/rules/di-order.js → rules/ng_di_order.js b/rules/di-order.js → rules/ng_di_order.js
diff --git a/rules/di-unused.js → rules/ng_di_unused.js b/rules/di-unused.js → rules/ng_di_unused.js
diff --git a/rules/directive-name.js → rules/ng_directive_name.js b/rules/directive-name.js → rules/ng_directive_name.js
diff --git a/rules/document-service.js → rules/ng_document_service.js b/rules/document-service.js → rules/ng_document_service.js
diff --git a/rules/empty-controller.js → rules/ng_empty_controller.js b/rules/empty-controller.js → rules/ng_empty_controller.js
diff --git a/rules/file-name.js → rules/ng_file_name.js b/rules/file-name.js → rules/ng_file_name.js
diff --git a/rules/filter-name.js → rules/ng_filter_name.js b/rules/filter-name.js → rules/ng_filter_name.js
diff --git a/rules/foreach.js → rules/ng_foreach.js b/rules/foreach.js → rules/ng_foreach.js
diff --git a/rules/function-type.js → rules/ng_function_type.js b/rules/function-type.js → rules/ng_function_type.js
diff --git a/rules/interval-service.js → rules/ng_interval_service.js b/rules/interval-service.js → rules/ng_interval_service.js
diff --git a/rules/json-functions.js → rules/ng_json_functions.js b/rules/json-functions.js → rules/ng_json_functions.js
diff --git a/rules/log.js → rules/ng_log.js b/rules/log.js → rules/ng_log.js
diff --git a/rules/module-getter.js → rules/ng_module_getter.js b/rules/module-getter.js → rules/ng_module_getter.js
diff --git a/rules/module-name.js → rules/ng_module_name.js b/rules/module-name.js → rules/ng_module_name.js
diff --git a/rules/module-setter.js → rules/ng_module_setter.js b/rules/module-setter.js → rules/ng_module_setter.js
diff --git a/rules/no-angular-mock.js → rules/ng_no_angular_mock.js b/rules/no-angular-mock.js → rules/ng_no_angular_mock.js
diff --git a/rules/no-controller.js → rules/ng_no_controller.js b/rules/no-controller.js → rules/ng_no_controller.js
diff --git a/rules/no-cookiestore.js → rules/ng_no_cookiestore.js b/rules/no-cookiestore.js → rules/ng_no_cookiestore.js
diff --git a/rules/no-digest.js → rules/ng_no_digest.js b/rules/no-digest.js → rules/ng_no_digest.js
diff --git a/rules/no-jquery-angularelement.js → rules/ng_no_jquery_angularelement.js b/rules/no-jquery-angularelement.js → rules/ng_no_jquery_angularelement.js
diff --git a/rules/no-private-call.js → rules/ng_no_private_call.js b/rules/no-private-call.js → rules/ng_no_private_call.js
diff --git a/rules/no-service-method.js → rules/ng_no_service_method.js b/rules/no-service-method.js → rules/ng_no_service_method.js
diff --git a/rules/no-services.js → rules/ng_no_services.js b/rules/no-services.js → rules/ng_no_services.js
diff --git a/rules/on-watch.js → rules/ng_on_watch.js b/rules/on-watch.js → rules/ng_on_watch.js
diff --git a/rules/rest-service.js → rules/ng_rest_service.js b/rules/rest-service.js → rules/ng_rest_service.js
diff --git a/rules/service-name.js → rules/ng_service_name.js b/rules/service-name.js → rules/ng_service_name.js
diff --git a/rules/timeout-service.js → rules/ng_timeout_service.js b/rules/timeout-service.js → rules/ng_timeout_service.js
diff --git a/rules/typecheck-array.js → rules/ng_typecheck_array.js b/rules/typecheck-array.js → rules/ng_typecheck_array.js
diff --git a/rules/typecheck-date.js → rules/ng_typecheck_date.js b/rules/typecheck-date.js → rules/ng_typecheck_date.js
diff --git a/rules/typecheck-function.js → rules/ng_typecheck_function.js b/rules/typecheck-function.js → rules/ng_typecheck_function.js
diff --git a/rules/typecheck-number.js → rules/ng_typecheck_number.js b/rules/typecheck-number.js → rules/ng_typecheck_number.js
diff --git a/rules/typecheck-object.js → rules/ng_typecheck_object.js b/rules/typecheck-object.js → rules/ng_typecheck_object.js
diff --git a/rules/typecheck-regexp.js → rules/ng_typecheck_regexp.js b/rules/typecheck-regexp.js → rules/ng_typecheck_regexp.js
diff --git a/rules/typecheck-string.js → rules/ng_typecheck_string.js b/rules/typecheck-string.js → rules/ng_typecheck_string.js
diff --git a/rules/watchers-execution.js → rules/ng_watchers_execution.js b/rules/watchers-execution.js → rules/ng_watchers_execution.js
diff --git a/rules/window-service.js → rules/ng_window_service.js b/rules/window-service.js → rules/ng_window_service.js
diff --git a/rules/utils/rulesConfiguration.js b/rules/utils/rulesConfiguration.js
diff --git a/test/angularelement.js → test/ng_angularelement.js b/test/angularelement.js → test/ng_angularelement.js
@@ -2,15 +2,15 @@
 // Requirements
 //------------------------------------------------------------------------------
 
-var rule = require('../rules/angularelement'),
+var rule = require('../rules/ng_angularelement'),
     RuleTester = require("eslint").RuleTester;
 
 //------------------------------------------------------------------------------
 // Tests
 //------------------------------------------------------------------------------
 
 var eslintTester = new RuleTester();
-eslintTester.run('angularelement', rule, {
+eslintTester.run('ng_angularelement', rule, {
     valid: [
         'angular.element("#id")'
     ],

diff --git a/test/controller-as.js → test/ng_controller_as.js b/test/controller-as.js → test/ng_controller_as.js
@@ -2,15 +2,15 @@
 // Requirements
 //------------------------------------------------------------------------------
 
-var rule = require('../rules/controller-as'),
+var rule = require('../rules/ng_controller_as'),
     RuleTester = require("eslint").RuleTester;
 
 //------------------------------------------------------------------------------
 // Tests
 //------------------------------------------------------------------------------
 
 var eslintTester = new RuleTester();
-eslintTester.run('controller-as', rule, {
+eslintTester.run('ng_controller_as', rule, {
     valid: [
         'angular.module("test").controller("Test", function () { $scope.$watch() } )',
         'angular.module("test").controller("Test", function () { doSomething($scope) } )'

diff --git a/test/controller-as-route.js → test/ng_controller_as_route.js b/test/controller-as-route.js → test/ng_controller_as_route.js
@@ -2,15 +2,15 @@
 // Requirements
 //------------------------------------------------------------------------------
 
-var rule = require('../rules/controller-as-route'),
+var rule = require('../rules/ng_controller_as_route'),
     RuleTester = require("eslint").RuleTester;
 
 //------------------------------------------------------------------------------
 // Tests
 //------------------------------------------------------------------------------
 
 var eslintTester = new RuleTester();
-eslintTester.run('controller-as-route', rule, {
+eslintTester.run('ng_controller_as_route', rule, {
     valid: [
         '$routeProvider.when("/myroute", { controller: "MyController", controllerAs: "vm" })',
         '$routeProvider.when("/myroute2", { template: "<div></div>" })',

diff --git a/test/controller-as-vm.js → test/ng_controller_as_vm.js b/test/controller-as-vm.js → test/ng_controller_as_vm.js
@@ -2,15 +2,15 @@
 // Requirements
 //------------------------------------------------------------------------------
 
-var rule = require('../rules/controller-as-vm'),
+var rule = require('../rules/ng_controller_as_vm'),
     RuleTester = require("eslint").RuleTester;
 
 //------------------------------------------------------------------------------
 // Tests
 //------------------------------------------------------------------------------
 
 var eslintTester = new RuleTester();
-eslintTester.run('controller-as-vm', rule, {
+eslintTester.run('ng_controller_as_vm', rule, {
     valid: [
         { code: 'angular.module("test").controller("Test", function () { var vm = this; vm.test = "test"; } )',
             options: ['vm']},

diff --git a/test/controller-name.js → test/ng_controller_name.js b/test/controller-name.js → test/ng_controller_name.js
@@ -2,15 +2,15 @@
 // Requirements
 //------------------------------------------------------------------------------
 
-var rule = require('../rules/controller-name'),
+var rule = require('../rules/ng_controller_name'),
     RuleTester = require("eslint").RuleTester;
 
 //------------------------------------------------------------------------------
 // Tests
 //------------------------------------------------------------------------------
 
 var eslintTester = new RuleTester();
-eslintTester.run('controller-name', rule, {
+eslintTester.run('ng_controller_name', rule, {
     valid: [{
         code: 'app.controller("eslintController", function(){});',
         options: ['eslint']

diff --git a/test/deferred.js → test/ng_deferred.js b/test/deferred.js → test/ng_deferred.js
@@ -2,15 +2,15 @@
 // Requirements
 //------------------------------------------------------------------------------
 
-var rule = require('../rules/deferred'),
+var rule = require('../rules/ng_deferred'),
     RuleTester = require("eslint").RuleTester;
 
 //------------------------------------------------------------------------------
 // Tests
 //------------------------------------------------------------------------------
 
 var eslintTester = new RuleTester();
-eslintTester.run('deferred', rule, {
+eslintTester.run('ng_deferred', rule, {
     valid: [
         '$q(function(){});'
     ],

diff --git a/test/definedundefined.js → test/ng_definedundefined.js b/test/definedundefined.js → test/ng_definedundefined.js
@@ -2,15 +2,15 @@
 // Requirements
 //------------------------------------------------------------------------------
 
-var rule = require('../rules/definedundefined'),
+var rule = require('../rules/ng_definedundefined'),
     RuleTester = require("eslint").RuleTester;
 
 //------------------------------------------------------------------------------
 // Tests
 //------------------------------------------------------------------------------
 
 var eslintTester = new RuleTester();
-eslintTester.run('definedundefined', rule, {
+eslintTester.run('ng_definedundefined', rule, {
     valid: [
         'angular.isUndefined(toto)',
         'angular.isDefined(toto)'

diff --git a/test/di.js → test/ng_di.js b/test/di.js → test/ng_di.js
@@ -2,7 +2,7 @@
 // Requirements
 //------------------------------------------------------------------------------
 
-var rule = require('../rules/di'),
+var rule = require('../rules/ng_di'),
     RuleTester = require("eslint").RuleTester;
 
 
@@ -96,7 +96,7 @@ valid.push({
 //------------------------------------------------------------------------------
 
 var eslintTester = new RuleTester();
-eslintTester.run('di', rule, {
+eslintTester.run('ng_di', rule, {
     valid: valid,
     invalid: invalid
 });
diff --git a/test/di-order.js → test/ng_di_order.js b/test/di-order.js → test/ng_di_order.js
@@ -2,15 +2,15 @@
 // Requirements
 //------------------------------------------------------------------------------
 
-var rule = require('../rules/di-order'),
+var rule = require('../rules/ng_di_order'),
     RuleTester = require("eslint").RuleTester;
 
 //------------------------------------------------------------------------------
 // Tests
 //------------------------------------------------------------------------------
 
 var eslintTester = new RuleTester();
-eslintTester.run('di-order', rule, {
+eslintTester.run('ng_di_order', rule, {
     valid: [
         'app.controller("", function($http, $q){});',
         'app.directive("", function($http, $q){});',

diff --git a/test/di-unused.js → test/ng_di_unused.js b/test/di-unused.js → test/ng_di_unused.js
@@ -2,15 +2,15 @@
 // Requirements
 //------------------------------------------------------------------------------
 
-var rule = require('../rules/di-unused'),
+var rule = require('../rules/ng_di_unused'),
     RuleTester = require("eslint").RuleTester;
 
 //------------------------------------------------------------------------------
 // Tests
 //------------------------------------------------------------------------------
 
 var eslintTester = new RuleTester();
-eslintTester.run('di-unused', rule, {
+eslintTester.run('ng_di_unused', rule, {
     valid: [
         'app.controller("", function($q){return $q;});',
         'app.directive("", function($q){return $q;});',

diff --git a/test/directive-name.js → test/ng_directive_name.js b/test/directive-name.js → test/ng_directive_name.js
@@ -2,15 +2,15 @@
 // Requirements
 //------------------------------------------------------------------------------
 
-var rule = require('../rules/directive-name'),
+var rule = require('../rules/ng_directive_name'),
     RuleTester = require("eslint").RuleTester;
 
 //------------------------------------------------------------------------------
 // Tests
 //------------------------------------------------------------------------------
 
 var eslintTester = new RuleTester();
-eslintTester.run('directive-name', rule, {
+eslintTester.run('ng_directive_name', rule, {
     valid: [{
         code: 'app.directive("eslintDirective", function(){});',
         options: ['eslint'],