Skip to content

Commit

Permalink
removing the check for src and pages to allow plugins to add those at…
Browse files Browse the repository at this point in the history
… a later step. closes #448
  • Loading branch information
doowb committed Feb 20, 2014
1 parent 6ff29da commit 719a7ac
Show file tree
Hide file tree
Showing 9 changed files with 71 additions and 82 deletions.
2 changes: 1 addition & 1 deletion README.md
Expand Up @@ -342,7 +342,7 @@ Released under the MIT license

***

_This file was generated by [grunt-readme](https://github.com/assemble/grunt-readme) on Tuesday, February 18, 2014._
_This file was generated by [grunt-readme](https://github.com/assemble/grunt-readme) on Thursday, February 20, 2014._

[grunt]: http://gruntjs.com/
[Getting Started]: https://github.com/gruntjs/grunt/blob/devel/docs/getting_started.md
Expand Down
92 changes: 46 additions & 46 deletions docs/plugins.json
Expand Up @@ -80,9 +80,9 @@
"has_wiki": true,
"forks_count": 1,
"mirror_url": null,
"open_issues_count": 1,
"open_issues_count": 0,
"forks": 1,
"open_issues": 1,
"open_issues": 0,
"watchers": 3,
"default_branch": "master",
"master_branch": "master",
Expand Down Expand Up @@ -346,16 +346,16 @@
"labels_url": "https://api.github.com/repos/assemble/assemble-contrib-download/labels{/name}",
"releases_url": "https://api.github.com/repos/assemble/assemble-contrib-download/releases{/id}",
"created_at": "2013-11-28T18:54:29Z",
"updated_at": "2013-11-29T06:55:52Z",
"pushed_at": "2013-11-28T19:05:34Z",
"updated_at": "2014-02-15T01:52:20Z",
"pushed_at": "2014-02-15T01:52:19Z",
"git_url": "git://github.com/assemble/assemble-contrib-download.git",
"ssh_url": "git@github.com:assemble/assemble-contrib-download.git",
"clone_url": "https://github.com/assemble/assemble-contrib-download.git",
"svn_url": "https://github.com/assemble/assemble-contrib-download",
"homepage": null,
"size": 112,
"stargazers_count": 2,
"watchers_count": 2,
"size": 136,
"stargazers_count": 3,
"watchers_count": 3,
"language": "JavaScript",
"has_issues": true,
"has_downloads": true,
Expand All @@ -365,7 +365,7 @@
"open_issues_count": 0,
"forks": 0,
"open_issues": 0,
"watchers": 2,
"watchers": 3,
"default_branch": "master",
"master_branch": "master",
"permissions": {
Expand Down Expand Up @@ -440,26 +440,26 @@
"labels_url": "https://api.github.com/repos/assemble/assemble-contrib-i18n/labels{/name}",
"releases_url": "https://api.github.com/repos/assemble/assemble-contrib-i18n/releases{/id}",
"created_at": "2013-12-20T22:02:30Z",
"updated_at": "2013-12-22T20:56:03Z",
"pushed_at": "2013-12-22T05:53:12Z",
"updated_at": "2014-02-20T16:02:15Z",
"pushed_at": "2014-02-20T16:02:13Z",
"git_url": "git://github.com/assemble/assemble-contrib-i18n.git",
"ssh_url": "git@github.com:assemble/assemble-contrib-i18n.git",
"clone_url": "https://github.com/assemble/assemble-contrib-i18n.git",
"svn_url": "https://github.com/assemble/assemble-contrib-i18n",
"homepage": null,
"size": 102,
"stargazers_count": 1,
"watchers_count": 1,
"stargazers_count": 3,
"watchers_count": 3,
"language": "JavaScript",
"has_issues": true,
"has_downloads": true,
"has_wiki": true,
"forks_count": 2,
"has_wiki": false,
"forks_count": 4,
"mirror_url": null,
"open_issues_count": 0,
"forks": 2,
"open_issues": 0,
"watchers": 1,
"open_issues_count": 3,
"forks": 4,
"open_issues": 3,
"watchers": 3,
"default_branch": "master",
"master_branch": "master",
"permissions": {
Expand Down Expand Up @@ -589,7 +589,7 @@
},
"private": false,
"html_url": "https://github.com/assemble/assemble-contrib-markdown",
"description": "Convert markdown files to HTML using marked.js. This plugin is an alternative to Assemble's markdown Handlebars helpers. Both are useful in different scenarios.",
"description": "HEADS UP! This isn't ready for prime time! Convert markdown files to HTML using marked.js. This plugin is an alternative to Assemble's markdown Handlebars helpers. Both are useful in different scenarios.",
"fork": false,
"url": "https://github.com/assemble/assemble-contrib-markdown",
"forks_url": "https://api.github.com/repos/assemble/assemble-contrib-markdown/forks",
Expand Down Expand Up @@ -628,24 +628,24 @@
"labels_url": "https://api.github.com/repos/assemble/assemble-contrib-markdown/labels{/name}",
"releases_url": "https://api.github.com/repos/assemble/assemble-contrib-markdown/releases{/id}",
"created_at": "2013-11-16T00:22:56Z",
"updated_at": "2013-11-16T00:51:34Z",
"updated_at": "2014-01-21T13:48:02Z",
"pushed_at": "2013-11-16T00:51:33Z",
"git_url": "git://github.com/assemble/assemble-contrib-markdown.git",
"ssh_url": "git@github.com:assemble/assemble-contrib-markdown.git",
"clone_url": "https://github.com/assemble/assemble-contrib-markdown.git",
"svn_url": "https://github.com/assemble/assemble-contrib-markdown",
"homepage": null,
"homepage": "",
"size": 116,
"stargazers_count": 1,
"watchers_count": 1,
"language": "JavaScript",
"has_issues": true,
"has_downloads": true,
"has_wiki": true,
"forks_count": 1,
"forks_count": 2,
"mirror_url": null,
"open_issues_count": 0,
"forks": 1,
"forks": 2,
"open_issues": 0,
"watchers": 1,
"default_branch": "master",
Expand Down Expand Up @@ -722,26 +722,26 @@
"labels_url": "https://api.github.com/repos/assemble/assemble-contrib-permalinks/labels{/name}",
"releases_url": "https://api.github.com/repos/assemble/assemble-contrib-permalinks/releases{/id}",
"created_at": "2013-10-03T20:10:32Z",
"updated_at": "2014-01-16T21:55:37Z",
"pushed_at": "2014-01-16T21:55:37Z",
"updated_at": "2014-02-11T21:03:13Z",
"pushed_at": "2014-02-11T21:03:13Z",
"git_url": "git://github.com/assemble/assemble-contrib-permalinks.git",
"ssh_url": "git@github.com:assemble/assemble-contrib-permalinks.git",
"clone_url": "https://github.com/assemble/assemble-contrib-permalinks.git",
"svn_url": "https://github.com/assemble/assemble-contrib-permalinks",
"homepage": "",
"size": 820,
"stargazers_count": 18,
"watchers_count": 18,
"size": 938,
"stargazers_count": 21,
"watchers_count": 21,
"language": "JavaScript",
"has_issues": true,
"has_downloads": true,
"has_wiki": true,
"forks_count": 4,
"forks_count": 6,
"mirror_url": null,
"open_issues_count": 3,
"forks": 4,
"open_issues": 3,
"watchers": 18,
"open_issues_count": 5,
"forks": 6,
"open_issues": 5,
"watchers": 21,
"default_branch": "master",
"master_branch": "master",
"permissions": {
Expand Down Expand Up @@ -816,26 +816,26 @@
"labels_url": "https://api.github.com/repos/assemble/assemble-contrib-sitemap/labels{/name}",
"releases_url": "https://api.github.com/repos/assemble/assemble-contrib-sitemap/releases{/id}",
"created_at": "2013-10-02T06:48:32Z",
"updated_at": "2014-01-06T00:53:57Z",
"pushed_at": "2014-01-06T00:53:56Z",
"updated_at": "2014-02-16T03:25:07Z",
"pushed_at": "2014-02-16T03:25:07Z",
"git_url": "git://github.com/assemble/assemble-contrib-sitemap.git",
"ssh_url": "git@github.com:assemble/assemble-contrib-sitemap.git",
"clone_url": "https://github.com/assemble/assemble-contrib-sitemap.git",
"svn_url": "https://github.com/assemble/assemble-contrib-sitemap",
"homepage": null,
"size": 257,
"stargazers_count": 6,
"watchers_count": 6,
"size": 415,
"stargazers_count": 9,
"watchers_count": 9,
"language": "JavaScript",
"has_issues": true,
"has_downloads": true,
"has_wiki": true,
"forks_count": 3,
"forks_count": 5,
"mirror_url": null,
"open_issues_count": 1,
"forks": 3,
"open_issues": 1,
"watchers": 6,
"open_issues_count": 4,
"forks": 5,
"open_issues": 4,
"watchers": 9,
"default_branch": "master",
"master_branch": "master",
"permissions": {
Expand Down Expand Up @@ -918,8 +918,8 @@
"svn_url": "https://github.com/assemble/assemble-contrib-toc",
"homepage": "http://assemble.github.io/assemble-contrib-toc-example/components.html#table-of-contents",
"size": 110,
"stargazers_count": 3,
"watchers_count": 3,
"stargazers_count": 4,
"watchers_count": 4,
"language": "JavaScript",
"has_issues": true,
"has_downloads": true,
Expand All @@ -929,7 +929,7 @@
"open_issues_count": 1,
"forks": 2,
"open_issues": 1,
"watchers": 3,
"watchers": 4,
"default_branch": "master",
"master_branch": "master",
"permissions": {
Expand Down
17 changes: 0 additions & 17 deletions tasks/assemble.js
Expand Up @@ -45,23 +45,6 @@ module.exports = function(grunt) {
done(false);
}

var src = false;
assemble.files.forEach(function(fp) {
if(!src) {
src = fp.src;
}
});

if(!src || src.length === 0) {
// check if there's a pages
if(!assemble.options.pages) {
grunt.warn('No source files found.');
done(false);
} else {
src = _.keys(assemble.options.pages);
}
}

// find an engine to use
assemble.options.engine = assemble.options.engine || 'handlebars';
grunt.verbose.ok(">> Current engine:".yellow, assemble.options.engine);
Expand Down
7 changes: 4 additions & 3 deletions test/actual/collections/asc/lodash.html
Expand Up @@ -395,7 +395,8 @@ <h4>Pages related to each tag</h4>
</div>
<hr>
<h1>Assemble</h1>
<p>Static site generator for Grunt.js and Yeoman. Assemble makes it dead simple to build modular sites, blogs, gh-pages, components and documentation from reusable templates and data.</p>
<p>Static site generator for Grunt.js, Yeoman and Node.js. Used by Zurb Foundation, Zurb Ink, H5BP/Effeckt, Less.js / lesscss.org, Topcoat, Web Experience Toolkit, and hundreds of other projects to build sites, themes, components, documentation,
blogs and gh-pages.</p>
<div class="docs-header" id="content">
<h1>Content</h1>
</div>
Expand Down Expand Up @@ -912,9 +913,9 @@ <h1>Debug Info</h1>
"basename": "lodash",
"data": {
"title": "Assemble",
"description": "Static site generator for Grunt.js and Yeoman. Assemble makes it dead simple to build modular sites, blogs, gh-pages, components and documentation from reusable templates and data."
"description": "Static site generator for Grunt.js, Yeoman and Node.js. Used by Zurb Foundation, Zurb Ink, H5BP/Effeckt, Less.js / lesscss.org, Topcoat, Web Experience Toolkit, and hundreds of other projects to build sites, themes, components, documentation, blogs and gh-pages."
},
"description": "Static site generator for Grunt.js and Yeoman. Assemble makes it dead simple to build modular sites, blogs, gh-pages, components and documentation from reusable templates and data.",
"description": "Static site generator for Grunt.js, Yeoman and Node.js. Used by Zurb Foundation, Zurb Ink, H5BP/Effeckt, Less.js / lesscss.org, Topcoat, Web Experience Toolkit, and hundreds of other projects to build sites, themes, components, documentation, blogs and gh-pages.",
"dest": "test/actual/collections/asc/lodash.html",
"dirname": "test/actual/collections/asc",
"ext": ".html",
Expand Down
7 changes: 4 additions & 3 deletions test/actual/collections/complex/lodash.html
Expand Up @@ -395,7 +395,8 @@ <h4>Pages related to each tag</h4>
</div>
<hr>
<h1>Assemble</h1>
<p>Static site generator for Grunt.js and Yeoman. Assemble makes it dead simple to build modular sites, blogs, gh-pages, components and documentation from reusable templates and data.</p>
<p>Static site generator for Grunt.js, Yeoman and Node.js. Used by Zurb Foundation, Zurb Ink, H5BP/Effeckt, Less.js / lesscss.org, Topcoat, Web Experience Toolkit, and hundreds of other projects to build sites, themes, components, documentation,
blogs and gh-pages.</p>
<div class="docs-header" id="content">
<h1>Content</h1>
</div>
Expand Down Expand Up @@ -912,9 +913,9 @@ <h1>Debug Info</h1>
"basename": "lodash",
"data": {
"title": "Assemble",
"description": "Static site generator for Grunt.js and Yeoman. Assemble makes it dead simple to build modular sites, blogs, gh-pages, components and documentation from reusable templates and data."
"description": "Static site generator for Grunt.js, Yeoman and Node.js. Used by Zurb Foundation, Zurb Ink, H5BP/Effeckt, Less.js / lesscss.org, Topcoat, Web Experience Toolkit, and hundreds of other projects to build sites, themes, components, documentation, blogs and gh-pages."
},
"description": "Static site generator for Grunt.js and Yeoman. Assemble makes it dead simple to build modular sites, blogs, gh-pages, components and documentation from reusable templates and data.",
"description": "Static site generator for Grunt.js, Yeoman and Node.js. Used by Zurb Foundation, Zurb Ink, H5BP/Effeckt, Less.js / lesscss.org, Topcoat, Web Experience Toolkit, and hundreds of other projects to build sites, themes, components, documentation, blogs and gh-pages.",
"dest": "test/actual/collections/complex/lodash.html",
"dirname": "test/actual/collections/complex",
"ext": ".html",
Expand Down
7 changes: 4 additions & 3 deletions test/actual/collections/custom/lodash.html
Expand Up @@ -395,7 +395,8 @@ <h4>Pages related to each tag</h4>
</div>
<hr>
<h1>Assemble</h1>
<p>Static site generator for Grunt.js and Yeoman. Assemble makes it dead simple to build modular sites, blogs, gh-pages, components and documentation from reusable templates and data.</p>
<p>Static site generator for Grunt.js, Yeoman and Node.js. Used by Zurb Foundation, Zurb Ink, H5BP/Effeckt, Less.js / lesscss.org, Topcoat, Web Experience Toolkit, and hundreds of other projects to build sites, themes, components, documentation,
blogs and gh-pages.</p>
<div class="docs-header" id="content">
<h1>Content</h1>
</div>
Expand Down Expand Up @@ -912,9 +913,9 @@ <h1>Debug Info</h1>
"basename": "lodash",
"data": {
"title": "Assemble",
"description": "Static site generator for Grunt.js and Yeoman. Assemble makes it dead simple to build modular sites, blogs, gh-pages, components and documentation from reusable templates and data."
"description": "Static site generator for Grunt.js, Yeoman and Node.js. Used by Zurb Foundation, Zurb Ink, H5BP/Effeckt, Less.js / lesscss.org, Topcoat, Web Experience Toolkit, and hundreds of other projects to build sites, themes, components, documentation, blogs and gh-pages."
},
"description": "Static site generator for Grunt.js and Yeoman. Assemble makes it dead simple to build modular sites, blogs, gh-pages, components and documentation from reusable templates and data.",
"description": "Static site generator for Grunt.js, Yeoman and Node.js. Used by Zurb Foundation, Zurb Ink, H5BP/Effeckt, Less.js / lesscss.org, Topcoat, Web Experience Toolkit, and hundreds of other projects to build sites, themes, components, documentation, blogs and gh-pages.",
"dest": "test/actual/collections/custom/lodash.html",
"dirname": "test/actual/collections/custom",
"ext": ".html",
Expand Down
7 changes: 4 additions & 3 deletions test/actual/collections/desc/lodash.html
Expand Up @@ -395,7 +395,8 @@ <h4>Pages related to each tag</h4>
</div>
<hr>
<h1>Assemble</h1>
<p>Static site generator for Grunt.js and Yeoman. Assemble makes it dead simple to build modular sites, blogs, gh-pages, components and documentation from reusable templates and data.</p>
<p>Static site generator for Grunt.js, Yeoman and Node.js. Used by Zurb Foundation, Zurb Ink, H5BP/Effeckt, Less.js / lesscss.org, Topcoat, Web Experience Toolkit, and hundreds of other projects to build sites, themes, components, documentation,
blogs and gh-pages.</p>
<div class="docs-header" id="content">
<h1>Content</h1>
</div>
Expand Down Expand Up @@ -912,9 +913,9 @@ <h1>Debug Info</h1>
"basename": "lodash",
"data": {
"title": "Assemble",
"description": "Static site generator for Grunt.js and Yeoman. Assemble makes it dead simple to build modular sites, blogs, gh-pages, components and documentation from reusable templates and data."
"description": "Static site generator for Grunt.js, Yeoman and Node.js. Used by Zurb Foundation, Zurb Ink, H5BP/Effeckt, Less.js / lesscss.org, Topcoat, Web Experience Toolkit, and hundreds of other projects to build sites, themes, components, documentation, blogs and gh-pages."
},
"description": "Static site generator for Grunt.js and Yeoman. Assemble makes it dead simple to build modular sites, blogs, gh-pages, components and documentation from reusable templates and data.",
"description": "Static site generator for Grunt.js, Yeoman and Node.js. Used by Zurb Foundation, Zurb Ink, H5BP/Effeckt, Less.js / lesscss.org, Topcoat, Web Experience Toolkit, and hundreds of other projects to build sites, themes, components, documentation, blogs and gh-pages.",
"dest": "test/actual/collections/desc/lodash.html",
"dirname": "test/actual/collections/desc",
"ext": ".html",
Expand Down
7 changes: 4 additions & 3 deletions test/actual/paths/lodash.html
Expand Up @@ -395,7 +395,8 @@ <h4>Pages related to each tag</h4>
</div>
<hr>
<h1>Assemble</h1>
<p>Static site generator for Grunt.js and Yeoman. Assemble makes it dead simple to build modular sites, blogs, gh-pages, components and documentation from reusable templates and data.</p>
<p>Static site generator for Grunt.js, Yeoman and Node.js. Used by Zurb Foundation, Zurb Ink, H5BP/Effeckt, Less.js / lesscss.org, Topcoat, Web Experience Toolkit, and hundreds of other projects to build sites, themes, components, documentation,
blogs and gh-pages.</p>
<div class="docs-header" id="content">
<h1>Content</h1>
</div>
Expand Down Expand Up @@ -912,9 +913,9 @@ <h1>Debug Info</h1>
"basename": "lodash",
"data": {
"title": "Assemble",
"description": "Static site generator for Grunt.js and Yeoman. Assemble makes it dead simple to build modular sites, blogs, gh-pages, components and documentation from reusable templates and data."
"description": "Static site generator for Grunt.js, Yeoman and Node.js. Used by Zurb Foundation, Zurb Ink, H5BP/Effeckt, Less.js / lesscss.org, Topcoat, Web Experience Toolkit, and hundreds of other projects to build sites, themes, components, documentation, blogs and gh-pages."
},
"description": "Static site generator for Grunt.js and Yeoman. Assemble makes it dead simple to build modular sites, blogs, gh-pages, components and documentation from reusable templates and data.",
"description": "Static site generator for Grunt.js, Yeoman and Node.js. Used by Zurb Foundation, Zurb Ink, H5BP/Effeckt, Less.js / lesscss.org, Topcoat, Web Experience Toolkit, and hundreds of other projects to build sites, themes, components, documentation, blogs and gh-pages.",
"dest": "test/actual/paths/lodash.html",
"dirname": "test/actual/paths",
"ext": ".html",
Expand Down

0 comments on commit 719a7ac

Please sign in to comment.