diff --git a/scripts/Core/LineConveyor/TextConveyorPreprocessor.py b/scripts/Core/LineConveyor/TextConveyorPreprocessor.py index 00705f5..a474a80 100644 --- a/scripts/Core/LineConveyor/TextConveyorPreprocessor.py +++ b/scripts/Core/LineConveyor/TextConveyorPreprocessor.py @@ -7,10 +7,10 @@ class TextConveyorPreprocessor: self.processors.append(processor) - def processText(self, line): - assert line is not None + def processText(self, text): + assert text is not None for processor in self.processors: - line = processor.processText(line) + text = processor.processText(text) - return line + return text diff --git a/scripts/IosSteps.txt b/scripts/IosSteps.txt index eb5b620..1ba5119 100644 --- a/scripts/IosSteps.txt +++ b/scripts/IosSteps.txt @@ -1,3 +1,5 @@ + + sh echo hello from '{@author}' sh echo version: '{@version}' diff --git a/scripts/taskRunner.py b/scripts/taskRunner.py index b924c78..07dda9c 100644 --- a/scripts/taskRunner.py +++ b/scripts/taskRunner.py @@ -39,12 +39,12 @@ class TaskRunner: macroResolver = MacroResolver(macroProcessor, self.valueProvider) includeProcessor = IncludeProcessor() - fileContentProvider = FileContentProvider() - textInclude = TextInclude(includeProcessor, fileContentProvider) + self.fileContentProvider = FileContentProvider() + textInclude = TextInclude(includeProcessor, self.fileContentProvider) self.textPreprocessor = TextConveyorPreprocessor() - self.textPreprocessor.addProcessor(macroResolver) self.textPreprocessor.addProcessor(textInclude) + self.textPreprocessor.addProcessor(macroResolver) self.linePreprocessor = TextConveyorPreprocessor() self.linePreprocessor.addProcessor(lineStripper) @@ -66,9 +66,10 @@ class TaskRunner: def getStepsContent(self, config): pathToSteps = config['steps'] - stepsFile = open(pathToSteps) - content = stepsFile.read() + content = self.fileContentProvider.fetchContent(pathToSteps) + content = self.textPreprocessor.processText(content) + return content parser = argparse.ArgumentParser()