r44921 - in /branches/upstream/liborlite-migrate-perl/current: ./ inc/Module/ inc/Module/Install/ lib/ORLite/ lib/ORLite/Migrate/ t/ t/lib/

jawnsy-guest at users.alioth.debian.org jawnsy-guest at users.alioth.debian.org
Sun Sep 27 16:22:01 UTC 2009


Author: jawnsy-guest
Date: Sun Sep 27 16:21:56 2009
New Revision: 44921

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=44921
Log:
[svn-upgrade] Integrating new upstream version, liborlite-migrate-perl (1.05)

Modified:
    branches/upstream/liborlite-migrate-perl/current/Changes
    branches/upstream/liborlite-migrate-perl/current/META.yml
    branches/upstream/liborlite-migrate-perl/current/Makefile.PL
    branches/upstream/liborlite-migrate-perl/current/inc/Module/Install.pm
    branches/upstream/liborlite-migrate-perl/current/inc/Module/Install/Base.pm
    branches/upstream/liborlite-migrate-perl/current/inc/Module/Install/Can.pm
    branches/upstream/liborlite-migrate-perl/current/inc/Module/Install/DSL.pm
    branches/upstream/liborlite-migrate-perl/current/inc/Module/Install/Fetch.pm
    branches/upstream/liborlite-migrate-perl/current/inc/Module/Install/Makefile.pm
    branches/upstream/liborlite-migrate-perl/current/inc/Module/Install/Metadata.pm
    branches/upstream/liborlite-migrate-perl/current/inc/Module/Install/Win32.pm
    branches/upstream/liborlite-migrate-perl/current/inc/Module/Install/WriteAll.pm
    branches/upstream/liborlite-migrate-perl/current/lib/ORLite/Migrate.pm
    branches/upstream/liborlite-migrate-perl/current/lib/ORLite/Migrate/Patch.pm
    branches/upstream/liborlite-migrate-perl/current/t/01_compile.t
    branches/upstream/liborlite-migrate-perl/current/t/02_main.t
    branches/upstream/liborlite-migrate-perl/current/t/03_trivial.t
    branches/upstream/liborlite-migrate-perl/current/t/lib/Test.pm

Modified: branches/upstream/liborlite-migrate-perl/current/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/liborlite-migrate-perl/current/Changes?rev=44921&op=diff
==============================================================================
--- branches/upstream/liborlite-migrate-perl/current/Changes (original)
+++ branches/upstream/liborlite-migrate-perl/current/Changes Sun Sep 27 16:21:56 2009
@@ -1,4 +1,13 @@
 Changes for Perl extension ORLite-Migrate
+
+1.05 Sat 26 Sep 2009
+	- Some additional tweaks to the prune support
+
+1.04 Sat 26 Sep 2009
+	- Upgrade to Module::Install::DSL 0.91
+	- Added missing prereq for Params::Util 0.37
+	- Adding support for ORLite's prune feature
+	- Test scripts now run with prune enabled
 
 0.03 Sun 19 Apr 2009
 	- Updating to Module::Install::DSL 0.83

Modified: branches/upstream/liborlite-migrate-perl/current/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/liborlite-migrate-perl/current/META.yml?rev=44921&op=diff
==============================================================================
--- branches/upstream/liborlite-migrate-perl/current/META.yml (original)
+++ branches/upstream/liborlite-migrate-perl/current/META.yml Sun Sep 27 16:21:56 2009
@@ -8,7 +8,7 @@
 configure_requires:
   ExtUtils::MakeMaker: 6.42
 distribution_type: module
-generated_by: 'Module::Install version 0.85'
+generated_by: 'Module::Install version 0.91'
 license: perl
 meta-spec:
   url: http://module-build.sourceforge.net/META-spec-v1.4.html
@@ -26,7 +26,7 @@
   File::Spec: 3.2701
   File::pushd: 1.00
   IPC::Run3: 0.042
-  ORLite: 1.20
+  ORLite: 1.28
   Params::Util: 0.37
   Probe::Perl: 0.01
   perl: 5.6.0
@@ -34,4 +34,4 @@
   ChangeLog: http://fisheye2.atlassian.com/changelog/cpan/trunk/ORLite-Migrate
   license: http://dev.perl.org/licenses/
   repository: http://svn.ali.as/cpan/trunk/ORLite-Migrate
-version: 0.03
+version: 1.05

Modified: branches/upstream/liborlite-migrate-perl/current/Makefile.PL
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/liborlite-migrate-perl/current/Makefile.PL?rev=44921&op=diff
==============================================================================
--- branches/upstream/liborlite-migrate-perl/current/Makefile.PL (original)
+++ branches/upstream/liborlite-migrate-perl/current/Makefile.PL Sun Sep 27 16:21:56 2009
@@ -1,8 +1,9 @@
-use inc::Module::Install::DSL 0.83;
+use inc::Module::Install::DSL 0.91;
 
 all_from      lib/ORLite/Migrate.pm
 requires_from lib/ORLite/Migrate.pm
-requires      File::pushd 1.00
-requires      IPC::Run3   0.042
-requires      Probe::Perl 0.01
-test_requires Test::More  0.47
+requires      File::pushd  1.00
+requires      IPC::Run3    0.042
+requires      Probe::Perl  0.01
+requires      Params::Util 0.37
+test_requires Test::More   0.47

Modified: branches/upstream/liborlite-migrate-perl/current/inc/Module/Install.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/liborlite-migrate-perl/current/inc/Module/Install.pm?rev=44921&op=diff
==============================================================================
--- branches/upstream/liborlite-migrate-perl/current/inc/Module/Install.pm (original)
+++ branches/upstream/liborlite-migrate-perl/current/inc/Module/Install.pm Sun Sep 27 16:21:56 2009
@@ -28,7 +28,7 @@
 	# This is not enforced yet, but will be some time in the next few
 	# releases once we can make sure it won't clash with custom
 	# Module::Install extensions.
-	$VERSION = '0.85';
+	$VERSION = '0.91';
 
 	# Storage for the pseudo-singleton
 	$MAIN    = undef;
@@ -353,7 +353,7 @@
 	if ( $] >= 5.006 ) {
 		open( FH, '<', $_[0] ) or die "open($_[0]): $!";
 	} else {
-		open( FH, "< $_[0]"  ) or die "open($_[0]): $!";	
+		open( FH, "< $_[0]"  ) or die "open($_[0]): $!";
 	}
 	my $string = do { local $/; <FH> };
 	close FH or die "close($_[0]): $!";
@@ -384,7 +384,7 @@
 	if ( $] >= 5.006 ) {
 		open( FH, '>', $_[0] ) or die "open($_[0]): $!";
 	} else {
-		open( FH, "> $_[0]"  ) or die "open($_[0]): $!";	
+		open( FH, "> $_[0]"  ) or die "open($_[0]): $!";
 	}
 	foreach ( 1 .. $#_ ) {
 		print FH $_[$_] or die "print($_[0]): $!";

Modified: branches/upstream/liborlite-migrate-perl/current/inc/Module/Install/Base.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/liborlite-migrate-perl/current/inc/Module/Install/Base.pm?rev=44921&op=diff
==============================================================================
--- branches/upstream/liborlite-migrate-perl/current/inc/Module/Install/Base.pm (original)
+++ branches/upstream/liborlite-migrate-perl/current/inc/Module/Install/Base.pm Sun Sep 27 16:21:56 2009
@@ -4,7 +4,7 @@
 use strict 'vars';
 use vars qw{$VERSION};
 BEGIN {
-	$VERSION = '0.85';
+	$VERSION = '0.91';
 }
 
 # Suspend handler for "redefined" warnings
@@ -13,42 +13,34 @@
 	$SIG{__WARN__} = sub { $w };
 }
 
-### This is the ONLY module that shouldn't have strict on
-# use strict;
-
-#line 45
+#line 42
 
 sub new {
-	my ($class, %args) = @_;
-
-	foreach my $method ( qw(call load) ) {
-		next if defined &{"$class\::$method"};
-		*{"$class\::$method"} = sub {
-			shift()->_top->$method(@_);
-		};
+	my $class = shift;
+	unless ( defined &{"${class}::call"} ) {
+		*{"${class}::call"} = sub { shift->_top->call(@_) };
 	}
-
-	bless( \%args, $class );
+	unless ( defined &{"${class}::load"} ) {
+		*{"${class}::load"} = sub { shift->_top->load(@_) };
+	}
+	bless { @_ }, $class;
 }
 
-#line 66
+#line 61
 
 sub AUTOLOAD {
-	my $self = shift;
 	local $@;
-	my $autoload = eval {
-		$self->_top->autoload
-	} or return;
-	goto &$autoload;
+	my $func = eval { shift->_top->autoload } or return;
+	goto &$func;
 }
 
-#line 83
+#line 75
 
 sub _top {
 	$_[0]->{_top};
 }
 
-#line 98
+#line 90
 
 sub admin {
 	$_[0]->_top->{admin}
@@ -56,7 +48,7 @@
 	Module::Install::Base::FakeAdmin->new;
 }
 
-#line 114
+#line 106
 
 sub is_admin {
 	$_[0]->admin->VERSION;
@@ -83,4 +75,4 @@
 
 1;
 
-#line 162
+#line 154

Modified: branches/upstream/liborlite-migrate-perl/current/inc/Module/Install/Can.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/liborlite-migrate-perl/current/inc/Module/Install/Can.pm?rev=44921&op=diff
==============================================================================
--- branches/upstream/liborlite-migrate-perl/current/inc/Module/Install/Can.pm (original)
+++ branches/upstream/liborlite-migrate-perl/current/inc/Module/Install/Can.pm Sun Sep 27 16:21:56 2009
@@ -2,16 +2,16 @@
 package Module::Install::Can;
 
 use strict;
-use Module::Install::Base;
-use Config              ();
-use File::Spec          ();
-use ExtUtils::MakeMaker ();
+use Config                ();
+use File::Spec            ();
+use ExtUtils::MakeMaker   ();
+use Module::Install::Base ();
 
-use vars qw{$VERSION $ISCORE @ISA};
+use vars qw{$VERSION @ISA $ISCORE};
 BEGIN {
-	$VERSION = '0.85';
+	$VERSION = '0.91';
+	@ISA     = 'Module::Install::Base';
 	$ISCORE  = 1;
-	@ISA     = qw{Module::Install::Base};
 }
 
 # check if we can load some module

Modified: branches/upstream/liborlite-migrate-perl/current/inc/Module/Install/DSL.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/liborlite-migrate-perl/current/inc/Module/Install/DSL.pm?rev=44921&op=diff
==============================================================================
--- branches/upstream/liborlite-migrate-perl/current/inc/Module/Install/DSL.pm (original)
+++ branches/upstream/liborlite-migrate-perl/current/inc/Module/Install/DSL.pm Sun Sep 27 16:21:56 2009
@@ -4,14 +4,11 @@
 use strict;
 use vars qw{$VERSION $ISCORE};
 BEGIN {
-	$VERSION = '0.85';
+	$VERSION = '0.91';
 	$ISCORE  = 1;
 	*inc::Module::Install::DSL::VERSION = *VERSION;
 	@inc::Module::Install::DSL::ISA     = __PACKAGE__;
 }
-
-# Load the main Module::Install as usual.
-# require Module::Install;
 
 sub import {
 	# Read in the rest of the Makefile.PL

Modified: branches/upstream/liborlite-migrate-perl/current/inc/Module/Install/Fetch.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/liborlite-migrate-perl/current/inc/Module/Install/Fetch.pm?rev=44921&op=diff
==============================================================================
--- branches/upstream/liborlite-migrate-perl/current/inc/Module/Install/Fetch.pm (original)
+++ branches/upstream/liborlite-migrate-perl/current/inc/Module/Install/Fetch.pm Sun Sep 27 16:21:56 2009
@@ -2,13 +2,13 @@
 package Module::Install::Fetch;
 
 use strict;
-use Module::Install::Base;
+use Module::Install::Base ();
 
-use vars qw{$VERSION $ISCORE @ISA};
+use vars qw{$VERSION @ISA $ISCORE};
 BEGIN {
-	$VERSION = '0.85';
+	$VERSION = '0.91';
+	@ISA     = 'Module::Install::Base';
 	$ISCORE  = 1;
-	@ISA     = qw{Module::Install::Base};
 }
 
 sub get_file {

Modified: branches/upstream/liborlite-migrate-perl/current/inc/Module/Install/Makefile.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/liborlite-migrate-perl/current/inc/Module/Install/Makefile.pm?rev=44921&op=diff
==============================================================================
--- branches/upstream/liborlite-migrate-perl/current/inc/Module/Install/Makefile.pm (original)
+++ branches/upstream/liborlite-migrate-perl/current/inc/Module/Install/Makefile.pm Sun Sep 27 16:21:56 2009
@@ -2,14 +2,14 @@
 package Module::Install::Makefile;
 
 use strict 'vars';
-use Module::Install::Base;
-use ExtUtils::MakeMaker ();
-
-use vars qw{$VERSION $ISCORE @ISA};
+use ExtUtils::MakeMaker   ();
+use Module::Install::Base ();
+
+use vars qw{$VERSION @ISA $ISCORE};
 BEGIN {
-	$VERSION = '0.85';
+	$VERSION = '0.91';
+	@ISA     = 'Module::Install::Base';
 	$ISCORE  = 1;
-	@ISA     = qw{Module::Install::Base};
 }
 
 sub Makefile { $_[0] }

Modified: branches/upstream/liborlite-migrate-perl/current/inc/Module/Install/Metadata.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/liborlite-migrate-perl/current/inc/Module/Install/Metadata.pm?rev=44921&op=diff
==============================================================================
--- branches/upstream/liborlite-migrate-perl/current/inc/Module/Install/Metadata.pm (original)
+++ branches/upstream/liborlite-migrate-perl/current/inc/Module/Install/Metadata.pm Sun Sep 27 16:21:56 2009
@@ -2,18 +2,17 @@
 package Module::Install::Metadata;
 
 use strict 'vars';
-use Module::Install::Base;
+use Module::Install::Base ();
 
 use vars qw{$VERSION @ISA $ISCORE};
 BEGIN {
-	$VERSION = '0.85';
-	@ISA     = qw{Module::Install::Base};
+	$VERSION = '0.91';
+	@ISA     = 'Module::Install::Base';
 	$ISCORE  = 1;
 }
 
 my @boolean_keys = qw{
 	sign
-	mymeta
 };
 
 my @scalar_keys = qw{
@@ -440,21 +439,21 @@
 	/ixms ) {
 		my $license_text = $1;
 		my @phrases      = (
-			'under the same (?:terms|license) as perl itself' => 'perl',        1,
-			'GNU general public license'                      => 'gpl',         1,
-			'GNU public license'                              => 'gpl',         1,
-			'GNU lesser general public license'               => 'lgpl',        1,
-			'GNU lesser public license'                       => 'lgpl',        1,
-			'GNU library general public license'              => 'lgpl',        1,
-			'GNU library public license'                      => 'lgpl',        1,
-			'BSD license'                                     => 'bsd',         1,
-			'Artistic license'                                => 'artistic',    1,
-			'GPL'                                             => 'gpl',         1,
-			'LGPL'                                            => 'lgpl',        1,
-			'BSD'                                             => 'bsd',         1,
-			'Artistic'                                        => 'artistic',    1,
-			'MIT'                                             => 'mit',         1,
-			'proprietary'                                     => 'proprietary', 0,
+			'under the same (?:terms|license) as (?:perl|the perl programming language) itself' => 'perl', 1,
+			'GNU general public license'         => 'gpl',         1,
+			'GNU public license'                 => 'gpl',         1,
+			'GNU lesser general public license'  => 'lgpl',        1,
+			'GNU lesser public license'          => 'lgpl',        1,
+			'GNU library general public license' => 'lgpl',        1,
+			'GNU library public license'         => 'lgpl',        1,
+			'BSD license'                        => 'bsd',         1,
+			'Artistic license'                   => 'artistic',    1,
+			'GPL'                                => 'gpl',         1,
+			'LGPL'                               => 'lgpl',        1,
+			'BSD'                                => 'bsd',         1,
+			'Artistic'                           => 'artistic',    1,
+			'MIT'                                => 'mit',         1,
+			'proprietary'                        => 'proprietary', 0,
 		);
 		while ( my ($pattern, $license, $osi) = splice(@phrases, 0, 3) ) {
 			$pattern =~ s{\s+}{\\s+}g;
@@ -506,17 +505,29 @@
 	}
 }
 
+sub test_requires_from {
+	my $self     = shift;
+	my $content  = Module::Install::_readperl($_[0]);
+	my @requires = $content =~ m/^use\s+([^\W\d]\w*(?:::\w+)*)\s+([\d\.]+)/mg;
+	while ( @requires ) {
+		my $module  = shift @requires;
+		my $version = shift @requires;
+		$self->test_requires( $module => $version );
+	}
+}
+
 # Convert triple-part versions (eg, 5.6.1 or 5.8.9) to
 # numbers (eg, 5.006001 or 5.008009).
 # Also, convert double-part versions (eg, 5.8)
 sub _perl_version {
 	my $v = $_[-1];
-	$v =~ s/^([1-9])\.([1-9]\d?\d?)$/sprintf("%d.%03d",$1,$2)/e;	
+	$v =~ s/^([1-9])\.([1-9]\d?\d?)$/sprintf("%d.%03d",$1,$2)/e;
 	$v =~ s/^([1-9])\.([1-9]\d?\d?)\.(0|[1-9]\d?\d?)$/sprintf("%d.%03d%03d",$1,$2,$3 || 0)/e;
 	$v =~ s/(\.\d\d\d)000$/$1/;
 	$v =~ s/_.+$//;
 	if ( ref($v) ) {
-		$v = $v + 0; # Numify
+		# Numify
+		$v = $v + 0;
 	}
 	return $v;
 }
@@ -526,21 +537,56 @@
 
 
 ######################################################################
-# MYMETA.yml Support
+# MYMETA Support
 
 sub WriteMyMeta {
 	die "WriteMyMeta has been deprecated";
 }
 
-sub write_mymeta {
-	my $self = shift;
-	
-	# If there's no existing META.yml there is nothing we can do
-	return unless -f 'META.yml';
+sub write_mymeta_yaml {
+	my $self = shift;
 
 	# We need YAML::Tiny to write the MYMETA.yml file
 	unless ( eval { require YAML::Tiny; 1; } ) {
 		return 1;
+	}
+
+	# Generate the data
+	my $meta = $self->_write_mymeta_data or return 1;
+
+	# Save as the MYMETA.yml file
+	print "Writing MYMETA.yml\n";
+	YAML::Tiny::DumpFile('MYMETA.yml', $meta);
+}
+
+sub write_mymeta_json {
+	my $self = shift;
+
+	# We need JSON to write the MYMETA.json file
+	unless ( eval { require JSON; 1; } ) {
+		return 1;
+	}
+
+	# Generate the data
+	my $meta = $self->_write_mymeta_data or return 1;
+
+	# Save as the MYMETA.yml file
+	print "Writing MYMETA.json\n";
+	Module::Install::_write(
+		'MYMETA.json',
+		JSON->new->pretty(1)->canonical->encode($meta),
+	);
+}
+
+sub _write_mymeta_data {
+	my $self = shift;
+
+	# If there's no existing META.yml there is nothing we can do
+	return undef unless -f 'META.yml';
+
+	# We need Parse::CPAN::Meta to load the file
+	unless ( eval { require Parse::CPAN::Meta; 1; } ) {
+		return undef;
 	}
 
 	# Merge the perl version into the dependencies
@@ -558,7 +604,7 @@
 	}
 
 	# Load the advisory META.yml file
-	my @yaml = YAML::Tiny::LoadFile('META.yml');
+	my @yaml = Parse::CPAN::Meta::LoadFile('META.yml');
 	my $meta = $yaml[0];
 
 	# Overwrite the non-configure dependency hashs
@@ -572,9 +618,7 @@
 		$meta->{build_requires} = { map { @$_ } @{ $val->{build_requires} } };
 	}
 
-	# Save as the MYMETA.yml file
-	print "Writing MYMETA.yml\n";
-	YAML::Tiny::DumpFile('MYMETA.yml', $meta);	
+	return $meta;
 }
 
 1;

Modified: branches/upstream/liborlite-migrate-perl/current/inc/Module/Install/Win32.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/liborlite-migrate-perl/current/inc/Module/Install/Win32.pm?rev=44921&op=diff
==============================================================================
--- branches/upstream/liborlite-migrate-perl/current/inc/Module/Install/Win32.pm (original)
+++ branches/upstream/liborlite-migrate-perl/current/inc/Module/Install/Win32.pm Sun Sep 27 16:21:56 2009
@@ -2,12 +2,12 @@
 package Module::Install::Win32;
 
 use strict;
-use Module::Install::Base;
+use Module::Install::Base ();
 
 use vars qw{$VERSION @ISA $ISCORE};
 BEGIN {
-	$VERSION = '0.85';
-	@ISA     = qw{Module::Install::Base};
+	$VERSION = '0.91';
+	@ISA     = 'Module::Install::Base';
 	$ISCORE  = 1;
 }
 

Modified: branches/upstream/liborlite-migrate-perl/current/inc/Module/Install/WriteAll.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/liborlite-migrate-perl/current/inc/Module/Install/WriteAll.pm?rev=44921&op=diff
==============================================================================
--- branches/upstream/liborlite-migrate-perl/current/inc/Module/Install/WriteAll.pm (original)
+++ branches/upstream/liborlite-migrate-perl/current/inc/Module/Install/WriteAll.pm Sun Sep 27 16:21:56 2009
@@ -2,11 +2,11 @@
 package Module::Install::WriteAll;
 
 use strict;
-use Module::Install::Base;
+use Module::Install::Base ();
 
 use vars qw{$VERSION @ISA $ISCORE};
 BEGIN {
-	$VERSION = '0.85';
+	$VERSION = '0.91';;
 	@ISA     = qw{Module::Install::Base};
 	$ISCORE  = 1;
 }
@@ -41,8 +41,18 @@
 
 	# The Makefile write process adds a couple of dependencies,
 	# so write the META.yml files after the Makefile.
-	$self->Meta->write        if $args{meta};
-	$self->Meta->write_mymeta if $self->mymeta;
+	if ( $args{meta} ) {
+		$self->Meta->write;
+	}
+
+	# Experimental support for MYMETA
+	if ( $ENV{X_MYMETA} ) {
+		if ( $ENV{X_MYMETA} eq 'JSON' ) {
+			$self->Meta->write_mymeta_json;
+		} else {
+			$self->Meta->write_mymeta_yaml;
+		}
+	}
 
 	return 1;
 }

Modified: branches/upstream/liborlite-migrate-perl/current/lib/ORLite/Migrate.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/liborlite-migrate-perl/current/lib/ORLite/Migrate.pm?rev=44921&op=diff
==============================================================================
--- branches/upstream/liborlite-migrate-perl/current/lib/ORLite/Migrate.pm (original)
+++ branches/upstream/liborlite-migrate-perl/current/lib/ORLite/Migrate.pm Sun Sep 27 16:21:56 2009
@@ -11,11 +11,11 @@
 use Params::Util 0.37 qw{ _STRING _CLASS _HASH };
 use DBI          1.58 ();
 use DBD::SQLite  1.21 ();
-use ORLite       1.20 ();
+use ORLite       1.28 ();
 
 use vars qw{$VERSION @ISA};
 BEGIN {
-	$VERSION = '0.03';
+	$VERSION = '1.05';
 	@ISA     = 'ORLite';
 }
 
@@ -78,23 +78,32 @@
 		# Create the parent directory
 		my $dir = File::Basename::dirname($file);
 		unless ( -d $dir ) {
-			File::Path::mkpath( $dir, { verbose => 0 } );
+			my @dirs = File::Path::mkpath( $dir, { verbose => 0 } );
+			$class->prune(@dirs) if $params{prune};
 		}
+		$class->prune($file) if $params{prune};
 	}
 	my $dsn      = "dbi:SQLite:$file";
 	my $dbh      = DBI->connect($dsn);
 	my $version  = $dbh->selectrow_arrayref('pragma user_version')->[0];
 	$dbh->disconnect;
 
+	# We're done with the prune setting now
+	$params{prune} = 0;
+
 	# Build the migration plan
 	my $timeline = File::Spec->rel2abs($params{timeline});
-	my @plan = plan( $params{timeline}, $version );
+	my @plan     = plan( $params{timeline}, $version );
 
 	# Execute the migration plan
 	if ( @plan ) {
 		# Does the migration plan reach the required destination
 		my $destination = $version + scalar(@plan);
-		if ( exists $params{user_version} and $destination != $params{user_version} ) {
+		if (
+			exists $params{user_version}
+			and
+			$destination != $params{user_version}
+		) {
 			die "Schema migration destination user_version mismatch (got $destination, wanted $params{user_version})";
 		}
 
@@ -124,7 +133,10 @@
 	}
 
 	# Hand off to the regular constructor
-	return $class->SUPER::import( \%params, $DEBUG ? '-DEBUG' : () );
+	$class->SUPER::import(
+		\%params,
+		$DEBUG ? '-DEBUG' : ()
+	);
 }
 
 
@@ -243,8 +255,8 @@
 migration scripts.
 
 These patch scripts are named in the form F<migrate-$version.pl>, where
-C<$version> is the schema version to migrate to. A typical timeline directory
-will look something like the following.
+C<$version> is the schema version to migrate to. A typical timeline
+directory will look something like the following.
 
   migrate-01.pl
   migrate-02.pl

Modified: branches/upstream/liborlite-migrate-perl/current/lib/ORLite/Migrate/Patch.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/liborlite-migrate-perl/current/lib/ORLite/Migrate/Patch.pm?rev=44921&op=diff
==============================================================================
--- branches/upstream/liborlite-migrate-perl/current/lib/ORLite/Migrate/Patch.pm (original)
+++ branches/upstream/liborlite-migrate-perl/current/lib/ORLite/Migrate/Patch.pm Sun Sep 27 16:21:56 2009
@@ -11,7 +11,7 @@
 
 use vars qw{$VERSION @ISA @EXPORT $FILE};
 BEGIN {
-	$VERSION = '0.03';
+	$VERSION = '1.05';
 	@ISA     = 'Exporter';
 	@EXPORT  = qw{
 		file
@@ -33,7 +33,7 @@
 }
 
 sub file {
-	unless ($FILE) {
+	unless ( $FILE ) {
 		# The filename is passed on STDIN
 		$FILE = <STDIN>;
 		chomp($FILE);

Modified: branches/upstream/liborlite-migrate-perl/current/t/01_compile.t
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/liborlite-migrate-perl/current/t/01_compile.t?rev=44921&op=diff
==============================================================================
--- branches/upstream/liborlite-migrate-perl/current/t/01_compile.t (original)
+++ branches/upstream/liborlite-migrate-perl/current/t/01_compile.t Sun Sep 27 16:21:56 2009
@@ -6,8 +6,6 @@
 	$^W = 1;
 }
 
-use Test::More tests => 2;
-
-ok( $] >= 5.006, 'Perl version is new enough' );
+use Test::More tests => 1;
 
 require_ok( 'ORLite::Migrate' );

Modified: branches/upstream/liborlite-migrate-perl/current/t/02_main.t
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/liborlite-migrate-perl/current/t/02_main.t?rev=44921&op=diff
==============================================================================
--- branches/upstream/liborlite-migrate-perl/current/t/02_main.t (original)
+++ branches/upstream/liborlite-migrate-perl/current/t/02_main.t Sun Sep 27 16:21:56 2009
@@ -42,6 +42,7 @@
 	file   => '$file',
 	create => 1,
 	tables => 0,
+	prune  => 1,
 };
 
 1;

Modified: branches/upstream/liborlite-migrate-perl/current/t/03_trivial.t
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/liborlite-migrate-perl/current/t/03_trivial.t?rev=44921&op=diff
==============================================================================
--- branches/upstream/liborlite-migrate-perl/current/t/03_trivial.t (original)
+++ branches/upstream/liborlite-migrate-perl/current/t/03_trivial.t Sun Sep 27 16:21:56 2009
@@ -26,6 +26,7 @@
 	file         => '$file',
 	timeline     => '$timeline',
 	user_version => 3,
+	prune        => 1,
 };
 
 1;

Modified: branches/upstream/liborlite-migrate-perl/current/t/lib/Test.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/liborlite-migrate-perl/current/t/lib/Test.pm?rev=44921&op=diff
==============================================================================
--- branches/upstream/liborlite-migrate-perl/current/t/lib/Test.pm (original)
+++ branches/upstream/liborlite-migrate-perl/current/t/lib/Test.pm Sun Sep 27 16:21:56 2009
@@ -9,8 +9,8 @@
 
 use vars qw{$VERSION @ISA @EXPORT};
 BEGIN {
-        $VERSION = '0.03';
-	@ISA     = qw{ Exporter };
+        $VERSION = '1.05';
+	@ISA     = 'Exporter';
 	@EXPORT  = qw{ test_db connect_ok create_ok };
 }
 




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