Merge remote-tracking branch 'upstream/main' into feature/devonfw#103-implement-version-security-checks

# Conflicts:
#	cli/src/main/java/com/devonfw/tools/ide/tool/ToolCommandlet.java
#	cli/src/test/java/com/devonfw/tools/ide/context/AbstractIdeContextTest.java

Author: MattesMrzik

.github/workflows/build-pr.yml

@@ -14,3 +14,5 @@ jobs:
           java-version: '17'
       - name: Build project with Maven
         run: mvn -B -ntp -Dstyle.color=always install
+      - name: Coveralls GitHub Action
+        uses: coverallsapp/[email protected]

.github/workflows/build.yml

@@ -23,3 +23,5 @@ jobs:
           SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
           SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
         run: mvn --settings .mvn/settings.xml -DskipTests=true -Darchetype.test.skip=true -Dmaven.install.skip=true -Dstyle.color=always -B -ntp deploy
+      - name: Coveralls GitHub Action
+        uses: coverallsapp/[email protected]

README.adoc

@@ -10,6 +10,7 @@ image:https://img.shields.io/github/license/devonfw/IDEasy.svg?label=License["Ap
 image:https://img.shields.io/maven-central/v/com.devonfw.tools.ide/ide-cli.svg?label=Maven%20Central["Maven Central",link=https://search.maven.org/search?q=g:com.devonfw.tools.ide]
 image:https://github.com/devonfw/IDEasy/actions/workflows/build.yml/badge.svg["Build Status",link="https://github.com/devonfw/IDEasy/actions/workflows/build.yml"]
 image:https://github.com/devonfw/IDEasy/actions/workflows/update-urls.yml/badge.svg["Update URLS Status",link="https://github.com/devonfw/IDEasy/actions/workflows/update-urls.yml"]
+image:https://coveralls.io/repos/github/devonfw/IDEasy/badge.svg?branch=main["Coverage Status",link="https://coveralls.io/github/devonfw/IDEasy?branch=main"]
 
 toc::[]
 

cli/src/main/java/com/devonfw/tools/ide/cli/CliArgument.java

@@ -213,4 +213,37 @@ public static CliArgument of(boolean splitShortOpt, String... args) {
     return first;
   }
 
+  /**
+   * @param firstArgs the first arguments.
+   * @param nextArgs the additional arguments to append after {@code args}.
+   * @return a {@link String} array with the values from {@code firstArgs} followed by the values from {@code nextArgs}.
+   */
+  public static String[] append(String[] firstArgs, String... nextArgs) {
+
+    return join(firstArgs, false, nextArgs);
+  }
+
+  /**
+   * @param nextArgs the arguments to append after {@code firstArgs}.
+   * @param firstArgs the first arguments.
+   * @return a {@link String} array with the values from {@code firstArgs} followed by the values from {@code nextArgs}.
+   */
+  public static String[] prepend(String[] nextArgs, String... firstArgs) {
+
+    return join(nextArgs, false, firstArgs);
+  }
+
+  private static String[] join(String[] args, boolean prefix, String... extraArgs) {
+
+    String[] result = new String[args.length + extraArgs.length];
+    int argsStart = 0;
+    int extraArgsStart = args.length;
+    if (prefix) {
+      argsStart = extraArgs.length;
+      extraArgsStart = 0;
+    }
+    System.arraycopy(args, 0, result, argsStart, args.length);
+    System.arraycopy(extraArgs, 0, result, extraArgsStart, extraArgs.length);
+    return result;
+  }
 }

cli/src/main/java/com/devonfw/tools/ide/cli/Ide.java

@@ -63,7 +63,7 @@ public int run(String... args) {
     } catch (CliException error) {
       exitStatus = error.getExitCode();
       if (context().level(IdeLogLevel.DEBUG).isEnabled()) {
-        context().error(error.getMessage(), error);
+        context().error(error, error.getMessage());
       } else {
         context().error(error.getMessage());
       }

cli/src/main/java/com/devonfw/tools/ide/commandlet/HelpCommandlet.java

@@ -18,7 +18,7 @@
  */
 public final class HelpCommandlet extends Commandlet {
 
-  protected static final String LOGO = """
+  static final String LOGO = """
       __       ___ ___  ___
       ╲ ╲     |_ _|   ╲| __|__ _ ____ _
        > >     | || |) | _|/ _` (_-< || |