resume-cli 3.1.0 → 3.1.2

package/build/builder.js

@@ -4,7 +4,7 @@ const themeServer = process.env.THEME_SERVER || 'https://themes.jsonresume.org/t
 const fs = require('fs');
 const request = require('superagent');
 const chalk = require('chalk');
-const renderHtml = require('./render-html');
+const renderHtml = require('./render-html').default;
 const denormalizeTheme = value => {
   return value.match(/jsonresume-theme-(.*)/)[1];
 };
@@ -28,7 +28,7 @@ module.exports = function resumeBuilder(theme, dir, resumeFilename, cb) {
     if (err) {
       console.log(chalk.yellow('Could not find:'), resumeFilename);
       console.log(chalk.cyan('Using example resume.json from resume-schema instead...'));
-      resumeJson = require('resume-schema').resumeJson;
+      resumeJson = require('resume-schema/sample.resume.json');
     } else {
       try {
         // todo: test resume schema

package/build/main.js

@@ -22,7 +22,7 @@ const normalizeTheme = (value, defaultValue) => {
   return theme.match('jsonresume-theme-.*') ? theme : `jsonresume-theme-${theme}`;
 };
 (async () => {
-  program.name('resume').usage('[command] [options]').version(pkg.version).option('-F, --force', 'Used by `publish` and `export` - bypasses schema testing.').option('-t, --theme <theme name>', 'Specify theme used by `export` and `serve` or specify a path starting with . (use . for current directory or ../some/other/dir)', normalizeTheme, 'jsonresume-theme-even').option('-f, --format <file type extension>', 'Used by `export`.').option('-r, --resume <resume filename>', "path to the resume in json format. Use '-' to read from stdin", 'resume.json').option('-p, --port <port>', 'Used by `serve` (default: 4000)', 4000).option('-s, --silent', 'Used by `serve` to tell it if open browser auto or not.', false).option('-d, --dir <path>', 'Used by `serve` to indicate a public directory path.', 'public').option('--schema <relativePath>', 'Used by `validate` to validate against a custom schema.');
+  program.name('resume').usage('[command] [options]').version(pkg.version).option('-F, --force', 'Used by `publish` and `export` - bypasses schema testing.').option('-t, --theme <theme name>', 'Specify theme used by `export` and `serve` or specify a path starting with . (use . for current directory or ../some/other/dir)', normalizeTheme, 'jsonresume-theme-elegant').option('-f, --format <file type extension>', 'Used by `export`.').option('-r, --resume <resume filename>', "path to the resume in json format. Use '-' to read from stdin", 'resume.json').option('-p, --port <port>', 'Used by `serve` (default: 4000)', 4000).option('-s, --silent', 'Used by `serve` to tell it if open browser auto or not.', false).option('-d, --dir <path>', 'Used by `serve` to indicate a public directory path.', 'public').option('--schema <relativePath>', 'Used by `validate` to validate against a custom schema.');
   program.command('init').description('Initialize a resume.json file').action(async () => {
     await (0, _init.default)({
       resumePath: program.resume

package/build/render-html.js

@@ -18,10 +18,12 @@ var _default = async ({
   const cwd = process.cwd();
   let path;
   if (themePath[0] === '.') {
-    path = tryResolve(path.join(cwd, themePath), {
+    path = tryResolve(require('path').join(cwd, themePath), {
       paths: [cwd]
     });
-    throw new Error(`Theme ${themePath} could not be resolved relative to ${cwd}`);
+    if (!path) {
+      throw new Error(`Theme ${themePath} could not be resolved relative to ${cwd}`);
+    }
   }
   if (!path) {
     path = tryResolve(themePath, {

package/build/render-html.test.js

@@ -7,9 +7,6 @@ describe('renderHTML', () => {
     const originalRequireResolve = require.resolve;
     const mockThemePath = 'mock/path/to/jsonresume-theme-even';
     require.resolve = (...args) => {
-      if (args[0] === 'jsonresume-theme-even') {
-        return mockThemePath;
-      }
       if (args[0] === 'jsonresume-theme-even') {
         return mockThemePath;
       }
@@ -26,13 +23,13 @@ describe('renderHTML', () => {
       email: 'test4@test.com'
     }
   };
-  it('should reject when theme is not availlable', async () => {
+  it('should reject when theme is not available', async () => {
     await expect((0, _renderHtml.default)({
       resume,
       themePath: 'unknown'
     })).rejects.toBeTruthy();
   });
-  describe('should render html when theme is availlable', () => {
+  describe('should render html when theme is available', () => {
     it('with long theme name', async () => {
       expect(await (0, _renderHtml.default)({
         resume,
@@ -45,5 +42,17 @@ describe('renderHTML', () => {
         themePath: 'even'
       })).toStartWith('<!doctype html>');
     });
+    it('should reject theme with invalid path', async () => {
+      await expect((0, _renderHtml.default)({
+        resume,
+        themePath: './unknown'
+      })).rejects.toBeTruthy();
+    });
+    it('with local theme path', async () => {
+      expect(await (0, _renderHtml.default)({
+        resume,
+        themePath: './node_modules/jsonresume-theme-even'
+      })).toStartWith('<!doctype html>');
+    });
   });
 });

package/build/serve.js

@@ -6,6 +6,12 @@ const readline = require('readline');
 const bs = require('browser-sync').create();
 const builder = require('./builder');
 const reBuildResume = (theme, dir, resumeFilename, cb) => {
+  console.log({
+    theme,
+    dir,
+    resumeFilename,
+    cb
+  });
   builder(theme, dir, resumeFilename, (err, html) => {
     if (err) {
       readline.cursorTo(process.stdout, 0);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "resume-cli",
-  "version": "3.1.0",
+  "version": "3.1.2",
   "description": "The JSON Resume command line interface",
   "main": "index.js",
   "engines": {
@@ -37,6 +37,7 @@
     "dotenv": "^8.2.0",
     "file-exists": "^5.0.1",
     "jest-extended": "^0.11.5",
+    "jsonresume-theme-elegant": "^1.16.1",
     "jsonresume-theme-even": "^0.6.0",
     "mime-types": "^2.1.27",
     "object-path-immutable": "^4.1.1",