Skip to content

Commit

Permalink
Merge pull request #9 from NotNinja/develop
Browse files Browse the repository at this point in the history
Release 0.3.0
  • Loading branch information
neocotic committed May 10, 2017
2 parents 3496755 + cf2ca6a commit a62c3d2
Show file tree
Hide file tree
Showing 16 changed files with 794 additions and 823 deletions.
5 changes: 2 additions & 3 deletions .eslintrc.json
@@ -1,5 +1,5 @@
{
"extends": "skelp/v3/es5",
"extends": "notninja/es5",
"env": {
"es6": true,
"node": true
Expand All @@ -20,7 +20,6 @@
{
"functions": false
}
],
"sort-keys": "off"
]
}
}
2 changes: 1 addition & 1 deletion AUTHORS.md
@@ -1,3 +1,3 @@
# Authors ordered by first contribution

* Alasdair Mercer <alasdair@skelp.io>
* Alasdair Mercer <mercer.alasdair@gmail.com>
11 changes: 8 additions & 3 deletions CHANGES.md
@@ -1,8 +1,13 @@
## Version 0.3.0, 2017.05.10

* Move to !ninja [#6](https://github.com/NotNinja/scopy/issues/6)
* Switch to Codecov for code coverage [#7](https://github.com/NotNinja/scopy/issues/7)

## Version 0.2.0, 2017.03.23

* Correct anchor links in `README.md` [#2](https://github.com/Skelp/scopy/issues/2)
* Add method to provide a wrapped Scopy API for specific options [#3](https://github.com/Skelp/scopy/issues/3)
* Alias `Scopy.forAll` to `Scopy.for.all` [#4](https://github.com/Skelp/scopy/issues/4)
* Correct anchor links in `README.md` [#2](https://github.com/NotNinja/scopy/issues/2)
* Add method to provide a wrapped Scopy API for specific options [#3](https://github.com/NotNinja/scopy/issues/3)
* Alias `Scopy.forAll` to `Scopy.for.all` [#4](https://github.com/NotNinja/scopy/issues/4)

## Version 0.1.0, 2017.03.22

Expand Down
10 changes: 5 additions & 5 deletions CONTRIBUTING.md
@@ -1,10 +1,10 @@
# Contributing

If you have any questions about [Scopy](https://github.com/Skelp/scopy) please feel free to
[raise an issue](https://github.com/Skelp/scopy/issues/new).
If you have any questions about [Scopy](https://github.com/NotNinja/scopy) please feel free to
[raise an issue](https://github.com/NotNinja/scopy/issues/new).

Please [search existing issues](https://github.com/Skelp/scopy/issues) for the same feature and/or issue before raising
a new issue. Commenting on an existing issue is usually preferred over raising duplicate issues.
Please [search existing issues](https://github.com/NotNinja/scopy/issues) for the same feature and/or issue before
raising a new issue. Commenting on an existing issue is usually preferred over raising duplicate issues.

Please ensure that all files conform to the coding standards, using the same coding style as the rest of the code base.
All unit tests should be updated and passing as well. All of this can easily be checked via command-line:
Expand All @@ -21,5 +21,5 @@ You must have at least [Node.js](https://nodejs.org) version 4 or newer installe
All pull requests should be made to the `develop` branch.

Don't forget to add your details to the list of
[AUTHORS.md](https://github.com/Skelp/scopy/blob/master/AUTHORS.md) if you want your contribution to be recognized by
[AUTHORS.md](https://github.com/NotNinja/scopy/blob/master/AUTHORS.md) if you want your contribution to be recognized by
others.
41 changes: 16 additions & 25 deletions Gruntfile.js
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2017 Alasdair Mercer, Skelp
* Copyright (C) 2017 Alasdair Mercer, !ninja
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
Expand All @@ -20,12 +20,12 @@
* SOFTWARE.
*/

'use strict'
'use strict';

module.exports = function(grunt) {
var commonjs = require('rollup-plugin-commonjs')
var nodeResolve = require('rollup-plugin-node-resolve')
var uglify = require('rollup-plugin-uglify')
var commonjs = require('rollup-plugin-commonjs');
var nodeResolve = require('rollup-plugin-node-resolve');
var uglify = require('rollup-plugin-uglify');

grunt.initConfig({
pkg: grunt.file.readJSON('package.json'),
Expand All @@ -35,15 +35,6 @@ module.exports = function(grunt) {
test: [ 'coverage/' ]
},

coveralls: {
options: {
force: true
},
reportCoverage: {
src: [ 'coverage/lcov.info' ]
}
},

eslint: {
target: [
'src/**/*.js',
Expand Down Expand Up @@ -89,7 +80,7 @@ module.exports = function(grunt) {
return [
nodeResolve(),
commonjs()
]
];
}
},
files: {
Expand All @@ -103,19 +94,19 @@ module.exports = function(grunt) {
moduleName: 'Scopy',
sourceMap: true,
sourceMapRelativePaths: true,
banner: '/*! Scopy v<%= pkg.version %> | (C) <%= grunt.template.today("yyyy") %> <%= pkg.author.name %>, Skelp | <%= pkg.license %> License */',
banner: '/*! Scopy v<%= pkg.version %> | (C) <%= grunt.template.today("yyyy") %> <%= pkg.author.name %>, !ninja | <%= pkg.license %> License */',
plugins: function() {
return [
nodeResolve(),
commonjs(),
uglify({
output: {
comments: function(node, comment) {
return comment.type === 'comment2' && /^\!/.test(comment.value)
return comment.type === 'comment2' && /^\!/.test(comment.value);
}
}
})
]
];
}
},
files: {
Expand All @@ -130,12 +121,12 @@ module.exports = function(grunt) {
tasks: [ 'eslint', 'mochaTest:watch' ]
}
}
})
});

require('load-grunt-tasks')(grunt)
require('load-grunt-tasks')(grunt);

grunt.registerTask('default', [ 'ci' ])
grunt.registerTask('build', [ 'eslint', 'clean:build', 'rollup' ])
grunt.registerTask('ci', [ 'eslint', 'clean', 'rollup', 'mocha_istanbul' ])
grunt.registerTask('test', [ 'eslint', 'clean:test', 'mocha_istanbul' ])
}
grunt.registerTask('default', [ 'ci' ]);
grunt.registerTask('build', [ 'eslint', 'clean:build', 'rollup' ]);
grunt.registerTask('ci', [ 'eslint', 'clean', 'rollup', 'mocha_istanbul' ]);
grunt.registerTask('test', [ 'eslint', 'clean:test', 'mocha_istanbul' ]);
};
2 changes: 1 addition & 1 deletion LICENSE.md
@@ -1,4 +1,4 @@
Copyright (C) 2017 Alasdair Mercer, Skelp
Copyright (C) 2017 Alasdair Mercer, !ninja

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down

0 comments on commit a62c3d2

Please sign in to comment.