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

---
 .../SettingsParser/test_SettingsLineParser.py | 26 +++++++++++---
 .../SettingsParser/SettingsLineParser.py      | 34 ++++++++++++++-----
 scripts/settings.txt                          |  4 +--
 3 files changed, 50 insertions(+), 14 deletions(-)

diff --git a/scripts/TouchinBuild/Tests/UnitTests/SettingsParser/test_SettingsLineParser.py b/scripts/TouchinBuild/Tests/UnitTests/SettingsParser/test_SettingsLineParser.py
index da2be49..00fb89a 100644
--- a/scripts/TouchinBuild/Tests/UnitTests/SettingsParser/test_SettingsLineParser.py
+++ b/scripts/TouchinBuild/Tests/UnitTests/SettingsParser/test_SettingsLineParser.py
@@ -7,9 +7,27 @@ class TestSettingsLineParser(unittest.TestCase):
 	def setUp(self):
 		self.parser = SettingsLineParser()
 
-	def test_getPathAndValue(self):
-		line = "abc.123.some_name = 'crazy value ±~ ../ 123'"
+	def test_whiteSpaces(self):
+		self.checkPathAndValue("abc.123.some_name = 'crazy value ±~ ../ 123'", 'abc.123.some_name', 'crazy value ±~ ../ 123')
+		self.checkPathAndValue("a.b.c = 'value'", 'a.b.c', 'value')
+		self.checkPathAndValue("a.b.c= 'value'", 'a.b.c', 'value')
+		self.checkPathAndValue("a.b.c ='value'", 'a.b.c', 'value')
+		self.checkPathAndValue("a.b.c='value'", 'a.b.c', 'value')
+
+	def test_valueWithoutComma(self):
+		self.checkPathAndValue("a.b.c = value", 'a.b.c', 'value')
+		self.checkPathAndValue("a.b.c = some value", 'a.b.c', 'some value')
+		self.checkPathAndValue("a.b.c =   some value  ", 'a.b.c', 'some value')
+
+	def test_valueWithEscapeComma(self):
+		self.checkPathAndValue("a.b.c = '\"value\"'  ", 'a.b.c', '"value"')
+		self.checkPathAndValue('a.b.c = "\'value\'"  ', 'a.b.c', "'value'")
+
+		self.checkPathAndValue('a.b.c = ""value""  ', 'a.b.c', 'value')
+		self.checkPathAndValue("a.b.c = ''value''  ", 'a.b.c', 'value')
+
+	def checkPathAndValue(self, line, expectedPath, expectedValue):
 		result = self.parser.splitToPathAndValue(line)
 
-		self.assertEqual('abc.123.some_name', result[0])
-		self.assertEqual('crazy value ±~ ../ 123', result[1])
+		self.assertEqual(expectedPath, result[0])
+		self.assertEqual(expectedValue, result[1])
diff --git a/scripts/TouchinBuild/parsers/SettingsParser/SettingsLineParser.py b/scripts/TouchinBuild/parsers/SettingsParser/SettingsLineParser.py
index e7e6ca2..755d4be 100644
--- a/scripts/TouchinBuild/parsers/SettingsParser/SettingsLineParser.py
+++ b/scripts/TouchinBuild/parsers/SettingsParser/SettingsLineParser.py
@@ -27,17 +27,35 @@ class SettingsLineParser(LineParser):
 		return result
 
 	def splitToPathAndValue(self, line):
+		# some.path = some_value
+		result = line.split('=')
 
-		propPathRegexp = r"^(?P<prop_path>[\w.]+)"
-		valueRegexp = "'(?P<value>.*)'"
+		propPath = self.getPropertyPath(result[0])
+		value = self.getValue(result[1])
 
-		regexpSource = propPathRegexp + r'\s*=\s*' + valueRegexp
-		regexp = re.compile(regexpSource, re.UNICODE)
+		return propPath, value
 
-		match = regexp.match(line)
-		self._guardMatch(match, line, regexpSource)
+	def getPropertyPath(self, rawPropertyPath):
+		assert rawPropertyPath is not None
+		stripped = rawPropertyPath.strip()
+
+		propPathRegexp = r"^(?P<prop_path>[\w.]+)$"
+		regexp = re.compile(propPathRegexp, re.UNICODE)
+
+		match = regexp.match(stripped)
+		self._guardMatch(match, stripped, propPathRegexp)
 
 		propPath = match.group('prop_path')
-		value = match.group('value')
+		return propPath
 
-		return propPath, value
\ No newline at end of file
+	def getValue(self, rawValue):
+		assert rawValue is not None
+		stripped = rawValue.strip()
+
+		old = stripped
+		stripped = stripped.strip("'")
+
+		if old == stripped:
+			stripped = stripped.strip('"')
+
+		return stripped
\ No newline at end of file
diff --git a/scripts/settings.txt b/scripts/settings.txt
index 277d2b8..ffa0f45 100644
--- a/scripts/settings.txt
+++ b/scripts/settings.txt
@@ -1,6 +1,6 @@
 # global settings
-build_tool = '/Applications/Xamarin\ Studio.app/Contents/MacOS/mdtool'
-version = '0.0.0' # комментарий в тойже строке
+build_tool='/Applications/Xamarin\ Studio.app/Contents/MacOS/mdtool'
+version=0.0.0 # комментарий в тойже строке
 configs = 'appstore, staging'
 
 # ios platform settings