From 6c605dd3e2d9dafe17569acbe11a54dca6ebe225 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Val=C3=A9rian=20Galliat?= Date: Fri, 30 Jan 2015 11:09:45 +0100 Subject: [PATCH] Use `-` for `stdin` * See https://github.com/SassDoc/sassdoc/pull/349#issuecomment-72183157 --- Makefile | 4 ++-- src/cli.js | 9 ++++++++- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index f1521bdc..dc761c87 100644 --- a/Makefile +++ b/Makefile @@ -24,9 +24,9 @@ lint: .jshintrc test: test/data/expected.stream.json dist $(MOCHA) test/**/*.test.js $(SASSDOC) --parse test/data/test.scss | diff - test/data/expected.json - $(SASSDOC) --parse < test/data/test.scss | diff - test/data/expected.stream.json + $(SASSDOC) --parse - < test/data/test.scss | diff - test/data/expected.stream.json rm -rf sassdoc && $(SASSDOC) test/data/test.scss && [ -d sassdoc ] - rm -rf sassdoc && $(SASSDOC) < test/data/test.scss && [ -d sassdoc ] + rm -rf sassdoc && $(SASSDOC) - < test/data/test.scss && [ -d sassdoc ] test/data/expected.stream.json: test/data/expected.json test/data/stream $< > $@ diff --git a/src/cli.js b/src/cli.js index 123bf2cc..d63b3a84 100644 --- a/src/cli.js +++ b/src/cli.js @@ -1,5 +1,6 @@ let doc = ` Usage: + sassdoc - [options] sassdoc ... [options] sassdoc [options] @@ -29,6 +30,12 @@ const errors = require('./errors'); export default function cli(argv = process.argv.slice(2)) { let options = docopt(doc, { version: pkg.version, argv: argv }); + + if (!options['-'] && !options[''].length) { + // Trigger help display. + docopt(doc, { version: pkg.version, argv: ['--help'] }); + } + let logger = new Logger(options['--verbose'], options['--debug'] || process.env.SASSDOC_DEBUG); let env = new Environment(logger, options['--strict']); @@ -69,7 +76,7 @@ export default function cli(argv = process.argv.slice(2)) { cb = data => console.log(JSON.stringify(data, null, 2)); } - if (!options[''].length) { + if (options['-']) { return process.stdin .pipe(source()) .pipe(handler(env))