X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=gitmo%2FMouse.git;a=blobdiff_plain;f=author%2Fimport-moose-test.pl;fp=author%2Fimport-moose-test.pl;h=e89735914ed3c3ebe94d3da3160f41424f6f8920;hp=fcb6db854fa2e2f4e4bba548ca2c5374bd0e914e;hb=854768370fd54135bc90fd39053d9e331c7da2dd;hpb=65a61aeecb1a9cc9d3f1f07a35a1f084b0b683ab

diff --git a/author/import-moose-test.pl b/author/import-moose-test.pl
index fcb6db8..e897359 100644
--- a/author/import-moose-test.pl
+++ b/author/import-moose-test.pl
@@ -4,6 +4,7 @@ use strict;
 use warnings FATAL => 'all';
 use File::Path qw(mkpath);
 use File::Find;
+use File::Basename qw(basename dirname);
 use autodie;
 
 my($moose_dir, $result) = @ARGV;
@@ -15,15 +16,18 @@ $result //= 'Moose-t';
 my @tests;
 sub wanted {
     return if /native_traits/;
-    (my $mouse_test         = $_) =~ s{\A $moose_dir/t }{$result}xmso;
-    (my $mouse_failing_test = $_) =~ s{\A $moose_dir/t }{$result-failing}xmso;
+    my $file = $_;
+    (my $basename = basename($file)) =~ s/Moose/Mouse/g;
+    $file = dirname($file) . '/' . $basename;
+    (my $test         = $file) =~ s{\A $moose_dir/t }{$result}xmso;
+    (my $failing_test = $file) =~ s{\A $moose_dir/t }{$result-failing}xmso;
     if( -d $_ ) {
-        mkpath [$mouse_test, $mouse_failing_test];
+        mkpath [$test, $failing_test];
         return;
     }
-    copy_as_mouse($_ => $mouse_test);
-    push @tests, [$mouse_test, $mouse_failing_test]
-        if $mouse_test =~/\.t\z/xms;
+    copy_as_mouse($_ => $test);
+    push @tests, [$test, $failing_test]
+        if $file =~/\.t\z/xms;
     return;
 }
 
@@ -77,9 +81,9 @@ sub copy_as_mouse {
             say $out "# DO NOT EDIT THIS FILE. ANY CHANGES WILL BE LOST!!!";
             say $out 'use t::lib::MooseCompat;';
         }
-        s/\b Class::MOP::([a-z_]+) \b/Mouse::Util::$1/xmsg;
-        s/\b Class::MOP \b /Mouse::Meta/xmsg;
-        s/\b Moose \b/Mouse/xmsg;
+        s/ Class::MOP::([a-z_]+) /Mouse::Util::$1/xmsg;
+        s/ Class::MOP            /Mouse::Meta/xmsg;
+        s/ Moose                 /Mouse/xmsg;
 
         # make classes simple
         s{\b(Mouse::Meta::TypeConstraint)::\w+    }{$1}xmsg;