From e18212094df1f780c3f877484a513c335a1e801f Mon Sep 17 00:00:00 2001 From: rzaitov Date: Fri, 1 Nov 2013 18:46:35 +0400 Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=B8?= =?UTF-8?q?=D0=BB=20=D0=BF=D1=80=D0=B5=D0=B4=D1=83=D0=BF=D1=80=D0=B5=D0=B6?= =?UTF-8?q?=D0=B4=D0=B5=D0=BD=D0=B8=D1=8F=20=D1=81=D1=82=D1=83=D0=B4=D0=B8?= =?UTF-8?q?=D0=B8=20=D1=80=D0=B0=D0=B7=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D0=BA?= =?UTF-8?q?=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scripts/CommandBuilders/CleanBuildCommandBuilder.py | 2 +- scripts/CommandBuilders/CopyCommandBuilder.py | 3 +++ scripts/CommandBuilders/CreateBackupCommandBuilder.py | 3 +++ scripts/CommandBuilders/DeleteBackupCommandBuilder.py | 3 +++ scripts/CommandBuilders/MakeDirsCommandBuilder.py | 3 +++ scripts/CommandBuilders/RemoveProjectCommandBuilder.py | 3 +++ scripts/CommandBuilders/RestoreBackupCommandBuilder.py | 3 +++ scripts/CommandBuilders/ShCommandBuilder.py | 3 +++ scripts/Tests/ManualTests/copy_test.py | 6 +----- scripts/Tests/ManualTests/create_backup_test.py | 6 +----- scripts/Tests/ManualTests/csproj_test.py | 5 +---- scripts/Tests/ManualTests/delete_backup_test.py | 6 +----- scripts/Tests/ManualTests/restore_backup_test.py | 6 +----- .../BuildConfigProvider/test_BuildConfigProvider.py | 1 - .../UnitTests/SettingsParser/test_SettingsParser.py | 1 + .../commands/CleanBuildCommands/CleanBuildCommandBase.py | 2 +- scripts/commands/DeleteBackupCommand.py | 3 +++ scripts/commands/PatchInfoPlistCommand.py | 2 +- scripts/commands/RemoveProjectCommand.py | 2 +- scripts/commands/RestoreBackupCommand.py | 3 +++ scripts/commands/TestflightCommand.py | 9 ++++++--- scripts/parser/BackupParser/CreateBackupParser.py | 1 + scripts/parser/BackupParser/DeleteBackupParser.py | 3 +++ scripts/parser/BackupParser/RestoreBackupParser.py | 3 +++ scripts/parser/CleanBuildParser.py | 3 ++- scripts/parser/CopyParser/CopyLineParser.py | 3 ++- scripts/parser/InsideParser/InsideRemoveParser.py | 3 ++- scripts/parser/InsideParser/InsideSetParser.py | 3 ++- scripts/parser/LineParser.py | 3 +++ scripts/parser/MakeDirsParser.py | 3 +++ scripts/parser/SettingsParser/PathParser.py | 3 +++ scripts/parser/SettingsParser/SettingsLineParser.py | 5 ++++- scripts/parser/SettingsParser/SettingsMerger.py | 5 ++++- scripts/parser/ShParser.py | 3 +++ scripts/taskRunner.py | 6 +++++- scripts/utils/BuildConfigProvider.py | 3 +++ scripts/utils/FromFileSettingsProvider.py | 3 +++ 37 files changed, 89 insertions(+), 39 deletions(-) diff --git a/scripts/CommandBuilders/CleanBuildCommandBuilder.py b/scripts/CommandBuilders/CleanBuildCommandBuilder.py index a4740b4..545c61f 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 import CleanBuildParser +from parser.CleanBuildParser import CleanBuildParser class CleanBuildCommandBuilder: diff --git a/scripts/CommandBuilders/CopyCommandBuilder.py b/scripts/CommandBuilders/CopyCommandBuilder.py index 297557f..f4e735b 100644 --- a/scripts/CommandBuilders/CopyCommandBuilder.py +++ b/scripts/CommandBuilders/CopyCommandBuilder.py @@ -3,6 +3,9 @@ from parser.CopyParser.CopyLineParser import CopyLineParser class CopyCommandBuilder: + def __init__(self): + pass + def isCopy(self, line): assert line is not None diff --git a/scripts/CommandBuilders/CreateBackupCommandBuilder.py b/scripts/CommandBuilders/CreateBackupCommandBuilder.py index 79b7cbb..74688b5 100644 --- a/scripts/CommandBuilders/CreateBackupCommandBuilder.py +++ b/scripts/CommandBuilders/CreateBackupCommandBuilder.py @@ -3,6 +3,9 @@ from parser.BackupParser.CreateBackupParser import CreateBackupParser class CreateBackupCommandBuilder: + def __init__(self): + pass + def isCreateBackup(self, line): assert line is not None diff --git a/scripts/CommandBuilders/DeleteBackupCommandBuilder.py b/scripts/CommandBuilders/DeleteBackupCommandBuilder.py index 49b8259..04f869b 100644 --- a/scripts/CommandBuilders/DeleteBackupCommandBuilder.py +++ b/scripts/CommandBuilders/DeleteBackupCommandBuilder.py @@ -3,6 +3,9 @@ from parser.BackupParser.DeleteBackupParser import DeleteBackupParser class DeleteBackupCommandBuilder: + def __init__(self): + pass + def isDeleteBackup(self, line): assert line is not None diff --git a/scripts/CommandBuilders/MakeDirsCommandBuilder.py b/scripts/CommandBuilders/MakeDirsCommandBuilder.py index f523e9f..d589888 100644 --- a/scripts/CommandBuilders/MakeDirsCommandBuilder.py +++ b/scripts/CommandBuilders/MakeDirsCommandBuilder.py @@ -3,6 +3,9 @@ from parser.MakeDirsParser import MakeDirsParser class MakeDirsCommandBuilder: + def __init__(self): + pass + def isMakeDirsCommand(self, line): assert line is not None diff --git a/scripts/CommandBuilders/RemoveProjectCommandBuilder.py b/scripts/CommandBuilders/RemoveProjectCommandBuilder.py index 5451b30..9288aa6 100644 --- a/scripts/CommandBuilders/RemoveProjectCommandBuilder.py +++ b/scripts/CommandBuilders/RemoveProjectCommandBuilder.py @@ -3,6 +3,9 @@ from parser.InsideParser.InsideRemoveParser import InsideRemoveParser class RemoveProjectCommandBuilder: + def __init__(self): + pass + def isRemoveProject(self, line): assert line is not None diff --git a/scripts/CommandBuilders/RestoreBackupCommandBuilder.py b/scripts/CommandBuilders/RestoreBackupCommandBuilder.py index 5dbdb34..59768d9 100644 --- a/scripts/CommandBuilders/RestoreBackupCommandBuilder.py +++ b/scripts/CommandBuilders/RestoreBackupCommandBuilder.py @@ -3,6 +3,9 @@ from parser.BackupParser.RestoreBackupParser import RestoreBackupParser class RestoreBackupCommandBuilder: + def __init__(self): + pass + def isRestoreBackup(self, line): assert line is not None diff --git a/scripts/CommandBuilders/ShCommandBuilder.py b/scripts/CommandBuilders/ShCommandBuilder.py index edcf924..8301a32 100644 --- a/scripts/CommandBuilders/ShCommandBuilder.py +++ b/scripts/CommandBuilders/ShCommandBuilder.py @@ -3,6 +3,9 @@ from parser.ShParser import ShParser class ShCommandBuilder: + def __init__(self): + pass + def isShCommand(self, line): assert line is not None diff --git a/scripts/Tests/ManualTests/copy_test.py b/scripts/Tests/ManualTests/copy_test.py index dd547eb..08680b3 100644 --- a/scripts/Tests/ManualTests/copy_test.py +++ b/scripts/Tests/ManualTests/copy_test.py @@ -1,13 +1,9 @@ from CommandBuilders.CopyCommandBuilder import CopyCommandBuilder -from Tests.ManualTests.path_provider import PathProvider line1 = "copy 'BuildSample/BuildSample.sln' to 'BuildSample/BuildSample.txt'" line2 = "copy 'BuildSample/BuildSample/Profiles/8F606DAE-F9C9-4A19-8EFF-34B990D76C28.mobileprovision' to '~/Library/MobileDevice/Provisioning Profiles/BuildScript.mobileprovision'" -baseDir = '../' -path_provider = PathProvider(baseDir) - -copyCmdBuilder = CopyCommandBuilder(path_provider) +copyCmdBuilder = CopyCommandBuilder() #copyCmdToRel = copyCmdBuilder.getCommandFor(line1) #copyCmdToRel.execute() diff --git a/scripts/Tests/ManualTests/create_backup_test.py b/scripts/Tests/ManualTests/create_backup_test.py index 4761f7c..48bc235 100644 --- a/scripts/Tests/ManualTests/create_backup_test.py +++ b/scripts/Tests/ManualTests/create_backup_test.py @@ -1,12 +1,8 @@ from CommandBuilders.CreateBackupCommandBuilder import CreateBackupCommandBuilder -from Tests.ManualTests.path_provider import PathProvider line = "create backup for 'BuildSample'" -baseDir = '../' -path_provider = PathProvider(baseDir) - -cmdBuilder = CreateBackupCommandBuilder(path_provider) +cmdBuilder = CreateBackupCommandBuilder() command = cmdBuilder.getCommandFor(line) command.execute() \ No newline at end of file diff --git a/scripts/Tests/ManualTests/csproj_test.py b/scripts/Tests/ManualTests/csproj_test.py index 30bdfbe..c307d0a 100644 --- a/scripts/Tests/ManualTests/csproj_test.py +++ b/scripts/Tests/ManualTests/csproj_test.py @@ -1,14 +1,11 @@ from CommandBuilders.PatchCsprojCommandBuilder import PatchCsprojCommandBuilder -from Tests.ManualTests.path_provider import PathProvider from commands.ValueProvider import ValueProvider config = {'sln_config' : 'Release|iPhone'} line = "inside 'BuildSample/BuildSample/CoolApp.csproj' set OutputPath to 'Output'" -base_dir = '../' -path_provider = PathProvider(base_dir) value_provider = ValueProvider(config) -builder = PatchCsprojCommandBuilder(config, path_provider, value_provider) +builder = PatchCsprojCommandBuilder(config, value_provider) command = builder.getCommandFor(line) command.execute() \ No newline at end of file diff --git a/scripts/Tests/ManualTests/delete_backup_test.py b/scripts/Tests/ManualTests/delete_backup_test.py index e922c55..4c312c4 100644 --- a/scripts/Tests/ManualTests/delete_backup_test.py +++ b/scripts/Tests/ManualTests/delete_backup_test.py @@ -1,12 +1,8 @@ from CommandBuilders.DeleteBackupCommandBuilder import DeleteBackupCommandBuilder -from Tests.ManualTests.path_provider import PathProvider line = "delete backup" -baseDir = '../' -path_provider = PathProvider(baseDir) - -cmdBuilder = DeleteBackupCommandBuilder(path_provider) +cmdBuilder = DeleteBackupCommandBuilder() command = cmdBuilder.getCommandFor(line) command.execute() \ No newline at end of file diff --git a/scripts/Tests/ManualTests/restore_backup_test.py b/scripts/Tests/ManualTests/restore_backup_test.py index 7ad5520..a61e390 100644 --- a/scripts/Tests/ManualTests/restore_backup_test.py +++ b/scripts/Tests/ManualTests/restore_backup_test.py @@ -1,12 +1,8 @@ from CommandBuilders.RestoreBackupCommandBuilder import RestoreBackupCommandBuilder -from Tests.ManualTests.path_provider import PathProvider line = "restore from backup" -baseDir = '../' -path_provider = PathProvider(baseDir) - -builder = RestoreBackupCommandBuilder(path_provider) +builder = RestoreBackupCommandBuilder() command = builder.getCommandFor(line) command.execute() diff --git a/scripts/Tests/UnitTests/BuildConfigProvider/test_BuildConfigProvider.py b/scripts/Tests/UnitTests/BuildConfigProvider/test_BuildConfigProvider.py index 5c0556e..66fff02 100644 --- a/scripts/Tests/UnitTests/BuildConfigProvider/test_BuildConfigProvider.py +++ b/scripts/Tests/UnitTests/BuildConfigProvider/test_BuildConfigProvider.py @@ -1,5 +1,4 @@ import unittest -from utils import BuildConfigProvider from utils.BuildConfigProvider import BuildConfigProvider diff --git a/scripts/Tests/UnitTests/SettingsParser/test_SettingsParser.py b/scripts/Tests/UnitTests/SettingsParser/test_SettingsParser.py index b391cc3..23af627 100644 --- a/scripts/Tests/UnitTests/SettingsParser/test_SettingsParser.py +++ b/scripts/Tests/UnitTests/SettingsParser/test_SettingsParser.py @@ -40,6 +40,7 @@ class TestSettingsParser(unittest.TestCase): def test_emptyLinesAndComments(self): class PartialSettingsParser(SettingsParser): def __init__(self): + SettingsParser.__init__(self) self.processLineCall = 0 def processLine(self, line): diff --git a/scripts/commands/CleanBuildCommands/CleanBuildCommandBase.py b/scripts/commands/CleanBuildCommands/CleanBuildCommandBase.py index 60fc025..8bed240 100644 --- a/scripts/commands/CleanBuildCommands/CleanBuildCommandBase.py +++ b/scripts/commands/CleanBuildCommands/CleanBuildCommandBase.py @@ -15,4 +15,4 @@ class CleanBuildCommandBase: def execute(self): cmdText = self.__commandPattern.format(self.__pathToBuildUtil, self.__slnConfig, self.__slnPath) - returnCode = call(cmdText, shell=True) + call(cmdText, shell=True) diff --git a/scripts/commands/DeleteBackupCommand.py b/scripts/commands/DeleteBackupCommand.py index 5246d1a..ac5dddc 100644 --- a/scripts/commands/DeleteBackupCommand.py +++ b/scripts/commands/DeleteBackupCommand.py @@ -2,6 +2,9 @@ import os import shutil class DeleteBackupCommand: + def __init__(self): + pass + def execute(self): dirs = [name for name in os.listdir('.') if os.path.isdir(os.path.join('.', name)) & name.startswith('backup.')] for d in dirs: diff --git a/scripts/commands/PatchInfoPlistCommand.py b/scripts/commands/PatchInfoPlistCommand.py index f75a4e2..c16987b 100644 --- a/scripts/commands/PatchInfoPlistCommand.py +++ b/scripts/commands/PatchInfoPlistCommand.py @@ -1,4 +1,4 @@ -from utils import InfoPlistPatcher +from utils.InfoPlistPatcher import InfoPlistPatcher class PatchInfoPlistCommand(): diff --git a/scripts/commands/RemoveProjectCommand.py b/scripts/commands/RemoveProjectCommand.py index 7177673..858d205 100644 --- a/scripts/commands/RemoveProjectCommand.py +++ b/scripts/commands/RemoveProjectCommand.py @@ -1,4 +1,4 @@ -from utils import SlnPatcher +from utils.SlnPatcher import SlnPatcher class RemoveProjectCommand: diff --git a/scripts/commands/RestoreBackupCommand.py b/scripts/commands/RestoreBackupCommand.py index f92362a..dfb9247 100644 --- a/scripts/commands/RestoreBackupCommand.py +++ b/scripts/commands/RestoreBackupCommand.py @@ -3,6 +3,9 @@ import shutil class RestoreBackupCommand: + def __init__(self): + pass + def execute(self): dirPairs = [(name, "backup.{0}".format(name)) for name in os.listdir('.') if os.path.isdir(name) and not name.startswith('backup.')] diff --git a/scripts/commands/TestflightCommand.py b/scripts/commands/TestflightCommand.py index 6f1e86f..1780ab4 100644 --- a/scripts/commands/TestflightCommand.py +++ b/scripts/commands/TestflightCommand.py @@ -2,8 +2,11 @@ from utils.TestflightPublisher import TestFlightPublisher class PublishToTestFlightCommand: - def __init__(self, api_token, team_token, notes): - self._publisher = TestFlightPublisher(api_token, team_token, notes) + def __init__(self, pathToFile, api_token, team_token, notes): + assert pathToFile is not None + + self.__pathToFile = pathToFile + self.__publisher = TestFlightPublisher(api_token, team_token, notes) def execute(self): - self._publisher.Publish() \ No newline at end of file + self.__publisher.Publish(self.__pathToFile) diff --git a/scripts/parser/BackupParser/CreateBackupParser.py b/scripts/parser/BackupParser/CreateBackupParser.py index e45cc5e..c1c10ba 100644 --- a/scripts/parser/BackupParser/CreateBackupParser.py +++ b/scripts/parser/BackupParser/CreateBackupParser.py @@ -6,6 +6,7 @@ from parser.LineParser import LineParser class CreateBackupParser(LineParser): def __init__(self): + LineParser.__init__(self) self.__createBackupArguments = CreateBackupArguments() def parseLine(self, line): diff --git a/scripts/parser/BackupParser/DeleteBackupParser.py b/scripts/parser/BackupParser/DeleteBackupParser.py index 830a9ef..381a694 100644 --- a/scripts/parser/BackupParser/DeleteBackupParser.py +++ b/scripts/parser/BackupParser/DeleteBackupParser.py @@ -4,6 +4,9 @@ from parser.LineParser import LineParser class DeleteBackupParser(LineParser): + def __init__(self): + LineParser.__init__(self) + def parseLine(self, line): assert line is not None diff --git a/scripts/parser/BackupParser/RestoreBackupParser.py b/scripts/parser/BackupParser/RestoreBackupParser.py index fe0b3ef..6dc834a 100644 --- a/scripts/parser/BackupParser/RestoreBackupParser.py +++ b/scripts/parser/BackupParser/RestoreBackupParser.py @@ -4,6 +4,9 @@ from parser.LineParser import LineParser class RestoreBackupParser(LineParser): + def __init__(self): + LineParser.__init__(self) + def parseLine(self, line): assert line is not None diff --git a/scripts/parser/CleanBuildParser.py b/scripts/parser/CleanBuildParser.py index d0461a0..3499d92 100644 --- a/scripts/parser/CleanBuildParser.py +++ b/scripts/parser/CleanBuildParser.py @@ -5,6 +5,7 @@ from parser.LineParser import LineParser class CleanBuildParser(LineParser): def __init__(self, commandToken): + LineParser.__init__(self) assert commandToken is not None self.__commandToken = commandToken @@ -24,7 +25,7 @@ class CleanBuildParser(LineParser): path = match.group('path') slnConfig = match.group('config') - return (path, slnConfig) + return path, slnConfig def isValidLine(self, line): assert line is not None diff --git a/scripts/parser/CopyParser/CopyLineParser.py b/scripts/parser/CopyParser/CopyLineParser.py index 729f4f2..7aa179a 100644 --- a/scripts/parser/CopyParser/CopyLineParser.py +++ b/scripts/parser/CopyParser/CopyLineParser.py @@ -6,6 +6,7 @@ from parser.LineParser import LineParser class CopyLineParser(LineParser): def __init__(self): + LineParser.__init__(self) self.__copyArguments = CopyArguments() def parseLine(self, line): @@ -29,5 +30,5 @@ class CopyLineParser(LineParser): def isValidLine(self, line): assert line is not None - isValid = line.startswith("copy"); + isValid = line.startswith("copy") return isValid \ No newline at end of file diff --git a/scripts/parser/InsideParser/InsideRemoveParser.py b/scripts/parser/InsideParser/InsideRemoveParser.py index 77b7534..97b0a73 100644 --- a/scripts/parser/InsideParser/InsideRemoveParser.py +++ b/scripts/parser/InsideParser/InsideRemoveParser.py @@ -5,6 +5,7 @@ from parser.LineParser import LineParser class InsideRemoveParser(LineParser): def __init__(self, fileExt): + LineParser.__init__(self) assert fileExt is not None self.__extension = fileExt @@ -24,7 +25,7 @@ class InsideRemoveParser(LineParser): filePath = match.group('file') projectName = match.group('project') - return (filePath, projectName) + return filePath, projectName def isValidLine(self, line): regexpSrc = r"inside\s+'[./ a-zA-Z]+\.{0}'\s+remove".format(self.__extension) diff --git a/scripts/parser/InsideParser/InsideSetParser.py b/scripts/parser/InsideParser/InsideSetParser.py index a5ac3ff..c184137 100644 --- a/scripts/parser/InsideParser/InsideSetParser.py +++ b/scripts/parser/InsideParser/InsideSetParser.py @@ -5,6 +5,7 @@ from parser.LineParser import LineParser class InsideSetParser(LineParser): def __init__(self, value_provider, fileExt): + LineParser.__init__(self) assert value_provider is not None self.__value_provider = value_provider @@ -27,7 +28,7 @@ class InsideSetParser(LineParser): key = match.group('key') value = match.group('value') - return (filePath, key, value) + return filePath, key, value def isValidLine(self, line): regexpSrc = r"inside\s+'[./ a-zA-Z]+\.{0}'\s+set".format(self.__extension) diff --git a/scripts/parser/LineParser.py b/scripts/parser/LineParser.py index ef5e2cb..d68196a 100644 --- a/scripts/parser/LineParser.py +++ b/scripts/parser/LineParser.py @@ -1,4 +1,7 @@ class LineParser: + def __init__(self): + pass + def parseLine(self, line): assert line is not None pass diff --git a/scripts/parser/MakeDirsParser.py b/scripts/parser/MakeDirsParser.py index cd68c4d..1886c31 100644 --- a/scripts/parser/MakeDirsParser.py +++ b/scripts/parser/MakeDirsParser.py @@ -4,6 +4,9 @@ from parser.LineParser import LineParser class MakeDirsParser(LineParser): + def __init__(self): + LineParser.__init__(self) + def parseLine(self, line): pathRegexp = r"'(?P[^']+)'$" diff --git a/scripts/parser/SettingsParser/PathParser.py b/scripts/parser/SettingsParser/PathParser.py index 6ac3a6b..f0852fa 100644 --- a/scripts/parser/SettingsParser/PathParser.py +++ b/scripts/parser/SettingsParser/PathParser.py @@ -1,4 +1,7 @@ class PathParser: + def __init__(self): + pass + def parse(self, line): assert line is not None diff --git a/scripts/parser/SettingsParser/SettingsLineParser.py b/scripts/parser/SettingsParser/SettingsLineParser.py index aaaa872..bef23b6 100644 --- a/scripts/parser/SettingsParser/SettingsLineParser.py +++ b/scripts/parser/SettingsParser/SettingsLineParser.py @@ -5,6 +5,9 @@ from parser.SettingsParser.PathParser import PathParser class SettingsLineParser(LineParser): + def __init__(self): + LineParser.__init__(self) + def parseLine(self, line): assert line is not None @@ -37,4 +40,4 @@ class SettingsLineParser(LineParser): propPath = match.group('prop_path') value = match.group('value') - return (propPath, value) \ No newline at end of file + return propPath, value \ No newline at end of file diff --git a/scripts/parser/SettingsParser/SettingsMerger.py b/scripts/parser/SettingsParser/SettingsMerger.py index c3cd2f8..755e6ff 100644 --- a/scripts/parser/SettingsParser/SettingsMerger.py +++ b/scripts/parser/SettingsParser/SettingsMerger.py @@ -1,4 +1,7 @@ class SettingsMerger: + def __init__(self): + pass + def merge(self, globalSettings, settingDescription): value = settingDescription['value'] segments = settingDescription['segments'] @@ -25,7 +28,7 @@ class SettingsMerger: def overrideGuard(self, dictionary, key, path): if key in dictionary: - pathStr = '.'.joun(path) + pathStr = '.'.join(path) msg = 'settings with name {0} by path {1} already exists with value {3}'.format(key, dictionary[key], pathStr) raise Exception(msg) diff --git a/scripts/parser/ShParser.py b/scripts/parser/ShParser.py index 0067883..4ef3050 100644 --- a/scripts/parser/ShParser.py +++ b/scripts/parser/ShParser.py @@ -4,6 +4,9 @@ from parser.LineParser import LineParser class ShParser(LineParser): + def __init__(self): + LineParser.__init__(self) + def parseLine(self, line): assert line diff --git a/scripts/taskRunner.py b/scripts/taskRunner.py index 7c148f5..f9f73a3 100644 --- a/scripts/taskRunner.py +++ b/scripts/taskRunner.py @@ -1,5 +1,6 @@ import os -from utils import BuildConfigProvider, FromFileSettingsProvider +from utils.BuildConfigProvider import BuildConfigProvider +from utils.FromFileSettingsProvider import FromFileSettingsProvider scriptFilePath = os.path.abspath(__file__) @@ -12,6 +13,9 @@ from StepRunner.StepsRunner import StepsRunner class TaskRunner: + def __init__(self): + pass + def run(self): settingsProvider = FromFileSettingsProvider() settings = settingsProvider.fetchSettings() diff --git a/scripts/utils/BuildConfigProvider.py b/scripts/utils/BuildConfigProvider.py index bdc1af7..e65edd0 100644 --- a/scripts/utils/BuildConfigProvider.py +++ b/scripts/utils/BuildConfigProvider.py @@ -1,4 +1,7 @@ class BuildConfigProvider: + def __init__(self): + pass + def getConfigs(self, rootConfig): leafs = [] self.traverseDict(None, rootConfig, leafs) diff --git a/scripts/utils/FromFileSettingsProvider.py b/scripts/utils/FromFileSettingsProvider.py index 65ad292..7164d9f 100644 --- a/scripts/utils/FromFileSettingsProvider.py +++ b/scripts/utils/FromFileSettingsProvider.py @@ -2,6 +2,9 @@ from parser.SettingsParser.SettingsParser import SettingsParser class FromFileSettingsProvider: + def __init__(self): + pass + def fetchSettings(self): settingsFile = open('scripts/settings.txt') content = settingsFile.read()