Merge pull request #6 from hariadi/develop

use object directly instead of require

app/index.js

@@ -16,7 +16,22 @@ var MetalsmithGenerator = yeoman.generators.Base.extend({
       });
     });
 
-    this.metalsmith = require('../metalsmith.json');
+    this.metalsmith = {
+	  title: 'Metalsmith Blog',
+	  description: 'My Metalsmith-Powered Site',
+	  plugins: {
+	    'metalsmith-ignore': '^0.1.2',
+	    'metalsmith-drafts': '^0.0.1',
+	    'metalsmith-templates': '^0.3.0',
+	    'metalsmith-markdown': '^0.2.1',
+	    'metalsmith-permalinks': '^0.2.2',
+	    'metalsmith-collections': '^0.1.0'
+	  },
+	  engine: {
+	    swig: '^1.3.2',
+	    handlebars: '^2.0.0-alpha.2'
+	  }
+	};
 
   },
 

app/templates/_package.json

@@ -13,11 +13,11 @@
   "dependencies": {<% if(ignore){ %>
     "metalsmith-ignore": "^0.1.2",<% } %><% if(drafts){ %>
     "metalsmith-drafts": "0.0.1",<% } %><% if(templates){ %>
-    "metalsmith-templates": "^0.3.0",
+    "metalsmith-templates": "^0.4.0",
     "<%= templateEngine %>": "<%= metalsmith.engine[templateEngine] %>",<% } %><% if(markdown){ %>
     "metalsmith-markdown": "^0.2.1",<% } %><% if(permalinks){ %>
-    "metalsmith-permalinks": "^0.2.2",<% } %><% if(collections){ %>
+    "metalsmith-permalinks": "^0.3.0",<% } %><% if(collections){ %>
     "metalsmith-collections": "^0.1.0",<% } %>
-    "metalsmith": "^0.5.0"
+    "metalsmith": "^0.6.0"
   }
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "generator-metalsmith",
-  "version": "0.2.2",
+  "version": "0.2.3",
   "homepage": "https://github.com/hariadi/generator-metalsmith",
   "description": "Yeoman generator for Metalsmith",
   "author": {