Skip to content

Commit

Permalink
Start integrating generator-statisk
Browse files Browse the repository at this point in the history
This is the beginning of using generator-statisk as the base from which
I build my generators. This commit removes the boilerplate files, as in
git files, editorconfig and the README. It's not feature complete
however.

See #137 for more.
  • Loading branch information
sondr3 committed Jun 1, 2016
1 parent 48064de commit b53066e
Show file tree
Hide file tree
Showing 11 changed files with 66 additions and 208 deletions.
12 changes: 10 additions & 2 deletions generators/app/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -113,15 +113,23 @@ module.exports = generators.Base.extend({
},

default: function () {
this.composeWith('jekyllized:boilerplate', {
this.composeWith('statisk:editorconfig', {}, {
local: require.resolve('generator-statisk/generators/editorconfig')
});

this.composeWith('statisk:git', {}, {
local: require.resolve('generator-statisk/generators/git')
});

this.composeWith('statisk:readme', {
options: {
projectName: this.props.projectName,
projectDescription: this.props.projectDescription,
projectURL: this.props.projectURL,
authorName: this.props.authorName
}
}, {
local: require.resolve('../boilerplate')
local: require.resolve('generator-statisk/generators/readme')
});

this.composeWith('jekyllized:gulp', {
Expand Down
61 changes: 0 additions & 61 deletions generators/boilerplate/index.js

This file was deleted.

45 changes: 0 additions & 45 deletions generators/boilerplate/templates/README.md

This file was deleted.

12 changes: 0 additions & 12 deletions generators/boilerplate/templates/editorconfig

This file was deleted.

1 change: 0 additions & 1 deletion generators/boilerplate/templates/gitattributes

This file was deleted.

69 changes: 0 additions & 69 deletions generators/boilerplate/templates/gitignore

This file was deleted.

1 change: 0 additions & 1 deletion index.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

module.exports = {
app: require.resolve('./generators/app'),
boilerplate: require.resolve('./generators/boilerplate'),
gulp: require.resolve('./generators/gulp'),
jekyll: require.resolve('./generators/jekyll')
};
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
],
"dependencies": {
"chalk": "^1.1.0",
"generator-statisk": "^0.1.0",
"lodash": "^4.11.1",
"shelljs": "^0.7.0",
"yargs": "^4.6.0",
Expand All @@ -30,6 +31,7 @@
"devDependencies": {
"ava": "^0.15.1",
"coveralls": "^2.11.9",
"mockery": "^1.7.0",
"nyc": "^6.4.4",
"xo": "^0.15.1",
"yeoman-assert": "^2.2.1",
Expand All @@ -39,7 +41,6 @@
"space": true,
"ignores": [
"generators/app/templates/**",
"generators/boilerplate/templates/**",
"generators/gulp/templates/**",
"generators/jekyll/templates/**"
]
Expand Down
22 changes: 22 additions & 0 deletions test/editorconfig.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
'use strict';
var path = require('path');
var test = require('ava');
var assert = require('yeoman-assert');
var helpers = require('yeoman-test');

test.before(() => {
var deps = [
[helpers.createDummyGenerator(), 'statisk:editorconfig']
];

return helpers.run(path.join(__dirname, '../generators/app'))
.withOptions({'skip-install': true})
.withGenerators(deps)
.toPromise();
});

test('generates expected files', () => {
assert.file([
'.editorconfig'
]);
});
23 changes: 23 additions & 0 deletions test/git.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
'use strict';
var path = require('path');
var test = require('ava');
var assert = require('yeoman-assert');
var helpers = require('yeoman-test');

test.before(() => {
var deps = [
[helpers.createDummyGenerator(), 'statisk:git']
];

return helpers.run(path.join(__dirname, '../generators/app'))
.withOptions({'skip-install': true})
.withGenerators(deps)
.toPromise();
});

test('generates expected files', () => {
assert.file([
'.gitattributes',
'.gitignore'
]);
});
25 changes: 9 additions & 16 deletions test/boilerplate.js → test/readme.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,28 +5,21 @@ var assert = require('yeoman-assert');
var helpers = require('yeoman-test');

test.before(() => {
return helpers.run(path.join(__dirname, '../generators/boilerplate'))
.withOptions({
var deps = [
[helpers.createDummyGenerator(), 'statisk:readme']
];

return helpers.run(path.join(__dirname, '../generators/app'))
.withPrompts({
projectName: 'README',
projectDescription: 'This is a great README',
projectURL: 'hello-world.com',
projectURL: 'http://hello-world.com',
authorName: 'Ola Nordmann'
})
.withGenerators(deps)
.toPromise();
});

test('creates .editorconfig', () => {
assert.file('.editorconfig');
});

test('creates .gitignore', () => {
assert.file('.gitignore');
});

test('creates .gitattributes', () => {
assert.file('.gitattributes');
});

test('creates README.md', () => {
assert.file('README.md');
});
Expand All @@ -35,7 +28,7 @@ test('README is correct', () => {
[
'# README',
'> This is a great README',
'[Ola Nordmann](hello-world.com)'
'[Ola Nordmann](http://hello-world.com)'
].forEach(field => {
assert.fileContent('README.md', field);
});
Expand Down

0 comments on commit b53066e

Please sign in to comment.