From 885a847c2045bc342da057235787cb333eb8e31c Mon Sep 17 00:00:00 2001 From: Andreas Krummsdorf Date: Thu, 13 Mar 2014 10:52:11 +0100 Subject: [PATCH] chore: update dependencies and license - run test in node 0.11 in travis --- .travis.yml | 6 +++++- Gruntfile.js | 40 ++++++++++++++++++-------------------- LICENSE | 2 +- package.json | 55 ++++++++++++++++++---------------------------------- 4 files changed, 44 insertions(+), 59 deletions(-) diff --git a/.travis.yml b/.travis.yml index b204257..2f318ea 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,5 +4,9 @@ language: node_js node_js: - '0.8' - '0.10' + - '0.11' before_script: - - npm install -g grunt-cli \ No newline at end of file + - npm install -g grunt-cli +matrix: + allow_failures: + - node_js: '0.11' \ No newline at end of file diff --git a/Gruntfile.js b/Gruntfile.js index e272d5a..e0cb43b 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -1,5 +1,4 @@ 'use strict'; -var fs = require('fs'); module.exports = function (grunt) { // load grunt tasks @@ -9,14 +8,6 @@ module.exports = function (grunt) { grunt.initConfig({ pkg: grunt.file.readJSON('package.json'), jshint_files_to_test: ['Gruntfile.js', 'lib/**/*.js', 'test/**/*.js'], - banner: '/*!\n' + - ' * <%= pkg.title || pkg.name %> - v<%= pkg.version %> - <%= grunt.template.today("yyyy-mm-dd") %>\n' + - '<%= pkg.homepage ? " * " + pkg.homepage + "\\n" : "" %>' + - ' *\n' + - ' * Copyright (c) <%= grunt.template.today("yyyy") %> <%= pkg.author.name %>\n' + - ' * Licensed <%= _.pluck(pkg.licenses, "type").join(", ") %>\n' + - ' */\n\n', - // Before generating any new files, remove any previously-created files. clean: { jasmine: ['build/jasmine'], coverage: ['build/coverage'] @@ -59,15 +50,22 @@ module.exports = function (grunt) { } }, jasmine_node: { - specNameMatcher: './*.spec', // load only specs containing specNameMatcher - projectRoot: 'test', - requirejs: false, - forceExit: true, - jUnit: { - report: true, - savePath: 'build/reports/jasmine/', - useDotNotation: true, - consolidate: true + options: { + specNameMatcher: './*.spec', // load only specs containing specNameMatcher + requirejs: false, + forceExit: true + }, + test: ['test/'], + ci: { + options: { + jUnit: { + report: true, + savePath: 'build/reports/jasmine/', + useDotNotation: true, + consolidate: true + } + }, + src: ['test/'] } }, changelog: { @@ -87,13 +85,13 @@ module.exports = function (grunt) { // Register tasks. grunt.registerTask('git:commitHook', 'Install git commit hook', function () { grunt.file.copy('validate-commit-msg.js', '.git/hooks/commit-msg'); - fs.chmodSync('.git/hooks/commit-msg', '0755'); + require('fs').chmodSync('.git/hooks/commit-msg', '0755'); grunt.log.ok('Registered git hook: commit-msg'); }); - grunt.registerTask('test', ['git:commitHook', 'clean:jasmine', 'jshint:test', 'jasmine_node']); + grunt.registerTask('test', ['git:commitHook', 'clean:jasmine', 'jshint:test', 'jasmine_node:test']); grunt.registerTask('cover', ['clean:coverage', 'jshint:test', 'bgShell:coverage', 'open']); - grunt.registerTask('ci', ['clean', 'jshint:jslint', 'jshint:checkstyle', 'bgShell:coverage', 'bgShell:cobertura', 'jasmine_node']); + grunt.registerTask('ci', ['clean', 'jshint:jslint', 'jshint:checkstyle', 'bgShell:coverage', 'bgShell:cobertura', 'jasmine_node:ci']); grunt.registerTask('release', 'Bump version, update changelog and tag version', function (version) { grunt.task.run([ 'bump:' + (version || 'patch') + ':bump-only', diff --git a/LICENSE b/LICENSE index 321aaae..4b74394 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright (C) 2013 Litixsoft GmbH +Copyright (C) 2013-2014 Litixsoft GmbH Licensed under the MIT license. Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/package.json b/package.json index a4e4756..4531361 100644 --- a/package.json +++ b/package.json @@ -3,35 +3,16 @@ "description": "Litixsoft backend driver for mongoDb.", "version": "0.5.2", "homepage": "https://github.com/litixsoft/lx-mongodb", - "author": { - "name": "Litixsoft GmbH", - "email": "info@litixsoft.de" - }, + "author": "Litixsoft GmbH (http://www.litixsoft.de)", "maintainers": [ - { - "name": "Timo Liebetrau", - "email": "t.liebetrau@litixsoft.de" - }, - { - "name": "Thomas Heinrich Linke", - "email": "t.heinrich-linke@litixsoft.de" - }, - { - "name": "Marco Kannenberg", - "email": "m.kannenberg@litixsoft.de" - }, - { - "name": "Andreas Krummsdorf", - "email": "a.krummsdorf@litixsoft.de" - }, - { - "name": "Sven Bernstein", - "email": "s.bernstein@litixsoft.de" - }, - { - "name": "Thomas Scheibe", - "email": "th.scheibe@litixsoft.de" - } + "Timo Liebetrau ", + "Marco Kannenberg ", + "Sven Bernstein ", + "Dominic Sachs ", + "Thomas Scheibe ", + "Mike Alig ", + "Joerg Raschke ", + "Andreas Krummsdorf " ], "repository": { "type": "git", @@ -57,26 +38,28 @@ "url": "https://github.com/litixsoft/lx-mongodb/blob/master/LICENSE" } ], - "readmeFilename": "README.md", "main": "lib/lx-mongodb.js", + "directories": { + "lib": "./lib" + }, "scripts": { "test": "grunt test" }, "devDependencies": { - "grunt": "~0.4.2", + "grunt": "~0.4.4", "grunt-bg-shell": "~2.3.1", "grunt-bump": "~0.0.13", "grunt-contrib-clean": "~0.5.0", - "grunt-contrib-jshint": "~0.8.0", - "grunt-conventional-changelog": "~1.0.0", - "grunt-jasmine-node": "~0.1.0", + "grunt-contrib-jshint": "~0.9.2", + "grunt-conventional-changelog": "~1.1.0", + "grunt-jasmine-node": "~0.2.1", "grunt-open": "~0.2.3", - "istanbul": "~0.2.4", - "load-grunt-tasks": "~0.3.0" + "istanbul": "~0.2.6", + "load-grunt-tasks": "~0.4.0" }, "dependencies": { "async": "~0.2.10", - "lx-helpers": "~0.4.1", + "lx-helpers": "~0.5.0", "mongodb": "1.3.19", "mongojs": "litixsoft/mongojs" }