Добавил шаги по включению текстовых файлов в другие файлы

This commit is contained in:
rzaitov 2013-11-06 13:47:01 +04:00
parent aef4ee5f20
commit e03dfdbfc0
3 changed files with 12 additions and 9 deletions

View File

@ -7,10 +7,10 @@ class TextConveyorPreprocessor:
self.processors.append(processor) self.processors.append(processor)
def processText(self, line): def processText(self, text):
assert line is not None assert text is not None
for processor in self.processors: for processor in self.processors:
line = processor.processText(line) text = processor.processText(text)
return line return text

View File

@ -1,3 +1,5 @@
<include 'scripts/IosSetupSteps.txt'>
sh echo hello from '{@author}' sh echo hello from '{@author}'
sh echo version: '{@version}' sh echo version: '{@version}'

View File

@ -39,12 +39,12 @@ class TaskRunner:
macroResolver = MacroResolver(macroProcessor, self.valueProvider) macroResolver = MacroResolver(macroProcessor, self.valueProvider)
includeProcessor = IncludeProcessor() includeProcessor = IncludeProcessor()
fileContentProvider = FileContentProvider() self.fileContentProvider = FileContentProvider()
textInclude = TextInclude(includeProcessor, fileContentProvider) textInclude = TextInclude(includeProcessor, self.fileContentProvider)
self.textPreprocessor = TextConveyorPreprocessor() self.textPreprocessor = TextConveyorPreprocessor()
self.textPreprocessor.addProcessor(macroResolver)
self.textPreprocessor.addProcessor(textInclude) self.textPreprocessor.addProcessor(textInclude)
self.textPreprocessor.addProcessor(macroResolver)
self.linePreprocessor = TextConveyorPreprocessor() self.linePreprocessor = TextConveyorPreprocessor()
self.linePreprocessor.addProcessor(lineStripper) self.linePreprocessor.addProcessor(lineStripper)
@ -66,9 +66,10 @@ class TaskRunner:
def getStepsContent(self, config): def getStepsContent(self, config):
pathToSteps = config['steps'] pathToSteps = config['steps']
stepsFile = open(pathToSteps)
content = stepsFile.read() content = self.fileContentProvider.fetchContent(pathToSteps)
content = self.textPreprocessor.processText(content)
return content return content
parser = argparse.ArgumentParser() parser = argparse.ArgumentParser()