Fix order of config files and name of project exclusion list conf

L7R7 · Jul 8, 2024 · 5b04e1c · 5b04e1c
1 parent 5d945f9
commit 5b04e1c
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 11 deletions.
diff --git a/src/Config.hs b/src/Config.hs
@@ -39,8 +39,8 @@ data Config = Config
 configFiles :: Parser [Path Abs File]
 configFiles =
   sequenceA
-    [ runIO (getHomeDir >>= \home -> resolveFile home ".gitlab-helper.yml"),
-      runIO (resolveFile' ".gitlab-helper.yml")
+    [ runIO (resolveFile' ".gitlab-helper.yml"),
+      runIO (getHomeDir >>= \home -> resolveFile home ".gitlab-helper.yml")
     ]
 
 instance HasParser Config where
@@ -81,7 +81,7 @@ instance HasParser Config where
           reader (commaSeparatedList (Id <$> positiveIntReader)),
           long "exclude-projects",
           option,
-          conf "exclude-projects",
+          conf "excludeProjects",
           env "EXCLUDE_PROJECTS",
           metavar "ID1,ID2,ID3",
           value []
@@ -194,11 +194,26 @@ data MergeRequestUpdateAction = List | Rebase | Merge MergeCiOption | SetToDraft
 instance HasParser MergeRequestUpdateAction where
   settingsParser =
     commands
-      [ command "rebase" "rebase the merge requests" $ pure Rebase,
-        command "merge" "merge the merge requests" $ Merge <$> settingsParser,
-        command "draft" "set the merge requests to `draft`" $ pure SetToDraft,
-        command "ready" "mark the merge requests as ready" $ pure MarkAsReady,
-        command "list" "list the merge requests" $ pure List
+      [ command
+          "rebase"
+          "rebase the merge requests"
+          (pure Rebase),
+        command
+          "merge"
+          "merge the merge requests"
+          (Merge <$> settingsParser),
+        command
+          "draft"
+          "set the merge requests to `draft`"
+          (pure SetToDraft),
+        command
+          "ready"
+          "mark the merge requests as ready"
+          (pure MarkAsReady),
+        command
+          "list"
+          "list the merge requests"
+          (pure List)
       ]
 
 data MergeCiOption = PipelineMustSucceed | SkipCi deriving stock (Show)

diff --git a/test_resources/reference.txt b/test_resources/reference.txt
@@ -1,6 +1,10 @@
-[36mUsage: [m[33mgitlab-helper[m [37m--group-id[m [33mGROUP_ID[m [37m--base-url[m [33mURL[m [37m--api-token[m [33mTOKEN[m [37m--exclude-projects[m [33mID1,ID2,ID3[m [35mshow-branches[m [36m|[m [35mshow-projects[m [36m|[m [35mlist-all-projects-meta[m [36m|[m [35mlist-projects-meta[m [36m|[m [35menable-source-branch-deletion[m [37m--execute[m[36m|[m[37m-x[m [36m|[m [35menable-all-discussions-must-be-resolved-for-merge-requirement[m [37m--execute[m[36m|[m[37m-x[m [36m|[m [35menable-successful-pipeline-for-merge-requirement[m [37m--execute[m[36m|[m[37m-x[m [36m|[m [35mshow-schedules[m [36m|[m [35mshow-merge-requests[m [37m--[no-]recheck-merge-status[m [36m|[m [35mcount-deployments[m [37m--year[m [33mYEAR[m [37m--[no-]include-archived-projects[m [36m|[m [35mset-merge-method-to-fast-forward[m [37m--execute[m[36m|[m[37m-x[m [36m|[m [35mupdate-merge-requests[m [35mrebase[m [36m|[m [35mmerge[m [37m--skip-ci[m [36m|[m [35mdraft[m [36m|[m [35mready[m [36m|[m [35mlist[m [37m-u[m[36m|[m[37m--user-id[m [33mUSER_ID[m [36m([m[37m--search-title[m [33mTXT[m[36m)[m [36m|[m [36m([m[37m-s[m[36m|[m[37m--search[m [33mTXT[m[36m)[m [37m--[no-]recheck-merge-status[m [37m--execute[m[36m|[m[37m-x[m
+[36mUsage: [m[33mgitlab-helper[m [37m--config-file[m [33mFILE_PATH[m [37m--group-id[m [33mGROUP_ID[m [37m--base-url[m [33mURL[m [37m--api-token[m [33mTOKEN[m [37m--exclude-projects[m [33mID1,ID2,ID3[m [35mshow-branches[m [36m|[m [35mshow-projects[m [36m|[m [35mlist-all-projects-meta[m [36m|[m [35mlist-projects-meta[m [36m|[m [35menable-source-branch-deletion[m [37m--execute[m[36m|[m[37m-x[m [36m|[m [35menable-all-discussions-must-be-resolved-for-merge-requirement[m [37m--execute[m[36m|[m[37m-x[m [36m|[m [35menable-successful-pipeline-for-merge-requirement[m [37m--execute[m[36m|[m[37m-x[m [36m|[m [35mshow-schedules[m [36m|[m [35mshow-merge-requests[m [37m--[no-]recheck-merge-status[m [36m|[m [35mcount-deployments[m [37m--year[m [33mYEAR[m [37m--[no-]include-archived-projects[m [36m|[m [35mset-merge-method-to-fast-forward[m [37m--execute[m[36m|[m[37m-x[m [36m|[m [35mupdate-merge-requests[m [35mrebase[m [36m|[m [35mmerge[m [37m--skip-ci[m [36m|[m [35mdraft[m [36m|[m [35mready[m [36m|[m [35mlist[m [37m-u[m[36m|[m[37m--user-id[m [33mUSER_ID[m [36m([m[37m--search-title[m [33mTXT[m[36m)[m [36m|[m [36m([m[37m-s[m[36m|[m[37m--search[m [33mTXT[m[36m)[m [37m--[no-]recheck-merge-status[m [37m--execute[m[36m|[m[37m-x[m
 
 [36mAll settings[m:
+  [34mPath to the configuration file[m
+  option: [37m--config-file[m [33mFILE_PATH[m
+  env: [37mCONFIG_FILE[m [33mFILE_PATH[m
+
   [34mID of the GitLab group to work with[m
   option: [37m--group-id[m [33mGROUP_ID[m
   env: [37mGLH_GROUP_ID[m [33mGROUP_ID[m
@@ -26,7 +30,7 @@
   option: [37m--exclude-projects[m [33mID1,ID2,ID3[m
   env: [37mGLH_EXCLUDE_PROJECTS[m [33mID1,ID2,ID3[m
   config:
-    [37mconfig.exclude-projects[m: # [32mor null[m
+    [37mconfig.excludeProjects[m: # [32mor null[m
       - [33m<number>[m # [32m64 bit signed integer[m
 
   [34mShow branches[m
@@ -121,6 +125,7 @@
 
 
 [36mOptions[m:
+  [37m--config-file[m [34mPath to the configuration file[m 
   [37m--group-id[m [34mID of the GitLab group to work with[m 
   [37m--base-url[m [34mBase URL of your GitLab instance (e.g. `https://my.gitlab.com`)[m 
   [37m--api-token[m [34mAPI Token to use for authorizing requests against the Gitlab API. `api` scope is required.[m 
@@ -157,6 +162,7 @@
       [37m--execute[m[36m|[m[37m-x[m [34mwhether to actually change the world via the API. By default, only a dry run will be performed[m default: [33mDryRun[m
 
 [36mEnvironment Variables[m:
+  [37mCONFIG_FILE[m [33mFILE_PATH[m              [34mPath to the configuration file[m                                                            
   [37mGLH_GROUP_ID[m [33mGROUP_ID[m              [34mID of the GitLab group to work with[m                                                       
   [37mGLH_BASE_URL[m [33mURL[m                   [34mBase URL of your GitLab instance (e.g. `https://my.gitlab.com`)[m                           
   [37mGLH_API_TOKEN[m [33mTOKEN[m                [34mAPI Token to use for authorizing requests against the Gitlab API. `api` scope is required.[m
@@ -176,7 +182,7 @@
     # [32mor null[m
     [33m<string>[m
   [34mset the list of projects to exclude as a comma-separated list of IDs[m
-  [37mconfig.exclude-projects[m:
+  [37mconfig.excludeProjects[m:
     # [32mor null[m
     - [33m<number>[m # [32m64 bit signed integer[m