#370 DirDeps

eo-maven-plugin/src/main/java/org/eolang/maven/DepDirs.java

@@ -0,0 +1,78 @@
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2016-2021 Yegor Bugayenko
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package org.eolang.maven;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.stream.Collectors;
+import org.cactoos.list.ListEnvelope;
+
+/**
+ * Walk through directories in a directory and find dep names. Each
+ * dep is a sub-directory of the third level,
+ * for example "org.eolang/eo-runtime/0.10.0".
+ *
+ * @since 0.13
+ */
+final class DepDirs extends ListEnvelope<String> {
+
+    /**
+     * Ctor.
+     *
+     * @param dir The directory
+     * @throws IOException If fails
+     */
+    DepDirs(final Path dir) throws IOException {
+        super(DepDirs.list(dir));
+    }
+
+    /**
+     * List them all.
+     * @param dir The dir
+     * @return List
+     * @throws IOException If fails
+     * @checkstyle MagicNumber (20 lines)
+     */
+    private static List<String> list(final Path dir) throws IOException {
+        final List<String> names = new LinkedList<>();
+        if (Files.exists(dir)) {
+            final String home = dir.toAbsolutePath().toString();
+            names.addAll(
+                Files.find(dir, 3, (t, u) -> true)
+                    .filter(file -> file.toFile().isDirectory())
+                    .map(file -> file.toAbsolutePath().toString())
+                    .filter(name -> !name.equals(home))
+                    .map(name -> name.substring(home.length() + 1))
+                    .filter(name -> name.split(File.separator).length == 3)
+                    .collect(Collectors.toList())
+            );
+        }
+        return names;
+    }
+
+}

eo-maven-plugin/src/main/java/org/eolang/maven/MarkMojo.java

@@ -24,11 +24,11 @@
 package org.eolang.maven;
 
 import com.jcabi.log.Logger;
+import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.Collection;
-import java.util.stream.Collectors;
 import org.apache.maven.plugins.annotations.LifecyclePhase;
 import org.apache.maven.plugins.annotations.Mojo;
 import org.eolang.tojos.Tojo;
@@ -52,14 +52,15 @@ public final class MarkMojo extends SafeMojo {
     public void exec() throws IOException {
         final Path home = this.targetDir.toPath().resolve(ResolveMojo.DIR);
         if (Files.exists(home)) {
-            final Collection<Path> deps = Files.list(home).collect(Collectors.toList());
+            final Collection<String> deps = new DepDirs(home);
             int found = 0;
-            for (final Path dir : deps) {
+            for (final String dep : deps) {
+                final Path dir = home.resolve(dep);
                 final Path sub = dir.resolve(CopyMojo.DIR);
                 if (!Files.exists(sub)) {
                     continue;
                 }
-                final String ver = dir.toString().replaceAll("^.+[_:]([0-9.]+)$", "$1");
+                final String ver = dep.split(File.separator)[2];
                 found += this.scan(sub, ver);
             }
             Logger.info(

eo-maven-plugin/src/main/java/org/eolang/maven/PlaceMojo.java

@@ -29,7 +29,6 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.Collection;
-import java.util.stream.Collectors;
 import org.apache.maven.plugins.annotations.LifecyclePhase;
 import org.apache.maven.plugins.annotations.Mojo;
 import org.apache.maven.plugins.annotations.Parameter;
@@ -77,12 +76,13 @@ public final class PlaceMojo extends SafeMojo {
     public void exec() throws IOException {
         final Path home = this.targetDir.toPath().resolve(ResolveMojo.DIR);
         if (Files.exists(home)) {
-            final Collection<Path> deps = Files.list(home).collect(Collectors.toList());
+            final Collection<String> deps = new DepDirs(home);
             final Tojos tojos = new MonoTojos(this.placed);
             int copied = 0;
-            for (final Path dep : deps) {
-                for (final Path file : new Walk(dep)) {
-                    final String path = file.toString().substring(dep.toString().length() + 1);
+            for (final String dep : deps) {
+                final Path dir = home.resolve(dep);
+                for (final Path file : new Walk(dir)) {
+                    final String path = file.toString().substring(dir.toString().length() + 1);
                     if (path.startsWith(CopyMojo.DIR)) {
                         continue;
                     }

eo-maven-plugin/src/main/java/org/eolang/maven/ResolveMojo.java

@@ -85,9 +85,10 @@ public void exec() throws IOException {
         final Collection<Dependency> deps = this.deps();
         for (final Dependency dep : deps) {
             final String coords = ResolveMojo.coords(dep);
-            final Path dest = this.targetDir.toPath().resolve(ResolveMojo.DIR).resolve(
-                coords.replaceAll("[^0-9a-zA-Z.-]", "_")
-            );
+            final Path dest = this.targetDir.toPath().resolve(ResolveMojo.DIR)
+                .resolve(dep.getGroupId())
+                .resolve(dep.getArtifactId())
+                .resolve(dep.getVersion());
             if (Files.exists(dest)) {
                 Logger.info(
                     this, "Dependency %s already resolved to %s",

eo-maven-plugin/src/test/java/org/eolang/maven/DepDirsTest.java

@@ -0,0 +1,57 @@
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2016-2021 Yegor Bugayenko
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package org.eolang.maven;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Path;
+import org.hamcrest.MatcherAssert;
+import org.hamcrest.Matchers;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+
+/**
+ * Test case for {@link DepDirs}.
+ *
+ * @since 0.11
+ */
+public final class DepDirsTest {
+
+    @Test
+    public void findsDirs(@TempDir final Path temp) throws IOException {
+        new Save("", temp.resolve("a/b/c/f/test.txt")).save();
+        new Save("", temp.resolve("a/b/f.txt")).save();
+        new Save("", temp.resolve("test/f.txt")).save();
+        new Save("", temp.resolve("a/g")).save();
+        MatcherAssert.assertThat(
+            new DepDirs(temp),
+            Matchers.contains(String.format("a%sb%1$sc", File.separator))
+        );
+        MatcherAssert.assertThat(
+            new DepDirs(temp),
+            Matchers.iterableWithSize(1)
+        );
+    }
+
+}

eo-maven-plugin/src/test/java/org/eolang/maven/MarkMojoTest.java

@@ -43,7 +43,7 @@ public void extendForeignWithNewObjects(@TempDir final Path temp) throws Excepti
         final Path bins = temp.resolve(ResolveMojo.DIR);
         new Save(
             "hi",
-            bins.resolve(String.format("foo_hello_0.1.8/%s/foo/bar.eo", CopyMojo.DIR))
+            bins.resolve(String.format("foo/hello/0.1.8/%s/foo/bar.eo", CopyMojo.DIR))
         ).save();
         final Path foreign = temp.resolve("placed.csv");
         new Moja<>(MarkMojo.class)

eo-maven-plugin/src/test/java/org/eolang/maven/PlaceMojoTest.java

@@ -42,7 +42,7 @@ public final class PlaceMojoTest {
     public void placesBinaries(@TempDir final Path temp) throws Exception {
         final Path bins = temp.resolve(ResolveMojo.DIR);
         final Path classes = temp.resolve("classes");
-        new Save("hello", bins.resolve("foo_hello_0.1/bar/x.bin")).save();
+        new Save("hello", bins.resolve("foo/hello/0.1/bar/x.bin")).save();
         new Moja<>(PlaceMojo.class)
             .with("targetDir", temp.toFile())
             .with("outputDir", classes.toFile())