Merge pull request #278 from AntumDeluge/usage_version

ldoc.lua

@@ -37,38 +37,44 @@ app.require_here()
 
 --- @usage
 local usage = [[
-ldoc, a documentation generator for Lua, vs ]]..version..[[
+ldoc, a documentation generator for Lua, v]]..version..[[
 
-  -d,--dir (default doc) output directory
-  -o,--output  (default 'index') output name
-  -v,--verbose          verbose
-  -a,--all              show local functions, etc, in docs
-  -q,--quiet            suppress output
-  -m,--module           module docs as text
-  -s,--style (default !) directory for style sheet (ldoc.css)
-  -l,--template (default !) directory for template (ldoc.ltp)
-  -p,--project (default ldoc) project name
-  -t,--title (default Reference) page title
-  -f,--format (default plain) formatting - can be markdown, discount, lunamark, commonmark, backticks, or plain
-  -b,--package  (default .) top-level package basename (needed for module(...))
-  -x,--ext (default html) output file extension
-  -c,--config (default config.ld) configuration name
-  -u,--unqualified     don't show package name in sidebar links
-  -i,--ignore ignore any 'no doc comment or no module' warnings
-  -X,--not_luadoc break LuaDoc compatibility. Descriptions may continue after tags.
-  -D,--define (default none) set a flag to be used in config.ld
-  -C,--colon use colon style
-  -N,--no_args_infer  don't infer arguments from source
-  -B,--boilerplate ignore first comment in source files
-  -M,--merge allow module merging
-  -S,--simple no return or params, no summary
-  -O,--one one-column output layout
-  --date (default system) use this date in generated doc
-  --dump                debug output dump
-  --filter (default none) filter output as Lua data (e.g pl.pretty.dump)
-  --tags (default none) show all references to given tags, comma-separated
-  --fatalwarnings non-zero exit status on any warning
-  --testing  reproducible build; no date or version on output
+  Invocation:
+    ldoc [options] <file>
+    ldoc --version
+
+  Options:
+    -d,--dir		(default doc) output directory
+    -o,--output		(default 'index') output name
+    -v,--verbose	verbose
+    -a,--all		show local functions, etc, in docs
+    -q,--quiet		suppress output
+    -m,--module		module docs as text
+    -s,--style		(default !) directory for style sheet (ldoc.css)
+    -l,--template	(default !) directory for template (ldoc.ltp)
+    -p,--project	(default ldoc) project name
+    -t,--title		(default Reference) page title
+    -f,--format		(default plain) formatting - can be markdown, discount or plain
+    -b,--package	(default .) top-level package basename (needed for module(...))
+    -x,--ext		(default html) output file extension
+    -c,--config		(default config.ld) configuration name
+    -u,--unqualified	don't show package name in sidebar links
+    -i,--ignore		ignore any 'no doc comment or no module' warnings
+    -X,--not_luadoc	break LuaDoc compatibility. Descriptions may continue after tags.
+    -D,--define		(default none) set a flag to be used in config.ld
+    -C,--colon		use colon style
+    -N,--no_args_infer	don't infer arguments from source
+    -B,--boilerplate	ignore first comment in source files
+    -M,--merge		allow module merging
+    -S,--simple		no return or params, no summary
+    -O,--one		one-column output layout
+    -V,--version	show version information
+    --date		(default system) use this date in generated doc
+    --dump		debug output dump
+    --filter		(default none) filter output as Lua data (e.g pl.pretty.dump)
+    --tags		(default none) show all references to given tags, comma-separated
+    --fatalwarnings	non-zero exit status on any warning
+    --testing		reproducible build; no date or version on output
 
   <file> (string) source file or directory containing source
 
@@ -88,6 +94,11 @@ local KindMap = tools.KindMap
 local Item,File,Module = doc.Item,doc.File,doc.Module
 local quit = utils.quit
 
+if args.version then
+   print('LDoc v' .. version)
+   os.exit(0)
+end
+
 
 local ModuleMap = class(KindMap)
 doc.ModuleMap = ModuleMap
@@ -345,6 +356,9 @@ else
       if err then quit("no "..quote(args.config).." found") end
    end
    -- with user-provided file
+   if args.file == nil then
+      lapp.error('missing required parameter: file')
+   end
    args.file = abspath(args.file)
 end