[FEATURE] ✨ Select branch column in batch mode

Allow to select a branch column from the CSV file
provided in the batch mode,
e.g. `branch-column=test-stage`.

Author: pixelbrackets

README.md

@@ -261,9 +261,9 @@ to use the batch processing mode instead.
 This mode will trigger the `patch` or `merge` command for a list of
 repositories. The list is expected as CSV file named `repositories.csv`.
 
-*repositories.csv - Example file content*
+*repositories.csv - Example file content, with repository & branch to use*
 ```csv
-repository-url,source-branch
+repository-url,main-branch
 https://git.example.com/projecta,main
 https://git.example.com/projectb,main
 https://git.example.com/projectc,development
@@ -292,6 +292,34 @@ in all repositories of the first column:
 ./vendor/bin/patchbot batch merge --source=feature-add-phpcs-rules
 ```
 
+**Different branch names**
+
+When the branch names used in the `patch` and `merge` subcommand differ,
+or when you need to merge the feature branch into several stage branches
+you may provide a file with all branches and pass the name of the designated
+branch column as option `branch-column`.
+
+*repositories.csv - Example file content with many branch columns*
+```csv
+repository-url,main,development,integration-stage,test-stage
+https://git.example.com/projecta,main,development,integration,testing
+https://git.example.com/projectb,main,dev,stage/integration,stage/test
+https://git.example.com/projectc,live,development,stage/integration,stage/test
+```
+
+Apply the patch `rename-changelog` to the feature branch
+`feature-rename-changelog`, which is based on branch name given in column
+`development`:
+```bash
+./vendor/bin/patchbot batch patch --branch-column=development patch-name=rename-changelog branch-name=feature-rename-changelog
+```
+Now merge the feature branch into the branch name given in column `test-stage`
+and then into the of given in column `integration-stage`:
+```bash
+./vendor/bin/patchbot batch merge --branch-column=test-stage source=feature-rename-changelog
+./vendor/bin/patchbot batch merge --branch-column=integration-stage source=feature-rename-changelog
+```
+
 ## License
 
 GNU General Public License version 2 or later

src/RoboFile.php

@@ -184,6 +184,8 @@ public function create(array $options = [
      *
      * @param string $batchCommand Name of command to run in batch mode (patch or merge, default: patch)
      * @param array $options
+     * @option $repository-column Name of the repository column (fallback: first column in CSV)
+     * @option $branch-column Name of the branch column (fallback: second column in CSV)
      * @option $working-directory Working directory to check out repositories
      * @option $patch-source-directory Source directory for all collected patches
      * @option $patch-name Name of the directory where the patch code resides
@@ -194,6 +196,8 @@ public function create(array $options = [
      * @throws TaskException
      */
     public function batch(string $batchCommand, array $options = [
+        'repository-column' => null,
+        'branch-column' => null,
         'working-directory|d' => null,
         'patch-source-directory|s' => null,
         'patch-name|p' => 'template',
@@ -209,23 +213,24 @@ public function batch(string $batchCommand, array $options = [
             return 1;
         }
 
+        // Parse CSV to array, with keys from header row
         $csvFileContent = file_get_contents('repositories.csv');
         $repositories = str_getcsv($csvFileContent, PHP_EOL);
-        array_walk($repositories, static function (&$k) use ($repositories) {
-            $k = str_getcsv($k);
+        $header = str_getcsv(array_shift($repositories)); // get & remove header
+        array_walk($repositories, static function (&$k) use ($repositories, $header) {
+            $k = array_combine($header, str_getcsv($k));
         });
-        array_shift($repositories); // remove column header
 
         if ($batchCommand === 'patch') {
             foreach ($repositories as $repository) {
                 /** @noinspection DisconnectedForeachInstructionInspection */
                 chdir($workingDirectory); // reset working directory
                 $this->patch([
-                    'repository-url' => $repository[0],
+                    'repository-url' => $repository[$options['repository-column']] ?? array_values($repository)[0],
                     'working-directory' => $options['working-directory'],
                     'patch-source-directory' => $options['patch-source-directory'],
                     'patch-name' => $options['patch-name'],
-                    'source-branch' => $repository[1],
+                    'source-branch' => $repository[$options['branch-column']] ?? array_values($repository)[1],
                     'branch-name' => $options['branch-name'],
                     'halt-before-commit' => $options['halt-before-commit'],
                 ]);
@@ -236,10 +241,10 @@ public function batch(string $batchCommand, array $options = [
                 /** @noinspection DisconnectedForeachInstructionInspection */
                 chdir($workingDirectory); // reset working directory
                 $this->merge([
-                    'repository-url' => $repository[0],
+                    'repository-url' => $repository[$options['repository-column']] ?? array_values($repository)[0],
                     'working-directory' => $options['working-directory'],
                     'source' => $options['source'],
-                    'target' => $repository[1],
+                    'target' => $repository[$options['branch-column']] ?? array_values($repository)[1],
                 ]);
             }
         }