Переименовал пакет из parser в parsers, потому что исходное название вызывало коллизию при установке через pip

scripts/CommandBuilders/CleanBuildCommandBuilder.py

@@ -1,6 +1,6 @@
 from commands.CleanBuildCommands.BuildCommand import BuildCommand
 from commands.CleanBuildCommands.CleanCommand import CleanCommand
-from parser.CleanBuildParser import CleanBuildParser
+from parsers.CleanBuildParser import CleanBuildParser
 
 
 class CleanBuildCommandBuilder:

scripts/CommandBuilders/CopyCommandBuilder.py

@@ -1,5 +1,5 @@
 from commands.CopyCommand import CopyCommand
-from parser.CopyParser.CopyLineParser import CopyLineParser
+from parsers.CopyParser.CopyLineParser import CopyLineParser
 
 
 class CopyCommandBuilder:

scripts/CommandBuilders/CreateBackupCommandBuilder.py

@@ -1,5 +1,5 @@
 from commands.CreateBackupCommand import CreateBackupCommand
-from parser.BackupParser.CreateBackupParser import CreateBackupParser
+from parsers.BackupParser.CreateBackupParser import CreateBackupParser
 
 
 class CreateBackupCommandBuilder:

scripts/CommandBuilders/DeleteBackupCommandBuilder.py

@@ -1,5 +1,5 @@
 from commands.DeleteBackupCommand import DeleteBackupCommand
-from parser.BackupParser.DeleteBackupParser import DeleteBackupParser
+from parsers.BackupParser.DeleteBackupParser import DeleteBackupParser
 
 
 class DeleteBackupCommandBuilder:

scripts/CommandBuilders/InstallProfileCommandBuilder.py

@@ -1,5 +1,5 @@
 from commands.CopyCommand import CopyCommand
-from parser.InstallProfileParser import InstallProfileParser
+from parsers.InstallProfileParser import InstallProfileParser
 
 
 class InstallProfileCommandBuilder:

scripts/CommandBuilders/MakeDirsCommandBuilder.py

@@ -1,5 +1,5 @@
 from commands.MakeDirsCommand import MakeDirsCommand
-from parser.MakeDirsParser import MakeDirsParser
+from parsers.MakeDirsParser import MakeDirsParser
 
 
 class MakeDirsCommandBuilder:

scripts/CommandBuilders/PatchCsprojCommandBuilder.py

@@ -1,5 +1,5 @@
 from commands.PatchCsprojCommand import PatchCsprojCommand
-from parser.InsideParser.InsideSetParser import InsideSetParser
+from parsers.InsideParser.InsideSetParser import InsideSetParser
 
 
 class PatchCsprojCommandBuilder:

scripts/CommandBuilders/PatchInfoplistCommandBuilder.py

@@ -1,5 +1,5 @@
 from commands.PatchInfoPlistCommand import PatchInfoPlistCommand
-from parser.InsideParser.InsideSetParser import InsideSetParser
+from parsers.InsideParser.InsideSetParser import InsideSetParser
 
 
 class PatchInfoplistCommandBuilder:

scripts/CommandBuilders/RemoveProjectCommandBuilder.py

@@ -1,5 +1,5 @@
 from commands.RemoveProjectCommand import RemoveProjectCommand
-from parser.InsideParser.InsideRemoveParser import InsideRemoveParser
+from parsers.InsideParser.InsideRemoveParser import InsideRemoveParser
 
 
 class RemoveProjectCommandBuilder:

scripts/CommandBuilders/RestoreBackupCommandBuilder.py

@@ -1,5 +1,5 @@
 from commands.RestoreBackupCommand import RestoreBackupCommand
-from parser.BackupParser.RestoreBackupParser import RestoreBackupParser
+from parsers.BackupParser.RestoreBackupParser import RestoreBackupParser
 
 
 class RestoreBackupCommandBuilder:

scripts/CommandBuilders/ShCommandBuilder.py

@@ -1,5 +1,5 @@
 from commands.ShCommand import ShCommand
-from parser.ShParser import ShParser
+from parsers.ShParser import ShParser
 
 
 class ShCommandBuilder:

scripts/CommandBuilders/TestflightCommandBuilder.py

@@ -1,5 +1,5 @@
 from commands.TestflightCommand import TestflightCommand
-from parser.TestflightParser import TestflightParser
+from parsers.TestflightParser import TestflightParser
 
 
 class TestflightCommandBuilder:

scripts/MANIFEST

@@ -39,29 +39,29 @@ commands/CleanBuildCommands/BuildCommand.py
 commands/CleanBuildCommands/CleanBuildCommandBase.py
 commands/CleanBuildCommands/CleanCommand.py
 commands/CleanBuildCommands/__init__.py
-parser/CleanBuildParser.py
-parser/InstallProfileParser.py
-parser/LineParser.py
-parser/MakeDirsParser.py
-parser/ShParser.py
-parser/TestflightParser.py
-parser/__init__.py
-parser/BackupParser/CreateBackupArguments.py
-parser/BackupParser/CreateBackupParser.py
-parser/BackupParser/DeleteBackupParser.py
-parser/BackupParser/RestoreBackupParser.py
-parser/BackupParser/__init__.py
-parser/CopyParser/CopyArguments.py
-parser/CopyParser/CopyLineParser.py
-parser/CopyParser/__init__.py
-parser/InsideParser/InsideRemoveParser.py
-parser/InsideParser/InsideSetParser.py
-parser/InsideParser/__init__.py
-parser/SettingsParser/PathParser.py
-parser/SettingsParser/SettingsLineParser.py
-parser/SettingsParser/SettingsMerger.py
-parser/SettingsParser/SettingsParser.py
-parser/SettingsParser/__init__.py
+parsers/CleanBuildParser.py
+parsers/InstallProfileParser.py
+parsers/LineParser.py
+parsers/MakeDirsParser.py
+parsers/ShParser.py
+parsers/TestflightParser.py
+parsers/__init__.py
+parsers/BackupParser/CreateBackupArguments.py
+parsers/BackupParser/CreateBackupParser.py
+parsers/BackupParser/DeleteBackupParser.py
+parsers/BackupParser/RestoreBackupParser.py
+parsers/BackupParser/__init__.py
+parsers/CopyParser/CopyArguments.py
+parsers/CopyParser/CopyLineParser.py
+parsers/CopyParser/__init__.py
+parsers/InsideParser/InsideRemoveParser.py
+parsers/InsideParser/InsideSetParser.py
+parsers/InsideParser/__init__.py
+parsers/SettingsParser/PathParser.py
+parsers/SettingsParser/SettingsLineParser.py
+parsers/SettingsParser/SettingsMerger.py
+parsers/SettingsParser/SettingsParser.py
+parsers/SettingsParser/__init__.py
 utils/BuildConfigProvider.py
 utils/CsprojPatcher.py
 utils/IncludeProcessor.py

scripts/Tests/UnitTests/CleanBuildParser/test_cleanBuildParser.py

@@ -1,5 +1,5 @@
 import unittest
-from parser.CleanBuildParser import CleanBuildParser
+from parsers.CleanBuildParser import CleanBuildParser
 
 
 class TestCleanBuildParser(unittest.TestCase):

scripts/Tests/UnitTests/CopyParser/test_copyArguments.py

@@ -1,5 +1,5 @@
 import unittest
-from parser.CopyParser.CopyArguments import CopyArguments
+from parsers.CopyParser.CopyArguments import CopyArguments
 
 
 class TestCopyArguments(unittest.TestCase):

scripts/Tests/UnitTests/CopyParser/test_copyParser.py

@@ -1,5 +1,5 @@
 import unittest
-from parser.CopyParser.CopyLineParser import CopyLineParser
+from parsers.CopyParser.CopyLineParser import CopyLineParser
 
 
 class TestCopyParser(unittest.TestCase):

scripts/Tests/UnitTests/InstallProfile/test_installProfile.py

@@ -1,5 +1,5 @@
 import unittest
-from parser.InstallProfileParser import InstallProfileParser
+from parsers.InstallProfileParser import InstallProfileParser
 
 
 class TestInstallProfile(unittest.TestCase):

scripts/Tests/UnitTests/MakeDirsParser/test_makeDirsParser.py

@@ -1,5 +1,5 @@
 import unittest
-from parser.MakeDirsParser import MakeDirsParser
+from parsers.MakeDirsParser import MakeDirsParser
 
 
 class TestMakeDirsParser(unittest.TestCase):

scripts/Tests/UnitTests/ProjectParser/test_projectParser.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 import unittest
 from commands.ValueProvider import ValueProvider
-from parser.InsideParser.InsideSetParser import InsideSetParser
+from parsers.InsideParser.InsideSetParser import InsideSetParser
 
 
 class TestCsprojParser(unittest.TestCase):

scripts/Tests/UnitTests/SettingsParser/test_PathParser.py

@@ -1,5 +1,5 @@
 import unittest
-from parser.SettingsParser.PathParser import PathParser
+from parsers.SettingsParser.PathParser import PathParser
 
 
 class TestPathParser(unittest.TestCase):

scripts/Tests/UnitTests/SettingsParser/test_SettingsLineParser.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 import unittest
-from parser.SettingsParser.SettingsLineParser import SettingsLineParser
+from parsers.SettingsParser.SettingsLineParser import SettingsLineParser
 
 
 class TestSettingsLineParser(unittest.TestCase):

scripts/Tests/UnitTests/SettingsParser/test_SettingsParser.py

@@ -1,5 +1,5 @@
 import unittest
-from parser.SettingsParser.SettingsParser import SettingsParser
+from parsers.SettingsParser.SettingsParser import SettingsParser
 
 
 

scripts/Tests/UnitTests/ShParser/test_shPareser.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 import unittest
-from parser.ShParser import ShParser
+from parsers.ShParser import ShParser
 
 
 class TestShParser(unittest.TestCase):

scripts/Tests/UnitTests/TestflightParser/test_testflightParser.py

@@ -1,5 +1,5 @@
 import unittest
-from parser.TestflightParser import TestflightParser
+from parsers.TestflightParser import TestflightParser
 
 
 class TesttestflightParser(unittest.TestCase):

scripts/build

@@ -1,3 +0,0 @@
-#!/usr/bin/env bash
-
-python setup.py sdist

scripts/parser/BackupParser/CreateBackupArguments.py

@@ -1,11 +0,0 @@
-class CreateBackupArguments:
-	def __init__(self):
-		self.folderName = None
-
-	def getSourceFolderName(self):
-		return self.folderName
-
-	def getBackupFolderName(self):
-		return "backup.{0}".format(self.folderName)
-
-

scripts/parser/BackupParser/CreateBackupParser.py

@@ -1,32 +0,0 @@
-import re
-
-from parser.BackupParser.CreateBackupArguments import CreateBackupArguments
-from parser.LineParser import LineParser
-
-
-class CreateBackupParser(LineParser):
-	def __init__(self):
-		LineParser.__init__(self)
-		self.__createBackupArguments = CreateBackupArguments()
-
-	def parseLine(self, line):
-		assert line is not None
-
-		folderNameRegexp = r"'(?P<folder>[^']+)'$"
-
-		regexpSource = self.startsWith('create backup for') + folderNameRegexp
-		regexp = re.compile(regexpSource, re.UNICODE)
-
-		match = regexp.match(line)
-		self._guardMatch(match, line, regexpSource)
-
-		folderName = match.group('folder')
-		self.__createBackupArguments.folderName = folderName
-
-		return self.__createBackupArguments
-
-	def isValidLine(self, line):
-		assert line is not None
-
-		isValid = line.startswith('create backup')
-		return  isValid

scripts/parser/BackupParser/DeleteBackupParser.py

@@ -1,23 +0,0 @@
-import re
-
-from parser.LineParser import LineParser
-
-
-class DeleteBackupParser(LineParser):
-	def __init__(self):
-		LineParser.__init__(self)
-
-	def parseLine(self, line):
-		assert line is not None
-
-		regexpSource = r'delete backup\s*'
-		regexp = re.compile(regexpSource, re.UNICODE)
-
-		match = regexp.match(line)
-		self._guardMatch(match, line, regexpSource)
-
-	def isValidLine(self, line):
-		assert line is not None
-
-		isValid = line.startswith('delete backup')
-		return isValid

scripts/parser/BackupParser/RestoreBackupParser.py

@@ -1,24 +0,0 @@
-import re
-
-from parser.LineParser import LineParser
-
-
-class RestoreBackupParser(LineParser):
-	def __init__(self):
-		LineParser.__init__(self)
-
-	def parseLine(self, line):
-		assert line is not None
-
-		regexpSource = r'restore from backup\s*'
-		regexp = re.compile(regexpSource, re.UNICODE)
-
-		match = regexp.match(line)
-		self._guardMatch(match, line, regexpSource)
-
-	def isValidLine(self, line):
-		assert line is not None
-
-		isValid = line.startswith('restore from backup')
-		return isValid
-

scripts/parser/__init__.py

@@ -1 +0,0 @@
-__author__ = 'rzaitov'

scripts/parsers/CleanBuildParser.py

@@ -1,6 +1,6 @@
 import re
 
-from parser.LineParser import LineParser
+from parsers.LineParser import LineParser
 
 
 class CleanBuildParser(LineParser):

scripts/parsers/CopyParser/CopyLineParser.py

@@ -1,7 +1,7 @@
 import re
 
-from parser.CopyParser.CopyArguments import CopyArguments
-from parser.LineParser import LineParser
+from parsers.CopyParser.CopyArguments import CopyArguments
+from parsers.LineParser import LineParser
 
 
 class CopyLineParser(LineParser):

scripts/parsers/InsideParser/InsideRemoveParser.py

@@ -1,6 +1,6 @@
 import re
 
-from parser.LineParser import LineParser
+from parsers.LineParser import LineParser
 
 
 class InsideRemoveParser(LineParser):

scripts/parsers/InsideParser/InsideSetParser.py

@@ -1,6 +1,6 @@
 import re
 
-from parser.LineParser import LineParser
+from parsers.LineParser import LineParser
 
 
 class InsideSetParser(LineParser):

scripts/parsers/InstallProfileParser.py

@@ -1,7 +1,7 @@
 import re
 import os
-from parser.CopyParser.CopyArguments import CopyArguments
-from parser.LineParser import LineParser
+from parsers.CopyParser.CopyArguments import CopyArguments
+from parsers.LineParser import LineParser
 
 
 class InstallProfileParser(LineParser):

scripts/parsers/MakeDirsParser.py

@@ -1,6 +1,6 @@
 import re
 
-from parser.LineParser import LineParser
+from parsers.LineParser import LineParser
 
 
 class MakeDirsParser(LineParser):

scripts/parsers/SettingsParser/SettingsLineParser.py

@@ -1,7 +1,7 @@
 import re
 
-from parser.LineParser import LineParser
-from parser.SettingsParser.PathParser import PathParser
+from parsers.LineParser import LineParser
+from parsers.SettingsParser.PathParser import PathParser
 
 
 class SettingsLineParser(LineParser):

scripts/parsers/SettingsParser/SettingsParser.py

@@ -1,5 +1,5 @@
-from parser.SettingsParser.SettingsLineParser import SettingsLineParser
-from parser.SettingsParser.SettingsMerger import SettingsMerger
+from parsers.SettingsParser.SettingsLineParser import SettingsLineParser
+from parsers.SettingsParser.SettingsMerger import SettingsMerger
 
 
 class SettingsParser:

scripts/parsers/ShParser.py

@@ -1,6 +1,6 @@
 import re
 
-from parser.LineParser import LineParser
+from parsers.LineParser import LineParser
 
 
 class ShParser(LineParser):

scripts/parsers/TestflightParser.py

@@ -1,4 +1,4 @@
-from parser.LineParser import LineParser
+from parsers.LineParser import LineParser
 import re
 
 class TestflightParser(LineParser):

scripts/setup.py

@@ -4,12 +4,14 @@ setup(name= 'TouchinBuild',
 	version= '0.0.10',
 	packages= ['Core', 'Core.LineConveyor',
 				'utils', 'utils.SettingsProvider',
-				'parser', 'parser.CopyParser', 'parser.BackupParser', 'parser.InsideParser', 'parser.SettingsParser',
+				'parsers', 'parsers.CopyParser', 'parsers.BackupParser', 'parsers.InsideParser', 'parsers.SettingsParser',
 				'commands', 'commands.CleanBuildCommands',
 				'CommandBuilders'],
 	url = 'http://touchin.ru',
-	license = 'All rights reserved.',
+	license = 'BSD License',
 	description = 'Build tool for Touchin',
 	author = 'Rustam Zaitov',
-	author_email = 'rustam.zaitov@touchin.ru'
+	author_email = 'rustam.zaitov [at] touchin.ru',
+	maintainer= 'Rustam Zaitov',
+	maintainer_email='rustam.zaitov [at] touchin.ru'
 )

scripts/utils/IncludeProcessor.py

@@ -1,5 +1,5 @@
 import re
-from parser.LineParser import LineParser
+from parsers.LineParser import LineParser
 
 
 class IncludeProcessor(LineParser):

scripts/utils/SettingsProvider/CmdArgsOverriderSettingsProvider.py

@@ -1,5 +1,5 @@
 import select
-from parser.SettingsParser.SettingsParser import SettingsParser
+from parsers.SettingsParser.SettingsParser import SettingsParser
 
 
 class CmdArgsOverriderSettingsProvider:

scripts/utils/SettingsProvider/FromFileSettingsProvider.py

@@ -1,4 +1,4 @@
-from parser.SettingsParser.SettingsParser import SettingsParser
+from parsers.SettingsParser.SettingsParser import SettingsParser
 
 
 class FromFileSettingsProvider: