Merge pull request #125 from mattpolzin/support-mainbranch-config-cmd

Add ability to set mainBranch config prop via CLI

Makefile

@@ -13,6 +13,14 @@ idris2-version = $(shell $(idris2) --version | sed -En 's/Idris 2, version ([^-]
 idris2-build   = $(shell $(idris2) --version | sed -En 's/Idris 2, version [^-]+(.*)/\1/p')
 idris2-minor-version = $(shell echo ${idris2-version} | sed -En 's/0\.(.*)\../\1/p')
 
+kernel = $(shell uname -s)
+
+ifeq ($(kernel),Linux)
+	ised = sed -i''
+else
+	ised = sed -I ''
+endif
+
 .PHONY: all build nix-build install package publish clean version
 
 all: build
@@ -114,10 +122,10 @@ nix-build:
 
 version:
 	@(if [[ "${v}" == '' ]]; then echo "please set the 'v' variable."; exit 1; fi)
-	sed -I '' "s/version = .*/version = ${v}/" ./harmony.ipkg
-	sed -I '' "s/appVersion = \".*\"/appVersion = \"${v}\"/" ./src/AppVersion.idr
-	sed -I '' "s/\"version\": \".*\"/\"version\": \"${v}\"/" ./package.json
-	sed -I '' "s/version = \".*\";/version = \"${v}\";/" ./default.nix
+	$(ised) "s/version = .*/version = ${v}/" ./harmony.ipkg
+	$(ised) "s/appVersion = \".*\"/appVersion = \"${v}\"/" ./src/AppVersion.idr
+	$(ised) "s/\"version\": \".*\"/\"version\": \"${v}\"/" ./package.json
+	$(ised) "s/version = \".*\";/version = \"${v}\";/" ./default.nix
 	@npm update
 	@$(node2nix) -- --composition node2nix.nix # -l # <- can't use -l for lockfile because lockfile version 3 not supported yet.
 	@$(nix) fmt

default.nix

@@ -76,7 +76,7 @@
   };
 
   harmonyPkg = buildIdris {
-    version = "4.1.0";
+    version = "4.2.0";
     ipkgName = "harmony";
     src = ./.;
 

harmony.ipkg

@@ -1,5 +1,5 @@
 package harmony
-version = 4.1.0
+version = 4.2.0
 authors = "Mathew Polzin"
 license = "MIT"
 brief = "Harmony GitHub collaboration tool"

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mattpolzin/harmony",
-  "version": "4.1.0",
+  "version": "4.2.0",
   "engines": {
     "node": ">=18.0.0"
   },

src/AppVersion.idr

@@ -4,7 +4,7 @@ module AppVersion
 
 export
 appVersion : String
-appVersion = "4.1.0"
+appVersion = "4.2.0"
 
 export
 printVersion : HasIO io => io ()

src/Config.idr

@@ -130,6 +130,7 @@ propSetter RequestTeams     = update parseBool (\b => { requestTeams := b })
 propSetter RequestUsers     = update parseBool (\b => { requestUsers := b })
 propSetter CommentOnRequest = update parseBool (\b => { commentOnRequest := b })
 propSetter DefaultRemote    = update Just (\s => { defaultRemote := s })
+propSetter MainBranch       = update Just (\s => { mainBranch := s })
 propSetter GithubPAT        = update Just (\s => { githubPAT := Just $ hide s })
 propSetter AssignTeams      = update parseBool (\b => { requestTeams := b })
 propSetter AssignUsers      = update parseBool (\b => { requestUsers := b })
@@ -154,6 +155,7 @@ propGetter RequestTeams     = show . requestTeams
 propGetter RequestUsers     = show . requestUsers
 propGetter CommentOnRequest = show . commentOnRequest
 propGetter DefaultRemote    = show . defaultRemote
+propGetter MainBranch       = show . mainBranch
 propGetter GithubPAT        = maybe "Not set (will use $GITHUB_PAT environment variable)" show . githubPAT
 propGetter AssignTeams      = show . requestTeams
 propGetter AssignUsers      = show . requestUsers

src/Data/Config.idr

@@ -108,6 +108,9 @@ data SettableProp : (name : String) -> (help : String) -> Type where
   DefaultRemote   : SettableProp
     "defaultRemote"
     "[string]     The name of the default Git remote to use (e.g. 'origin')."
+  MainBranch : SettableProp
+    "mainBranch"
+    "[string]     The name of the default Git base branch for new PRs."
   GithubPAT       : SettableProp
     "githubPAT"
     """
@@ -143,6 +146,7 @@ settablePropNamed : (name : String) -> Maybe (Exists (SettableProp name))
 settablePropNamed "requestTeams"     = Just $ Evidence _ RequestTeams
 settablePropNamed "commentOnRequest" = Just $ Evidence _ CommentOnRequest
 settablePropNamed "defaultRemote"    = Just $ Evidence _ DefaultRemote
+settablePropNamed "mainBranch"       = Just $ Evidence _ MainBranch
 settablePropNamed "githubPAT"        = Just $ Evidence _ GithubPAT
 settablePropNamed "requestUsers"     = Just $ Evidence _ RequestUsers
 settablePropNamed "assignTeams"      = Just $ Evidence _ AssignTeams
@@ -164,6 +168,7 @@ settableProps = [
   , (_ ** _ ** RequestUsers)
   , (_ ** _ ** CommentOnRequest)
   , (_ ** _ ** DefaultRemote)
+  , (_ ** _ ** MainBranch)
   , (_ ** _ ** GithubPAT)
   , (_ ** _ ** AssignUsers)
   , (_ ** _ ** AssignTeams)

test/expected_help.txt

@@ -9,7 +9,8 @@ Subcommands:
       Get or set the value of a configuration property. Not all properties can
       be set and read via this subcommand.
       properties: requestTeams, requestUsers, commentOnRequest, defaultRemote,
-                  githubPAT, assignUsers, assignTeams, commentOnAssign
+                  mainBranch, githubPAT, assignUsers, assignTeams,
+                  commentOnAssign
   contribute [-c/--checkout] [-<num>] [-i/--ignore {<uri>/<pr-number>}]
       Contribute to an open PR. Prints a URL. Prioritizes PRs you are requested
       to review but will also return other PRs.