From 553318b40040ee15df77a305710696733bd74245 Mon Sep 17 00:00:00 2001 From: Robert Kaussow Date: Wed, 9 Oct 2019 23:32:21 +0200 Subject: [PATCH] raise exception if template dir not accessable --- ansibledoctor/DocumentationGenerator.py | 13 ++++++++----- example/demo-role/.ansibledoctor.yml | 1 + 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/ansibledoctor/DocumentationGenerator.py b/ansibledoctor/DocumentationGenerator.py index b97f61d..6d0f712 100644 --- a/ansibledoctor/DocumentationGenerator.py +++ b/ansibledoctor/DocumentationGenerator.py @@ -31,7 +31,6 @@ class Generator: self.config = SingleConfig() self.log = SingleLog() self.logger = self.log.logger - self.logger.info("Using template dir: " + self.config.get_template()) self._parser = doc_parser self._scan_template() @@ -41,10 +40,14 @@ class Generator: :return: None """ - role_dir = self.config.get_template() - - for file in glob.iglob(role_dir + "/**/*." + self.extension, recursive=True): - relative_file = file[len(role_dir) + 1:] + template_dir = self.config.get_template() + if os.path.isdir(template_dir): + self.logger.info("Using template dir: {}".format(template_dir)) + else: + self.log.sysexit_with_message("Can not open template dir {}".format(template_dir)) + + for file in glob.iglob(template_dir + "/**/*." + self.extension, recursive=True): + relative_file = file[len(template_dir) + 1:] if ntpath.basename(file)[:1] != "_": self.logger.debug("Found template file: " + relative_file) self.template_files.append(relative_file) diff --git a/example/demo-role/.ansibledoctor.yml b/example/demo-role/.ansibledoctor.yml index 9f9453f..4974bc1 100644 --- a/example/demo-role/.ansibledoctor.yml +++ b/example/demo-role/.ansibledoctor.yml @@ -2,3 +2,4 @@ custom_header: HEADER.md logging: level: debug +template: readme