diff --git a/README.md b/README.md index 8e83a29..60d594e 100644 --- a/README.md +++ b/README.md @@ -22,7 +22,7 @@ For a general overview of Yeoman generators, see the [Getting Started Guide](htt $ npm install -g generator-compute-io ``` -## Usage +## Usage Once installed, navigate to the directory in which you want to place generated files and run @@ -43,7 +43,7 @@ The module name requires the convention that the module be prefixed with `comput Valid names include: `compute-mean`, `compute-variance`, `compute-sum`, etc. Do __not__ include spaces or special characters in the name; e.g., `compute io correlation @ value`. -Also note that using the generator requires internet access, as module name availability is confirmed on NPM via [npm-name](https://github.com/sindresorhus/npm-name). +Also note that using the generator requires internet access, as module name availability is confirmed on NPM via [npm-name](https://github.com/sindresorhus/npm-name). #### Git @@ -79,13 +79,6 @@ If you have chosen to initialize the directory as a Git repository, the default If the Github email address is fine, just type `enter`. -#### License - -Enter the license holder for this module. The default is your name, but this could be the organization for which you work (say, if they are helping sponsor development) or some other entity. - -If the default option is fine, just type `enter`. - - #### Description Enter the module description. diff --git a/TODO.md b/TODO.md index 55d128a..7d0413e 100644 --- a/TODO.md +++ b/TODO.md @@ -11,6 +11,3 @@ TODO ### Tests 1. Prompts - - - diff --git a/app/index.js b/app/index.js index 7e42b45..63fadcf 100644 --- a/app/index.js +++ b/app/index.js @@ -153,14 +153,6 @@ var Generator = yeoman.generators.Base.extend({ return ( answers.git ) ? email : ''; } }, - { - 'type': 'input', - 'name': 'license_holder', - 'message': 'Author name(s) to include in the license file?', - default: function( answers ) { - return answers.author; - } - }, { 'type': 'input', 'name': 'description', @@ -173,7 +165,6 @@ var Generator = yeoman.generators.Base.extend({ this.prompt( prompts, function onAnswers( answers ) { this.author = answers.author; this.email = answers.email; - this.license_holder = answers.license_holder; this.moduleName = answers.name; this.description = answers.description; this.git = answers.git; @@ -222,7 +213,6 @@ var Generator = yeoman.generators.Base.extend({ */ license: function() { var context = { - 'holder': this.license_holder, 'year': this.year }; diff --git a/app/templates/_LICENSE b/app/templates/_LICENSE index 0b2b012..e7af03d 100644 --- a/app/templates/_LICENSE +++ b/app/templates/_LICENSE @@ -1,6 +1,6 @@ The MIT License (MIT) -Copyright (c) <%= year %> <%= holder %>. +Copyright (c) <%= year %> The Compute.io Authors. All rights reserved. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -18,4 +18,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. \ No newline at end of file +SOFTWARE. diff --git a/app/templates/_README.md b/app/templates/_README.md index 164d9c4..404b74d 100644 --- a/app/templates/_README.md +++ b/app/templates/_README.md @@ -69,12 +69,12 @@ $ make view-cov --- ## License -[MIT license](http://opensource.org/licenses/MIT). +[MIT license](http://opensource.org/licenses/MIT). ## Copyright -Copyright © <%= year %>. <%= author %>. +Copyright © <%= year %>. The Compute.io Authors. [npm-image]: http://img.shields.io/npm/v/<%= name %>.svg diff --git a/package.json b/package.json index 16888a2..1f7209d 100644 --- a/package.json +++ b/package.json @@ -8,7 +8,16 @@ "url": "https://github.com/kgryte" }, "contributors": [ - {} + { + "name": "Athan Reines", + "email": "kgryte@gmail.com", + "url": "https://github.com/kgryte" + }, + { + "name": "Philipp Burckhardt", + "email": "pburckhardt@outlook.com", + "url": "https://github.com/Planeshifter" + } ], "scripts": { "test": "./node_modules/.bin/mocha", @@ -35,7 +44,7 @@ "dependencies": { "chalk": "^1.0.0", "npm-name": "^1.0.1", - "shelljs": "^0.4.0", + "shelljs": "^0.5.0", "yeoman-generator": "^0.18.9", "yosay": "^1.0.0" }, @@ -45,7 +54,7 @@ "coveralls": "^2.11.1", "istanbul": "^0.3.0", "jshint": "2.x.x", - "jshint-stylish": "^1.0.0" + "jshint-stylish": "^2.0.0" }, "peerDependencies": { "yo": ">=1.0.0" diff --git a/test/test.creation.js b/test/test.creation.js index 2f84c3d..d8ac22d 100644 --- a/test/test.creation.js +++ b/test/test.creation.js @@ -31,7 +31,6 @@ describe( 'compute-io generator', function tests() { 'name': 'compute-generator-test', 'author': 'Jane Doe', 'email': 'jane@doe.com', - 'license_holder': 'Jane Doe <jane@doe.com>', 'description': 'Compute.io generator test module.', 'git': false })