r41954 - in /trunk/libtest-tempdir-perl: .gitignore Changes MANIFEST MANIFEST.SKIP META.yml Makefile.PL README lib/Test/TempDir.pm lib/Test/TempDir/Factory.pm lib/Test/TempDir/Handle.pm

gregoa at users.alioth.debian.org gregoa at users.alioth.debian.org
Sun Aug 16 12:39:21 UTC 2009


Author: gregoa
Date: Sun Aug 16 12:39:13 2009
New Revision: 41954

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=41954
Log:
finish merging of branches/upstrem/0.05 into trunk, for whatever reason half of the files were still from 0.04

Added:
    trunk/libtest-tempdir-perl/.gitignore
      - copied unchanged from r41953, branches/upstream/libtest-tempdir-perl/current/.gitignore
    trunk/libtest-tempdir-perl/Changes
      - copied unchanged from r41953, branches/upstream/libtest-tempdir-perl/current/Changes
    trunk/libtest-tempdir-perl/README
      - copied unchanged from r41953, branches/upstream/libtest-tempdir-perl/current/README
Modified:
    trunk/libtest-tempdir-perl/MANIFEST
    trunk/libtest-tempdir-perl/MANIFEST.SKIP
    trunk/libtest-tempdir-perl/META.yml
    trunk/libtest-tempdir-perl/Makefile.PL
    trunk/libtest-tempdir-perl/lib/Test/TempDir.pm
    trunk/libtest-tempdir-perl/lib/Test/TempDir/Factory.pm
    trunk/libtest-tempdir-perl/lib/Test/TempDir/Handle.pm

Modified: trunk/libtest-tempdir-perl/MANIFEST
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtest-tempdir-perl/MANIFEST?rev=41954&op=diff
==============================================================================
--- trunk/libtest-tempdir-perl/MANIFEST (original)
+++ trunk/libtest-tempdir-perl/MANIFEST Sun Aug 16 12:39:13 2009
@@ -1,9 +1,12 @@
+.gitignore
+Changes
 lib/Test/TempDir.pm
 lib/Test/TempDir/Factory.pm
 lib/Test/TempDir/Handle.pm
 Makefile.PL
 MANIFEST			This list of files
 MANIFEST.SKIP
+README
 t/00_load.t
 t/basic.t
 t/factory.t

Modified: trunk/libtest-tempdir-perl/MANIFEST.SKIP
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtest-tempdir-perl/MANIFEST.SKIP?rev=41954&op=diff
==============================================================================
--- trunk/libtest-tempdir-perl/MANIFEST.SKIP (original)
+++ trunk/libtest-tempdir-perl/MANIFEST.SKIP Sun Aug 16 12:39:13 2009
@@ -5,6 +5,7 @@
 ,v$
 \B\.svn\b
 \b_darcs\b
+\B\.git\b
 
 # Avoid Makemaker generated and utility files.
 \bMANIFEST\.bak

Modified: trunk/libtest-tempdir-perl/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtest-tempdir-perl/META.yml?rev=41954&op=diff
==============================================================================
--- trunk/libtest-tempdir-perl/META.yml (original)
+++ trunk/libtest-tempdir-perl/META.yml Sun Aug 16 12:39:13 2009
@@ -1,22 +1,30 @@
 --- #YAML:1.0
-name:                Test-TempDir
-version:             0.04
-abstract:            ~
-license:             ~
-author:              ~
-generated_by:        ExtUtils::MakeMaker version 6.44
-distribution_type:   module
-requires:     
-    File::NFSLock:                 0
-    File::Path:                    2.04
-    File::Spec:                    0
-    File::Temp:                    0
-    Moose:                         0.50
-    MooseX::Types::Path::Class:    0
-    namespace::clean:              0.08
-    Path::Class:                   0
-    Sub::Exporter:                 0
-    Test::use::ok:                 0
+name:               Test-TempDir
+version:            0.05
+abstract:           ~
+author:  []
+license:            unknown
+distribution_type:  module
+configure_requires:
+    ExtUtils::MakeMaker:  0
+build_requires:
+    ExtUtils::MakeMaker:  0
+requires:
+    File::NFSLock:        0
+    File::Path:           2.04
+    File::Spec:           0
+    File::Temp:           0
+    Moose:                0.87
+    MooseX::Types::Path::Class:  0
+    namespace::clean:     0.08
+    Path::Class:          0
+    Sub::Exporter:        0
+    Test::use::ok:        0
+no_index:
+    directory:
+        - t
+        - inc
+generated_by:       ExtUtils::MakeMaker version 6.55_02
 meta-spec:
-    url:     http://module-build.sourceforge.net/META-spec-v1.3.html
-    version: 1.3
+    url:      http://module-build.sourceforge.net/META-spec-v1.4.html
+    version:  1.4

Modified: trunk/libtest-tempdir-perl/Makefile.PL
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtest-tempdir-perl/Makefile.PL?rev=41954&op=diff
==============================================================================
--- trunk/libtest-tempdir-perl/Makefile.PL (original)
+++ trunk/libtest-tempdir-perl/Makefile.PL Sun Aug 16 12:39:13 2009
@@ -16,7 +16,7 @@
 		'File::Spec' => 0,
 		'File::Temp' => 0,
 		'File::NFSLock' => 0,
-		'Moose' => '0.50',
+		'Moose' => '0.87',
 		'MooseX::Types::Path::Class' => 0,
 		'Path::Class' => 0,
 		'Sub::Exporter' => 0,

Modified: trunk/libtest-tempdir-perl/lib/Test/TempDir.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtest-tempdir-perl/lib/Test/TempDir.pm?rev=41954&op=diff
==============================================================================
--- trunk/libtest-tempdir-perl/lib/Test/TempDir.pm (original)
+++ trunk/libtest-tempdir-perl/lib/Test/TempDir.pm Sun Aug 16 12:39:13 2009
@@ -5,7 +5,7 @@
 use strict;
 use warnings;
 
-our $VERSION = "0.04";
+our $VERSION = "0.05";
 
 use File::Temp ();
 
@@ -131,9 +131,8 @@
 
 =head1 VERSION CONTROL
 
-This module is maintained using Darcs. You can get the latest version from
-L<http://nothingmuch.woobling.org/code>, and use C<darcs send> to commit
-changes.
+This module is maintained using Git. You can get the latest version from
+L<git://github.com/nothingmuch/test-tempdir.git>.
 
 =head1 AUTHOR
 

Modified: trunk/libtest-tempdir-perl/lib/Test/TempDir/Factory.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtest-tempdir-perl/lib/Test/TempDir/Factory.pm?rev=41954&op=diff
==============================================================================
--- trunk/libtest-tempdir-perl/lib/Test/TempDir/Factory.pm (original)
+++ trunk/libtest-tempdir-perl/lib/Test/TempDir/Factory.pm Sun Aug 16 12:39:13 2009
@@ -61,7 +61,7 @@
 has use_subdir => (
 	isa => "Bool",
 	is  => "rw",
-	default => 1,
+	default => sub { $ENV{TEST_TEMPDIR_USE_SUBDIR} ? 1 : 0 },
 );
 
 has subdir_template => (

Modified: trunk/libtest-tempdir-perl/lib/Test/TempDir/Handle.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtest-tempdir-perl/lib/Test/TempDir/Handle.pm?rev=41954&op=diff
==============================================================================
--- trunk/libtest-tempdir-perl/lib/Test/TempDir/Handle.pm (original)
+++ trunk/libtest-tempdir-perl/lib/Test/TempDir/Handle.pm Sun Aug 16 12:39:13 2009
@@ -54,6 +54,7 @@
 	my $self = shift;
 	return unless -d $self->dir;
 	$self->rmtree({ keep_root => 0 });
+	$self->dir->parent->remove; # rmdir, safe, and we don't care about errors
 }
 
 sub release_lock {




More information about the Pkg-perl-cvs-commits mailing list