Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Loading…

fixes #109 and correction in readme #110

Merged
merged 3 commits into from

1 participant

This page is out of date. Refresh to see the latest.
View
6 Gruntfile.js
@@ -7,6 +7,7 @@
*/
+
module.exports = function(grunt) {
// Project configuration.
@@ -42,6 +43,10 @@ module.exports = function(grunt) {
reporter: 'nyan'
}
},
+ manifest: {
+ src: '',
+ dest: ''
+ },
assemble: {
options: {
@@ -88,6 +93,7 @@ module.exports = function(grunt) {
// Default task.
grunt.registerTask('default', [
+ 'manifest',
'assemble',
'jshint'
]);
View
4 README.md
@@ -1,4 +1,4 @@
-# [Assemble v0.3.24](http://github.com/assemble/assemble) [![Build Status](https://travis-ci.org/assemble/assemble.png)](https://travis-ci.org/assemble/assemble)
+# [Assemble v0.3.25](http://github.com/assemble/assemble) [![Build Status](https://travis-ci.org/assemble/assemble.png)](https://travis-ci.org/assemble/assemble)
> Get the rocks out of your socks. Assemble helps you **quickly launch static web projects** by emphasizing a strong separation of concerns between structure, style, content and configuration.
@@ -592,7 +592,7 @@ _(Big plans in the works)_
---
Authored by [assemble](https://github.com/assemble/assemble)
-_This file was generated using Grunt and [assemble](http://github.com/assemble/assemble) on Fri Mar 29 2013 21:51:28._
+_This file was generated using Grunt and [assemble](http://github.com/assemble/assemble) on Sat Mar 30 2013 17:33:13._
View
13 component.json
@@ -1,6 +1,8 @@
{
"name": "assemble",
- "version": "0.3.24",
+ "description": "Get the rocks out of your socks. Assemble helps you quickly launch static web projects by emphasizing a strong separation of concerns between structure, style, content and configuration.",
+ "version": "0.3.25",
+ "repo": "assemble/assemble",
"main": [
"./lib/assemble.js"
],
@@ -14,5 +16,10 @@
"grunt-release": "~0.2.0",
"handlebars": "~1.0.9",
"testem": "~0.2.68"
- }
-}
+ },
+ "styles": [],
+ "scripts": [],
+ "images": [],
+ "fonts": [],
+ "files": []
+}
View
2  docs/docs-examples.md
@@ -149,7 +149,6 @@ And then we use an external data file, either `grid.yml` or `grid.json`, to conf
This is the data for our grid, written in YAML (`grid.yml`):
``` yaml
----
container:
rows:
- columns:
@@ -169,7 +168,6 @@ container:
- width: 6
heading: Advanced
content: <%= content %>/advanced.md
-...
```
**JSON version**
View
10 docs/docs-options.md
@@ -3,7 +3,7 @@ See the [Options](https://github.com/assemble/assemble/wiki/Options) section on
#### assets
_Path to "assets" (or "public") folder._
-Type: `String` (optional)
+Type: `String` (optional)
Default: `undefined`
Used with the `{{assets}}` template to resolve the relative path _to the destination assets folder_, _from the dest file_.
@@ -52,7 +52,7 @@ Gets the data from specified `JSON` and/or `YAML` files to populate the template
```
-_Note that Handlebars.js is the only supported template engine at this time_. If you would like to see another engine added to Assemble, please make a [feature request][issues] (or pull request).
+_Note that Handlebars.js is the only supported template engine at this time_. If you would like to see another engine added to Assemble, please make a [feature request][issues] (or pull request).
Example:
``` js
@@ -85,7 +85,7 @@ Also see: [YAML front matter][yaml] todo...
#### layout
-Type: `String` (optional)
+Type: `String` (optional)
Default: `undefined`
Path to the layout to be used.
@@ -129,9 +129,9 @@ Pull requests are welcome for additional template engines. Since we're still wor
#### helpers
Type: `Object|Array` (optional)
-Default: []
+Default: [helper-lib](http://github.com/assemble/helper-lib)
-Path defined to a directory of custom helpers to use with the specified template engine. Assemble currently includes more than **[75 built-in Handlebars helpers](https://github.com/assemble/helper-lib)**, since Handlebars is the default engine for Assemble.
+Path defined to a directory of custom helpers to use with the specified template engine. Assemble currently includes more than **[75 built-in Handlebars helpers](https://github.com/assemble/helper-lib)**, since Handlebars is the default engine for Assemble.
``` js
assemble: {
View
9 package.json
@@ -1,7 +1,7 @@
{
"name": "assemble",
"description": "Get the rocks out of your socks. Assemble helps you **quickly launch static web projects** by emphasizing a strong separation of concerns between structure, style, content and configuration.",
- "version": "0.3.24",
+ "version": "0.3.25",
"homepage": "https://github.com/assemble/assemble",
"author": {
"name": "assemble",
@@ -39,7 +39,7 @@
},
"dependencies": {
"amdefine": "0.0.4",
- "helper-lib": "~0.1.7",
+ "helper-lib": "~0.1.9",
"handlebars": "~1.0.9",
"highlight.js": "~7.3.0",
"js-yaml": "~2.0.2",
@@ -47,13 +47,12 @@
"marked": "~0.2.8"
},
"devDependencies": {
- "assemble-styles": "~0.3.0",
+ "assemble-less": "~0.4.0",
"grunt": "~0.4.1",
"grunt-contrib-jshint": "~0.2.0",
"grunt-contrib-watch": "~0.2.0",
"chai": "~1.5.0",
- "grunt-mocha-test": "~0.2.0",
- "testem": "~0.2.68"
+ "grunt-mocha-test": "~0.2.0"
},
"keywords": [
"blog generator",
View
81 tasks/manifest.js
@@ -0,0 +1,81 @@
+
+
+
+module.exports = function(grunt) {
+
+ var _ = require('lodash');
+ var fs = require('fs');
+ var path = require('path');
+
+
+ /* the manifest for component.json is used by Bower */
+ grunt.registerMultiTask('manifest', 'Generates component.json file.', function() {
+
+ /* See https://github.com/component/component/wiki/Spec for more info */
+ var component = {
+ name: 'assemble',
+ description: 'Get the rocks out of your socks. Assemble helps you quickly launch static web projects by emphasizing a strong separation of concerns between structure, style, content and configuration.',
+ version: '<%= pkg.version %>',
+ repo: 'assemble/assemble',
+ main: [
+ './lib/assemble.js'
+ ],
+ dependencies: {
+ 'amdefine': '0.0.4',
+ 'chai': '~1.5.0',
+ 'grunt': '~0.4.0',
+ 'grunt-contrib-jshint': '~0.1.0',
+ 'grunt-contrib-watch': '~0.2.0',
+ 'grunt-mocha-test': '~0.2.0',
+ 'grunt-release': '~0.2.0',
+ 'handlebars': '~1.0.9',
+ 'testem': '~0.2.68'
+ },
+ styles: [],
+ scripts: [],
+ images: [],
+ fonts: [],
+ files: []
+ };
+
+ var done = this.async();
+ var base = path.join(__dirname, '../new');
+
+ function addFilesToCollection(collection, basePath, localPath) {
+ fs.readdirSync(path.join(basePath, localPath)).forEach(function(file) {
+ if (fs.statSync(path.join(basePath, localPath, file)).isDirectory()) {
+ addFilesToCollection(collection, basePath, path.join(localPath, file));
+ } else {
+ collection.push(path.join("../new", localPath, file));
+ }
+ });
+ }
+ fs.readdirSync(base).forEach(function(dir) {
+ switch (dir) {
+ case "css":
+ addFilesToCollection(component.styles, base, dir);
+ break;
+ case "scripts":
+ addFilesToCollection(component.scripts, base, dir);
+ break;
+ case "font":
+ addFilesToCollection(component.fonts, base, dir);
+ break;
+ case "img":
+ addFilesToCollection(component.images, base, dir);
+ break;
+ default:
+ addFilesToCollection(component.images, base, dir);
+ break;
+ }
+
+ /* bower needs everything to be pushed in main */
+ addFilesToCollection(component.main, base, dir);
+ });
+ var c = JSON.stringify(component, null, 2);
+ fs.writeFileSync(path.join(__dirname, '../component.json'), c, 'utf8');
+
+ done();
+ });
+};
+
View
2  test/actual/yaml/associative-arrays.html
@@ -6,7 +6,7 @@
<link href="../bootstrap.css" rel="stylesheet">
</head>
<body>
- <div class="container">
+ <div class="container">
<div class="page-header">
<h1>Associative arrays</h1>
View
2  test/actual/yaml/block-literals.html
@@ -6,7 +6,7 @@
<link href="../bootstrap.css" rel="stylesheet">
</head>
<body>
- <div class="container">
+ <div class="container">
<div class="page-header">
<h4>Block Literals</h4>
View
2  test/actual/yaml/comments.html
@@ -6,7 +6,7 @@
<link href="../bootstrap.css" rel="stylesheet">
</head>
<body>
- <div class="container">
+ <div class="container">
<div class="page-header">
<h4>Comments in YAML front matter</h4>
View
2  test/actual/yaml/data-files.html
@@ -6,7 +6,7 @@
<link href="../bootstrap.css" rel="stylesheet">
</head>
<body>
- <div class="container">
+ <div class="container">
<div class="page-header">
<h4>first</h4>
</div>
View
2  test/actual/yaml/data-types.html
@@ -6,7 +6,7 @@
<link href="../bootstrap.css" rel="stylesheet">
</head>
<body>
- <div class="container">
+ <div class="container">
<div class="page-header">
<h4>Data Types</h4>
View
2  test/actual/yaml/document.html
@@ -6,7 +6,7 @@
<link href="../bootstrap.css" rel="stylesheet">
</head>
<body>
- <div class="container">
+ <div class="container">
<div class="page-header">
<h4></h4>
View
2  test/actual/yaml/lists.html
@@ -6,7 +6,7 @@
<link href="../bootstrap.css" rel="stylesheet">
</head>
<body>
- <div class="container">
+ <div class="container">
<div class="page-header">
<h1>Almost a Haiku</h1>
View
2  test/actual/yaml/relational-trees.html
@@ -6,7 +6,7 @@
<link href="../bootstrap.css" rel="stylesheet">
</head>
<body>
- <div class="container">
+ <div class="container">
<div class="page-header">
<h4>Relational Trees - References</h4>
View
2  test/actual/yaml/variables.html
@@ -6,7 +6,7 @@
<link href="../bootstrap.css" rel="stylesheet">
</head>
<body>
- <div class="container">
+ <div class="container">
<div class="page-header">
<h4>YAML Variables</h4>
Something went wrong with that request. Please try again.