make list_windows return list, not print to selected filehandle

Changes

@@ -1,7 +1,7 @@
-Revision history for PDL-DSP-Windows
-
 {{$NEXT}}
 
+- list_windows now returns a list, not print to selected filehandle
+
 0.101     2024-09-11 20:13:59 BST
 
 Fixes:

META.json

@@ -82,7 +82,6 @@
             "CPAN::Meta" : "2.120900"
          },
          "requires" : {
-            "Capture::Tiny" : "0",
             "ExtUtils::MakeMaker" : "0",
             "File::Spec" : "0",
             "Test::More" : "0.96",

Makefile.PL

@@ -20,7 +20,6 @@ my %WriteMakefileArgs = (
     "PDL" => "2.055"
   },
   "TEST_REQUIRES" => {
-    "Capture::Tiny" => 0,
     "ExtUtils::MakeMaker" => 0,
     "File::Spec" => 0,
     "Test::More" => "0.96"
@@ -33,7 +32,6 @@ my %WriteMakefileArgs = (
 
 
 my %FallbackPrereqs = (
-  "Capture::Tiny" => 0,
   "ExtUtils::MakeMaker" => 0,
   "File::Spec" => 0,
   "PDL" => "2.055",

README.md

@@ -124,11 +124,12 @@ are case-insensitive.
 
 ## list\_windows
 
-    list_windows
-    list_windows STR
+    print join ", ", list_windows(), "\n"
+    print join ", ", list_windows(STR), "\n"
 
-`list_windows` prints the names all of the available windows.
-`list_windows STR` prints only the names of windows matching the string `STR`.
+`list_windows` returns the names all of the available windows.
+`list_windows STR` returns only the names of windows matching the
+regular expression `STR`.
 
 # METHODS
 

cpanfile

@@ -13,6 +13,5 @@ feature plot => 'Plot windows' => sub {
 };
 
 on test => sub {
-    requires 'Capture::Tiny' => '0';
     requires 'Test::More'    => '0.96';
 };

lib/PDL/DSP/Windows.pm

@@ -319,35 +319,29 @@ sub window { PDL::DSP::Windows->new(@_)->samples }
 
 =head2 list_windows
 
-    list_windows
-    list_windows STR
+    print join ", ", list_windows(), "\n"
+    print join ", ", list_windows(STR), "\n"
 
-C<list_windows> prints the names all of the available windows.
-C<list_windows STR> prints only the names of windows matching the string C<STR>.
+C<list_windows> returns the names all of the available windows.
+C<list_windows STR> returns only the names of windows matching the
+regular expression C<STR>.
 
 =cut
 
 sub list_windows {
     my ($expr) = @_;
-
+    return sort keys %symmetric_windows if !$expr;
     my @match;
-    if ($expr) {
-        for my $name ( sort keys %symmetric_windows ) {
-            if ( $name =~ /$expr/ ) {
-                push @match, $name;
-                next;
-            }
-
-            push @match,
-                map "$name (alias $_)",
-                grep /$expr/i, @{ $window_aliases{$name} // [] };
+    for my $name ( sort keys %symmetric_windows ) {
+        if ( $name =~ /$expr/ ) {
+            push @match, $name;
+            next;
         }
+        push @match,
+            map "$name (alias $_)",
+            grep /$expr/i, @{ $window_aliases{$name} // [] };
     }
-    else {
-        @match = sort keys %symmetric_windows;
-    }
-
-    print join( ', ', @match ), "\n";
+    @match;
 }
 
 =head1 METHODS

t/list_windows.t

@@ -3,7 +3,6 @@ use Test::More;
 use strict;
 use warnings;
 
-use Capture::Tiny 'capture';
 use PDL::DSP::Windows qw( list_windows );
 
 my @windows = qw(
@@ -47,7 +46,13 @@ my @windows = qw(
     welch
 );
 
-sub do_test (@);
+sub do_test (@) {
+    my $expected = shift;
+    my @args = @_;
+    my @got = list_windows(@args);
+    my $message = @args ? join( ', ', @args ) : 'defaults';
+    is_deeply \@got, $expected, "list_windows using $message";
+}
 
 note 'Can filter windows';
 do_test [ grep { /blackman/ } @windows ] => 'blackman';
@@ -66,18 +71,4 @@ do_test ['tukey'] => qw( tukey nothing else matters welch );
 note 'Matches on window aliases';
 do_test ['tukey (alias tapered cosine)'] => 'tapered cosine';
 
-sub do_test (@) {
-    my $expected = shift;
-    my @args = @_;
-
-    my ($stdout) = capture { list_windows(@args) };
-
-    chomp $stdout;
-
-    my $message = @args ? join( ', ', @args ) : 'defaults';
-
-    is $stdout, join( ', ' => @{$expected} ),
-        "list_windows using $message";
-}
-
 done_testing;