Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

resolves #86 exit process consistency #88

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

resolves #86 exit process consistency #88

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 23 additions & 30 deletions lib/invoker.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,18 +19,28 @@ class Invoker {
this.showVersion()
process.exit(0)
}
if (files.length === 0 && !this.options.stdin) {
// nothing to do...
this.showHelp()
process.exit(0)
}
Invoker.prepareProcessor(args, asciidoctor)
const options = this.options.options
const failureLevel = options['failure_level']
if (this.options.stdin) {
await Invoker.convertFromStdin(options, args)
Invoker.exit(failureLevel)
} else if (files && files.length > 0) {
Invoker.processFiles(files, verbose, args['timings'], options)
try {
if (this.options.stdin) {
await Invoker.convertFromStdin(options, args)
} else if (files && files.length > 0) {
Invoker.convertFiles(files, verbose, args['timings'], options)
}
Invoker.exit(failureLevel)
} else {
this.showHelp()
process.exit(0)
} catch (e) {
if (e && e.name === 'NotImplementedError' && e.message === `asciidoctor: FAILED: missing converter for backend '${options.backend}'. Processing aborted.`) {
console.error(`> Error: missing converter for backend '${options.backend}'. Processing aborted.`)
console.error(`> You might want to require a Node.js package with --require option to support this backend.`)
process.exit(1)
}
throw e
}
}

Expand Down Expand Up @@ -69,42 +79,25 @@ CLI version ${pkg.version}`
if (args['timings']) {
const timings = asciidoctor.Timings.create()
const instanceOptions = Object.assign({}, options, { timings })
Invoker.convert(asciidoctor.convert, data, instanceOptions)
asciidoctor.convert(data, instanceOptions)
timings.printReport(process.stderr, '-')
} else {
Invoker.convert(asciidoctor.convert, data, options)
}
}

static convert (processorFn, input, options) {
try {
processorFn.apply(asciidoctor, [input, options])
} catch (e) {
if (e && e.name === 'NotImplementedError' && e.message === `asciidoctor: FAILED: missing converter for backend '${options.backend}'. Processing aborted.`) {
console.error(`> Error: missing converter for backend '${options.backend}'. Processing aborted.`)
console.error(`> You might want to require a Node.js package with --require option to support this backend.`)
process.exit(1)
}
throw e
asciidoctor.convert(data, options)
}
}

static convertFile (file, options) {
Invoker.convert(asciidoctor.convertFile, file, options)
}

static processFiles (files, verbose, timings, options) {
static convertFiles (files, verbose, timings, options) {
files.forEach((file) => {
if (verbose) {
console.log(`converting file ${file}`)
}
if (timings) {
const timings = asciidoctor.Timings.create()
const instanceOptions = Object.assign({}, options, { timings })
Invoker.convertFile(file, instanceOptions)
asciidoctor.convertFile(file, instanceOptions)
timings.printReport(process.stderr, file)
} else {
Invoker.convertFile(file, options)
asciidoctor.convertFile(file, options)
}
})
}
Expand Down
42 changes: 40 additions & 2 deletions test/test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,7 @@ describe('Help', () => {
describe('Print timings report', () => {
it('should print timings report', () => {
sinon.stub(process.stderr, 'write')
sinon.stub(process.stdout, 'write')
sinon.stub(process, 'exit')
try {
new Invoker(new Options().parse(['node', 'asciidoctor', `${__dirname}/fixtures/sample.adoc`, '--timings', '-o', '-'])).invoke()
Expand All @@ -166,6 +167,43 @@ describe('Print timings report', () => {
expect(process.stderr.write.getCall(3).args[0]).to.include('Total time (read, parse and convert):')
} finally {
process.stderr.write.restore()
process.stdout.write.restore()
process.exit.restore()
}
})
})

describe('Write to stdout', () => {
it('should write to stdout', () => {
sinon.stub(process.stdout, 'write')
sinon.stub(process, 'exit')
try {
new Invoker(new Options().parse(['node', 'asciidoctor', `${__dirname}/fixtures/sample.adoc`, '-a', 'nofooter', '-o', '-'])).invoke()
expect(process.stdout.write.called).to.be.true()
expect(process.stdout.write.getCall(0).args[0]).to.include(`<body class="article">
<div id="header">
<h1>Title</h1>
</div>
<div id="content">
<div id="preamble">
<div class="sectionbody">
<div class="paragraph">
<p>This is a sample document</p>
</div>
</div>
</div>
<div class="sect1">
<h2 id="_first_section">First section</h2>
<div class="sectionbody">
<div class="paragraph">
<p>This is a paragraph.</p>
</div>
</div>
</div>
</div>
</body>`)
} finally {
process.stdout.write.restore()
process.exit.restore()
}
})
Expand Down Expand Up @@ -227,7 +265,7 @@ describe('Process files', () => {
it('should exit with code 1 when failure level is lower than the maximum logging level', () => {
sinon.stub(process, 'exit')
try {
Invoker.processFiles([bookFilePath], false, false)
Invoker.convertFiles([bookFilePath], false, false)
Invoker.exit(3) // ERROR: 3
expect(process.exit.called).to.be.true()
expect(process.exit.calledWith(1)).to.be.true()
Expand All @@ -239,7 +277,7 @@ describe('Process files', () => {
it('should exit with code 0 when failure level is lower than the maximum logging level', () => {
sinon.stub(process, 'exit')
try {
Invoker.processFiles([bookFilePath], false, false)
Invoker.convertFiles([bookFilePath], false, false)
Invoker.exit(4) // FATAL: 4
expect(process.exit.called).to.be.true()
expect(process.exit.calledWith(0)).to.be.true()
Expand Down