Skip to content

Commit

Permalink
Merge pull request #1 from bekk/master
Browse files Browse the repository at this point in the history
Pull inn changes from main
  • Loading branch information
eoftedal committed Apr 6, 2015
2 parents 2bf4563 + a24c656 commit d8dd409
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 20 deletions.
4 changes: 2 additions & 2 deletions Gruntfile.js
Expand Up @@ -20,8 +20,8 @@ module.exports = function (grunt) {
options: {
verbose: true,
packageOnly: true,
jsRepository: 'https://raw.github.com/bekk/retire.js/master/repository/jsrepository.json',
nodeRepository: 'https://raw.github.com/bekk/retire.js/master/repository/npmrepository.json'
jsRepository: 'https://raw.github.com/RetireJS/retire.js/master/repository/jsrepository.json',
nodeRepository: 'https://raw.github.com/RetireJS/retire.js/master/repository/npmrepository.json'
}
}
});
Expand Down
22 changes: 11 additions & 11 deletions README.md
Expand Up @@ -4,7 +4,7 @@
[![NPM version](https://badge.fury.io/js/grunt-retire.png)](http://badge.fury.io/js/grunt-retire)
[![Retire Status](http://retire.insecurity.today/api/image?uri=https://raw.githubusercontent.com/bekk/grunt-retire/master/package.json)](http://retire.insecurity.today/api/image?uri=https://raw.githubusercontent.com/bekk/grunt-retire/master/package.json)

Grunt task for [retire.js](https://github.com/bekk/retire.js). Scanner detecting the use of JavaScript libraries with known vulnerabilities.
Grunt task for [retire.js](https://github.com/RetireJS/retire.js). Scanner detecting the use of JavaScript libraries with known vulnerabilities.



Expand All @@ -31,8 +31,8 @@ _Run this task with the `grunt retire` command._

This task primarily delegates to [Retire][], so please consider the [Retire documentation][] as required reading for advanced configuration.

[Retire]: https://github.com/bekk/retire.js
[Retire documentation]: https://github.com/bekk/retire.js
[Retire]: https://github.com/RetireJS/retire.js
[Retire documentation]: https://github.com/RetireJS/retire.js

Task targets, files and options may be specified according to the grunt [Configuring tasks](http://gruntjs.com/configuring-tasks) guide.

Expand All @@ -47,8 +47,8 @@ Example configuration below shows default option values and the correct syntax t
proxy: 'http://something.something:8080',
verbose: true,
packageOnly: true,
jsRepository: 'https://raw.github.com/bekk/retire.js/master/repository/jsrepository.json',
nodeRepository: 'https://raw.github.com/bekk/retire.js/master/repository/npmrepository.json',
jsRepository: 'https://raw.github.com/RetireJS/retire.js/master/repository/jsrepository.json',
nodeRepository: 'https://raw.github.com/RetireJS/retire.js/master/repository/npmrepository.json',
ignore: 'documents,java',
ignorefile: '.retireignore' /** list of files to ignore **/
}
Expand All @@ -61,9 +61,9 @@ Example configuration below shows default option values and the correct syntax t

`packageOnly: true/false`, default is `true`. Only scan only dependencies in package.json, skip dependencies to dependencies.

`jsRepository: String`, default is `https://raw.github.com/bekk/retire.js/master/repository/jsrepository.json`. JSON file which specifies where to retrieve Javascript vulnerability database.
`jsRepository: String`, default is `https://raw.github.com/RetireJS/retire.js/master/repository/jsrepository.json`. JSON file which specifies where to retrieve Javascript vulnerability database.

`nodeRepository: String`, default is `https://raw.github.com/bekk/retire.js/master/repository/npmrepository.json`. JSON file which specifies where to retrieve Node vulnerability database.
`nodeRepository: String`, default is `https://raw.github.com/RetireJS/retire.js/master/repository/npmrepository.json`. JSON file which specifies where to retrieve Node vulnerability database.

`ignore: String`, default is empty. Paths to ignore when scanning for JavaScript files.

Expand Down Expand Up @@ -95,10 +95,10 @@ Running ```grunt retire``` will scan all dependencies specified under `dependenc
```
➜ grunt-retire git:(master) ✗ grunt retire
Running "retire:jsPath" (retire) task
JS repository loaded from: https://raw.github.com/bekk/retire.js/master/repository/jsrepository.json
JS repository loaded from: https://raw.github.com/RetireJS/retire.js/master/repository/jsrepository.json
>> test-files/jquery-1.6.js
>> ↳ jquery 1.6 has known vulnerabilities: http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2011-4969
Node repository loaded from: https://raw.github.com/bekk/retire.js/master/repository/npmrepository.json
Node repository loaded from: https://raw.github.com/RetireJS/retire.js/master/repository/npmrepository.json
```


Expand All @@ -107,8 +107,8 @@ Node repository loaded from: https://raw.github.com/bekk/retire.js/master/reposi
```
➜ grunt-retire git:(master) ✗ grunt retire
Running "retire:jsPath" (retire) task
JS repository loaded from: https://raw.github.com/bekk/retire.js/master/repository/jsrepository.json
Node repository loaded from: https://raw.github.com/bekk/retire.js/master/repository/npmrepository.json
JS repository loaded from: https://raw.github.com/RetireJS/retire.js/master/repository/jsrepository.json
Node repository loaded from: https://raw.github.com/RetireJS/retire.js/master/repository/npmrepository.json
No vulnerabilities found.
Done, without errors.
Expand Down
10 changes: 5 additions & 5 deletions package.json
@@ -1,7 +1,7 @@
{
"name": "grunt-retire",
"description": "Grunt plugin for retire.",
"version": "0.3.7",
"version": "0.3.8",
"homepage": "https://github.com/bekk/grunt-retire",
"author": {
"name": "Ståle Pettersen",
Expand All @@ -23,12 +23,12 @@
},
"dependencies" : {
"grunt" : "~0.4.x",
"grunt-contrib-jshint" : "~0.10.x",
"grunt-contrib-jshint" : "~0.11.x",
"grunt-contrib-clean" : "~0.6.x",
"grunt-contrib-nodeunit" : "0.4.x",
"retire" : "~0.3.x",
"async" : "~0.9",
"request" : "~2.51"
"retire" : "~1.0.x",
"async" : "~0.9.x",
"request" : "~2.55.x"
},
"peerDependencies": {
"grunt": "~0.4.x"
Expand Down
4 changes: 2 additions & 2 deletions tasks/retire.js
Expand Up @@ -27,8 +27,8 @@ module.exports = function (grunt) {
var options = this.options({
verbose: true,
packageOnly: false,
jsRepository: 'https://raw.github.com/bekk/retire.js/master/repository/jsrepository.json',
nodeRepository: 'https://raw.github.com/bekk/retire.js/master/repository/npmrepository.json',
jsRepository: 'https://raw.github.com/RetireJS/retire.js/master/repository/jsrepository.json',
nodeRepository: 'https://raw.github.com/RetireJS/retire.js/master/repository/npmrepository.json',
logger: grunt.log.writeln,
warnlogger: grunt.log.error
});
Expand Down

0 comments on commit d8dd409

Please sign in to comment.