r1324 - in packages/libfile-remove-perl/branches/upstream/current: . lib/File t

[Gunnar Wolf]

Author: gwolf
Date: 2005-09-01 23:00:54 +0000 (Thu, 01 Sep 2005)
New Revision: 1324

Modified:
   packages/libfile-remove-perl/branches/upstream/current/Changes
   packages/libfile-remove-perl/branches/upstream/current/META.yml
   packages/libfile-remove-perl/branches/upstream/current/lib/File/Remove.pm
   packages/libfile-remove-perl/branches/upstream/current/t/1_directories.t
Log:
Load /tmp/tmp.gO9Zza/libfile-remove-perl-0.30 into
packages/libfile-remove-perl/branches/upstream/current.


Modified: packages/libfile-remove-perl/branches/upstream/current/Changes
===================================================================
--- packages/libfile-remove-perl/branches/upstream/current/Changes	2005-08-31 06:51:23 UTC (rev 1323)
+++ packages/libfile-remove-perl/branches/upstream/current/Changes	2005-09-01 23:00:54 UTC (rev 1324)
@@ -1,5 +1,8 @@
 Revision history for Perl extension File::Remove.
 
+0.30 Wed Jul 14 19:12:00 2005
+    - Applied CNANDOR's patch to fix trash() support on OS X 10.4.
+
 0.29 Mon Dec 04 16:35:00 2004
     - Stabilize undelete support for OS X and Windows.
 

Modified: packages/libfile-remove-perl/branches/upstream/current/META.yml
===================================================================
--- packages/libfile-remove-perl/branches/upstream/current/META.yml	2005-08-31 06:51:23 UTC (rev 1323)
+++ packages/libfile-remove-perl/branches/upstream/current/META.yml	2005-09-01 23:00:54 UTC (rev 1324)
@@ -1,10 +1,11 @@
+# http://module-build.sourceforge.net/META-spec.html
 #XXXXXXX This is a prototype!!!  It will change in the future!!! XXXXX#
 name:         File-Remove
-version:      0.29
+version:      0.30
 version_from: lib/File/Remove.pm
 installdirs:  site
 requires:
     File::Spec:                    0.84
 
 distribution_type: module
-generated_by: ExtUtils::MakeMaker version 6.12
+generated_by: ExtUtils::MakeMaker version 6.17

Modified: packages/libfile-remove-perl/branches/upstream/current/lib/File/Remove.pm
===================================================================
--- packages/libfile-remove-perl/branches/upstream/current/lib/File/Remove.pm	2005-08-31 06:51:23 UTC (rev 1323)
+++ packages/libfile-remove-perl/branches/upstream/current/lib/File/Remove.pm	2005-09-01 23:00:54 UTC (rev 1324)
@@ -104,8 +104,10 @@
 use File::Spec;
 use File::Path qw(rmtree);
 
-$VERSION = '0.29';
+$VERSION = '0.30';
 
+our $glue;
+
 sub expand (@)
 {
     my @args;
@@ -176,13 +178,14 @@
 	$unlink = \&Win32::FileOp::Recycle;
 	$rmdir = \&Win32::FileOp::Recycle;
     } elsif ($^O eq 'darwin') {
-	our $f;
-	eval 'use Mac::Glue ();';
-	die "Can't load Mac::Glue::Finder to support the Trash Can: \$@ = $@" if length $@;
+	unless ($glue) {
+	    eval 'use Mac::Glue ();';
+	    die "Can't load Mac::Glue::Finder to support the Trash Can: \$@ = $@" if length $@;
+	    $glue = Mac::Glue->new('Finder');
+	}
 	my $code = sub {
-	    my $f = Mac::Glue->new("Finder");
-	    my @files = map { s{^:}{}; $_ } map { s{/}{:}g; $_ } map { File::Spec->rel2abs($_) } @_;
-	    $f->delete(@files);
+	    my @files = map { Mac::Glue::param_type(Mac::Glue::typeAlias() => $_) } @_;
+	    $glue->delete(\@files);
 	};
 	$unlink = $code;
 	$rmdir = $code;

Modified: packages/libfile-remove-perl/branches/upstream/current/t/1_directories.t
===================================================================
--- packages/libfile-remove-perl/branches/upstream/current/t/1_directories.t	2005-08-31 06:51:23 UTC (rev 1323)
+++ packages/libfile-remove-perl/branches/upstream/current/t/1_directories.t	2005-09-01 23:00:54 UTC (rev 1324)
@@ -29,6 +29,7 @@
       "!-e: $path";
     ok mkdir($path),
       "mkdir: $path";
+	chmod 0777, $path;
     ok -e $path,
       "-e: $path";
 }
@@ -47,6 +48,7 @@
       "!-e: $path";
     ok mkdir($path),
       "mkdir: $path";
+	chmod 0777, $path;
     ok -e $path,
       "-e: $path";
 }
@@ -65,6 +67,7 @@
       "!-e: $path";
     ok mkdir($path),
       "mkdir: $path";
+	chmod 0777, $path;
     ok -e $path,
       "-e: $path";
 }
@@ -92,8 +95,10 @@
 TODO: {
     local $TODO;
     if ($^O eq 'darwin') {
-        eval 'use Mac::Glue;';
+        eval 'use Mac::Glue ();';
         $TODO = "Undelete support requires Mac::Glue" if length $@;
+	eval 'use Mac::Glue::Finder ();';
+        $TODO = "Undelete support requires Mac::Glue::Finder" if length $@;
     } elsif ($^O eq 'cygwin' || $^O =~ /^MSWin/) {
         eval 'use Win32::FileOp::Recycle;';
         $TODO = "Undelete support requires Win32::FileOp::Recycle" if length $@;
@@ -106,6 +111,7 @@
 	  "!-e: $path";
 	ok mkdir($path),
 	  "mkdir: $path";
+	chmod 0777, $path;
 	ok -e $path,
 	  "-e: $path";
     }
@@ -137,6 +143,7 @@
 	  "!-e: $path";
 	ok mkdir($path),
 	  "mkdir: $path";
+	chmod 0777, $path;
 	ok -e $path,
 	  "-e: $path";
     }
@@ -166,6 +173,7 @@
 	  "!-e: $path";
 	ok mkdir($path),
 	  "mkdir: $path";
+	chmod 0777, $path;
 	ok -e $path,
 	  "-e: $path";
     }