From 6fedf085b4495800d1aef5c8251948f9f3b4ca48 Mon Sep 17 00:00:00 2001 From: Josh Soref <2119212+jsoref@users.noreply.github.com> Date: Wed, 4 Jun 2025 15:53:13 -0400 Subject: [PATCH 01/11] spelling: blockcomment Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com> --- .../java/org/neo4j/shell/parser/ShellStatementParserTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/geequel-shell/src/test/java/org/neo4j/shell/parser/ShellStatementParserTest.java b/geequel-shell/src/test/java/org/neo4j/shell/parser/ShellStatementParserTest.java index 368a154..3b3d7cc 100644 --- a/geequel-shell/src/test/java/org/neo4j/shell/parser/ShellStatementParserTest.java +++ b/geequel-shell/src/test/java/org/neo4j/shell/parser/ShellStatementParserTest.java @@ -378,7 +378,7 @@ public void quoteInComment() throws Exception { } @Test - public void quoteInBlockomment() throws Exception { + public void quoteInBlockComment() throws Exception { // when parser.parseMoreText("/* `;\n;*/\n;"); From 5aed4f99ab3c5693365ecc51bdecc007c78c2ff3 Mon Sep 17 00:00:00 2001 From: Josh Soref <2119212+jsoref@users.noreply.github.com> Date: Wed, 4 Jun 2025 15:54:32 -0400 Subject: [PATCH 02/11] spelling: set up Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com> --- geequel-shell/src/dist/geequel-shell.bat | 2 +- gradlew.bat | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/geequel-shell/src/dist/geequel-shell.bat b/geequel-shell/src/dist/geequel-shell.bat index e37fe37..bb53462 100755 --- a/geequel-shell/src/dist/geequel-shell.bat +++ b/geequel-shell/src/dist/geequel-shell.bat @@ -82,7 +82,7 @@ rem Get arguments from the 4NT Shell from JP Software set CMD_LINE_ARGS=%$ :execute -rem Setup the command line +rem Set up the command line SETLOCAL EnableDelayedExpansion SET GEEQUEL_SHELL_JAR= diff --git a/gradlew.bat b/gradlew.bat index f955316..185c172 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -61,7 +61,7 @@ if "x%~1" == "x" goto execute set CMD_LINE_ARGS=%* :execute -@rem Setup the command line +@rem Set up the command line set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar From 4ff61eecde5dcead43c5ca7e9311cad54bb5efb8 Mon Sep 17 00:00:00 2001 From: Josh Soref <2119212+jsoref@users.noreply.github.com> Date: Wed, 4 Jun 2025 15:54:55 -0400 Subject: [PATCH 03/11] spelling: them Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com> --- geequel-shell/src/main/java/org/neo4j/shell/ParameterMap.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/geequel-shell/src/main/java/org/neo4j/shell/ParameterMap.java b/geequel-shell/src/main/java/org/neo4j/shell/ParameterMap.java index 04e77ea..dd56ab1 100644 --- a/geequel-shell/src/main/java/org/neo4j/shell/ParameterMap.java +++ b/geequel-shell/src/main/java/org/neo4j/shell/ParameterMap.java @@ -26,7 +26,7 @@ import java.util.Map; /** - * An object which keeps named parameters and allows them them to be set/unset. + * An object which keeps named parameters and allows them to be set/unset. */ public interface ParameterMap { /** From 0f248eef1567a7b69982b2ea548198adf2adff12 Mon Sep 17 00:00:00 2001 From: Josh Soref <2119212+jsoref@users.noreply.github.com> Date: Wed, 4 Jun 2025 14:18:16 -0400 Subject: [PATCH 04/11] Suggest ignoring geequel-xxx tags --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 5ba7837..947789f 100644 --- a/build.gradle +++ b/build.gradle @@ -59,7 +59,7 @@ subprojects { } ext { - // Only match tags starting with a number to avoid ongdb-xxx changelog tags + // Only match tags starting with a number to avoid ongdb-xxx / geequel-xxx changelog tags gitVersion = 'git describe --tags --match [0-9]*'.execute([], project.rootDir).text.trim() if (project.hasProperty('buildVersion')) { From fd2161bd35450053f462dc6f2bb6e4368f87e306 Mon Sep 17 00:00:00 2001 From: Josh Soref <2119212+jsoref@users.noreply.github.com> Date: Wed, 4 Jun 2025 14:06:59 -0400 Subject: [PATCH 05/11] Update Java Driver Version to 1.7.6 --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 947789f..d41537a 100644 --- a/build.gradle +++ b/build.gradle @@ -71,7 +71,7 @@ ext { argparse4jVersion = '0.7.0' junitVersion = '4.12' evaluatorVersion = '3.5.14' - neo4jJavaDriverVersion = '1.7.5' + neo4jJavaDriverVersion = '1.7.6' findbugsVersion = '3.0.0' jansiVersion = '1.13' jlineVersion = '2.14.6' From af42a74de6c35202fbae80b782271d0f0594c0d0 Mon Sep 17 00:00:00 2001 From: Josh Soref <2119212+jsoref@users.noreply.github.com> Date: Wed, 4 Jun 2025 14:48:58 -0400 Subject: [PATCH 06/11] Link to graphfoundation query language docs --- geequel-shell/src/main/java/org/neo4j/shell/commands/Help.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/geequel-shell/src/main/java/org/neo4j/shell/commands/Help.java b/geequel-shell/src/main/java/org/neo4j/shell/commands/Help.java index 9007f07..8a22224 100644 --- a/geequel-shell/src/main/java/org/neo4j/shell/commands/Help.java +++ b/geequel-shell/src/main/java/org/neo4j/shell/commands/Help.java @@ -36,7 +36,7 @@ public class Help implements Command { public static final String COMMAND_NAME = ":help"; private final Logger logger; private final CommandHelper commandHelper; - public static String CYPHER_REFCARD_LINK = "https://neo4j.com/docs/developer-manual/current/cypher/"; + public static String CYPHER_REFCARD_LINK = "https://docs.graphfoundation.org/docs/category/query-language-docs"; public Help(@Nonnull final Logger shell, @Nonnull final CommandHelper commandHelper) { this.logger = shell; From c7d67c737ad541898b2f1fe40b0be85887f6f1da Mon Sep 17 00:00:00 2001 From: Josh Soref <2119212+jsoref@users.noreply.github.com> Date: Wed, 4 Jun 2025 14:12:31 -0400 Subject: [PATCH 07/11] ci: Simplify log artifact path --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2921e00..30edeef 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -22,4 +22,4 @@ jobs: uses: actions/upload-artifact@v4 with: name: ${{ inputs.log-name || 'logs' }} - path: /home/runner/work/geequel-shell/geequel-shell/geequel-shell/build/reports/tests/test/ + path: geequel-shell/build/reports/tests/test/ From 5f223d10a3cdf12fb5179b9e6e05466a9fd24259 Mon Sep 17 00:00:00 2001 From: Josh Soref <2119212+jsoref@users.noreply.github.com> Date: Wed, 4 Jun 2025 14:13:05 -0400 Subject: [PATCH 08/11] ci: Simplify log name --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 30edeef..4b7702b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -21,5 +21,5 @@ jobs: if: failure() uses: actions/upload-artifact@v4 with: - name: ${{ inputs.log-name || 'logs' }} + name: logs path: geequel-shell/build/reports/tests/test/ From 8ae32aa2e435860e02974726f36293c25638f3fe Mon Sep 17 00:00:00 2001 From: Josh Soref <2119212+jsoref@users.noreply.github.com> Date: Wed, 4 Jun 2025 14:13:27 -0400 Subject: [PATCH 09/11] ci: Upload geequel-shell artifact --- .github/workflows/ci.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4b7702b..2b79906 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,6 +17,11 @@ jobs: cache: gradle - name: Build with Makefile run: make build && make test && make untested-zip + - name: Upload artifact + uses: actions/upload-artifact@v4 + with: + name: geequel-shell + path: out/geequel-shell.zip - name: Upload logs if: failure() uses: actions/upload-artifact@v4 From cd7c0a4c7f96a01a425d7dae0212be2962590425 Mon Sep 17 00:00:00 2001 From: Josh Soref <2119212+jsoref@users.noreply.github.com> Date: Wed, 4 Jun 2025 14:23:50 -0400 Subject: [PATCH 10/11] ci: Report build info --- .github/workflows/ci.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2b79906..5b5ba3f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,7 +16,11 @@ jobs: distribution: 'corretto' cache: gradle - name: Build with Makefile - run: make build && make test && make untested-zip + run: | + make info + make build + make test + make untested-zip - name: Upload artifact uses: actions/upload-artifact@v4 with: From ff2f92f75aa7c1007cdbb2a858dc5c67aded1732 Mon Sep 17 00:00:00 2001 From: Josh Soref <2119212+jsoref@users.noreply.github.com> Date: Wed, 4 Jun 2025 14:28:13 -0400 Subject: [PATCH 11/11] ci: Fix versioning * Fetch commits and tags * Set version to 0.0.1 for repos without tags * Fix version test --- .github/workflows/ci.yml | 3 +++ Makefile | 7 ++++--- geequel-shell/src/test/java/org/neo4j/shell/MainTest.java | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5b5ba3f..4041471 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -9,6 +9,9 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 + with: + fetch-depth: 0 + fetch-tags: true - name: Set up JDK 8 uses: actions/setup-java@v4 with: diff --git a/Makefile b/Makefile index f5cd179..923d442 100644 --- a/Makefile +++ b/Makefile @@ -1,11 +1,12 @@ .DEFAULT: help .PHONY: help build clean zip run untested-zip test integration-test tyrekicking-test mutation-test install info -gitdescribe := $(shell git describe --tags --match [0-9]*) -lasttag := $(shell git describe --tags --match [0-9]* --abbrev=0) +gitdescribe := $(shell git describe --tags --match '[0-9]*' 2>/dev/null || echo 0.0.1-alpha) +gitafter := $(shell git describe --tags --match '[0-9]*' --all 2>/dev/null | perl -pe 'exit unless /-\d+-/;s<^tags/><>;s<^(?:\d+\.)+\d+-><>;s<-.*><>; s/^/modified-/ if /./') +lasttag := $(shell git describe --tags --match '[0-9]*' --abbrev=0 2>/dev/null || echo 0.0.1-alpha) version ?= $(lasttag) -versionlabel = $(shell echo ${version} | awk '{ sub("^[0-9]+.[0-9]+.[0-9]+-?", "", $$1); print }') +versionlabel = $(shell (echo ${version} | perl -pe 's/^\d+\.\d+\.\d+-?//'; echo ${gitafter}) | grep . | head -1) versionnumber = $(shell echo ${version} | awk '{ sub("-.*$$", "", $$1); print }') pkgversion ?= 1 diff --git a/geequel-shell/src/test/java/org/neo4j/shell/MainTest.java b/geequel-shell/src/test/java/org/neo4j/shell/MainTest.java index 7fd1fca..37a8c36 100644 --- a/geequel-shell/src/test/java/org/neo4j/shell/MainTest.java +++ b/geequel-shell/src/test/java/org/neo4j/shell/MainTest.java @@ -399,7 +399,7 @@ public void printsVersionAndExits() { ArgumentCaptor argument = ArgumentCaptor.forClass(String.class); verify(printStream).println(argument.capture()); - assertTrue(argument.getValue().matches("Geequel-Shell ( \\d+\\.\\d+\\.\\d+.*)?")); + assertTrue(argument.getValue().matches("Geequel-Shell (\\d+\\.\\d+\\.\\d+.*)?")); } @Test