From 4de2b0b3f1892f9431e6b158e8b2844bc0576424 Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Mon, 27 May 2024 16:09:52 -0700 Subject: [PATCH 01/69] Added script to list parameters --- cliargs.sh | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100755 cliargs.sh diff --git a/cliargs.sh b/cliargs.sh new file mode 100755 index 0000000..cb32bde --- /dev/null +++ b/cliargs.sh @@ -0,0 +1,7 @@ +#!/bin/bash + +java -cp "lib/test/*" com.puppycrawl.tools.checkstyle.Main --help |\ +grep "^ -.*" |\ +sed -e "s/ -/-/" -e "s/[,=].*//" -e "s/-/\"-/" -e "s/$/\",/" |\ +sed -e '$s/,//' -e '/-V/d' -e '/-h/d' |\ +sort From 7aa0319d4d9a8667a39075e2247db8c802dc23ca Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Mon, 27 May 2024 20:38:53 -0700 Subject: [PATCH 02/69] Read parameters from resource file --- cliargs.sh | 5 ++-- .../extension/CheckstyleOperationTest.java | 25 +++++-------------- src/test/resources/checkstyle-args.txt | 16 ++++++++++++ 3 files changed, 24 insertions(+), 22 deletions(-) create mode 100644 src/test/resources/checkstyle-args.txt diff --git a/cliargs.sh b/cliargs.sh index cb32bde..3c9bc28 100755 --- a/cliargs.sh +++ b/cliargs.sh @@ -2,6 +2,5 @@ java -cp "lib/test/*" com.puppycrawl.tools.checkstyle.Main --help |\ grep "^ -.*" |\ -sed -e "s/ -/-/" -e "s/[,=].*//" -e "s/-/\"-/" -e "s/$/\",/" |\ -sed -e '$s/,//' -e '/-V/d' -e '/-h/d' |\ -sort +sed -e "s/ -/-/" -e "s/[,=].*//" -e '/-V/d' -e '/-h/d' |\ +sort > "src/test/resources/checkstyle-args.txt" diff --git a/src/test/java/rife/bld/extension/CheckstyleOperationTest.java b/src/test/java/rife/bld/extension/CheckstyleOperationTest.java index f844153..f41077a 100644 --- a/src/test/java/rife/bld/extension/CheckstyleOperationTest.java +++ b/src/test/java/rife/bld/extension/CheckstyleOperationTest.java @@ -24,6 +24,8 @@ import rife.bld.operations.exceptions.ExitStatusException; import java.io.File; import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Paths; import java.util.List; import static org.assertj.core.api.Assertions.assertThat; @@ -43,25 +45,10 @@ class CheckstyleOperationTest { } @Test - void checkAllParameters() { - var params = List.of( - "-b", - "-c", - "-d", - "-e", - "-E", - "-f", - "-g", - "-j", - "-J", - "-o", - "-p", - "-s", - "-t", - "-T", - "-w", - "-x" - ); + void checkAllParameters() throws IOException { + var params = Files.readAllLines(Paths.get("src", "test", "resources", "checkstyle-args.txt")); + + assertThat(params).isNotEmpty(); var args = new CheckstyleOperation() .fromProject(new Project()) diff --git a/src/test/resources/checkstyle-args.txt b/src/test/resources/checkstyle-args.txt new file mode 100644 index 0000000..fa76eaf --- /dev/null +++ b/src/test/resources/checkstyle-args.txt @@ -0,0 +1,16 @@ +-b +-c +-d +-e +-E +-f +-g +-j +-J +-o +-p +-s +-t +-T +-w +-x From aa6d6a70b026733221f9efbd836b5d2ba2b805e8 Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Tue, 28 May 2024 14:01:45 -0700 Subject: [PATCH 03/69] Execute cliargs script before running tests --- checkcliargs.sh | 16 ---------------- lib/bld/bld-wrapper.properties | 1 + scripts/checkcliargs.sh | 16 ++++++++++++++++ cliargs.sh => scripts/cliargs.sh | 0 .../bld/extension/CheckstyleOperationBuild.java | 9 +++++++++ .../bld/extension/CheckstyleOperationTest.java | 10 +++++----- 6 files changed, 31 insertions(+), 21 deletions(-) delete mode 100755 checkcliargs.sh create mode 100755 scripts/checkcliargs.sh rename cliargs.sh => scripts/cliargs.sh (100%) diff --git a/checkcliargs.sh b/checkcliargs.sh deleted file mode 100755 index 867c768..0000000 --- a/checkcliargs.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/bash - -MAIN="com.puppycrawl.tools.checkstyle.Main" -TMPNEW=/tmp/checkcliargs-new -TMPOLD=/tmp/checkcliargs-old - -java -cp "lib/test/*" $MAIN --help >$TMPNEW -java -cp "examples/lib/test/*" $MAIN --help >$TMPOLD - -if [ "$1" == "-v" ]; then - code --wait --diff $TMPOLD $TMPNEW -else - diff $TMPOLD $TMPNEW -fi - -rm -rf $TMPNEW $TMPOLD diff --git a/lib/bld/bld-wrapper.properties b/lib/bld/bld-wrapper.properties index cab667f..d8197e2 100644 --- a/lib/bld/bld-wrapper.properties +++ b/lib/bld/bld-wrapper.properties @@ -2,6 +2,7 @@ bld.downloadExtensionJavadoc=false bld.downloadExtensionSources=true bld.extension-pmd=com.uwyn.rife2:bld-pmd:0.9.9 bld.extension-jacoco=com.uwyn.rife2:bld-jacoco-report:0.9.5 +bld.extension-exec=com.uwyn.rife2:bld-exec:1.0.0 bld.repositories=MAVEN_CENTRAL,MAVEN_LOCAL,RIFE2_SNAPSHOTS,RIFE2_RELEASES bld.downloadLocation= bld.sourceDirectories= diff --git a/scripts/checkcliargs.sh b/scripts/checkcliargs.sh new file mode 100755 index 0000000..1ed3db1 --- /dev/null +++ b/scripts/checkcliargs.sh @@ -0,0 +1,16 @@ +#!/bin/bash + +main="com.puppycrawl.tools.checkstyle.Main" +new=/tmp/checkcliargs-new +old=/tmp/checkcliargs-old + +java -cp "lib/test/*" $main --help >$new +java -cp "examples/lib/test/*" $main --help >$old + +if [ "$1" == "-v" ]; then + code --wait --diff $old $new +else + diff $old $new +fi + +rm -rf $new $old diff --git a/cliargs.sh b/scripts/cliargs.sh similarity index 100% rename from cliargs.sh rename to scripts/cliargs.sh diff --git a/src/bld/java/rife/bld/extension/CheckstyleOperationBuild.java b/src/bld/java/rife/bld/extension/CheckstyleOperationBuild.java index b2f7fd9..2ef6a10 100644 --- a/src/bld/java/rife/bld/extension/CheckstyleOperationBuild.java +++ b/src/bld/java/rife/bld/extension/CheckstyleOperationBuild.java @@ -104,4 +104,13 @@ public class CheckstyleOperationBuild extends Project { .ruleSets("config/pmd.xml") .execute(); } + + @Override + public void test() throws Exception { + new ExecOperation() + .fromProject(this) + .command("scripts/cliargs.sh") + .execute(); + super.test(); + } } diff --git a/src/test/java/rife/bld/extension/CheckstyleOperationTest.java b/src/test/java/rife/bld/extension/CheckstyleOperationTest.java index f41077a..db4ec48 100644 --- a/src/test/java/rife/bld/extension/CheckstyleOperationTest.java +++ b/src/test/java/rife/bld/extension/CheckstyleOperationTest.java @@ -46,11 +46,11 @@ class CheckstyleOperationTest { @Test void checkAllParameters() throws IOException { - var params = Files.readAllLines(Paths.get("src", "test", "resources", "checkstyle-args.txt")); + var args = Files.readAllLines(Paths.get("src", "test", "resources", "checkstyle-args.txt")); - assertThat(params).isNotEmpty(); + assertThat(args).isNotEmpty(); - var args = new CheckstyleOperation() + var params = new CheckstyleOperation() .fromProject(new Project()) .branchMatchingXpath("xpath") .configurationFile("config") @@ -70,9 +70,9 @@ class CheckstyleOperationTest { .treeWithJavadoc(true) .executeConstructProcessCommandList(); - for (var p : params) { + for (var p : args) { var found = false; - for (var a : args) { + for (var a : params) { if (a.startsWith(p)) { found = true; break; From 00f40e887f5cb41ffc5eaa94ae2dbee70f71fb45 Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Fri, 14 Jun 2024 23:50:48 -0700 Subject: [PATCH 04/69] Fixed bld URL --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 4b7e28d..d6ba605 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# [Checkstyle](https://checkstyle.sourceforge.io/) Extension for [bld](https://rife2.com/bldb) +# [Checkstyle](https://checkstyle.sourceforge.io/) Extension for [bld](https://rife2.com/bld) [![License](https://img.shields.io/badge/license-Apache%20License%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0) [![Java](https://img.shields.io/badge/java-17%2B-blue)](https://www.oracle.com/java/technologies/javase/jdk17-archive-downloads.html) From 826a967815238c56034f144d414d36028ca1879f Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Mon, 22 Jul 2024 09:41:55 -0700 Subject: [PATCH 05/69] Switched from Lists to Collections --- .github/workflows/bld.yml | 7 +- .idea/libraries/bld.xml | 4 +- .vscode/settings.json | 2 +- examples/.idea/libraries/bld.xml | 4 +- examples/.idea/misc.xml | 4 + examples/.vscode/settings.json | 2 +- examples/lib/bld/bld-wrapper.jar | Bin 27319 -> 29769 bytes examples/lib/bld/bld-wrapper.properties | 6 +- lib/bld/bld-wrapper.jar | Bin 27319 -> 29519 bytes lib/bld/bld-wrapper.properties | 10 +- .../extension/CheckstyleOperationBuild.java | 19 +- .../bld/extension/CheckstyleOperation.java | 258 +++++++++++------- .../OutputFormat.java} | 8 +- .../extension/CheckstyleOperationTest.java | 119 +++++--- 14 files changed, 280 insertions(+), 163 deletions(-) rename src/main/java/rife/bld/extension/{CheckstyleFormatOption.java => checkstyle/OutputFormat.java} (82%) diff --git a/.github/workflows/bld.yml b/.github/workflows/bld.yml index c0ba763..bf65051 100644 --- a/.github/workflows/bld.yml +++ b/.github/workflows/bld.yml @@ -22,11 +22,8 @@ jobs: distribution: "zulu" java-version: ${{ matrix.java-version }} - - name: Grant execute permission for bld - run: chmod +x bld - - - name: Download the dependencies + - name: Download dependencies run: ./bld download - - name: Run tests with bld + - name: Run tests run: ./bld compile test diff --git a/.idea/libraries/bld.xml b/.idea/libraries/bld.xml index a2969be..2fb5ff0 100644 --- a/.idea/libraries/bld.xml +++ b/.idea/libraries/bld.xml @@ -2,12 +2,12 @@ - + - + diff --git a/.vscode/settings.json b/.vscode/settings.json index 87dd394..fc389ce 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -9,7 +9,7 @@ ], "java.configuration.updateBuildConfiguration": "automatic", "java.project.referencedLibraries": [ - "${HOME}/.bld/dist/bld-1.9.1.jar", + "${HOME}/.bld/dist/bld-2.0.0-SNAPSHOT.jar", "lib/**/*.jar" ], "java.compile.nullAnalysis.mode": "automatic" diff --git a/examples/.idea/libraries/bld.xml b/examples/.idea/libraries/bld.xml index a2969be..2fb5ff0 100644 --- a/examples/.idea/libraries/bld.xml +++ b/examples/.idea/libraries/bld.xml @@ -2,12 +2,12 @@ - + - + diff --git a/examples/.idea/misc.xml b/examples/.idea/misc.xml index 97c1009..a01a1f3 100644 --- a/examples/.idea/misc.xml +++ b/examples/.idea/misc.xml @@ -1,4 +1,8 @@ + + + +