From e03dfdbfc046ff0d8f620b43d515ca973bedecee Mon Sep 17 00:00:00 2001
From: rzaitov <r-zaitov@yandex.ru>
Date: Wed, 6 Nov 2013 13:47:01 +0400
Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB=20?=
 =?UTF-8?q?=D1=88=D0=B0=D0=B3=D0=B8=20=D0=BF=D0=BE=20=D0=B2=D0=BA=D0=BB?=
 =?UTF-8?q?=D1=8E=D1=87=D0=B5=D0=BD=D0=B8=D1=8E=20=D1=82=D0=B5=D0=BA=D1=81?=
 =?UTF-8?q?=D1=82=D0=BE=D0=B2=D1=8B=D1=85=20=D1=84=D0=B0=D0=B9=D0=BB=D0=BE?=
 =?UTF-8?q?=D0=B2=20=D0=B2=20=D0=B4=D1=80=D1=83=D0=B3=D0=B8=D0=B5=20=D1=84?=
 =?UTF-8?q?=D0=B0=D0=B9=D0=BB=D1=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 scripts/Core/LineConveyor/TextConveyorPreprocessor.py |  8 ++++----
 scripts/IosSteps.txt                                  |  2 ++
 scripts/taskRunner.py                                 | 11 ++++++-----
 3 files changed, 12 insertions(+), 9 deletions(-)

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 @@
+<include 'scripts/IosSetupSteps.txt'>
+
 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()