feat: improve help

Author: wojciech-kulik

Sources/Tests/InputPathTests.swift

@@ -33,6 +33,13 @@ struct InputPathTests {
         #expect(path.lastComponent == "file.swift")
     }
 
+    @Test
+    func inputPath_firstRelativeComponent_shouldReturnCorrectValue() {
+        let path = InputPath(filePath, projectRoot: projectRoot)
+
+        #expect(path.firstRelativeComponent == "Group1")
+    }
+
     @Test
     func inputPath_equals_shouldReturnTrue() {
         let path1 = InputPath(filePath, projectRoot: projectRoot)

Sources/Tests/MoveGroupCommandTests.swift

@@ -11,7 +11,7 @@ extension SerializedSuite {
 // ---------------------------------------------------------------------------------------
 extension SerializedSuite.MoveGroupCommandTests {
     @Test
-    func moveGroup_shouldMoveGroupInProjectAndOnDisk() throws {
+    func moveGroup_shouldMoveGroupInProjectAndOnDisk_andShouldNotChangeTarget() throws {
         let group = Files.Helpers.GeneralUtils.Subfolder2.group
         let dest = Files.XcodebuildNvimApp.Modules.group
         let newGroupPath = "\(dest)/Subfolder2"
@@ -28,6 +28,10 @@ extension SerializedSuite.MoveGroupCommandTests {
 
         try notExpectGroupInProject(group.asInputPath)
         try expectGroupInProject(newGroupPath.asInputPath)
+        try expectTargets(
+            ["Helpers", "XcodebuildNvimApp"],
+            forFile: newGroupPath.asInputPath.appending("String+Extensions.swift")
+        )
         try validateProject()
     }
 

Sources/XcodeProjectCLI/Core/ProjectTargets.swift

@@ -63,7 +63,7 @@ final class ProjectTargets {
             }
         }
 
-        let firstGroup = groupPath.relativePathComponents.first ?? ""
+        let firstGroup = groupPath.firstRelativeComponent
         return project.pbxproj.targets(named: firstGroup)
     }
 

Sources/XcodeProjectCLI/Models/InputPath.swift

@@ -57,6 +57,8 @@ extension InputPath {
 extension InputPath {
     var isRelative: Bool { !path.hasPrefix("/") }
 
+    var firstRelativeComponent: String { relativePathComponents.first ?? "" }
+
     var lastComponent: String { nsString.lastPathComponent }
 
     var exists: Bool { FileManager.default.fileExists(atPath: absolutePath) }

Sources/XcodeProjectCLI/Subcommands/Files/AddFileCommand.swift

@@ -9,7 +9,7 @@ struct AddFileCommand: ParsableCommand {
     @OptionGroup
     var options: ProjectWriteOptions
 
-    @Option(name: .customLong("file"), help: "Path to file.")
+    @Option(name: .customLong("file"), help: .init("File path.", valueName: "file-path"))
     var filePath: String
 
     @Option(help: "Comma separated list of target names.")

Sources/XcodeProjectCLI/Subcommands/Files/DeleteFileCommand.swift

@@ -10,7 +10,7 @@ struct DeleteFileCommand: ParsableCommand {
     @OptionGroup
     var options: ProjectWriteOptions
 
-    @Option(name: .customLong("file"), help: "Path to file.")
+    @Option(name: .customLong("file"), help: .init("File path.", valueName: "file-path"))
     var filePath: String
 
     func run() throws {

Sources/XcodeProjectCLI/Subcommands/Files/RenameFileCommand.swift

@@ -10,7 +10,7 @@ struct RenameFileCommand: ParsableCommand {
     @OptionGroup
     var options: ProjectWriteOptions
 
-    @Option(name: .customLong("file"), help: "Path to file.")
+    @Option(name: .customLong("file"), help: .init("File path.", valueName: "file-path"))
     var filePath: String
 
     @Option(name: .customLong("name"), help: "New name for the file.")

Sources/XcodeProjectCLI/Subcommands/Groups/AddGroupCommand.swift

@@ -10,7 +10,7 @@ struct AddGroupCommand: 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
 
     @Flag(help: "If set, the tool will create missing groups in the project structure.")

Sources/XcodeProjectCLI/Subcommands/Groups/DeleteGroupCommand.swift

@@ -10,7 +10,7 @@ struct DeleteGroupCommand: 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
 
     func run() throws {

Sources/XcodeProjectCLI/Subcommands/Groups/MoveGroupCommand.swift

@@ -5,19 +5,29 @@ struct MoveGroupCommand: ParsableCommand {
     static var configuration = CommandConfiguration(
         commandName: "move-group",
         abstract: "Move a group to a different location within the project.",
-        discussion: "Groups will be automatically merged if a group with the same name already exists at the destination. " +
-            "When merging, files and subgroups will be combined.\n\n" +
-            "If a file conflict occurs, existing files in the destination group will be preserved, " +
-            "and the conflicting source files will be removed. A warning will be displayed to indicate the conflict."
+        discussion: """
+          - This command does not allow to move and rename the group at the same time.
+          - Groups will be automatically merged if another group with the same name already exists at the destination.
+          - When merging, files and subgroups will be combined.
+          - If a file conflict occurs, existing files in the destination group will be preserved.
+          - The conflicting source files will be moved with a ".bak" suffix. 
+          - A warning will be displayed to indicate the conflict.
+        """
     )
 
     @OptionGroup
     var options: ProjectWriteOptions
 
-    @Option(name: .customLong("group"), help: "Path to group.")
+    @Option(name: .customLong("group"), help: .init("Source group path.", valueName: "group-path"))
     var groupPath: String
 
-    @Option(name: .customLong("dest"), help: "Destination path.")
+    @Option(
+        name: .customLong("dest"),
+        help: .init(
+            "Destination group path. The whole source group will be moved into this path.",
+            valueName: "group-path"
+        )
+    )
     var destination: String
 
     func run() throws {