From db015acedf253e54569d58d6aa1daf200417f9b5 Mon Sep 17 00:00:00 2001 From: rzaitov Date: Tue, 5 Nov 2013 19:53:34 +0400 Subject: [PATCH] =?UTF-8?q?=D0=9D=D0=B0=D1=87=D0=B0=D0=BB=20=D1=80=D0=B5?= =?UTF-8?q?=D0=B0=D0=BB=D0=B8=D0=B7=D0=BE=D0=B2=D1=8B=D0=B2=D0=B0=D1=82?= =?UTF-8?q?=D1=8C=20=D0=BA=D0=BB=D0=B0=D1=81=D1=81,=20=D0=BA=D0=BE=D1=82?= =?UTF-8?q?=D0=BE=D1=80=D1=8B=D0=B9=20=D0=BE=D1=82=D0=B2=D0=B5=D1=87=D0=B0?= =?UTF-8?q?=D0=B5=D1=82=20=D0=B7=D0=B0=20=D0=B2=D0=BA=D0=BB=D1=8E=D1=87?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D1=81=D0=BE=D0=B4=D0=B5=D1=80=D0=B6?= =?UTF-8?q?=D0=B8=D0=BC=D0=BE=D0=B3=D0=BE=20=D0=B8=D0=B7=20=D0=B4=D1=80?= =?UTF-8?q?=D1=83=D0=B3=D0=B8=D1=85=20=D1=84=D0=B0=D0=B9=D0=BB=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scripts/Core/LineConveyor/CommentRemover.py | 2 +- scripts/Core/LineConveyor/MacroResolver.py | 2 +- scripts/Core/LineConveyor/Stripper.py | 2 +- ...LineConveyor.py => TextConveyorPreprocessor.py} | 6 +++--- scripts/Core/LineConveyor/TextInclude.py | 6 ++++++ scripts/Core/StepsRunner.py | 2 +- .../UnitTests/LineConveyor/test_commentRemover.py | 4 ++-- .../UnitTests/LineConveyor/test_macroResolver.py | 2 +- .../Tests/UnitTests/LineConveyor/test_stripper.py | 2 +- scripts/taskRunner.py | 14 ++++++++------ 10 files changed, 25 insertions(+), 17 deletions(-) rename scripts/Core/LineConveyor/{LineConveyor.py => TextConveyorPreprocessor.py} (69%) create mode 100644 scripts/Core/LineConveyor/TextInclude.py diff --git a/scripts/Core/LineConveyor/CommentRemover.py b/scripts/Core/LineConveyor/CommentRemover.py index 4567066..59875f6 100644 --- a/scripts/Core/LineConveyor/CommentRemover.py +++ b/scripts/Core/LineConveyor/CommentRemover.py @@ -1,5 +1,5 @@ class CommentRemover: - def processLine(self, line): + def processText(self, line): assert line is not None newLine = line diff --git a/scripts/Core/LineConveyor/MacroResolver.py b/scripts/Core/LineConveyor/MacroResolver.py index a57b5fe..eeeb8bc 100644 --- a/scripts/Core/LineConveyor/MacroResolver.py +++ b/scripts/Core/LineConveyor/MacroResolver.py @@ -6,7 +6,7 @@ class MacroResolver: self.macroProcessor = macroProcessor self.valueProvider = valueProvider - def processLine(self, line): + def processText(self, line): assert line is not None symbols = self.macroProcessor.getSymbols(line) diff --git a/scripts/Core/LineConveyor/Stripper.py b/scripts/Core/LineConveyor/Stripper.py index 9b57bee..f1393d6 100644 --- a/scripts/Core/LineConveyor/Stripper.py +++ b/scripts/Core/LineConveyor/Stripper.py @@ -1,5 +1,5 @@ class Stripper: - def processLine(self, line): + def processText(self, line): assert line is not None return line.strip(' \t\n\r') diff --git a/scripts/Core/LineConveyor/LineConveyor.py b/scripts/Core/LineConveyor/TextConveyorPreprocessor.py similarity index 69% rename from scripts/Core/LineConveyor/LineConveyor.py rename to scripts/Core/LineConveyor/TextConveyorPreprocessor.py index 3231185..00705f5 100644 --- a/scripts/Core/LineConveyor/LineConveyor.py +++ b/scripts/Core/LineConveyor/TextConveyorPreprocessor.py @@ -1,4 +1,4 @@ -class LineConveyor: +class TextConveyorPreprocessor: def __init__(self): self.processors = [] @@ -7,10 +7,10 @@ class LineConveyor: self.processors.append(processor) - def processLine(self, line): + def processText(self, line): assert line is not None for processor in self.processors: - line = processor.processLine(line) + line = processor.processText(line) return line diff --git a/scripts/Core/LineConveyor/TextInclude.py b/scripts/Core/LineConveyor/TextInclude.py new file mode 100644 index 0000000..4052cab --- /dev/null +++ b/scripts/Core/LineConveyor/TextInclude.py @@ -0,0 +1,6 @@ +class TextInclude: + def __init__(self): + pass + + def processText(self, text): + pass diff --git a/scripts/Core/StepsRunner.py b/scripts/Core/StepsRunner.py index 9643fe4..d115eef 100644 --- a/scripts/Core/StepsRunner.py +++ b/scripts/Core/StepsRunner.py @@ -42,7 +42,7 @@ class StepsRunner: lines = content.splitlines() for line in lines: - processedLine = self.lineConveyor.processLine(line) + processedLine = self.lineConveyor.processText(line) if len(processedLine) == 0: continue diff --git a/scripts/Tests/UnitTests/LineConveyor/test_commentRemover.py b/scripts/Tests/UnitTests/LineConveyor/test_commentRemover.py index 5c0baf8..97c27aa 100644 --- a/scripts/Tests/UnitTests/LineConveyor/test_commentRemover.py +++ b/scripts/Tests/UnitTests/LineConveyor/test_commentRemover.py @@ -8,12 +8,12 @@ class TestCommentRemover(unittest.TestCase): def test_startsWithComment(self): line = '# this line is comment' - newLine = self.commentRemover.processLine(line) + newLine = self.commentRemover.processText(line) self.assertEqual('', newLine) def test_containsComment(self): line = 'this line contains # a comment' - newLine = self.commentRemover.processLine(line) + newLine = self.commentRemover.processText(line) self.assertEqual('this line contains ', newLine) \ No newline at end of file diff --git a/scripts/Tests/UnitTests/LineConveyor/test_macroResolver.py b/scripts/Tests/UnitTests/LineConveyor/test_macroResolver.py index 3ac7f63..803a358 100644 --- a/scripts/Tests/UnitTests/LineConveyor/test_macroResolver.py +++ b/scripts/Tests/UnitTests/LineConveyor/test_macroResolver.py @@ -21,6 +21,6 @@ class TestMacroResolver(unittest.TestCase): def test_resolveLine(self): line = '{@key1} bla {@some_name} version: {@version}' - newLine = self.macroResolver.processLine(line) + newLine = self.macroResolver.processText(line) self.assertEqual('hello world bla another name version: 1.2.3', newLine) \ No newline at end of file diff --git a/scripts/Tests/UnitTests/LineConveyor/test_stripper.py b/scripts/Tests/UnitTests/LineConveyor/test_stripper.py index 75057be..ecd6b81 100644 --- a/scripts/Tests/UnitTests/LineConveyor/test_stripper.py +++ b/scripts/Tests/UnitTests/LineConveyor/test_stripper.py @@ -8,6 +8,6 @@ class TestStripper(unittest.TestCase): def test_stripLine(self): line = ' \tSome text \t\r\n' - newLine = self.stripper.processLine(line) + newLine = self.stripper.processText(line) self.assertEqual('Some text', newLine) \ No newline at end of file diff --git a/scripts/taskRunner.py b/scripts/taskRunner.py index e9eb2e5..846e071 100644 --- a/scripts/taskRunner.py +++ b/scripts/taskRunner.py @@ -2,7 +2,7 @@ import os import argparse from Core.LineConveyor.CommentRemover import CommentRemover -from Core.LineConveyor.LineConveyor import LineConveyor +from Core.LineConveyor.TextConveyorPreprocessor import TextConveyorPreprocessor from Core.LineConveyor.MacroResolver import MacroResolver from Core.LineConveyor.Stripper import Stripper from commands.ValueProvider import ValueProvider @@ -35,10 +35,12 @@ class TaskRunner: self.valueProvider = ValueProvider() macroResolver = MacroResolver(macroProcessor, self.valueProvider) - self.lineConveyor = LineConveyor() - self.lineConveyor.addProcessor(lineStripper) - self.lineConveyor.addProcessor(commentRemover) - self.lineConveyor.addProcessor(macroResolver) + self.textPreprocessor = TextConveyorPreprocessor() + self.textPreprocessor.addProcessor(macroResolver) + + self.linePreprocessor = TextConveyorPreprocessor() + self.linePreprocessor.addProcessor(lineStripper) + self.linePreprocessor.addProcessor(commentRemover) def run(self): rawSettings = self.settingsProvider.fetchSettings() @@ -51,7 +53,7 @@ class TaskRunner: def runConfig(self, config): content = self.getStepsContent(config) - stepsRunner = StepsRunner(config, self.lineConveyor, self.valueProvider) + stepsRunner = StepsRunner(config, self.linePreprocessor, self.valueProvider) stepsRunner.run(content) def getStepsContent(self, config):