feat: improve rollback - don't save project file until all operations succeed

Author: wojciech-kulik

Sources/XcodeProjectCLI/Subcommands/Files/DeleteFileCommand.swift

@@ -22,10 +22,10 @@ struct DeleteFileCommand: ParsableCommand {
         }
 
         try project.files.removeFile(filePath)
-        try project.save()
-
-        guard !options.projectOnly else { return }
 
-        try FileManager.default.removeItem(atPath: filePath.absolutePath)
+        if !options.projectOnly {
+            try FileManager.default.removeItem(atPath: filePath.absolutePath)
+        }
+        try project.save()
     }
 }

Sources/XcodeProjectCLI/Subcommands/Files/MoveFileCommand.swift

@@ -33,17 +33,17 @@ struct MoveFileCommand: ParsableCommand {
         }
 
         let targets = try project.files.moveFile(filePath, to: destination)
-        try project.save()
 
         if printTargets {
             targets.forEach { print($0) }
         }
 
-        guard !options.projectOnly else { return }
-
-        try FileManager.default.moveItem(
-            atPath: filePath.absolutePath,
-            toPath: destination.absolutePath
-        )
+        if !options.projectOnly {
+            try FileManager.default.moveItem(
+                atPath: filePath.absolutePath,
+                toPath: destination.absolutePath
+            )
+        }
+        try project.save()
     }
 }

Sources/XcodeProjectCLI/Subcommands/Files/RenameFileCommand.swift

@@ -25,13 +25,13 @@ struct RenameFileCommand: ParsableCommand {
         }
 
         try project.files.renameFile(filePath, newName: name)
-        try project.save()
-
-        guard !options.projectOnly else { return }
 
-        try FileManager.default.moveItem(
-            atPath: filePath.absolutePath,
-            toPath: filePath.changeLastComponent(to: name).absolutePath
-        )
+        if !options.projectOnly {
+            try FileManager.default.moveItem(
+                atPath: filePath.absolutePath,
+                toPath: filePath.changeLastComponent(to: name).absolutePath
+            )
+        }
+        try project.save()
     }
 }

Sources/XcodeProjectCLI/Subcommands/Groups/AddGroupCommand.swift

@@ -20,18 +20,20 @@ struct AddGroupCommand: ParsableCommand {
         let project = try Project(projectPath: options.projectPath)
         let groupPath = groupPath.asInputPath
 
-        if !groupPath.exists {
-            if createGroups, !options.projectOnly {
-                try FileManager.default.createDirectory(
-                    atPath: groupPath.absolutePath,
-                    withIntermediateDirectories: true
-                )
-            } else if !createGroups {
-                throw CLIError.groupNotFoundOnDisk(groupPath)
-            }
+        try project.groups.addGroup(groupPath)
+
+        guard !options.projectOnly, !groupPath.exists else {
+            return try project.save()
         }
 
-        try project.groups.addGroup(groupPath)
+        guard createGroups else {
+            throw CLIError.groupNotFoundOnDisk(groupPath)
+        }
+
+        try FileManager.default.createDirectory(
+            atPath: groupPath.absolutePath,
+            withIntermediateDirectories: true
+        )
         try project.save()
     }
 }

Sources/XcodeProjectCLI/Subcommands/Groups/DeleteGroupCommand.swift

@@ -22,10 +22,10 @@ struct DeleteGroupCommand: ParsableCommand {
         }
 
         try project.groups.deleteGroup(groupPath)
-        try project.save()
-
-        guard !options.projectOnly else { return }
 
-        try FileManager.default.removeItem(atPath: groupPath.absolutePath)
+        if !options.projectOnly {
+            try FileManager.default.removeItem(atPath: groupPath.absolutePath)
+        }
+        try project.save()
     }
 }

Sources/XcodeProjectCLI/Subcommands/Groups/MoveGroupCommand.swift

@@ -30,9 +30,8 @@ struct MoveGroupCommand: ParsableCommand {
         }
 
         try project.groups.moveGroup(groupPath, to: destination)
-        try project.save()
 
-        guard !options.projectOnly else { return }
+        guard !options.projectOnly else { return try project.save() }
 
         let newGroupPath = destination.appending(groupPath.lastComponent)
 
@@ -50,6 +49,8 @@ struct MoveGroupCommand: ParsableCommand {
                 toPath: newGroupPath.absolutePath
             )
         }
+
+        try project.save()
     }
 
     private func mergeDirectories(from source: String, to destination: String) throws {

Sources/XcodeProjectCLI/Subcommands/Groups/RenameGroupCommand.swift

@@ -10,7 +10,7 @@ struct RenameGroupCommand: ParsableCommand {
     @OptionGroup
     var options: ProjectWriteOptions
 
-    @Option(name: .customLong("group"), help: "Path to group.")
+    @Option(name: .customLong("group"), help: .init("Group path.", valueName: "group-path"))
     var groupPath: String
 
     @Option(name: .customLong("name"), help: "New name for the group.")
@@ -25,13 +25,13 @@ struct RenameGroupCommand: ParsableCommand {
         }
 
         try project.groups.renameGroup(groupPath, newName: name)
-        try project.save()
-
-        guard !options.projectOnly else { return }
 
-        try FileManager.default.moveItem(
-            atPath: groupPath.absolutePath,
-            toPath: groupPath.changeLastComponent(to: name).absolutePath
-        )
+        if !options.projectOnly {
+            try FileManager.default.moveItem(
+                atPath: groupPath.absolutePath,
+                toPath: groupPath.changeLastComponent(to: name).absolutePath
+            )
+        }
+        try project.save()
     }
 }

Sources/XcodeProjectCLI/XcodeProjectCLI.swift

@@ -34,7 +34,7 @@ struct XcodeProjectCLI: ParsableCommand {
     static let configuration: CommandConfiguration = .init(
         commandName: "xcp",
         abstract: "XcodeProjectCLI",
-        version: "0.9.2",
+        version: "0.9.3",
         groupedSubcommands: [
             .init(
                 name: "Target",