Merge pull request #22 from fluentdesk/v0.10.1

v0.10.1
hacksalot · Dec 12, 2015 · 201d96f · 201d96f
2 parents a3cefa1 + 8747429
commit 201d96f
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "fluentcv",
-  "version": "0.10.0",
-  "description": "Generate beautiful, targeted resumes from your command line, shell, or in Javascript with Node.js.",
+  "version": "0.10.1",
+  "description": "Generate polished résumés and CVs in HTML, Markdown, LaTeX, MS Word, PDF, plain text, JSON, XML, YAML, smoke signal, and carrier pigeon.",
   "repository": {
     "type": "git",
     "url": "https://github.com/fluentdesk/fluentcv.git"
@@ -32,9 +32,9 @@
   },
   "homepage": "https://github.com/fluentdesk/fluentcv",
   "dependencies": {
-    "fresca": "^0.2.0",
+    "fresca": "~0.2.1",
     "colors": "^1.1.2",
-    "fluent-themes": "0.6.0-beta",
+    "fluent-themes": "~0.6.1-beta",
     "fs-extra": "^0.24.0",
     "handlebars": "^4.0.5",
     "html": "0.0.10",

diff --git a/src/eng/underscore-generator.js b/src/eng/underscore-generator.js
@@ -10,8 +10,8 @@ Underscore template generate for FluentCV.
   module.exports = function( json, jst, format, cssInfo, opts ) {
 
     // Tweak underscore's default template delimeters
-    var delims = opts.themeObj.delimeters || opts.template;
-    if( opts.themeObj.delimeters ) {
+    var delims = (opts.themeObj && opts.themeObj.delimeters) || opts.template;
+    if( opts.themeObj && opts.themeObj.delimeters ) {
       delims = _.mapObject( delims, function(val,key) {
         return new RegExp( val, "ig");
       });

diff --git a/src/gen/template-generator.js b/src/gen/template-generator.js
@@ -121,7 +121,8 @@ Template-based resume generator base for FluentCV.
         Object.keys( curFmt.symLinks ).forEach( function(loc) {
           var absLoc = PATH.join(outFolder, loc);
           var absTarg = PATH.join(PATH.dirname(absLoc), curFmt.symLinks[loc]);
-          var type = PATH.parse( absLoc ).ext ? 'file' : 'junction'; // 'file', 'dir', or 'junction' (Windows only)
+           // 'file', 'dir', or 'junction' (Windows only)
+          var type = PATH.parse( absLoc ).ext ? 'file' : 'junction';
           FS.symlinkSync( absTarg, absLoc, type);
         });
       }
@@ -140,7 +141,8 @@ Template-based resume generator base for FluentCV.
     */
     single: function( json, jst, format, cssInfo, opts ) {
       this.opts.freezeBreaks && ( jst = freeze(jst) );
-      var eng = require( '../eng/' + opts.themeObj.engine + '-generator' );
+      var eng = require( '../eng/' + ((opts.themeObj && opts.themeObj.engine) ||
+        opts.engine)  + '-generator' );
       var result = eng( json, jst, format, cssInfo, opts );
       this.opts.freezeBreaks && ( result = unfreeze(result) );
       return result;