Merge pull request #26 from cxw42/vnext

v0.500.2

Author: cxw42

Changes

@@ -1,12 +1,22 @@
 Revision history for Text-PerlPP
+(Note: GH = GitHub issue; # = RT issue)
+
+0.500.2 2018/05/27
+        Fixes to installation package
+
+0.500.1 2018/05/26
+        Changed code to OOP interface.
+        Updated tests to run more cleanly and more quickly (GH 24; #125326).
+        Version numbers are now in decimal rather than dotted, so this is
+            actually version "0.500001".
 
 0.4.0   2018/05/15
         You can omit `?>` at EOF (#15).
-        Error messages are reported closer to the source line number (#14).
+        Error messages are reported closer to the source line number (GH 14).
 
 0.3.2   2018/05/14
-        Fixes to run on Perl 5.10.1 (#19).
-        Added documentation (#20).
+        Fixes to run on Perl 5.10.1 (GH 19).
+        Added documentation (GH 20).
 
 0.3.1   2018/05/11
         First CPAN version, released on an unsuspecting world.

Makefile.PL

@@ -50,17 +50,25 @@ WriteMakefile(
     },
     BUILD_REQUIRES => {
         'App::FatPacker' => '0',
+        'parent' => '0',
     },
     TEST_REQUIRES => {
         'Capture::Tiny' => '0',
         'Carp' => '0',
         'Config' => '0',
+        'constant' => '0',
+        'Cwd' => '0',
+        'Exporter' => '0',
         'File::Spec' => '0',
+        'Getopt::Long' => '2.5',
+        'Import::Into' => '0',
         'IPC::Run3' => '0',
+        'List::Util' => '1.33', # for any()
+        'Pod::Usage' => '0',
         'rlib' => '0',
+        'Text::Diff' => '0',   # for t/03-idempotency.t
         'Test::More' => '0',
         'Text::ParseWords' => '0',
-        'Text::Diff' => '0',   # for t/03-idempotency.t
     },
     PREREQ_PM => {
         'Getopt::Long'     => '2.5',    # Per issue #17

lib/Text/PerlPP.pm

@@ -5,15 +5,14 @@ package Text::PerlPP;
 
 # Semantic versioning, packed per Perl rules.  Must always be at least one
 # digit left of the decimal, and six digits right of the decimal.
-our $VERSION = '0.500001';
+our $VERSION = '0.500002';
 
 use 5.010001;
 use strict;
 use warnings;
 
 use Getopt::Long 2.5 qw(GetOptionsFromArray);
 use Pod::Usage;
-use Data::Dumper;
 
 # === Constants ===========================================================
 
@@ -131,9 +130,6 @@ sub StartOB {
 	if ( scalar @{$self->{OutputBuffers}} == 0 ) {
 		$| = 1;					# flush contents of STDOUT
 		open( $self->{RootSTDOUT}, ">&STDOUT" ) or die $!;		# dup filehandle
-		#$self->{RootSTDOUT} = $fh;
-		#undef $fh;
-		#say STDERR "stdout in startob ", Dumper($self->{RootSTDOUT});
 	}
 	unshift( @{$self->{OutputBuffers}}, [ $mode, "", $lineno ] );
 	close( STDOUT );			# must be closed before redirecting it to a variable
@@ -777,12 +773,7 @@ sub _parse_command_line {
 	# Map the option names from GetOptions back to the internal names we use,
 	# e.g., $hrOptsOut->{EVAL} from $hrOptsOut->{e}.
 	my %revmap = map { $CMDLINE_OPTS{$_}->[0] => $_ } keys %CMDLINE_OPTS;
-	#say "revmap ", Dumper(\%revmap);
-	#say "hrOptsOut ", Dumper($hrOptsOut);
 	for my $optname (keys %$hrOptsOut) {
-		#say "\nOptname $optname";
-		#say "Value $hrOptsOut->{$optname}";
-		#say "Revmap $revmap{$optname}";
 		$hrOptsOut->{ $revmap{$optname} } = $hrOptsOut->{ $optname };
 	}
 

t/00-load.t

@@ -3,7 +3,7 @@ use 5.010;
 use strict;
 use warnings;
 use Test::More;
-use rlib './lib';
+use rlib 'lib';
 
 BEGIN {
     if($ENV{PERLPP_NOUSE} || 0) {

t/01-capture.t

@@ -1,6 +1,6 @@
 #!perl
 # Some basic tests for perlpp
-use rlib './lib';
+use rlib 'lib';
 use PerlPPTest;
 
 if($ENV{PERLPP_NOUSE} || 0) {

t/02-basic.t

@@ -1,6 +1,6 @@
 #!/usr/bin/env perl
 # Some basic tests for perlpp
-use rlib './lib';
+use rlib 'lib';
 use PerlPPTest;
 
 use IPC::Run3;

t/02-readme.t

@@ -1,6 +1,6 @@
 #!/usr/bin/env perl
 # Tests from perlpp's README.md and bin/perlpp's POD.
-use rlib './lib';
+use rlib 'lib';
 use PerlPPTest;
 
 my @testcases=(		# In the order they are given in README.md

t/03-cmdline.t

@@ -1,6 +1,6 @@
 #!/usr/bin/env perl
 # Tests of perlpp command-line options
-use rlib './lib';
+use rlib 'lib';
 use PerlPPTest;
 use TestcaseList;
 

t/03-idempotency.t

@@ -1,10 +1,10 @@
 #!/usr/bin/env perl
 # Test running perlpp on itself - nothing should change.
-use rlib './lib';
+use rlib 'lib';
 use PerlPPTest;
 use Text::Diff;
 use File::Spec;
-use Data::Dumper;
+#use Data::Dumper;
 plan tests => 1;
 
 my $fn = File::Spec->rel2abs($INC{'Text/PerlPP.pm'});

t/04-include.t

@@ -1,6 +1,6 @@
 #!/usr/bin/env perl
 # Tests of :include, :macro Include, :immediate ProcessFile
-use rlib './lib';
+use rlib 'lib';
 use PerlPPTest;
 
 (my $whereami = __FILE__) =~ s/04-include\.t$//;