убрал неиспользуемый класс

scripts/TouchinBuild/CommandBuilders/CreateBackupCommandBuilder.py

@@ -16,7 +16,7 @@ class CreateBackupCommandBuilder:
 		assert line is not None
 
 		parser = CreateBackupParser()
-		backupArguments = parser.parseLine(line)
+		folderPath = parser.parseLine(line)
 
-		command = CreateBackupCommand(backupArguments)
+		command = CreateBackupCommand(folderPath)
 		return command

scripts/TouchinBuild/CommandBuilders/DeleteBackupCommandBuilder.py

@@ -18,7 +18,7 @@ class DeleteBackupCommandBuilder:
 		assert line is not None
 
 		parser = DeleteBackupParser()
-		backupArguments = parser.parseLine(line)
+		folderPath = parser.parseLine(line)
 
-		command = DeleteBackupCommand(backupArguments)
+		command = DeleteBackupCommand(folderPath)
 		return command

scripts/TouchinBuild/CommandBuilders/RestoreBackupCommandBuilder.py

@@ -18,7 +18,7 @@ class RestoreBackupCommandBuilder:
 		assert line is not None
 
 		parser = RestoreBackupParser()
-		backupArguments = parser.parseLine(line)
+		folderPath = parser.parseLine(line)
 
-		command = RestoreBackupCommand(backupArguments)
+		command = RestoreBackupCommand(folderPath)
 		return command

scripts/TouchinBuild/Tests/ManualTests/create_backup_test.py

@@ -1,6 +1,6 @@
 from CommandBuilders.CreateBackupCommandBuilder import CreateBackupCommandBuilder
 
-line = "create backup for 'BuildSample'"
+line = "create backup for '.'"
 
 cmdBuilder = CreateBackupCommandBuilder()
 command = cmdBuilder.getCommandFor(line)

scripts/TouchinBuild/Tests/UnitTests/ParserBackup/test_create_backup.py

@@ -8,18 +8,18 @@ class TestCreateBackup(unittest.TestCase):
 
 	def test_parseCurrentDir(self):
 		line = "create   backup  for    '.'"
-		backupArg = self.parser.parseLine(line)
+		folderPath = self.parser.parseLine(line)
 
-		self.assertEqual('.', backupArg.folderPath)
+		self.assertEqual('.', folderPath)
 
 	def test_parseRelativePath(self):
 		line = "create backup for '../Some/Path'"
-		backupArg = self.parser.parseLine(line)
+		folderPath = self.parser.parseLine(line)
 
-		self.assertEqual('../Some/Path', backupArg.folderPath)
+		self.assertEqual('../Some/Path', folderPath)
 
 	def test_parseAbsPath(self):
 		line = "create backup for '/Some/Abs/Path'"
-		backupArg = self.parser.parseLine(line)
+		folderPath = self.parser.parseLine(line)
 
-		self.assertEqual('/Some/Abs/Path', backupArg.folderPath)
+		self.assertEqual('/Some/Abs/Path', folderPath)

scripts/TouchinBuild/Tests/UnitTests/ParserBackup/test_deleteBackup.py

@@ -8,18 +8,18 @@ class TestDeleteBackup(unittest.TestCase):
 
 	def test_parseCurrentDir(self):
 		line = "delete  backup '.'"
-		backupArg = self.parser.parseLine(line)
+		folderPath = self.parser.parseLine(line)
 
-		self.assertEqual('.', backupArg.folderPath)
+		self.assertEqual('.', folderPath)
 
 	def test_parseRelativePath(self):
 		line = "delete backup '../Some/Path'"
-		backupArg = self.parser.parseLine(line)
+		folderPath = self.parser.parseLine(line)
 
-		self.assertEqual('../Some/Path', backupArg.folderPath)
+		self.assertEqual('../Some/Path', folderPath)
 
 	def test_parseAbsPath(self):
 		line = "delete backup '/Some/Abs/Path'"
-		backupArg = self.parser.parseLine(line)
+		folderPath = self.parser.parseLine(line)
 
-		self.assertEqual('/Some/Abs/Path', backupArg.folderPath)
+		self.assertEqual('/Some/Abs/Path', folderPath)

scripts/TouchinBuild/Tests/UnitTests/ParserBackup/test_restoreBackup.py

@@ -8,18 +8,18 @@ class TestRestoreBackup(unittest.TestCase):
 
 	def test_parseCurrentDir(self):
 		line = "restore   from  backup '.'"
-		backupArg = self.parser.parseLine(line)
+		folderPath = self.parser.parseLine(line)
 
-		self.assertEqual('.', backupArg.folderPath)
+		self.assertEqual('.', folderPath)
 
 	def test_parseRelativePath(self):
 		line = "restore from backup '../Some/Path'"
-		backupArg = self.parser.parseLine(line)
+		folderPath = self.parser.parseLine(line)
 
-		self.assertEqual('../Some/Path', backupArg.folderPath)
+		self.assertEqual('../Some/Path', folderPath)
 
 	def test_parseAbsPath(self):
 		line = "restore from backup '/Some/Abs/Path'"
-		backupArg = self.parser.parseLine(line)
+		folderPath = self.parser.parseLine(line)
 
-		self.assertEqual('/Some/Abs/Path', backupArg.folderPath)
+		self.assertEqual('/Some/Abs/Path', folderPath)

scripts/TouchinBuild/commands/BaseBackupCommand/BaseBackupCommand.py

@@ -2,16 +2,17 @@ import os
 
 
 class BaseBackupCommand:
-	def __init__(self, backupArguments):
-		assert backupArguments is not None
+	def __init__(self, folderPath):
+		assert folderPath is not None
 
-		self.backupArguments = backupArguments
+		self.folderPath = folderPath
 
 	def getAbsSrc(self):
-		return self.getAbs(self.backupArguments.getSourceFolderName())
+		return self.getAbs(self.folderPath)
 
 	def getAbsDst(self):
-		return self.getAbs(self.backupArguments.getBackupFolderName())
+		srcDirName = os.path.dirname(self.folderPath)
+		return self.getAbs('backup'.format(srcDirName))
 
 	def getAbs(self, path):
 		return os.path.abspath(path)

scripts/TouchinBuild/commands/BaseBackupCommand/CreateBackupCommand.py

@@ -3,12 +3,14 @@ from commands.BaseBackupCommand.BaseBackupCommand import BaseBackupCommand
 
 
 class CreateBackupCommand(BaseBackupCommand):
-	def __init__(self, backupArguments):
-		BaseBackupCommand.__init__(self, backupArguments)
+	def __init__(self, folderPath):
+		BaseBackupCommand.__init__(self, folderPath)
 
 	def execute(self):
 		src = self.getAbsSrc()
 		backupDir = self.getAbsDst()
 
+		print src, backupDir
+
 		shutil.rmtree(backupDir, ignore_errors=True)
 		shutil.copytree(src, backupDir, symlinks=False)

scripts/TouchinBuild/commands/BaseBackupCommand/RestoreBackupCommand.py

@@ -3,8 +3,8 @@ from commands.BaseBackupCommand.BaseBackupCommand import BaseBackupCommand
 
 
 class RestoreBackupCommand(BaseBackupCommand):
-	def __init__(self, backupArguments):
-		BaseBackupCommand.__init__(self, backupArguments)
+	def __init__(self, folderPath):
+		BaseBackupCommand.__init__(self, folderPath)
 
 	def execute(self):
 		src = self.getAbsSrc()

scripts/TouchinBuild/parsers/ParserBackup/BackupArguments.py

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

scripts/TouchinBuild/parsers/ParserBackup/ParserBackupBase.py

@@ -1,13 +1,10 @@
-import re
-
 from parsers.LineParser import LineParser
-from parsers.ParserBackup.BackupArguments import BackupArguments
 
 
 class ParserBackupBase(LineParser):
 	def __init__(self):
 		LineParser.__init__(self)
-		self.__backupArguments = BackupArguments()
+		self.folderName = None
 
 	def parseLine(self, line):
 		assert line is not None
@@ -19,9 +16,9 @@ class ParserBackupBase(LineParser):
 		self._guardMatch(match, line, regexpSource)
 
 		folderName = match.group('folder')
-		self.__backupArguments.folderPath = folderName
+		self.folderName = folderName
 
-		return self.__backupArguments
+		return self.folderName
 
 	def getMatchInfo(self, line):
 		return None, None

scripts/TouchinBuild/run_manual_tests.py

@@ -9,8 +9,8 @@ os.chdir(baseDir)
 #import Tests.ManualTests.csproj_test
 #import ManualTests.info_plist_test
 #import ManualTests.copy_test
-#import Tests.ManualTests.create_backup_test
-import Tests.ManualTests.delete_backup_test
+import Tests.ManualTests.create_backup_test
+#import Tests.ManualTests.delete_backup_test
 #import Tests.ManualTests.restore_backup_test
 #import ManualTests.csproj_test
 #import ManualTests.run_sh_command