From e889481ad881c76d61d8111000c6522121cd8cde Mon Sep 17 00:00:00 2001 From: hacksalot Date: Fri, 2 Feb 2018 02:56:59 -0500 Subject: [PATCH 1/6] chore: bump HackMyResume version to 2.0.0 With this upcoming release we've introduced potentially breaking functionality so a major version bump is indicated. Additionally, it's been over a year since the last HackMyResume release; a major version bump allows us to accept some fruitful breakage, giving us a clean basis as we move forward on new features. --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 0c31da6..613346b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "hackmyresume", - "version": "1.9.0", + "version": "2.0.0", "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", From f53c316ecba7765e4fa412bd562b8af69c240808 Mon Sep 17 00:00:00 2001 From: hacksalot Date: Fri, 2 Feb 2018 03:42:50 -0500 Subject: [PATCH 2/6] chore: replace fresca with fresh-resume-schema --- package.json | 2 +- src/core/fresh-resume.coffee | 2 +- src/verbs/validate.coffee | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 613346b..459e3fa 100644 --- a/package.json +++ b/package.json @@ -54,8 +54,8 @@ "copy": "^0.1.3", "escape-latex": "^0.1.2", "extend": "^3.0.0", - "fresca": "~0.6.1", "fresh-jrs-converter": "^0.2.3", + "fresh-resume-schema": "^1.0.0-beta", "fresh-resume-starter": "^0.3.1", "fresh-themes": "^0.16.0-beta", "fs-extra": "^0.26.4", diff --git a/src/core/fresh-resume.coffee b/src/core/fresh-resume.coffee index 28b89e5..8a7e825 100644 --- a/src/core/fresh-resume.coffee +++ b/src/core/fresh-resume.coffee @@ -285,7 +285,7 @@ class FreshResume extends AbstractResume ###* Validate the sheet against the FRESH Resume schema. ### isValid: ( info ) -> - schemaObj = require 'fresca' + schemaObj = require 'fresh-resume-schema' validator = require 'is-my-json-valid' validate = validator( schemaObj, { # See Note [1]. formats: { date: /^\d{4}(?:-(?:0[0-9]{1}|1[0-2]{1})(?:-[0-9]{2})?)?$/ } diff --git a/src/verbs/validate.coffee b/src/verbs/validate.coffee index bc07520..c74e7f2 100644 --- a/src/verbs/validate.coffee +++ b/src/verbs/validate.coffee @@ -36,7 +36,7 @@ _validate = (sources, unused, opts) -> validator = require 'is-my-json-valid' schemas = - fresh: require 'fresca' + fresh: require 'fresh-resume-schema' jars: require '../core/resume.json' results = _.map sources, (t) -> From db6ec47dccea191cbe265bd081d55d7fabb5fda7 Mon Sep 17 00:00:00 2001 From: hacksalot Date: Fri, 2 Feb 2018 04:48:28 -0500 Subject: [PATCH 3/6] chore: update stale JavaScript --- dist/core/fresh-resume.js | 2 +- dist/verbs/validate.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dist/core/fresh-resume.js b/dist/core/fresh-resume.js index 6632689..c256e63 100644 --- a/dist/core/fresh-resume.js +++ b/dist/core/fresh-resume.js @@ -352,7 +352,7 @@ Definition of the FRESHResume class. FreshResume.prototype.isValid = function(info) { var ret, schemaObj, validate; - schemaObj = require('fresca'); + schemaObj = require('fresh-resume-schema'); validator = require('is-my-json-valid'); validate = validator(schemaObj, { formats: { diff --git a/dist/verbs/validate.js b/dist/verbs/validate.js index abf663e..a1f0062 100644 --- a/dist/verbs/validate.js +++ b/dist/verbs/validate.js @@ -52,7 +52,7 @@ Implementation of the 'validate' verb for HackMyResume. } validator = require('is-my-json-valid'); schemas = { - fresh: require('fresca'), + fresh: require('fresh-resume-schema'), jars: require('../core/resume.json') }; results = _.map(sources, function(t) { From ba719166f7619dda32298319f8c836a2974a58bb Mon Sep 17 00:00:00 2001 From: hacksalot Date: Fri, 2 Feb 2018 04:49:26 -0500 Subject: [PATCH 4/6] test: replace fresca with fresh-resume-schema --- test/scripts/test-fresh-sheet.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/scripts/test-fresh-sheet.js b/test/scripts/test-fresh-sheet.js index b04cf56..a489c64 100644 --- a/test/scripts/test-fresh-sheet.js +++ b/test/scripts/test-fresh-sheet.js @@ -60,7 +60,7 @@ function testResume(opts) { it('should validate against the FRESH resume schema', function() { var result = _sheet.isValid(); - // var schemaJson = require('fresca'); + // var schemaJson = require('fresh-resume-schema'); // var validate = validator( schemaJson, { verbose: true } ); // var result = validate( JSON.parse( _sheet.imp.raw ) ); result || console.log("\n\nOops, resume didn't validate. " + From b1515fc6562462cb8d6cba14ac76c970913e89a8 Mon Sep 17 00:00:00 2001 From: hacksalot Date: Sat, 3 Feb 2018 04:31:22 -0500 Subject: [PATCH 5/6] docs: update fresh-resume-schema link --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c901a44..57a5eb8 100644 --- a/README.md +++ b/README.md @@ -570,7 +570,7 @@ MIT. Go crazy. See [LICENSE.md][1] for details. [10]: https://github.com/beautify-web/js-beautify [11]: http://weasyprint.org/ [fresh]: https://github.com/fluentdesk/FRESH -[fresca]: https://github.com/fluentdesk/FRESCA +[fresca]: https://github.com/fresh-standard/fresh-resume-schema [dry]: https://en.wikipedia.org/wiki/Don%27t_repeat_yourself [img-release]: https://img.shields.io/github/release/hacksalot/HackMyResume.svg?label=version [img-master]: https://img.shields.io/travis/hacksalot/HackMyResume/master.svg From 02f0af1ff83aad8a6c6438a08653fda75daf6e59 Mon Sep 17 00:00:00 2001 From: hacksalot Date: Sat, 3 Feb 2018 04:35:07 -0500 Subject: [PATCH 6/6] chore: update HackMyResume version to 1.9.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 459e3fa..4bf94af 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "hackmyresume", - "version": "2.0.0", + "version": "1.9.0", "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",