Skip to content

Commit

Permalink
chore: update dependencies and license
Browse files Browse the repository at this point in the history
- run test in node 0.11 in travis
  • Loading branch information
Andreas Krummsdorf committed Mar 13, 2014
1 parent 2b2755a commit 885a847
Show file tree
Hide file tree
Showing 4 changed files with 44 additions and 59 deletions.
6 changes: 5 additions & 1 deletion .travis.yml
Expand Up @@ -4,5 +4,9 @@ language: node_js
node_js:
- '0.8'
- '0.10'
- '0.11'
before_script:
- npm install -g grunt-cli
- npm install -g grunt-cli
matrix:
allow_failures:
- node_js: '0.11'
40 changes: 19 additions & 21 deletions Gruntfile.js
@@ -1,5 +1,4 @@
'use strict';
var fs = require('fs');

module.exports = function (grunt) {
// load grunt tasks
Expand All @@ -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']
Expand Down Expand Up @@ -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: {
Expand All @@ -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',
Expand Down
2 changes: 1 addition & 1 deletion LICENSE
@@ -1,4 +1,4 @@
Copyright (C) 2013 Litixsoft GmbH <info@litixsoft.de>
Copyright (C) 2013-2014 Litixsoft GmbH <info@litixsoft.de>
Licensed under the MIT license.

Permission is hereby granted, free of charge, to any person obtaining a copy
Expand Down
55 changes: 19 additions & 36 deletions package.json
Expand Up @@ -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 <info@litixsoft.de> (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 <t.liebetrau@litixsoft.de>",
"Marco Kannenberg <m.kannenberg@litixsoft.de@litixsoft.de>",
"Sven Bernstein <s.bernstein@litixsoft.de>",
"Dominic Sachs <d.sachs@litixsoft.de>",
"Thomas Scheibe <th.scheibe@litixsoft.de>",
"Mike Alig <m.alig@litixsoft.de>",
"Joerg Raschke <j.Raschke@litixsoft.de>",
"Andreas Krummsdorf <a.krummsdorf@litixsoft.de>"
],
"repository": {
"type": "git",
Expand All @@ -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"
}
Expand Down

0 comments on commit 885a847

Please sign in to comment.