r4196@vesta (orig r705): dagolden | 2006-08-17 07:33:11 -0400

 - store a copy of ptee in auto/Tee for tee()
 - removed unused test files
 - downgraded IPC::Run3 prereq version to 0.033
 


git-svn-id: https://dagolden.googlecode.com/svn/Tee/trunk@717 dfce27d5-b31c-0410-bb09-030b4413eeba

Build.PL

@@ -6,6 +6,29 @@ my $class = Module::Build->subclass(
     class => "Module::Build::WikiDoc",
     code => <<'SUBCLASS', );
 
+    sub ACTION_build {
+        my $self = shift;
+        $self->SUPER::ACTION_build;
+        $self->depends_on('share');
+    }
+
+    sub ACTION_share {
+        my $self = shift;
+        my $blib = $self->blib;
+        my @dist_names = split "/-/", $self->dist_name;
+        my $autodir = File::Spec->catdir($blib, 'lib', 'auto', @dist_names); 
+        File::Path::mkpath( $autodir );
+        for my $f ( @{ $self->rscan_dir( 'scripts', '.' ) } ) {
+            next if $f eq 'scripts';
+            my $to = File::Spec->abs2rel( $f, 'scripts' );
+            $self->copy_if_modified(
+                from => $f, 
+                to => File::Spec->catfile( $autodir, $to ),
+                verbose => 1
+            );
+        }
+    }
+    
     sub ACTION_wikidoc {
         my $self = shift;
         eval "use Pod::WikiDoc";
@@ -69,7 +92,7 @@ $class->new(
         'File::Basename' => 0,
         'File::Spec' => 0,
         'Getopt::Long' => 2.32,
-        'IPC::Run3' => 0.035,
+        'IPC::Run3' => 0.033,
         'Probe::Perl' => 0,
         'Test::More' => 0.45,   # thread-safe
     },

Changes

@@ -1,5 +1,10 @@
 Revision history for Perl module Tee
 
+0.12
+    - store a copy of ptee in auto/Tee for tee()
+    - removed unused test files
+    - downgraded IPC::Run3 prereq version to 0.033
+
 0.11 Thu Aug  3 14:49:31 EDT 2006
     - added multiple file support to tee() to match documentation
     - Pod addition and cleanups

MANIFEST

@@ -13,11 +13,8 @@ scripts/ptee
 t/01_Tee.t
 t/02_tee_script.t
 t/03_tee_function.t
-t/04_exit-codes.t
 t/98_pod.t
 t/99_pod-coverage.t
 t/Expected.pm
-t/fail.pl
 t/helloworld.pl
-t/succeed.pl
 Todo

Todo

@@ -2,4 +2,6 @@ TODO list for Perl module Tee
 
 - test tee() with multiple files
 
+- have Tee create a temporary ptee if it can't find one!
+
 

lib/Tee.pm

@@ -1,6 +1,6 @@
 package Tee;
 
-$VERSION     = "0.11";
+$VERSION     = "0.12";
 @ISA         = qw (Exporter);
 @EXPORT      = qw (tee);
 
@@ -20,8 +20,12 @@ my $p = Probe::Perl->new;
 my $perl = $p->find_perl_interpreter;
 my $ptee_cmd;
 my $to_devnull = " > " . File::Spec->devnull . " 2>&1";
-for my $path ( split($p->config('path_sep'), $ENV{PATH}) ) {
-    my $try_ptee = File::Spec->catfile( $path, PTEE );
+
+# On installation, we store a copy of ptee in auto/Tee so we're sure
+# to find it later without worrying about $ENV{PATH}
+
+for my $path ( @INC ) {
+    my $try_ptee = File::Spec->catfile( $path, 'auto', 'Tee', PTEE );
     next unless -r $try_ptee;
     if ( system("$try_ptee -V $to_devnull" ) == 0 ) {
         $ptee_cmd = $try_ptee;
@@ -33,13 +37,12 @@ for my $path ( split($p->config('path_sep'), $ENV{PATH}) ) {
     }
 }
 
-die "Couldn't find a working " . PTEE . "\n" unless $ptee_cmd;
-
 #--------------------------------------------------------------------------#
 # Functions
 #--------------------------------------------------------------------------#
 
 sub tee {
+    die "Couldn't find a working " . PTEE . "\n" unless $ptee_cmd;
     my $command = shift;
     my $options;
     $options = shift if (ref $_[0] eq 'HASH');
@@ -62,6 +65,10 @@ __END__
 
 Tee - Pure Perl emulation of GNU tee
 
+= VERSION
+
+This documentation refers to version %%VERSION%%
+
 = SYNOPSIS
 
  # from Perl

lib/Tee.pod

@@ -6,6 +6,10 @@
 
 Tee - Pure Perl emulation of GNU tee
 
+=head1 VERSION
+
+This documentation refers to version 0.12
+
 =head1 SYNOPSIS
 
   # from Perl

scripts/ptee

@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 
 # ptee -- perl implementation of unix tee
-$VERSION = '0.11';
+$VERSION = '0.12';
 use strict;
 use File::Basename qw/basename/;
 use Getopt::Long;

t/01_Tee.t

@@ -11,15 +11,9 @@ select($stdout);
 $|++;
 
 #--------------------------------------------------------------------------#
-use Probe::Perl;
 use Test::More;
 
 plan tests =>  1 ;
 
-my $pp = Probe::Perl->new;
-my $perl = $pp->find_perl_interpreter;
-my $path_sep = $pp->config("path_sep");
-$ENV{PATH} = join( $path_sep, 'scripts', split( $path_sep, $ENV{PATH} ) );
-
 require_ok( 'Tee' );
 

t/03_tee_function.t

@@ -22,16 +22,13 @@ $|=1;
 
 my $pp = Probe::Perl->new;
 my $perl = $pp->find_perl_interpreter;
-my $path_sep = $pp->config("path_sep");
 my $hello = File::Spec->catfile(qw/t helloworld.pl/);
 my $tee = File::Spec->catfile(qw/scripts ptee/);
 my $tempfh = File::Temp->new;
 my $tempfh2 = File::Temp->new;
 my $tempname = $tempfh->filename;
 my ($got_stdout, $got_stderr);
 
-$ENV{PATH} = join( $path_sep, 'scripts', split( $path_sep, $ENV{PATH} ) );
-
 #--------------------------------------------------------------------------#
 # Begin test plan
 #--------------------------------------------------------------------------#