Merge branch '__rultor'

objectionary · Jun 10, 2024 · c5bbe04 · c5bbe04
2 parents f36094c + 10b6088
commit c5bbe04
Show file tree

Hide file tree

Showing 3 changed files with 57 additions and 3 deletions.
diff --git a/eo-maven-plugin/src/main/java/org/eolang/maven/PullMojo.java b/eo-maven-plugin/src/main/java/org/eolang/maven/PullMojo.java
@@ -125,8 +125,18 @@ public void exec() throws IOException {
                     )
                 );
                 names.add(name);
-                tojo.withSource(this.pull(name).toAbsolutePath())
-                    .withHash(new ChNarrow(name.hash()));
+                try {
+                    tojo.withSource(this.pull(name).toAbsolutePath())
+                        .withHash(new ChNarrow(name.hash()));
+                } catch (final IOException exception) {
+                    throw new IOException(
+                        String.format(
+                            "Failed to pull object discovered at %s",
+                            tojo.discoveredAt()
+                        ),
+                        exception
+                    );
+                }
             }
             Logger.info(
                 this,

diff --git a/eo-maven-plugin/src/main/java/org/eolang/maven/tojos/ForeignTojo.java b/eo-maven-plugin/src/main/java/org/eolang/maven/tojos/ForeignTojo.java
@@ -37,7 +37,7 @@
  *
  * @since 0.30
  */
-@SuppressWarnings("PMD.TooManyMethods")
+@SuppressWarnings({"PMD.TooManyMethods", "PMD.GodClass"})
 public final class ForeignTojo {
 
     /**
@@ -137,6 +137,14 @@ public String probed() {
         return this.attribute(ForeignTojos.Attribute.PROBED);
     }
 
+    /**
+     * The discovered at location.
+     * @return The discovered at.
+     */
+    public String discoveredAt() {
+        return this.attribute(ForeignTojos.Attribute.DISCOVERED_AT);
+    }
+
     /**
      * Checks if tojo was not already optimized.
      *

diff --git a/eo-maven-plugin/src/test/java/org/eolang/maven/PullMojoTest.java b/eo-maven-plugin/src/test/java/org/eolang/maven/PullMojoTest.java
@@ -38,6 +38,8 @@
 import org.eolang.maven.hash.ChText;
 import org.eolang.maven.hash.CommitHash;
 import org.eolang.maven.hash.CommitHashesMap;
+import org.eolang.maven.log.CaptureLogs;
+import org.eolang.maven.log.Logs;
 import org.eolang.maven.name.ObjectName;
 import org.eolang.maven.name.OnVersioned;
 import org.eolang.maven.objectionary.Objectionaries;
@@ -46,6 +48,7 @@
 import org.eolang.maven.util.HmBase;
 import org.hamcrest.MatcherAssert;
 import org.hamcrest.Matchers;
+import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.junit.jupiter.api.io.TempDir;
@@ -294,6 +297,39 @@ void doesNotPullInOfflineMode(@TempDir final Path tmp) throws IOException {
         );
     }
 
+    @Test
+    @CaptureLogs
+    void showsWhereNotFoundWasDiscoveredAt(@TempDir final Path tmp, final Logs out) {
+        Assertions.assertThrows(
+            Exception.class,
+            () -> {
+                new FakeMaven(tmp)
+                    .withProgram(
+                        "+package com.example\n",
+                        "# This is the default 64+ symbols comment in front of named abstract object.",
+                        "[] > main",
+                        "  org.eolang.org > @"
+                    )
+                    .with(
+                        "objectionaries",
+                        new Objectionaries.Fake(
+                            new OyRemote(
+                                new ChRemote("master")
+                            )
+                        )
+                    )
+                    .execute(new FakeMaven.Pull());
+            },
+            "Pull mojo should fail, but it does not"
+        );
+        Assertions.assertTrue(
+            out.captured().stream().anyMatch(
+                line -> line.contains("Failed to pull object discovered at")
+            ),
+            "Log should contain info where failed to pull object was discovered at, but it does not"
+        );
+    }
+
     /**
      * Check if the given source file exists in the target directory.
      * @param temp Test temporary directory.