Update tools

Fix #34, update devDeps, add linter, modified build.
TheSharpieOne · Dec 17, 2015 · 19923ab · 19923ab
1 parent ed023df
commit 19923ab
Show file tree

Hide file tree

Showing 11 changed files with 89 additions and 46 deletions.
diff --git a/.jshintignore b/.jshintignore
@@ -0,0 +1,2 @@
+node_modules/**
+bower_components/**
diff --git a/.jshintrc b/.jshintrc
@@ -0,0 +1,37 @@
+{
+  "bitwise": true,
+  "immed": true,
+  "newcap": true,
+  "noarg": true,
+  "noempty": true,
+  "nonew": true,
+  "trailing": true,
+  "maxlen": 160,
+  "boss": true,
+  "eqnull": true,
+  "expr": true,
+  "laxbreak": true,
+  "loopfunc": true,
+  "sub": true,
+  "undef": true,
+  "indent": 2,
+  "esnext": true,
+  "node": true,
+  "browser": true,
+  "mocha": true,
+  "globals": {
+    "protractor": true,
+    "browser": true,
+    "by": true,
+    "element": true,
+    "it": true,
+    "describe": true,
+    "beforeEach": true,
+    "afterEach": true,
+    "expect": true,
+    "sinon": true,
+    "inject": true,
+    "module": true,
+    "angular": true
+  }
+}
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
     "name": "angular-validation-match",
-    "version": "1.6.0",
+    "version": "1.7.0",
     "homepage": "https://github.com/TheSharpieOne/angular-validation-match",
     "authors": [
         "TheSharpieOne  <evan@lostonia.com>"
@@ -33,9 +33,6 @@
         "tests"
     ],
     "dependencies": {
-        "angular": ">=1.2.0 <2.0.0"
-    },
-    "devDependencies": {
-        "angular-mocks": ">=1.2.0 <2.0.0"
+        "angular": ">=1.3.0 <2.0.0"
     }
 }
diff --git a/dist/angular-validation-match.js b/dist/angular-validation-match.js
@@ -1,7 +1,7 @@
 /*!
  * angular-validation-match
  * Checks if one input matches another
- * @version v1.6.0
+ * @version v1.7.0
  * @link https://github.com/TheSharpieOne/angular-validation-match
  * @license MIT License, http://www.opensource.org/licenses/MIT
  */
@@ -17,9 +17,6 @@ function match ($parse) {
         restrict: 'A',
         link: function(scope, elem, attrs, ctrl) {
             if(!ctrl) {
-                if(console && console.warn){
-                    console.warn('Match validation requires ngModel to be on the element');
-                }
                 return;
             }
 
@@ -41,7 +38,9 @@ function match ($parse) {
               }else{
                 value = ctrl.$viewValue === match;
               }
+              /*jslint bitwise: true */
               value ^= notMatch;
+              /*jslint bitwise: false */
               return !!value;
             };
 

diff --git a/dist/angular-validation-match.min.js b/dist/angular-validation-match.min.js
@@ -1,8 +1,8 @@
 /*!
  * angular-validation-match
  * Checks if one input matches another
- * @version v1.6.0
+ * @version v1.7.0
  * @link https://github.com/TheSharpieOne/angular-validation-match
  * @license MIT License, http://www.opensource.org/licenses/MIT
  */
-!function(a,b,c){"use strict";function d(a){return{require:"?ngModel",restrict:"A",link:function(c,d,e,f){function g(){var a=h(c);return b.isObject(a)&&a.hasOwnProperty("$viewValue")&&(a=a.$viewValue),a}if(!f)return void(console&&console.warn&&console.warn("Match validation requires ngModel to be on the element"));var h=a(e.match),i=a(e.matchCaseless),j=a(e.notMatch);c.$watch(g,function(){f.$$parseAndValidate()}),f.$validators.match=function(){var a,d=g(),e=j(c);return a=i(c)?b.lowercase(f.$viewValue)===b.lowercase(d):f.$viewValue===d,a^=e,!!a}}}}b.module("validation.match",[]),b.module("validation.match").directive("match",d),d.$inject=["$parse"]}(window,window.angular);
+!function(e,a,t){"use strict";function i(e){return{require:"?ngModel",restrict:"A",link:function(t,i,n,r){function c(){var e=o(t);return a.isObject(e)&&e.hasOwnProperty("$viewValue")&&(e=e.$viewValue),e}if(r){var o=e(n.match),u=e(n.matchCaseless),l=e(n.notMatch);t.$watch(c,function(){r.$$parseAndValidate()}),r.$validators.match=function(){var e,i=c(),n=l(t);return e=u(t)?a.lowercase(r.$viewValue)===a.lowercase(i):r.$viewValue===i,e^=n,!!e}}}}}a.module("validation.match",[]),a.module("validation.match").directive("match",i),i.$inject=["$parse"]}(window,window.angular);
diff --git a/files.js b/files.js
@@ -2,11 +2,16 @@ var pkg = require('./package.json');
 
 var pkgFiles = {
   angular: [
-    'bower_components/angular/angular.js'
+    'node_modules/angular/angular.js'
   ],
   karma: [
-    'bower_components/angular/angular.js',
-    'bower_components/angular-mocks/angular-mocks.js'
+    'node_modules/chai/chai.js',
+    'node_modules/sinon/pkg/sinon.js',
+    'node_modules/dirty-chai/lib/dirty-chai.js',
+    'node_modules/sinon-chai/lib/sinon-chai.js',
+    'node_modules/chai/chai.js',
+    'node_modules/angular/angular.js',
+    'node_modules/angular-mocks/angular-mocks.js'
   ],
   'karma-build': [
     '@karma',

diff --git a/gulpfile.js b/gulpfile.js
@@ -2,10 +2,11 @@
 
 var gulp = require('gulp');
 var ngAnnotate = require('gulp-ng-annotate');
-var uglify = require('gulp-uglifyjs');
+var uglify = require('gulp-uglify');
 var wrap = require('gulp-wrap');
 var bump = require('gulp-bump');
 var gulpKarma = require('gulp-karma');
+var rename = require('gulp-rename');
 var gulpSequence = require('gulp-sequence').use(gulp);
 var pkg = require('./package.json');
 var files = require('./files');
@@ -17,7 +18,7 @@ var banner = '/*!\n' +
 ' * <%= pkg.description %>\n' +
 ' * @version v<%= pkg.version %>\n' +
 ' * @link <%= pkg.homepage %>\n' +
-' * @license MIT License, http://www.opensource.org/licenses/MIT\n' +
+' * @license <%= pkg.license %> License, http://www.opensource.org/licenses/<%= pkg.license %>\n' +
 ' */\n';
 
 gulp.task('bump', function(){
@@ -35,12 +36,12 @@ gulp.task('buildDev', function () {
 
 gulp.task('minBuild', function () {
     return gulp.src('./build/'+pkg.name+'.js')
-    .pipe(uglify(pkg.name+'.min.js', {
+    .pipe(uglify({
         outSourceMap: false,
         mangle: true,
-        preserveComments: 'some'
+        preserveComments: 'license'
     }))
-    .pipe(wrap(banner+'<%= contents %>', {pkg: pkg}))
+    .pipe(rename(pkg.name+'.min.js'))
     .pipe(gulp.dest('./build/'));
 });
 

diff --git a/karma.conf.js b/karma.conf.js
@@ -5,7 +5,7 @@ module.exports = function (config) {
     config.set({
         basePath: './',
 
-        frameworks: ['mocha', 'chai-sinon'],
+        frameworks: ['mocha'],
 
         exclude: [],
 

diff --git a/package.js b/package.js
@@ -1,3 +1,4 @@
+/*global Package*/
 // package metadata file for Meteor.js
 var packageName = 'silintzir:angular-validation-match';
 var where = 'client';
@@ -21,4 +22,4 @@ Package.onUse(function(api) {
   api.use('angular:angular@1.2.0', where); // Dependencies
 
   api.addFiles('dist/angular-validation-match.js', where); // Files in use
-});
+});
diff --git a/package.json b/package.json
@@ -1,11 +1,12 @@
 {
   "name": "angular-validation-match",
-  "version": "1.6.0",
+  "version": "1.7.0",
   "homepage": "https://github.com/TheSharpieOne/angular-validation-match",
   "description": "Checks if one input matches another",
   "main": "./index.js",
   "scripts": {
-    "test": "gulp test"
+    "test": "gulp test",
+    "build": "gulp build"
   },
   "repository": {
     "type": "git",
@@ -28,28 +29,29 @@
       "web": "https://github.com/TheSharpieOne"
     }
   ],
-  "license": [
-    {
-      "type": "MIT",
-      "url": "http://www.opensource.org/licenses/MIT"
-    }
-  ],
+  "license": "MIT",
+  "dependencies":{
+    "angular": ">=1.3.0 <2.0.0"
+  },
   "devDependencies": {
-    "chai": "^1.10.0",
+    "angular-mocks": ">=1.3.0 <2.0.0",
+    "chai": "^3.4.1",
+    "dirty-chai": "1.2.2",
     "gulp": "^3.9.0",
-    "gulp-bump": "^0.1.13",
-    "gulp-karma": "0.0.4",
-    "gulp-ng-annotate": "^0.3.6",
-    "gulp-sequence": "^0.3.1",
-    "gulp-uglifyjs": "^0.4.4",
-    "gulp-wrap": "^0.3.0",
-    "karma": "^0.12.37",
-    "karma-chai-sinon": "^0.1.5",
-    "karma-chrome-launcher": "^0.1.12",
-    "karma-firefox-launcher": "~0.1.0",
-    "karma-mocha": "~0.1",
-    "karma-phantomjs-launcher": "^0.1.4",
-    "karma-script-launcher": "~0.1.0",
+    "gulp-bump": "^1.0.0",
+    "gulp-karma": "0.0.5",
+    "gulp-ng-annotate": "^1.1.0",
+    "gulp-rename": "^1.2.2",
+    "gulp-sequence": "^0.4.1",
+    "gulp-uglify": "^1.5.1",
+    "gulp-wrap": "^0.11.0",
+    "karma": "^0.13.15",
+    "karma-chrome-launcher": "^0.2.2",
+    "karma-firefox-launcher": "^0.1.0",
+    "karma-mocha": "^0.2.1",
+    "karma-phantomjs-launcher": "^0.2.1",
+    "mocha": "^2.3.4",
+    "phantomjs": "^1.9.19",
     "sinon": "^1.16.1",
     "sinon-chai": "^2.8.0"
   }

diff --git a/src/angular-validation-match.js b/src/angular-validation-match.js
@@ -10,9 +10,6 @@ function match ($parse) {
         restrict: 'A',
         link: function(scope, elem, attrs, ctrl) {
             if(!ctrl) {
-                if(console && console.warn){
-                    console.warn('Match validation requires ngModel to be on the element');
-                }
                 return;
             }
 
@@ -34,7 +31,9 @@ function match ($parse) {
               }else{
                 value = ctrl.$viewValue === match;
               }
+              /*jslint bitwise: true */
               value ^= notMatch;
+              /*jslint bitwise: false */
               return !!value;
             };