From 8d3d91e644e633c7bf616500a2d5758f77be1891 Mon Sep 17 00:00:00 2001 From: rzaitov Date: Fri, 1 Nov 2013 15:16: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=BA=D0=BE=D0=BC=D0=B0=D0=BD=D0=B4=D1=83=20=D1=83=D0=B4=D0=B0?= =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D0=B8=D1=8F=20=D0=B8=D0=B7=20=D0=B1=D1=8D?= =?UTF-8?q?=D0=BA=D0=B0=D0=BF=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scripts/CommandBuilders/DeleteBackupCommandBuilder.py | 6 +----- scripts/IosSteps.txt | 1 + scripts/StepRunner/StepsRunner.py | 5 +++++ scripts/commands/DeleteBackupCommand.py | 9 +-------- 4 files changed, 8 insertions(+), 13 deletions(-) diff --git a/scripts/CommandBuilders/DeleteBackupCommandBuilder.py b/scripts/CommandBuilders/DeleteBackupCommandBuilder.py index 0e9eb76..49b8259 100644 --- a/scripts/CommandBuilders/DeleteBackupCommandBuilder.py +++ b/scripts/CommandBuilders/DeleteBackupCommandBuilder.py @@ -3,10 +3,6 @@ from parser.BackupParser.DeleteBackupParser import DeleteBackupParser class DeleteBackupCommandBuilder: - def __init__(self, pathProvider): - assert pathProvider is not None - self.__pathProvider = pathProvider - def isDeleteBackup(self, line): assert line is not None @@ -21,5 +17,5 @@ class DeleteBackupCommandBuilder: parser = DeleteBackupParser() parser.parseLine(line) - command = DeleteBackupCommand(self.__pathProvider) + command = DeleteBackupCommand() return command diff --git a/scripts/IosSteps.txt b/scripts/IosSteps.txt index 935e91b..b8df53e 100644 --- a/scripts/IosSteps.txt +++ b/scripts/IosSteps.txt @@ -16,5 +16,6 @@ copy 'BuildSample/BuildSample/Output/BuildSample-1.2.3.ipa' to 'Output/Appstore/ sh cp -a BuildSample/BuildSample/Output/ Output/Appstore/ restore from backup +delete backup sh echo hello from Rustam \ No newline at end of file diff --git a/scripts/StepRunner/StepsRunner.py b/scripts/StepRunner/StepsRunner.py index 542cbe0..b805fc7 100644 --- a/scripts/StepRunner/StepsRunner.py +++ b/scripts/StepRunner/StepsRunner.py @@ -1,6 +1,7 @@ from CommandBuilders.CleanBuildCommandBuilder import CleanBuildCommandBuilder from CommandBuilders.CopyCommandBuilder import CopyCommandBuilder from CommandBuilders.CreateBackupCommandBuilder import CreateBackupCommandBuilder +from CommandBuilders.DeleteBackupCommandBuilder import DeleteBackupCommandBuilder from CommandBuilders.MakeDirsCommandBuilder import MakeDirsCommandBuilder from CommandBuilders.PatchCsprojCommandBuilder import PatchCsprojCommandBuilder from CommandBuilders.PatchInfoplistCommandBuilder import PatchInfoplistCommandBuilder @@ -20,6 +21,7 @@ class StepsRunner: self.removeProjectBuilder = RemoveProjectCommandBuilder() self.createBackupBuilder = CreateBackupCommandBuilder() self.restoreFromBackupBuilder = RestoreBackupCommandBuilder() + self.deleteBackupBuilder = DeleteBackupCommandBuilder() self.createDirs = MakeDirsCommandBuilder() self.patchCsproj = PatchCsprojCommandBuilder(config, self.valueProvider) self.patchInfoPlist = PatchInfoplistCommandBuilder(self.valueProvider) @@ -74,6 +76,9 @@ class StepsRunner: elif self.restoreFromBackupBuilder.isRestoreBackup(line): cmd = self.restoreFromBackupBuilder.getCommandFor(line) cmd.execute() + elif self.deleteBackupBuilder.isDeleteBackup(line): + cmd =self.deleteBackupBuilder.getCommandFor(line) + cmd.execute() else: msg = "unrecognised step. Line: '{0}'".format(line) raise Exception(msg) \ No newline at end of file diff --git a/scripts/commands/DeleteBackupCommand.py b/scripts/commands/DeleteBackupCommand.py index 6eb9735..c34add1 100644 --- a/scripts/commands/DeleteBackupCommand.py +++ b/scripts/commands/DeleteBackupCommand.py @@ -2,14 +2,7 @@ import os import shutil class DeleteBackupCommand: - def __init__(self, pathProvider): - assert pathProvider is not None - - self.__pathProvider = pathProvider - def execute(self): - baseDir = self.__pathProvider.resolveAbsPath('.') - - dirs = [self.__pathProvider.resolveAbsPath(name) for name in os.listdir(baseDir) if os.path.isdir(os.path.join(baseDir, name)) & name.startswith('backup.')] + dirs = [name for name in os.listdir('.') if os.path.isdir(os.path.join('.', name)) & name.startswith('backup.')] for dir in dirs: shutil.rmtree(dir) \ No newline at end of file