Use intermediate files to store META.* and *.ppd files

.gitignore

@@ -11,3 +11,4 @@ MYMETA.*
 ExtUtils-MakeMaker-*
 inc/
 .*.swp
+/_eumm

lib/ExtUtils/MM_Any.pm

@@ -9,7 +9,7 @@ use File::Basename;
 BEGIN { our @ISA = qw(File::Spec); }
 
 # We need $Verbose
-use ExtUtils::MakeMaker qw($Verbose);
+use ExtUtils::MakeMaker qw($Verbose write_file_via_tmp);
 
 use ExtUtils::MakeMaker::Config;
 
@@ -22,6 +22,7 @@ my $Updir   = __PACKAGE__->updir;
 
 my $METASPEC_URL = 'https://metacpan.org/pod/CPAN::Meta::Spec';
 my $METASPEC_V = 2;
+my $STASHDIR = '_eumm';
 
 =head1 NAME
 
@@ -365,7 +366,15 @@ at build-time.
 
 sub stashmeta {
     my($self, $text, $file) = @_;
-    $self->echo($text, $file, { allow_variables => 0, append => 0 });
+    -d $STASHDIR or die "$STASHDIR: $!" unless mkdir $STASHDIR;
+    my $stashfile = File::Spec->catfile($STASHDIR, $file);
+    write_file_via_tmp($stashfile, [ $text ]);
+    my $qlfile = $self->quote_literal($file);
+    my $qlstashfile = $self->quote_literal($stashfile);
+    (
+	sprintf('-$(NOECHO) $(RM_F) %s', $qlfile),
+	sprintf('-$(NOECHO) $(CP) %s %s', $qlstashfile, $qlfile),
+    );
 }
 
 
@@ -687,7 +696,7 @@ clean :: clean_subdirs
 ');
 
     my @files = sort values %{$self->{XS}}; # .c files from *.xs files
-    my @dirs  = qw(blib);
+    my @dirs  = qw(blib _eumm);
 
     # Normally these are all under blib but they might have been
     # redefined.

t/meta_convert.t

@@ -1,18 +1,21 @@
-BEGIN {
-    chdir '..' if -d '../t';
-    unshift @INC, 't/lib';
-    use lib 'lib';
-}
+#!perl -w
 
 use strict;
 use warnings;
+
+BEGIN { unshift @INC, 't/lib'; }
 use Test::More;
 eval { require CPAN::Meta; };
 plan skip_all => 'Failed to load CPAN::Meta' if $@;
 plan 'no_plan';
-
+use File::Temp qw[tempdir];
 require ExtUtils::MM_Any;
 
+my $tmpdir = tempdir( DIR => 't', CLEANUP => 1 );
+chdir $tmpdir or die "chdir $tmpdir: $!";
+
+my $METAJSON = File::Spec->catfile('_eumm', 'META_new.json');
+
 sub ExtUtils::MM_Any::quote_literal { $_[1] }
 
 my $new_mm = sub {
@@ -33,7 +36,7 @@ my $warn_ok = sub {
     return $ret;
 };
 
-my $version_regex = qr/version: ''/;
+my $version_regex = qr/['"]?version['"]?\s*:\s*['"]['"]/;
 my $version_action = "they're converted to empty string";
 
 
@@ -48,7 +51,8 @@ note "Filename as version"; {
         qr{Can't parse version 'Recursive.pm'}
     );
     ok $res, 'we know how to deal with bogus versions defined in Makefile.PL';
-    like $res, $version_regex, $version_action;
+    my $content = do { open my $fh, '<', $METAJSON or die "$METAJSON: $!\n"; local $/; <$fh>; };
+    like $content, $version_regex, $version_action;
 }
 
 
@@ -62,7 +66,8 @@ note "'undef' version from parse_version"; {
         qr{Can't parse version 'undef'}
     );
     ok $res, q|when there's no $VERSION in Module.pm, $self->{VERSION} = 'undef'; via MM_Unix::parse_version and we know how to deal with that|;
-    like $res, $version_regex, $version_action;
+    my $content = do { open my $fh, '<', $METAJSON or die "$METAJSON: $!\n"; local $/; <$fh>; };
+    like $content, $version_regex, $version_action;
 }
 
 
@@ -78,7 +83,8 @@ note "x.y.z version"; {
         qr{Can't parse version '\x00\x00\x03'}
     );
     ok $res, q|we know how to deal with our $VERSION = 0.0.3; style versions defined in the module|;
-    like $res, $version_regex, $version_action;
+    my $content = do { open my $fh, '<', $METAJSON or die "$METAJSON: $!\n"; local $/; <$fh>; };
+    like $content, $version_regex, $version_action;
 }
 
 
@@ -92,7 +98,8 @@ note ".5 version"; {
         qr{Can't parse version '.5'}
     );
     ok $res, q|we know how to deal with our $VERSION = '.5'; style versions defined in the module|;
-    like $res, $version_regex, $version_action;
+    my $content = do { open my $fh, '<', $METAJSON or die "$METAJSON: $!\n"; local $/; <$fh>; };
+    like $content, $version_regex, $version_action;
 }
 
 
@@ -108,7 +115,8 @@ note "Non-camel case metadata"; {
     );
     my $res = eval { $mm->metafile_target };
     ok $res, q|we know how to deal with non-camel-cased custom meta resource keys defined in Makefile.PL|;
-    like $res, qr/x_Repositoryclone/, "they're camel-cased";
+    my $content = do { open my $fh, '<', $METAJSON or die "$METAJSON: $!\n"; local $/; <$fh>; };
+    like $content, qr/x_Repositoryclone/, "they're camel-cased";
 }
 
 
@@ -126,5 +134,6 @@ note "version object in provides"; {
         },
     );
     my $res = eval { $mm->metafile_target };
-    like $res, qr{version: \s* v1.2.3}x;
+    my $content = do { open my $fh, '<', $METAJSON or die "$METAJSON: $!\n"; local $/; <$fh>; };
+    like $content, qr/['"]?version['"]?\s*:\s*['"]v1\.2\.3['"]/;
 }