From ed0792e8f8d3bbf9ce746835238b0d0d3c65bd46 Mon Sep 17 00:00:00 2001 From: hacksalot Date: Sun, 31 Jan 2016 09:41:00 -0500 Subject: [PATCH] Fix YML/JSON/PNG invalid output format warning. Fixes #97 but we still need to support standalone PNG (ie, a PNG not generated as part of a .all output target). --- dist/verbs/build.js | 2 +- src/verbs/build.coffee | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dist/verbs/build.js b/dist/verbs/build.js index d756d6c..ff570b3 100644 --- a/dist/verbs/build.js +++ b/dist/verbs/build.js @@ -242,12 +242,12 @@ Implementation of the 'build' verb for HackMyResume. fmt: targInfo.fmt.outFormat, file: PATH.relative(process.cwd(), f) }); + _opts.targets = finished; if (targInfo.fmt.files && targInfo.fmt.files.length) { theFormat = _fmts.filter(function(fmt) { return fmt.name === targInfo.fmt.outFormat; })[0]; MKDIRP.sync(PATH.dirname(f)); - _opts.targets = finished; ret = theFormat.gen.generate(_rezObj, f, _opts); } else { theFormat = _fmts.filter(function(fmt) { diff --git a/src/verbs/build.coffee b/src/verbs/build.coffee index 87eb80e..dbfae25 100644 --- a/src/verbs/build.coffee +++ b/src/verbs/build.coffee @@ -82,7 +82,7 @@ build = ( src, dst, opts ) -> try tFolder = verifyTheme.call @, _opts.theme theme = _opts.themeObj = loadTheme tFolder - addFreebieFormats theme + addFreebieFormats theme catch ex newEx = fluenterror: HMSTATUS.themeLoad @@ -124,7 +124,7 @@ build = ( src, dst, opts ) -> rez = RConverter[ 'to' + toFormat ]( rez ); @stat HMEVENT.afterInlineConvert, { file: sheetObjects[0].file, fmt: toFormat } - # Add freebie formats to the theme + # Announce the theme @stat HMEVENT.applyTheme, { r: rez, theme: theme } # Load the resume into a FRESHResume or JRSResume object @@ -194,13 +194,14 @@ single = ( targInfo, theme, finished ) -> fmt: targInfo.fmt.outFormat file: PATH.relative(process.cwd(), f) + _opts.targets = finished; + # If targInfo.fmt.files exists, this format is backed by a document. # Fluent/FRESH themes are handled here. if targInfo.fmt.files && targInfo.fmt.files.length theFormat = _fmts.filter( (fmt) -> return fmt.name == targInfo.fmt.outFormat )[0]; MKDIRP.sync( PATH.dirname( f ) ); # Ensure dest folder exists; - _opts.targets = finished; ret = theFormat.gen.generate( _rezObj, f, _opts ); # Otherwise this is an ad-hoc format (JSON, YML, or PNG) that every theme