Merge branch 'development' of https://github.com/jaydata/jaydata into development

Author: borzav

dist/package.json

@@ -72,16 +72,7 @@
     "type": "git",
     "url": "git+ssh://[email protected]/jaydata/jaydata.git"
   },
-  "licenses": [
-    {
-      "type": "MIT",
-      "url": "http://jaydata.org/licensing"
-    },
-    {
-      "type": "GPLv2",
-      "url": "http://jaydata.org/licensing"
-    }
-  ],
+  "license": "(MIT OR GPL-2.0)",
   "bugs": {
     "url": "https://github.com/jaydata/jaydata/issues"
   },

gulpfile.js

@@ -20,6 +20,7 @@ var buffer = require('vinyl-buffer');
 var fs = require('fs');
 var karma = require('karma').server;
 var exec = require('child_process').exec;
+var eslint = require('gulp-eslint');
 
 config.options = minimist(process.argv.slice(2), config.buildDefaultOptions);
 var paths = {
@@ -74,7 +75,29 @@ gulp.task('sqliteprovider', function() {
     .pipe(gulp.dest('./dist/public/jaydataproviders'));
 });
 
-gulp.task('bundle', ['jaydata', 'odataprovider', 'sqliteprovider'])
+gulp.task('lint', function(){
+    return gulp.src(['src/**/*.js'])
+    .pipe(eslint({
+        parser: 'babel-eslint',
+        env: {
+            browser: true,
+            node: true,
+            es6: true
+        },
+        ecmaFeatures: {
+            modules: true
+        },
+        rules: {
+            'no-undef': 1,
+            'no-unused-vars': 1,
+            'no-use-before-define': 1
+        }
+    }))
+    .pipe(eslint.format())
+    .pipe(eslint.failAfterError());
+});
+
+gulp.task('bundle', ['lint', 'jaydata', 'odataprovider', 'sqliteprovider'])
 
 gulp.task('nodejs', function() {
     return gulp.src(['src/**/*.js'])

package.json

@@ -70,18 +70,10 @@
   "engines": {
     "node": ">=0.6.0"
   },
-  "licenses": [
-    {
-      "type": "MIT",
-      "url": "http://jaydata.org/licensing"
-    },
-    {
-      "type": "GPLv2",
-      "url": "http://jaydata.org/licensing"
-    }
-  ],
+  "license": "(MIT OR GPL-2.0)",
   "devDependencies": {
     "babel": "^5.8.23",
+    "babel-eslint": "^4.1.3",
     "babelify": "^6.3.0",
     "browserify": "^11.2.0",
     "browserify-derequire": "^0.9.4",
@@ -92,6 +84,7 @@
     "gulp-closure-compiler": "^0.3.1",
     "gulp-concat": "^2.5.2",
     "gulp-derequire": "^2.1.0",
+    "gulp-eslint": "^1.0.0",
     "gulp-header": "^1.2.2",
     "gulp-rename": "^1.2.2",
     "gulp-replace": "^0.5.3",

src/TypeSystem/index.js

@@ -14,8 +14,6 @@ import Converter from './Types/Converter.js';
 import { Guard as _guard } from './utils.js';
 import _exception from './Exception.js';
 
-
-
 export var Guard = _guard;
 $data.Guard = _guard;