authordeps: expand some code to be easier to read

rjbs · Jun 3, 2024 · aad2460 · aad2460
1 parent 3776ae0
commit aad2460
Showing 1 changed file with 32 additions and 18 deletions.
diff --git a/lib/Dist/Zilla/Util/AuthorDeps.pm b/lib/Dist/Zilla/Util/AuthorDeps.pm
@@ -107,24 +107,38 @@ sub extract_author_deps {
   if ($missing) {
     require Module::Runtime;
 
-    @packages =
-      grep {
-        $_ eq 'perl'
-        ? ! ($vermap->{perl} && eval "use $vermap->{perl}; 1")
-        : do {
-            my $m = $_;
-            ! eval {
-              local @INC = @INC; push @INC, "$root";
-              # This will die if module is missing
-              Module::Runtime::require_module($m);
-              my $v = $vermap->{$m};
-              # This will die if VERSION is too low
-              !$v || $m->VERSION($v);
-              # Success!
-              1
-            }
-          }
-      } @packages;
+    my @new_packages;
+    PACKAGE: for my $package (@packages) {
+      if ($package eq 'perl') {
+        # This is weird, perl can never really be a prereq to fulfill but...
+        # it was like this. -- rjbs, 2024-06-02
+        if ($vermap->{perl} && ! eval "use $vermap->{perl}; 1") {
+          push @new_packages, 'perl';
+        }
+
+        next PACKAGE;
+      }
+
+      my $ok = eval {
+        local @INC = (@INC, "$root");
+
+        # This will die if module is missing
+        Module::Runtime::require_module($package);
+        my $v = $vermap->{$package};
+
+        # This will die if VERSION is too low
+        !$v || $package->VERSION($v);
+
+        # Success!
+        1;
+      };
+
+      unless ($ok) {
+        push @new_packages, $package;
+      }
+    }
+
+    @packages = @new_packages;
   }
 
   # Now that we have a sorted list of packages, use that to build an array of