From 3de61aebcbf04b3430c65a732a297c69bdd7c957 Mon Sep 17 00:00:00 2001 From: Mathew Polzin Date: Sun, 21 Jan 2024 19:56:13 -0600 Subject: [PATCH 1/6] Add help for deprecated assign command --- src/Help.idr | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/Help.idr b/src/Help.idr index 73c4192..0824b4c 100644 --- a/src/Help.idr +++ b/src/Help.idr @@ -9,6 +9,9 @@ import Text.PrettyPrint.Prettyprinter.Render.Terminal %default total +warning : String -> Doc AnsiStyle +warning = annotate (color Yellow) . pretty + option : String -> Doc AnsiStyle option = annotate bold . pretty @@ -95,6 +98,8 @@ subcommandHelp' n@"whoami" = subcommand n [] ["Print information about the conf subcommandHelp' n@"reflect" = subcommand n [] ["Reflect on the current state of ones own PRs and review requests."] subcommandHelp' n@"list" = subcommand n [argument True ""] ["List the members of the given GitHub Team."] subcommandHelp' n@"health" = subcommand n [] ["Graph all open PRs grouped by the month they were created."] +subcommandHelp' n@"assign" = subcommand n [] [warning "Deprecated alias for 'request' command."] +-- TODO 0.5.0: ^ remove deprecated command help subcommandHelp' c = pretty "Unreconized command: \{c}" ||| Print help for a particular subcommand. @@ -109,7 +114,9 @@ helpDocs : Doc AnsiStyle helpDocs = vsep [ "harmony" <++> subcommand' "" , heading "Subcommands" $ vsep - [ subcommandHelp' "branch" + [ subcommandHelp' "assign" + -- TODO 0.5.0: ^ remove deprecated command help + , subcommandHelp' "branch" , subcommandHelp' "config" , subcommandHelp' "contribute" , subcommandHelp' "graph" From 1ed92c84211f94572d6426aab35555110644f6ef Mon Sep 17 00:00:00 2001 From: Mathew Polzin Date: Sun, 21 Jan 2024 19:58:39 -0600 Subject: [PATCH 2/6] bump patch version --- default.nix | 2 +- harmony.ipkg | 2 +- node-packages.nix | 22 +++++++++++----------- package-lock.json | 16 ++++++++-------- package.json | 2 +- src/AppVersion.idr | 2 +- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/default.nix b/default.nix index c39c341..262d0a1 100644 --- a/default.nix +++ b/default.nix @@ -68,7 +68,7 @@ }; harmonyPkg = buildIdris { - version = "4.0.0"; + version = "4.0.1"; projectName = "harmony"; src = ./.; diff --git a/harmony.ipkg b/harmony.ipkg index 63529d7..3b98af0 100644 --- a/harmony.ipkg +++ b/harmony.ipkg @@ -1,5 +1,5 @@ package harmony -version = 4.0.0 +version = 4.0.1 authors = "Mathew Polzin" license = "MIT" brief = "Harmony GitHub collaboration tool" diff --git a/node-packages.nix b/node-packages.nix index d2cfea8..48665ea 100644 --- a/node-packages.nix +++ b/node-packages.nix @@ -90,13 +90,13 @@ sha512 = "oxeWzmBFxWd+XolxKTc4zr+h3mt+yofn4r7OfoIkR/Cj/o70eEGmPsFbueyJE2iBAGpjgTnEOKM3pnuEGVmiqg=="; }; }; - "@octokit/core-5.0.2" = { + "@octokit/core-5.1.0" = { name = "_at_octokit_slash_core"; packageName = "@octokit/core"; - version = "5.0.2"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/core/-/core-5.0.2.tgz"; - sha512 = "cZUy1gUvd4vttMic7C0lwPed8IYXWYp8kHIMatyhY8t8n3Cpw2ILczkV5pGMPqef7v0bLo0pOHrEHarsau2Ydg=="; + url = "https://registry.npmjs.org/@octokit/core/-/core-5.1.0.tgz"; + sha512 = "BDa2VAMLSh3otEiaMJ/3Y36GU4qf6GI+VivQ/P41NC6GHcdxpKlqV0ikSZ5gdQsmS3ojXeRx5vasgNTinF0Q4g=="; }; }; "@octokit/endpoint-9.0.4" = { @@ -279,13 +279,13 @@ sha512 = "VRLSGzik+Unrup6BsouBeHsf4d1hOEgYWTm/7Nmw1sXoN1+tRly/Gy/po3yeahnP4jfnQWWAhQAqcNfH7ngOkA=="; }; }; - "@types/node-20.11.3" = { + "@types/node-20.11.5" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "20.11.3"; + version = "20.11.5"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-20.11.3.tgz"; - sha512 = "nrlmbvGPNGaj84IJZXMPhQuCMEVTT/hXZMJJG/aIqVL9fKxqk814sGGtJA4GI6hpJSLQjpi6cn0Qx9eOf9SDVg=="; + url = "https://registry.npmjs.org/@types/node/-/node-20.11.5.tgz"; + sha512 = "g557vgQjUUfN76MZAN/dt1z3dzcUsimuysco0KeluHgrPdJXkP/XdAURgyO2W9fZWHRtRBiVKzKn8vyOAwlG+w=="; }; }; "aggregate-error-3.1.0" = { @@ -598,7 +598,7 @@ args = { name = "_at_mattpolzin_slash_harmony"; packageName = "@mattpolzin/harmony"; - version = "4.0.0"; + version = "4.0.1"; src = ./.; dependencies = [ sources."@kwsites/file-exists-1.1.1" @@ -610,7 +610,7 @@ sources."@octokit/auth-oauth-user-4.0.1" sources."@octokit/auth-token-4.0.0" sources."@octokit/auth-unauthenticated-5.0.1" - sources."@octokit/core-5.0.2" + sources."@octokit/core-5.1.0" sources."@octokit/endpoint-9.0.4" sources."@octokit/graphql-7.0.2" sources."@octokit/oauth-app-6.0.0" @@ -631,7 +631,7 @@ sources."@types/aws-lambda-8.10.131" sources."@types/btoa-lite-1.0.2" sources."@types/jsonwebtoken-9.0.5" - sources."@types/node-20.11.3" + sources."@types/node-20.11.5" sources."aggregate-error-3.1.0" sources."before-after-hook-2.2.3" sources."bottleneck-2.19.5" diff --git a/package-lock.json b/package-lock.json index 5123476..45f75ef 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@mattpolzin/harmony", - "version": "4.0.0", + "version": "4.0.1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@mattpolzin/harmony", - "version": "4.0.0", + "version": "4.0.1", "license": "MIT", "dependencies": { "octokit": "^3.1", @@ -136,9 +136,9 @@ } }, "node_modules/@octokit/core": { - "version": "5.0.2", - "resolved": "https://registry.npmjs.org/@octokit/core/-/core-5.0.2.tgz", - "integrity": "sha512-cZUy1gUvd4vttMic7C0lwPed8IYXWYp8kHIMatyhY8t8n3Cpw2ILczkV5pGMPqef7v0bLo0pOHrEHarsau2Ydg==", + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/@octokit/core/-/core-5.1.0.tgz", + "integrity": "sha512-BDa2VAMLSh3otEiaMJ/3Y36GU4qf6GI+VivQ/P41NC6GHcdxpKlqV0ikSZ5gdQsmS3ojXeRx5vasgNTinF0Q4g==", "dependencies": { "@octokit/auth-token": "^4.0.0", "@octokit/graphql": "^7.0.0", @@ -374,9 +374,9 @@ } }, "node_modules/@types/node": { - "version": "20.11.3", - "resolved": "https://registry.npmjs.org/@types/node/-/node-20.11.3.tgz", - "integrity": "sha512-nrlmbvGPNGaj84IJZXMPhQuCMEVTT/hXZMJJG/aIqVL9fKxqk814sGGtJA4GI6hpJSLQjpi6cn0Qx9eOf9SDVg==", + "version": "20.11.5", + "resolved": "https://registry.npmjs.org/@types/node/-/node-20.11.5.tgz", + "integrity": "sha512-g557vgQjUUfN76MZAN/dt1z3dzcUsimuysco0KeluHgrPdJXkP/XdAURgyO2W9fZWHRtRBiVKzKn8vyOAwlG+w==", "dependencies": { "undici-types": "~5.26.4" } diff --git a/package.json b/package.json index 847acbb..5da025c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@mattpolzin/harmony", - "version": "4.0.0", + "version": "4.0.1", "engines" : { "node" : ">=18.0.0" }, diff --git a/src/AppVersion.idr b/src/AppVersion.idr index a3be0cc..20309cd 100644 --- a/src/AppVersion.idr +++ b/src/AppVersion.idr @@ -4,7 +4,7 @@ module AppVersion export appVersion : String -appVersion = "4.0.0" +appVersion = "4.0.1" export printVersion : HasIO io => io () From 6a52e40fafcc5463a3637c3b3c84a9bdeaf6d651 Mon Sep 17 00:00:00 2001 From: Mathew Polzin Date: Sun, 21 Jan 2024 20:00:24 -0600 Subject: [PATCH 3/6] Update src/Help.idr --- src/Help.idr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Help.idr b/src/Help.idr index 0824b4c..4c2e379 100644 --- a/src/Help.idr +++ b/src/Help.idr @@ -99,7 +99,7 @@ subcommandHelp' n@"reflect" = subcommand n [] ["Reflect on the current state of subcommandHelp' n@"list" = subcommand n [argument True ""] ["List the members of the given GitHub Team."] subcommandHelp' n@"health" = subcommand n [] ["Graph all open PRs grouped by the month they were created."] subcommandHelp' n@"assign" = subcommand n [] [warning "Deprecated alias for 'request' command."] --- TODO 0.5.0: ^ remove deprecated command help +-- TODO 5.0.0: ^ remove deprecated command help subcommandHelp' c = pretty "Unreconized command: \{c}" ||| Print help for a particular subcommand. From 11377449eb17086129df32424b378539ae6f433e Mon Sep 17 00:00:00 2001 From: Mathew Polzin Date: Sun, 21 Jan 2024 20:00:29 -0600 Subject: [PATCH 4/6] Update src/Help.idr --- src/Help.idr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Help.idr b/src/Help.idr index 4c2e379..594f098 100644 --- a/src/Help.idr +++ b/src/Help.idr @@ -115,7 +115,7 @@ helpDocs = vsep [ "harmony" <++> subcommand' "" , heading "Subcommands" $ vsep [ subcommandHelp' "assign" - -- TODO 0.5.0: ^ remove deprecated command help + -- TODO 5.0.0: ^ remove deprecated command help , subcommandHelp' "branch" , subcommandHelp' "config" , subcommandHelp' "contribute" From 169fb8cb16a1263b9dc4bfcaf6638b34ddab3476 Mon Sep 17 00:00:00 2001 From: Mathew Polzin Date: Sun, 21 Jan 2024 20:27:23 -0600 Subject: [PATCH 5/6] merge w/ main --- package.json | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 5da025c..ee75c35 100644 --- a/package.json +++ b/package.json @@ -1,8 +1,8 @@ { "name": "@mattpolzin/harmony", "version": "4.0.1", - "engines" : { - "node" : ">=18.0.0" + "engines": { + "node": ">=18.0.0" }, "publishConfig": { "access": "public" @@ -17,10 +17,12 @@ "homepage": "https://github.com/mattpolzin/harmony#readme", "repository": { "type": "git", - "url": "https://github.com/mattpolzin/harmony.git" + "url": "git+https://github.com/mattpolzin/harmony.git" }, "main": "harmony", - "bin": "./harmony", + "bin": { + "harmony": "harmony" + }, "scripts": {}, "author": "Mathew Polzin", "license": "MIT", From 23a3f88bd5995128c7700033af34d853b9a7995a Mon Sep 17 00:00:00 2001 From: Mathew Polzin Date: Sun, 21 Jan 2024 23:03:28 -0600 Subject: [PATCH 6/6] update expected help output --- test/expected_help.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/test/expected_help.txt b/test/expected_help.txt index d687c93..19f45b1 100644 --- a/test/expected_help.txt +++ b/test/expected_help.txt @@ -1,6 +1,8 @@ harmony Subcommands: + assign + Deprecated alias for 'request' command. branch Print the GitHub URI for the currently checked out branch. config {} []