Skip to content

Commit b53066e

Browse files
committed
Start integrating generator-statisk
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.
1 parent 48064de commit b53066e

File tree

11 files changed

+66
-208
lines changed

11 files changed

+66
-208
lines changed

generators/app/index.js

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,15 +113,23 @@ module.exports = generators.Base.extend({
113113
},
114114

115115
default: function () {
116-
this.composeWith('jekyllized:boilerplate', {
116+
this.composeWith('statisk:editorconfig', {}, {
117+
local: require.resolve('generator-statisk/generators/editorconfig')
118+
});
119+
120+
this.composeWith('statisk:git', {}, {
121+
local: require.resolve('generator-statisk/generators/git')
122+
});
123+
124+
this.composeWith('statisk:readme', {
117125
options: {
118126
projectName: this.props.projectName,
119127
projectDescription: this.props.projectDescription,
120128
projectURL: this.props.projectURL,
121129
authorName: this.props.authorName
122130
}
123131
}, {
124-
local: require.resolve('../boilerplate')
132+
local: require.resolve('generator-statisk/generators/readme')
125133
});
126134

127135
this.composeWith('jekyllized:gulp', {

generators/boilerplate/index.js

Lines changed: 0 additions & 61 deletions
This file was deleted.

generators/boilerplate/templates/README.md

Lines changed: 0 additions & 45 deletions
This file was deleted.

generators/boilerplate/templates/editorconfig

Lines changed: 0 additions & 12 deletions
This file was deleted.

generators/boilerplate/templates/gitattributes

Lines changed: 0 additions & 1 deletion
This file was deleted.

generators/boilerplate/templates/gitignore

Lines changed: 0 additions & 69 deletions
This file was deleted.

index.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
module.exports = {
44
app: require.resolve('./generators/app'),
5-
boilerplate: require.resolve('./generators/boilerplate'),
65
gulp: require.resolve('./generators/gulp'),
76
jekyll: require.resolve('./generators/jekyll')
87
};

package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
],
2222
"dependencies": {
2323
"chalk": "^1.1.0",
24+
"generator-statisk": "^0.1.0",
2425
"lodash": "^4.11.1",
2526
"shelljs": "^0.7.0",
2627
"yargs": "^4.6.0",
@@ -30,6 +31,7 @@
3031
"devDependencies": {
3132
"ava": "^0.15.1",
3233
"coveralls": "^2.11.9",
34+
"mockery": "^1.7.0",
3335
"nyc": "^6.4.4",
3436
"xo": "^0.15.1",
3537
"yeoman-assert": "^2.2.1",
@@ -39,7 +41,6 @@
3941
"space": true,
4042
"ignores": [
4143
"generators/app/templates/**",
42-
"generators/boilerplate/templates/**",
4344
"generators/gulp/templates/**",
4445
"generators/jekyll/templates/**"
4546
]

test/editorconfig.js

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
'use strict';
2+
var path = require('path');
3+
var test = require('ava');
4+
var assert = require('yeoman-assert');
5+
var helpers = require('yeoman-test');
6+
7+
test.before(() => {
8+
var deps = [
9+
[helpers.createDummyGenerator(), 'statisk:editorconfig']
10+
];
11+
12+
return helpers.run(path.join(__dirname, '../generators/app'))
13+
.withOptions({'skip-install': true})
14+
.withGenerators(deps)
15+
.toPromise();
16+
});
17+
18+
test('generates expected files', () => {
19+
assert.file([
20+
'.editorconfig'
21+
]);
22+
});

test/git.js

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
'use strict';
2+
var path = require('path');
3+
var test = require('ava');
4+
var assert = require('yeoman-assert');
5+
var helpers = require('yeoman-test');
6+
7+
test.before(() => {
8+
var deps = [
9+
[helpers.createDummyGenerator(), 'statisk:git']
10+
];
11+
12+
return helpers.run(path.join(__dirname, '../generators/app'))
13+
.withOptions({'skip-install': true})
14+
.withGenerators(deps)
15+
.toPromise();
16+
});
17+
18+
test('generates expected files', () => {
19+
assert.file([
20+
'.gitattributes',
21+
'.gitignore'
22+
]);
23+
});

test/boilerplate.js renamed to test/readme.js

Lines changed: 9 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -5,28 +5,21 @@ var assert = require('yeoman-assert');
55
var helpers = require('yeoman-test');
66

77
test.before(() => {
8-
return helpers.run(path.join(__dirname, '../generators/boilerplate'))
9-
.withOptions({
8+
var deps = [
9+
[helpers.createDummyGenerator(), 'statisk:readme']
10+
];
11+
12+
return helpers.run(path.join(__dirname, '../generators/app'))
13+
.withPrompts({
1014
projectName: 'README',
1115
projectDescription: 'This is a great README',
12-
projectURL: 'hello-world.com',
16+
projectURL: 'http://hello-world.com',
1317
authorName: 'Ola Nordmann'
1418
})
19+
.withGenerators(deps)
1520
.toPromise();
1621
});
1722

18-
test('creates .editorconfig', () => {
19-
assert.file('.editorconfig');
20-
});
21-
22-
test('creates .gitignore', () => {
23-
assert.file('.gitignore');
24-
});
25-
26-
test('creates .gitattributes', () => {
27-
assert.file('.gitattributes');
28-
});
29-
3023
test('creates README.md', () => {
3124
assert.file('README.md');
3225
});
@@ -35,7 +28,7 @@ test('README is correct', () => {
3528
[
3629
'# README',
3730
'> This is a great README',
38-
'[Ola Nordmann](hello-world.com)'
31+
'[Ola Nordmann](http://hello-world.com)'
3932
].forEach(field => {
4033
assert.fileContent('README.md', field);
4134
});

0 commit comments

Comments
 (0)