From 23c106433077c58b55b56e754e778bf1d409d9fe Mon Sep 17 00:00:00 2001 From: rzaitov Date: Thu, 7 Nov 2013 13:03:25 +0400 Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=B5=D1=80=D0=B5=D0=B8=D0=BC=D0=B5?= =?UTF-8?q?=D0=BD=D0=BE=D0=B2=D0=B0=D0=BB=20=D0=BF=D0=B0=D0=BA=D0=B5=D1=82?= =?UTF-8?q?=20=D0=B8=D0=B7=20parser=20=D0=B2=20parsers,=20=D0=BF=D0=BE?= =?UTF-8?q?=D1=82=D0=BE=D0=BC=D1=83=20=D1=87=D1=82=D0=BE=20=D0=B8=D1=81?= =?UTF-8?q?=D1=85=D0=BE=D0=B4=D0=BD=D0=BE=D0=B5=20=D0=BD=D0=B0=D0=B7=D0=B2?= =?UTF-8?q?=D0=B0=D0=BD=D0=B8=D0=B5=20=D0=B2=D1=8B=D0=B7=D1=8B=D0=B2=D0=B0?= =?UTF-8?q?=D0=BB=D0=BE=20=D0=BA=D0=BE=D0=BB=D0=BB=D0=B8=D0=B7=D0=B8=D1=8E?= =?UTF-8?q?=20=D0=BF=D1=80=D0=B8=20=D1=83=D1=81=D1=82=D0=B0=D0=BD=D0=BE?= =?UTF-8?q?=D0=B2=D0=BA=D0=B5=20=D1=87=D0=B5=D1=80=D0=B5=D0=B7=20pip?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CleanBuildCommandBuilder.py | 2 +- scripts/CommandBuilders/CopyCommandBuilder.py | 2 +- .../CreateBackupCommandBuilder.py | 2 +- .../DeleteBackupCommandBuilder.py | 2 +- .../InstallProfileCommandBuilder.py | 2 +- .../CommandBuilders/MakeDirsCommandBuilder.py | 2 +- .../PatchCsprojCommandBuilder.py | 2 +- .../PatchInfoplistCommandBuilder.py | 2 +- .../RemoveProjectCommandBuilder.py | 2 +- .../RestoreBackupCommandBuilder.py | 2 +- scripts/CommandBuilders/ShCommandBuilder.py | 2 +- .../TestflightCommandBuilder.py | 2 +- scripts/MANIFEST | 46 +++++++++---------- .../CleanBuildParser/test_cleanBuildParser.py | 2 +- .../CopyParser/test_copyArguments.py | 2 +- .../UnitTests/CopyParser/test_copyParser.py | 2 +- .../InstallProfile/test_installProfile.py | 2 +- .../MakeDirsParser/test_makeDirsParser.py | 2 +- .../ProjectParser/test_projectParser.py | 2 +- .../SettingsParser/test_PathParser.py | 2 +- .../SettingsParser/test_SettingsLineParser.py | 2 +- .../SettingsParser/test_SettingsParser.py | 2 +- .../UnitTests/ShParser/test_shPareser.py | 2 +- .../TestflightParser/test_testflightParser.py | 2 +- scripts/build | 3 -- .../BackupParser/CreateBackupArguments.py | 11 ----- .../parser/BackupParser/CreateBackupParser.py | 32 ------------- .../parser/BackupParser/DeleteBackupParser.py | 23 ---------- .../BackupParser/RestoreBackupParser.py | 24 ---------- scripts/parser/__init__.py | 1 - .../{parser => parsers}/CleanBuildParser.py | 2 +- .../CopyParser/CopyArguments.py | 0 .../CopyParser/CopyLineParser.py | 4 +- .../CopyParser}/__init__.py | 0 .../InsideParser/InsideRemoveParser.py | 2 +- .../InsideParser/InsideSetParser.py | 2 +- .../InsideParser}/__init__.py | 0 .../InstallProfileParser.py | 4 +- scripts/{parser => parsers}/LineParser.py | 0 scripts/{parser => parsers}/MakeDirsParser.py | 2 +- .../SettingsParser/PathParser.py | 0 .../SettingsParser/SettingsLineParser.py | 4 +- .../SettingsParser/SettingsMerger.py | 0 .../SettingsParser/SettingsParser.py | 4 +- .../SettingsParser}/__init__.py | 0 scripts/{parser => parsers}/ShParser.py | 2 +- .../{parser => parsers}/TestflightParser.py | 2 +- .../SettingsParser => parsers}/__init__.py | 0 scripts/setup.py | 8 ++-- scripts/utils/IncludeProcessor.py | 2 +- .../CmdArgsOverriderSettingsProvider.py | 2 +- .../FromFileSettingsProvider.py | 2 +- 52 files changed, 68 insertions(+), 160 deletions(-) delete mode 100644 scripts/build delete mode 100644 scripts/parser/BackupParser/CreateBackupArguments.py delete mode 100644 scripts/parser/BackupParser/CreateBackupParser.py delete mode 100644 scripts/parser/BackupParser/DeleteBackupParser.py delete mode 100644 scripts/parser/BackupParser/RestoreBackupParser.py delete mode 100644 scripts/parser/__init__.py rename scripts/{parser => parsers}/CleanBuildParser.py (95%) rename scripts/{parser => parsers}/CopyParser/CopyArguments.py (100%) rename scripts/{parser => parsers}/CopyParser/CopyLineParser.py (86%) rename scripts/{parser/BackupParser => parsers/CopyParser}/__init__.py (100%) rename scripts/{parser => parsers}/InsideParser/InsideRemoveParser.py (92%) rename scripts/{parser => parsers}/InsideParser/InsideSetParser.py (93%) rename scripts/{parser/CopyParser => parsers/InsideParser}/__init__.py (100%) rename scripts/{parser => parsers}/InstallProfileParser.py (87%) rename scripts/{parser => parsers}/LineParser.py (100%) rename scripts/{parser => parsers}/MakeDirsParser.py (92%) rename scripts/{parser => parsers}/SettingsParser/PathParser.py (100%) rename scripts/{parser => parsers}/SettingsParser/SettingsLineParser.py (86%) rename scripts/{parser => parsers}/SettingsParser/SettingsMerger.py (100%) rename scripts/{parser => parsers}/SettingsParser/SettingsParser.py (76%) rename scripts/{parser/InsideParser => parsers/SettingsParser}/__init__.py (100%) rename scripts/{parser => parsers}/ShParser.py (92%) rename scripts/{parser => parsers}/TestflightParser.py (93%) rename scripts/{parser/SettingsParser => parsers}/__init__.py (100%) diff --git a/scripts/CommandBuilders/CleanBuildCommandBuilder.py b/scripts/CommandBuilders/CleanBuildCommandBuilder.py index 545c61f..06d86db 100644 --- a/scripts/CommandBuilders/CleanBuildCommandBuilder.py +++ b/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: diff --git a/scripts/CommandBuilders/CopyCommandBuilder.py b/scripts/CommandBuilders/CopyCommandBuilder.py index f4e735b..bc1b1bd 100644 --- a/scripts/CommandBuilders/CopyCommandBuilder.py +++ b/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: diff --git a/scripts/CommandBuilders/CreateBackupCommandBuilder.py b/scripts/CommandBuilders/CreateBackupCommandBuilder.py index 74688b5..fdb8ce1 100644 --- a/scripts/CommandBuilders/CreateBackupCommandBuilder.py +++ b/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: diff --git a/scripts/CommandBuilders/DeleteBackupCommandBuilder.py b/scripts/CommandBuilders/DeleteBackupCommandBuilder.py index 04f869b..aca9028 100644 --- a/scripts/CommandBuilders/DeleteBackupCommandBuilder.py +++ b/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: diff --git a/scripts/CommandBuilders/InstallProfileCommandBuilder.py b/scripts/CommandBuilders/InstallProfileCommandBuilder.py index f477259..1e9668b 100644 --- a/scripts/CommandBuilders/InstallProfileCommandBuilder.py +++ b/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: diff --git a/scripts/CommandBuilders/MakeDirsCommandBuilder.py b/scripts/CommandBuilders/MakeDirsCommandBuilder.py index d589888..2d2663e 100644 --- a/scripts/CommandBuilders/MakeDirsCommandBuilder.py +++ b/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: diff --git a/scripts/CommandBuilders/PatchCsprojCommandBuilder.py b/scripts/CommandBuilders/PatchCsprojCommandBuilder.py index 1901be6..190f17e 100644 --- a/scripts/CommandBuilders/PatchCsprojCommandBuilder.py +++ b/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: diff --git a/scripts/CommandBuilders/PatchInfoplistCommandBuilder.py b/scripts/CommandBuilders/PatchInfoplistCommandBuilder.py index 466c5b4..75af291 100644 --- a/scripts/CommandBuilders/PatchInfoplistCommandBuilder.py +++ b/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: diff --git a/scripts/CommandBuilders/RemoveProjectCommandBuilder.py b/scripts/CommandBuilders/RemoveProjectCommandBuilder.py index 9288aa6..b81482f 100644 --- a/scripts/CommandBuilders/RemoveProjectCommandBuilder.py +++ b/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: diff --git a/scripts/CommandBuilders/RestoreBackupCommandBuilder.py b/scripts/CommandBuilders/RestoreBackupCommandBuilder.py index 59768d9..a0afc02 100644 --- a/scripts/CommandBuilders/RestoreBackupCommandBuilder.py +++ b/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: diff --git a/scripts/CommandBuilders/ShCommandBuilder.py b/scripts/CommandBuilders/ShCommandBuilder.py index 8301a32..b555582 100644 --- a/scripts/CommandBuilders/ShCommandBuilder.py +++ b/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: diff --git a/scripts/CommandBuilders/TestflightCommandBuilder.py b/scripts/CommandBuilders/TestflightCommandBuilder.py index b1a3296..981a413 100644 --- a/scripts/CommandBuilders/TestflightCommandBuilder.py +++ b/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: diff --git a/scripts/MANIFEST b/scripts/MANIFEST index 630d501..2ea4682 100644 --- a/scripts/MANIFEST +++ b/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 diff --git a/scripts/Tests/UnitTests/CleanBuildParser/test_cleanBuildParser.py b/scripts/Tests/UnitTests/CleanBuildParser/test_cleanBuildParser.py index 18c6065..d0d025c 100644 --- a/scripts/Tests/UnitTests/CleanBuildParser/test_cleanBuildParser.py +++ b/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): diff --git a/scripts/Tests/UnitTests/CopyParser/test_copyArguments.py b/scripts/Tests/UnitTests/CopyParser/test_copyArguments.py index e610773..e549199 100644 --- a/scripts/Tests/UnitTests/CopyParser/test_copyArguments.py +++ b/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): diff --git a/scripts/Tests/UnitTests/CopyParser/test_copyParser.py b/scripts/Tests/UnitTests/CopyParser/test_copyParser.py index 60e54ca..9cb7a12 100644 --- a/scripts/Tests/UnitTests/CopyParser/test_copyParser.py +++ b/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): diff --git a/scripts/Tests/UnitTests/InstallProfile/test_installProfile.py b/scripts/Tests/UnitTests/InstallProfile/test_installProfile.py index 56d0631..ba9313f 100644 --- a/scripts/Tests/UnitTests/InstallProfile/test_installProfile.py +++ b/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): diff --git a/scripts/Tests/UnitTests/MakeDirsParser/test_makeDirsParser.py b/scripts/Tests/UnitTests/MakeDirsParser/test_makeDirsParser.py index 6e1178a..655820c 100644 --- a/scripts/Tests/UnitTests/MakeDirsParser/test_makeDirsParser.py +++ b/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): diff --git a/scripts/Tests/UnitTests/ProjectParser/test_projectParser.py b/scripts/Tests/UnitTests/ProjectParser/test_projectParser.py index b1a6afe..9456623 100644 --- a/scripts/Tests/UnitTests/ProjectParser/test_projectParser.py +++ b/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): diff --git a/scripts/Tests/UnitTests/SettingsParser/test_PathParser.py b/scripts/Tests/UnitTests/SettingsParser/test_PathParser.py index 96471aa..26388bf 100644 --- a/scripts/Tests/UnitTests/SettingsParser/test_PathParser.py +++ b/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): diff --git a/scripts/Tests/UnitTests/SettingsParser/test_SettingsLineParser.py b/scripts/Tests/UnitTests/SettingsParser/test_SettingsLineParser.py index f4fdcaf..da2be49 100644 --- a/scripts/Tests/UnitTests/SettingsParser/test_SettingsLineParser.py +++ b/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): diff --git a/scripts/Tests/UnitTests/SettingsParser/test_SettingsParser.py b/scripts/Tests/UnitTests/SettingsParser/test_SettingsParser.py index 23af627..c8081f5 100644 --- a/scripts/Tests/UnitTests/SettingsParser/test_SettingsParser.py +++ b/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 diff --git a/scripts/Tests/UnitTests/ShParser/test_shPareser.py b/scripts/Tests/UnitTests/ShParser/test_shPareser.py index f5eb030..7b10bad 100644 --- a/scripts/Tests/UnitTests/ShParser/test_shPareser.py +++ b/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): diff --git a/scripts/Tests/UnitTests/TestflightParser/test_testflightParser.py b/scripts/Tests/UnitTests/TestflightParser/test_testflightParser.py index 9b61ec2..e9c92a7 100644 --- a/scripts/Tests/UnitTests/TestflightParser/test_testflightParser.py +++ b/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): diff --git a/scripts/build b/scripts/build deleted file mode 100644 index 0f3fb6d..0000000 --- a/scripts/build +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env bash - -python setup.py sdist \ No newline at end of file diff --git a/scripts/parser/BackupParser/CreateBackupArguments.py b/scripts/parser/BackupParser/CreateBackupArguments.py deleted file mode 100644 index fbeea2b..0000000 --- a/scripts/parser/BackupParser/CreateBackupArguments.py +++ /dev/null @@ -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) - - diff --git a/scripts/parser/BackupParser/CreateBackupParser.py b/scripts/parser/BackupParser/CreateBackupParser.py deleted file mode 100644 index acf90ba..0000000 --- a/scripts/parser/BackupParser/CreateBackupParser.py +++ /dev/null @@ -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[^']+)'$" - - 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 diff --git a/scripts/parser/BackupParser/DeleteBackupParser.py b/scripts/parser/BackupParser/DeleteBackupParser.py deleted file mode 100644 index 381a694..0000000 --- a/scripts/parser/BackupParser/DeleteBackupParser.py +++ /dev/null @@ -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 diff --git a/scripts/parser/BackupParser/RestoreBackupParser.py b/scripts/parser/BackupParser/RestoreBackupParser.py deleted file mode 100644 index 6dc834a..0000000 --- a/scripts/parser/BackupParser/RestoreBackupParser.py +++ /dev/null @@ -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 - diff --git a/scripts/parser/__init__.py b/scripts/parser/__init__.py deleted file mode 100644 index cc31abc..0000000 --- a/scripts/parser/__init__.py +++ /dev/null @@ -1 +0,0 @@ -__author__ = 'rzaitov' diff --git a/scripts/parser/CleanBuildParser.py b/scripts/parsers/CleanBuildParser.py similarity index 95% rename from scripts/parser/CleanBuildParser.py rename to scripts/parsers/CleanBuildParser.py index fc45994..2f7ed14 100644 --- a/scripts/parser/CleanBuildParser.py +++ b/scripts/parsers/CleanBuildParser.py @@ -1,6 +1,6 @@ import re -from parser.LineParser import LineParser +from parsers.LineParser import LineParser class CleanBuildParser(LineParser): diff --git a/scripts/parser/CopyParser/CopyArguments.py b/scripts/parsers/CopyParser/CopyArguments.py similarity index 100% rename from scripts/parser/CopyParser/CopyArguments.py rename to scripts/parsers/CopyParser/CopyArguments.py diff --git a/scripts/parser/CopyParser/CopyLineParser.py b/scripts/parsers/CopyParser/CopyLineParser.py similarity index 86% rename from scripts/parser/CopyParser/CopyLineParser.py rename to scripts/parsers/CopyParser/CopyLineParser.py index 4d77a66..9a99db9 100644 --- a/scripts/parser/CopyParser/CopyLineParser.py +++ b/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): diff --git a/scripts/parser/BackupParser/__init__.py b/scripts/parsers/CopyParser/__init__.py similarity index 100% rename from scripts/parser/BackupParser/__init__.py rename to scripts/parsers/CopyParser/__init__.py diff --git a/scripts/parser/InsideParser/InsideRemoveParser.py b/scripts/parsers/InsideParser/InsideRemoveParser.py similarity index 92% rename from scripts/parser/InsideParser/InsideRemoveParser.py rename to scripts/parsers/InsideParser/InsideRemoveParser.py index e533c7a..9618259 100644 --- a/scripts/parser/InsideParser/InsideRemoveParser.py +++ b/scripts/parsers/InsideParser/InsideRemoveParser.py @@ -1,6 +1,6 @@ import re -from parser.LineParser import LineParser +from parsers.LineParser import LineParser class InsideRemoveParser(LineParser): diff --git a/scripts/parser/InsideParser/InsideSetParser.py b/scripts/parsers/InsideParser/InsideSetParser.py similarity index 93% rename from scripts/parser/InsideParser/InsideSetParser.py rename to scripts/parsers/InsideParser/InsideSetParser.py index 1644a4d..cef95f6 100644 --- a/scripts/parser/InsideParser/InsideSetParser.py +++ b/scripts/parsers/InsideParser/InsideSetParser.py @@ -1,6 +1,6 @@ import re -from parser.LineParser import LineParser +from parsers.LineParser import LineParser class InsideSetParser(LineParser): diff --git a/scripts/parser/CopyParser/__init__.py b/scripts/parsers/InsideParser/__init__.py similarity index 100% rename from scripts/parser/CopyParser/__init__.py rename to scripts/parsers/InsideParser/__init__.py diff --git a/scripts/parser/InstallProfileParser.py b/scripts/parsers/InstallProfileParser.py similarity index 87% rename from scripts/parser/InstallProfileParser.py rename to scripts/parsers/InstallProfileParser.py index 2075bb3..d70797c 100644 --- a/scripts/parser/InstallProfileParser.py +++ b/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): diff --git a/scripts/parser/LineParser.py b/scripts/parsers/LineParser.py similarity index 100% rename from scripts/parser/LineParser.py rename to scripts/parsers/LineParser.py diff --git a/scripts/parser/MakeDirsParser.py b/scripts/parsers/MakeDirsParser.py similarity index 92% rename from scripts/parser/MakeDirsParser.py rename to scripts/parsers/MakeDirsParser.py index 2ec28ae..8345596 100644 --- a/scripts/parser/MakeDirsParser.py +++ b/scripts/parsers/MakeDirsParser.py @@ -1,6 +1,6 @@ import re -from parser.LineParser import LineParser +from parsers.LineParser import LineParser class MakeDirsParser(LineParser): diff --git a/scripts/parser/SettingsParser/PathParser.py b/scripts/parsers/SettingsParser/PathParser.py similarity index 100% rename from scripts/parser/SettingsParser/PathParser.py rename to scripts/parsers/SettingsParser/PathParser.py diff --git a/scripts/parser/SettingsParser/SettingsLineParser.py b/scripts/parsers/SettingsParser/SettingsLineParser.py similarity index 86% rename from scripts/parser/SettingsParser/SettingsLineParser.py rename to scripts/parsers/SettingsParser/SettingsLineParser.py index b3713e1..e7e6ca2 100644 --- a/scripts/parser/SettingsParser/SettingsLineParser.py +++ b/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): diff --git a/scripts/parser/SettingsParser/SettingsMerger.py b/scripts/parsers/SettingsParser/SettingsMerger.py similarity index 100% rename from scripts/parser/SettingsParser/SettingsMerger.py rename to scripts/parsers/SettingsParser/SettingsMerger.py diff --git a/scripts/parser/SettingsParser/SettingsParser.py b/scripts/parsers/SettingsParser/SettingsParser.py similarity index 76% rename from scripts/parser/SettingsParser/SettingsParser.py rename to scripts/parsers/SettingsParser/SettingsParser.py index 1e55f43..268d8d3 100644 --- a/scripts/parser/SettingsParser/SettingsParser.py +++ b/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: diff --git a/scripts/parser/InsideParser/__init__.py b/scripts/parsers/SettingsParser/__init__.py similarity index 100% rename from scripts/parser/InsideParser/__init__.py rename to scripts/parsers/SettingsParser/__init__.py diff --git a/scripts/parser/ShParser.py b/scripts/parsers/ShParser.py similarity index 92% rename from scripts/parser/ShParser.py rename to scripts/parsers/ShParser.py index 4a65cdb..6e39807 100644 --- a/scripts/parser/ShParser.py +++ b/scripts/parsers/ShParser.py @@ -1,6 +1,6 @@ import re -from parser.LineParser import LineParser +from parsers.LineParser import LineParser class ShParser(LineParser): diff --git a/scripts/parser/TestflightParser.py b/scripts/parsers/TestflightParser.py similarity index 93% rename from scripts/parser/TestflightParser.py rename to scripts/parsers/TestflightParser.py index 8ba1d91..b27f471 100644 --- a/scripts/parser/TestflightParser.py +++ b/scripts/parsers/TestflightParser.py @@ -1,4 +1,4 @@ -from parser.LineParser import LineParser +from parsers.LineParser import LineParser import re class TestflightParser(LineParser): diff --git a/scripts/parser/SettingsParser/__init__.py b/scripts/parsers/__init__.py similarity index 100% rename from scripts/parser/SettingsParser/__init__.py rename to scripts/parsers/__init__.py diff --git a/scripts/setup.py b/scripts/setup.py index c51cdf6..44f3582 100644 --- a/scripts/setup.py +++ b/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' ) diff --git a/scripts/utils/IncludeProcessor.py b/scripts/utils/IncludeProcessor.py index 32545e8..132c0dd 100644 --- a/scripts/utils/IncludeProcessor.py +++ b/scripts/utils/IncludeProcessor.py @@ -1,5 +1,5 @@ import re -from parser.LineParser import LineParser +from parsers.LineParser import LineParser class IncludeProcessor(LineParser): diff --git a/scripts/utils/SettingsProvider/CmdArgsOverriderSettingsProvider.py b/scripts/utils/SettingsProvider/CmdArgsOverriderSettingsProvider.py index 533c289..c9a7438 100644 --- a/scripts/utils/SettingsProvider/CmdArgsOverriderSettingsProvider.py +++ b/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: diff --git a/scripts/utils/SettingsProvider/FromFileSettingsProvider.py b/scripts/utils/SettingsProvider/FromFileSettingsProvider.py index 7164d9f..3fb9d6e 100644 --- a/scripts/utils/SettingsProvider/FromFileSettingsProvider.py +++ b/scripts/utils/SettingsProvider/FromFileSettingsProvider.py @@ -1,4 +1,4 @@ -from parser.SettingsParser.SettingsParser import SettingsParser +from parsers.SettingsParser.SettingsParser import SettingsParser class FromFileSettingsProvider: