some improvements #2

.codeclimate.yml

@@ -0,0 +1,29 @@
+---
+engines:
+  csslint:
+    enabled: true
+  duplication:
+    enabled: true
+    config:
+      languages:
+      - ruby
+      - javascript
+      - python
+      - php
+  eslint:
+    enabled: true
+  fixme:
+    enabled: true
+ratings:
+  paths:
+  - "**.css"
+  - "**.inc"
+  - "**.js"
+  - "**.jsx"
+  - "**.module"
+  - "**.php"
+  - "**.py"
+  - "**.rb"
+exclude_paths:
+- config/
+- test/

.csslintrc

@@ -0,0 +1,2 @@
+--exclude-exts=.min.css
+--ignore=adjoining-classes,box-model,ids,order-alphabetical,unqualified-attributes

.dev/.babelrc

@@ -0,0 +1,5 @@
+{
+  "presets": [
+    ["es2015"]
+  ]
+}

.dev/bower.json.backup

@@ -0,0 +1,24 @@
+{
+  "name": "watchmen",
+  "description": "A simple service monitor",
+  "version": "3.3.1",
+  "homepage": "https://github.com/iloire/watchmen",
+  "license": "MIT",
+  "private": true,
+  "dependencies": {
+    "angular": "^1.3.x",
+    "angular-resource": "1.3.x",
+    "angular-moment": "^0.9.x",
+    "ng-table": "^0.5.4",
+    "bootstrap": "^3.3.x",
+    "moment": "^2.9.x",
+    "angular-spinner": "^0.6.1",
+    "c3": "^0.4.10",
+    "angular-ui-router": "^0.2.14",
+    "angular-ms-time": "^1.0.0",
+    "lodash": "^3.8.0"
+  },
+  "resolutions": {
+    "bootstrap": "~3.3.4"
+  }
+}

.dev/gulpfile.js.backup

@@ -0,0 +1,125 @@
+var gulp = require('gulp');
+var plugins = require('gulp-load-plugins')();
+var mainBowerFiles = require('main-bower-files');
+var del = require('del');
+var runSequence = require('run-sequence');
+//var addsrc = require('gulp-add-src');
+  var fs = require("fs");
+  var browserify = require("browserify");
+  var typescript = require('gulp-typescript');
+
+
+function js(shouldMinify) {
+
+
+
+  return gulp.src(mainBowerFiles().concat([ // not taking wildcards
+    './webserver/public/browserify/ng-table.js',
+    './webserver/public/js/controllers/**',
+    './webserver/public/js/charting/**',
+    './webserver/public/js/directives/**',
+    './webserver/public/js/**'
+  ]))
+      .pipe(plugins.filter('**/*.js'))
+	  .pipe(plugins.sourcemaps.init())
+      .pipe(plugins.concat('scripts.js'))
+      .pipe(plugins.if(shouldMinify, plugins.ngAnnotate()))
+      .pipe(plugins.if(shouldMinify, plugins.uglify()))
+	  .pipe(plugins.sourcemaps.write())
+      .pipe(gulp.dest('./webserver/public/build'));
+}
+
+function css(shouldMinify) {
+  return gulp.src(mainBowerFiles().concat(['./webserver/public/less/main.less','./node_modules/ng-table/bundles/ng-table.css']))
+      .pipe(plugins.filter('**/*.+(less|css)')) 
+	  .pipe(plugins.sourcemaps.init())
+	  .pipe(plugins.less())
+      .pipe(plugins.concat('style.css'))
+      .pipe(plugins.if(shouldMinify, plugins.cleanCss({keepBreaks: true})))
+	  .pipe(plugins.sourcemaps.write())
+      .pipe(gulp.dest('./webserver/public/build'));
+}
+
+gulp.task('clean', function () {
+  return del([
+    './webserver/public/build/*',
+    './webserver/public/fonts/*'
+  ]);
+});
+
+gulp.task('copy-fonts', function () {
+  return gulp.src('./webserver/public/bower_components/bootstrap/fonts/*')
+      .pipe(plugins.copy('./webserver/public/fonts/', {prefix: 5}));
+});
+
+gulp.task('lint', function () {
+  return gulp.src([
+    './webserver/**/*.js',
+    '!./webserver/public/bower_components/**/*.js',
+    '!./webserver/public/build/**/*.js',
+    './lib/**/*.js',
+    './test/**/*.js',
+    './config/**/*.js',
+    './scripts/**/*.js',
+    './*.js'
+  ])
+      .pipe(eslint())
+      .pipe(eslint.format())
+      .pipe(eslint.failAfterError());
+});
+
+gulp.task('js-dev', function () {
+  return js(false);
+});
+
+gulp.task('js-prod', function () {
+  return js(true);
+});
+
+gulp.task('css-prod', function () {
+  return css(true);
+});
+
+gulp.task('build', function () {
+  return runSequence('clean', ['copy-fonts', 'js-prod', 'css-prod']);
+});
+
+gulp.task('build:dev', function () {
+  return runSequence('clean', 'ts', ['copy-fonts', 'js-dev', 'css-prod']);
+});
+
+gulp.task('browserify', function () {
+  browserify('./node_modules/ng-table/bundles/ng-table.js')
+  .transform("babelify", {presets: ["es2015"]})
+  .bundle()
+  .on('error', function (err) { console.error(err); })
+  .pipe(fs.createWriteStream("./webserver/public/browserify/ng-table.js"));
+});
+
+gulp.task('ts', function () {
+  return gulp
+    .src('./node_modules/ng-table/src/browser/index.d.ts')
+    .pipe(plugins.sourcemaps.init())          // <--- sourcemaps
+    .pipe(typescript({
+		"outDir": "./webserver/public/browserify", // <--- newly added configuration parameter
+		"target": "ES5",
+		"module": "umd",
+		"sourceMap": true,
+		"emitDecoratorMetadata": true,
+		"experimentalDecorators": true,
+		"moduleResolution": "node",
+		"removeComments": false,
+		"noImplicitAny": true,
+		"suppressImplicitAnyIndexErrors": true
+	  }))
+    .pipe(plugins.sourcemaps.write())      // <--- sourcemaps
+    .pipe(gulp.dest('./webserver/public/browserify'));
+});
+
+gulp.task('watch', ['build:dev'], function () {
+  gulp.watch('./webserver/public/bower_components/**/*', ['css-prod', 'js-dev']);
+  gulp.watch('./webserver/public/js/**', ['js-dev']);
+  gulp.watch('./webserver/public/less/*', ['css-prod']);
+});
+
+gulp.task('default', ['build']);

.dev/package.json.backup

@@ -0,0 +1,91 @@
+{
+  "author": "Iván Loire <[email protected]> (http://iloire.com/)",
+  "name": "watchmen",
+  "scripts": {
+    "start": "concurrently \"node run-monitor-server.js\" \"node run-web-server.js\"",
+    "start:mon": "node run-monitor-server.js",
+    "start:svr": "node run-web-server.js",
+    "start:dev": "cross-env WATCHMEN_WEB_NO_AUTH=true concurrently \"node run-monitor-server.js\" \"node run-web-server.js\"",
+    "coverage": "./node_modules/istanbul/lib/cli.js cover ./node_modules/mocha/bin/_mocha -- --ui bdd -R spec -t 5000",
+    "postcoverage": "kill `cat test/redis.pid`",
+    "posttest": "kill `cat test/redis.pid`",
+    "precoverage": "redis-server test/redis.test.conf",
+    "pretest": "redis-server test/redis.test.conf",
+    "test": "mocha -R list test/*.js"
+  },
+  "description": "A simple service monitor",
+  "version": "3.3.1",
+  "homepage": "http://letsnode.com",
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/iloire/watchmen.git"
+  },
+  "engines": {
+    "node": ">=0.10"
+  },
+  "keywords": [
+    "monitor",
+    "ping",
+    "service",
+    "watchmen"
+  ],
+  "license": "MIT",
+  "dependencies": {
+    "async": "^0.9.0",
+    "body-parser": "^1.12.4",
+    "colors": "^1.1.0",
+    "commander": "^2.8.1",
+    "compression": "^1.4.3",
+    "concat-stream": "^1.4.8",
+    "concurrently": "^3.1.0",
+    "connect-redis": "^3.0.1",
+    "cross-env": "^3.1.4",
+    "debug": "^2.2.0",
+    "ejs": "2.3.x",
+    "errorhandler": "^1.3.6",
+    "express": "^4.12.3",
+    "express-ejs-layouts": "^1.1.0",
+    "express-session": "^1.10.4",
+    "lodash": "^3.8.0",
+    "method-override": "2.3.x",
+    "moment": "^2.10.3",
+    "passport": "^0.2.1",
+    "passport-google-oauth2": "0.1.x",
+    "q": "^1.3.0",
+    "redis": "^0.12.1",
+    "shortid": "^2.2.2",
+    "stream-spigot": "^3.0.5",
+    "timestream-aggregates": "^0.1.7",
+    "validator": "^3.39.0",
+	"watchmen-ping-http-contains": "^0.0.2",
+    "watchmen-ping-http-head": "^0.2.0",
+    "watchmen-plugin-aws-ses": "0.0.1",
+    "watchmen-plugin-console": "0.2.0",
+    "watchmen-ping-icmp": "file:plugins\\watchmen-ping-icmp"
+  },
+  "devDependencies": {
+    "assert": "^1.3.0",
+    "bower": "1.4.x",
+    "del": "^2.0.2",
+    "faker": "^2.1.5",
+    "gulp": "^3.9.0",
+    "gulp-concat": "^2.5.2",
+    "gulp-copy": "0.0.2",
+    "gulp-filter": "^2.0.2",
+    "gulp-if": "^1.2.5",
+    "gulp-jshint": "^1.10.0",
+    "gulp-less": "^3.0.2",
+    "gulp-load-plugins": "^0.9.0",
+    "gulp-minify-css": "^1.0.0",
+    "gulp-ng-annotate": "^1.0.0",
+    "gulp-uglify": "^1.2.0",
+    "gulp-watch": "^4.2.4",
+    "istanbul": "0.3.x",
+    "main-bower-files": "^2.6.2",
+    "mocha": "^2.2.5",
+    "passport-mock": "0.0.3",
+    "run-sequence": "^1.1.4",
+    "sinon": "^1.14.1",
+    "supertest": "^1.0.1"
+  }
+}

.dev/package.json.backup2

@@ -0,0 +1,102 @@
+{
+  "author": "Iván Loire <[email protected]> (http://iloire.com/)",
+  "name": "watchmen",
+  "scripts": {
+    "start": "concurrently \"node run-monitor-server.js\" \"node run-web-server.js\"",
+    "start:mon": "node run-monitor-server.js",
+    "start:svr": "node run-web-server.js",
+    "start:dev": "cross-env WATCHMEN_WEB_NO_AUTH=true concurrently \"node run-monitor-server.js\" \"node run-web-server.js\"",
+    "coverage": "./node_modules/istanbul/lib/cli.js cover ./node_modules/mocha/bin/_mocha -- --ui bdd -R spec -t 5000",
+    "build": "gulp",
+    "watch": "forever node_modules/gulp/bin/gulp.js watch",
+    "postinstall": "bower install && npm run build",
+    "postcoverage": "kill `cat test/redis.pid`",
+    "posttest": "kill `cat test/redis.pid`",
+    "precoverage": "redis-server test/redis.test.conf",
+    "pretest": "redis-server test/redis.test.conf",
+    "test": "mocha -R list test/*.js"
+  },
+  "description": "A simple service monitor",
+  "version": "3.3.1",
+  "homepage": "http://letsnode.com",
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/iloire/watchmen.git"
+  },
+  "engines": {
+    "node": ">=0.10"
+  },
+  "keywords": [
+    "monitor",
+    "ping",
+    "service",
+    "watchmen"
+  ],
+  "license": "MIT",
+  "dependencies": {
+    "angular": "^1.6.1",
+    "angular-mocks": "^1.6.1",
+    "async": ">=2.1.4",
+    "body-parser": "^1.15.2",
+    "colors": "^1.1.2",
+    "commander": "^2.9.0",
+    "compression": "^1.6.2",
+    "concat-stream": "^1.6.0",
+    "concurrently": ">=3.1.0",
+    "connect-redis": "^3.2.0",
+    "cross-env": ">=3.1.4",
+    "debug": "^2.6.0",
+    "ejs": ">=2.5.5",
+    "errorhandler": "^1.5.0",
+    "express": "^4.14.0",
+    "express-ejs-layouts": "^2.2.0",
+    "express-session": "^1.14.2",
+    "lodash": "^4.17.4",
+    "method-override": "2.3.x",
+    "moment": "^2.17.1",
+    "ng-table": "^3.0.1",
+    "passport": "^0.3.2",
+    "passport-google-oauth2": "0.1.x",
+    "q": "^1.4.1",
+    "redis": ">=2.6.4",
+    "shortid": "^2.2.6",
+    "stream-spigot": "^3.0.5",
+    "timestream-aggregates": "^0.1.7",
+    "validator": "^6.x.x",
+    "watchmen-ping-http-contains": "^0.0.2",
+    "watchmen-ping-http-head": "^0.2.0",
+    "watchmen-plugin-aws-ses": "0.0.1",
+    "watchmen-plugin-console": "0.2.0"
+  },
+  "devDependencies": {
+    "assert": ">=1.4.1",
+    "babel-preset-es2015": "^6.18.0",
+    "babelify": "^7.3.0",
+    "bower": ">=1.8.0",
+    "browserify": "^13.3.0",
+    "del": ">=2.2.2",
+    "faker": "^3.1.0",
+    "forever": "^0.15.3",
+    "gulp": "^3.9.1",
+    "gulp-clean-css": ">=2.0.0",
+    "gulp-concat": ">=2.6.1",
+    "gulp-copy": ">=1.0.0",
+    "gulp-filter": ">=5.0.0",
+    "gulp-if": ">=2.0.2",
+    "gulp-less": ">=3.3.0",
+    "gulp-load-plugins": ">=1.4.0",
+    "gulp-ng-annotate": ">=2.0.0",
+    "gulp-sourcemaps": "^2.4.0",
+    "gulp-typescript": "^3.1.4",
+    "gulp-uglify": ">=2.0.0",
+    "gulp-watch": ">=4.3.11",
+    "istanbul": ">=0.4.x",
+    "main-bower-files": "^2.13.1",
+    "mocha": ">=3.2.0",
+    "passport-mock": ">=0.0.3",
+    "run-sequence": ">=1.2.2",
+    "sinon": ">=1.17.7",
+    "supertest": ">=2.0.1",
+    "typescript": "^2.1.5"
+  }
+}

.eslintignore

@@ -0,0 +1 @@
+**/*{.,-}min.js