[Rt-commit] r3994 - in Jifty-DBI/trunk: . inc/Module
inc/Module/Install lib/Jifty/DBI
jesse at bestpractical.com
jesse at bestpractical.com
Thu Oct 27 17:16:08 EDT 2005
Author: jesse
Date: Thu Oct 27 17:16:07 2005
New Revision: 3994
Modified:
Jifty-DBI/trunk/ (props changed)
Jifty-DBI/trunk/META.yml
Jifty-DBI/trunk/Makefile.PL
Jifty-DBI/trunk/inc/Module/Install.pm
Jifty-DBI/trunk/inc/Module/Install/AutoInstall.pm
Jifty-DBI/trunk/inc/Module/Install/Base.pm
Jifty-DBI/trunk/inc/Module/Install/Makefile.pm
Jifty-DBI/trunk/inc/Module/Install/Metadata.pm
Jifty-DBI/trunk/lib/Jifty/DBI/Collection.pm
Jifty-DBI/trunk/lib/Jifty/DBI/Record.pm
Log:
r18056 at truegrounds: jesse | 2005-10-28 03:15:11 -0400
* refactoring new_alias to let it take objects as well as table names
Modified: Jifty-DBI/trunk/META.yml
==============================================================================
--- Jifty-DBI/trunk/META.yml (original)
+++ Jifty-DBI/trunk/META.yml Thu Oct 27 17:16:07 2005
@@ -6,6 +6,7 @@
Test::More: 0.52
DBD::SQLite: 0
requires:
+ perl: 5.8.3
DBI: 0
Encode: 2.11
UNIVERSAL::require: 0
@@ -14,7 +15,12 @@
Cache::Simple::TimedExpiry: 0.21
DateTime: 0
DateTime::Format::Strptime: 0
+bundles:
+ DateTime::Duration: DateTime-0.2901
+ DateTime::Locale::Base: DateTime-Locale-0.22
+ DateTime::Duration: DateTime-0.2901
+ DateTime::Locale::Base: DateTime-Locale-0.22
no_index:
directory:
- inc
-generated_by: Module::Install version 0.36
+generated_by: Module::Install version 0.37
Modified: Jifty-DBI/trunk/Makefile.PL
==============================================================================
--- Jifty-DBI/trunk/Makefile.PL (original)
+++ Jifty-DBI/trunk/Makefile.PL Thu Oct 27 17:16:07 2005
@@ -1,5 +1,5 @@
use inc::Module::Install;
-
+requires( perl => '5.8.3');
name ('Jifty-DBI');
license ('perl');
version_from('lib/Jifty/DBI.pm');
@@ -22,7 +22,7 @@
'Class::Accessor' => '',
],
);
+auto_bundle_deps();
auto_install();
-
&WriteAll;
Modified: Jifty-DBI/trunk/inc/Module/Install.pm
==============================================================================
--- Jifty-DBI/trunk/inc/Module/Install.pm (original)
+++ Jifty-DBI/trunk/inc/Module/Install.pm Thu Oct 27 17:16:07 2005
@@ -1,6 +1,6 @@
-#line 1 "inc/Module/Install.pm - /usr/local/share/perl/5.8.4/Module/Install.pm"
+#line 1 "inc/Module/Install.pm - /usr/local/share/perl/5.8.7/Module/Install.pm"
package Module::Install;
-$VERSION = '0.36';
+$VERSION = '0.37';
die << "." unless $INC{join('/', inc => split(/::/, __PACKAGE__)).'.pm'};
Please invoke ${\__PACKAGE__} with:
@@ -21,7 +21,7 @@
@inc::Module::Install::ISA = 'Module::Install';
*inc::Module::Install::VERSION = *VERSION;
-#line 129
+#line 130
sub import {
my $class = shift;
@@ -44,7 +44,7 @@
delete $INC{"$self->{path}.pm"};
}
-#line 156
+#line 157
sub autoload {
my $self = shift;
@@ -64,7 +64,7 @@
};
}
-#line 181
+#line 182
sub new {
my ($class, %args) = @_;
@@ -89,7 +89,7 @@
bless(\%args, $class);
}
-#line 210
+#line 211
sub call {
my $self = shift;
@@ -100,7 +100,7 @@
goto &{$obj->can($method)};
}
-#line 225
+#line 226
sub load {
my ($self, $method) = @_;
@@ -124,7 +124,7 @@
$obj;
}
-#line 255
+#line 256
sub load_extensions {
my ($self, $path, $top_obj) = @_;
@@ -143,7 +143,7 @@
}
}
-#line 279
+#line 280
sub find_extensions {
my ($self, $path) = @_;
@@ -166,4 +166,4 @@
__END__
-#line 617
+#line 618
Modified: Jifty-DBI/trunk/inc/Module/Install/AutoInstall.pm
==============================================================================
--- Jifty-DBI/trunk/inc/Module/Install/AutoInstall.pm (original)
+++ Jifty-DBI/trunk/inc/Module/Install/AutoInstall.pm Thu Oct 27 17:16:07 2005
@@ -1,4 +1,4 @@
-#line 1 "inc/Module/Install/AutoInstall.pm - /usr/local/share/perl/5.8.4/Module/Install/AutoInstall.pm"
+#line 1 "inc/Module/Install/AutoInstall.pm - /usr/local/share/perl/5.8.7/Module/Install/AutoInstall.pm"
package Module::Install::AutoInstall;
use Module::Install::Base; @ISA = qw(Module::Install::Base);
@@ -18,20 +18,6 @@
my $self = shift;
return if $self->{done}++;
-# ExtUtils::AutoInstall Bootstrap Code, version 7.
-AUTO:{my$p='ExtUtils::AutoInstall';my$v=0.49;$p->VERSION||0>=$v
-or+eval"use $p $v;1"or+do{my$e=$ENV{PERL_EXTUTILS_AUTOINSTALL};
-(!defined($e)||$e!~m/--(?:default|skip|testonly)/and-t STDIN or
-eval"use ExtUtils::MakeMaker;WriteMakefile(PREREQ_PM=>{'$p',$v}
-);1"and exit)and print"==> $p $v required. Install it from CP".
-"AN? [Y/n] "and<STDIN>!~/^n/i and print"*** Installing $p\n"and
-do{if (eval '$>' and lc(`sudo -V`) =~ /version/){system('sudo',
-$^X,"-MCPANPLUS","-e","CPANPLUS::install $p");eval"use $p $v;1"
-||system('sudo', $^X, "-MCPAN", "-e", "CPAN::install $p")}eval{
-require CPANPLUS;CPANPLUS::install$p};eval"use $p $v;1"or eval{
-require CPAN;CPAN::install$p};eval"use $p $v;1"||die"*** Please
-manually install $p $v from cpan.org first...\n"}}}
-
# Flatten array of arrays into a single array
my @core = map @$_, map @$_, grep ref,
$self->build_requires, $self->requires;
@@ -40,6 +26,10 @@
push @core, splice(@_, 0, 2);
}
+ # We'll need ExtUtils::AutoInstall
+ $self->include('ExtUtils::AutoInstall');
+ require ExtUtils::AutoInstall;
+
ExtUtils::AutoInstall->import(
(@core ? (-core => \@core) : ()), @_, $self->features
);
Modified: Jifty-DBI/trunk/inc/Module/Install/Base.pm
==============================================================================
--- Jifty-DBI/trunk/inc/Module/Install/Base.pm (original)
+++ Jifty-DBI/trunk/inc/Module/Install/Base.pm Thu Oct 27 17:16:07 2005
@@ -1,4 +1,4 @@
-#line 1 "inc/Module/Install/Base.pm - /usr/local/share/perl/5.8.4/Module/Install/Base.pm"
+#line 1 "inc/Module/Install/Base.pm - /usr/local/share/perl/5.8.7/Module/Install/Base.pm"
package Module::Install::Base;
#line 28
Modified: Jifty-DBI/trunk/inc/Module/Install/Makefile.pm
==============================================================================
--- Jifty-DBI/trunk/inc/Module/Install/Makefile.pm (original)
+++ Jifty-DBI/trunk/inc/Module/Install/Makefile.pm Thu Oct 27 17:16:07 2005
@@ -1,4 +1,4 @@
-#line 1 "inc/Module/Install/Makefile.pm - /usr/local/share/perl/5.8.4/Module/Install/Makefile.pm"
+#line 1 "inc/Module/Install/Makefile.pm - /usr/local/share/perl/5.8.7/Module/Install/Makefile.pm"
package Module::Install::Makefile;
use Module::Install::Base; @ISA = qw(Module::Install::Base);
@@ -53,6 +53,7 @@
$args->{NAME} = $self->module_name || $self->name || $self->determine_NAME($args);
$args->{VERSION} = $self->version || $self->determine_VERSION($args);
$args->{NAME} =~ s/-/::/g;
+ $args->{test} = {TESTS => $self->tests};
if ($] >= 5.005) {
$args->{ABSTRACT} = $self->abstract;
@@ -140,4 +141,4 @@
__END__
-#line 273
+#line 274
Modified: Jifty-DBI/trunk/inc/Module/Install/Metadata.pm
==============================================================================
--- Jifty-DBI/trunk/inc/Module/Install/Metadata.pm (original)
+++ Jifty-DBI/trunk/inc/Module/Install/Metadata.pm Thu Oct 27 17:16:07 2005
@@ -1,4 +1,4 @@
-#line 1 "inc/Module/Install/Metadata.pm - /usr/local/share/perl/5.8.4/Module/Install/Metadata.pm"
+#line 1 "inc/Module/Install/Metadata.pm - /usr/local/share/perl/5.8.7/Module/Install/Metadata.pm"
package Module::Install::Metadata;
use Module::Install::Base; @ISA = qw(Module::Install::Base);
@@ -11,7 +11,7 @@
my @scalar_keys = qw(
name module_name version abstract author license
- distribution_type sign perl_version
+ distribution_type sign perl_version tests
);
my @tuple_keys = qw(build_requires requires recommends bundles);
Modified: Jifty-DBI/trunk/lib/Jifty/DBI/Collection.pm
==============================================================================
--- Jifty-DBI/trunk/lib/Jifty/DBI/Collection.pm (original)
+++ Jifty-DBI/trunk/lib/Jifty/DBI/Collection.pm Thu Oct 27 17:16:07 2005
@@ -2,6 +2,8 @@
use strict;
use vars qw($VERSION);
+use UNIVERSAL::can;
+
=head1 NAME
@@ -1036,17 +1038,25 @@
return ( $self->{'group_clause'} );
}
-=head2 new_alias
+=head2 new_alias TABLE_OR_CLASS
-Takes the name of a table. Returns the string of a new Alias for that
-table, which can be used to Join tables or to limit what gets found by
+Takes the name of a table or a Jifty::DBI::Record subclass.
+Returns the string of a new Alias for that table, which can be used
+to Join tables or to limit what gets found by
a search.
=cut
sub new_alias {
my $self = shift;
- my $table = shift || die "Missing parameter";
+ my $refers_to = shift || die "Missing parameter";
+ my $table;
+
+ if ($refers_to->can('table')) {
+ $table = $refers_to->table;
+ } else {
+ $table = $refers_to;
+ }
my $alias = $self->_get_alias($table);
Modified: Jifty-DBI/trunk/lib/Jifty/DBI/Record.pm
==============================================================================
--- Jifty-DBI/trunk/lib/Jifty/DBI/Record.pm (original)
+++ Jifty-DBI/trunk/lib/Jifty/DBI/Record.pm Thu Oct 27 17:16:07 2005
@@ -960,7 +960,7 @@
foreach my $column_name ( keys %attribs ) {
my $column = $self->column($column_name);
unless ($column) {
- die "$column_name isn't a column we know about";
+ Carp::confess "$column_name isn't a column we know about";
}
if ( $column->readable
and $column->refers_to
More information about the Rt-commit
mailing list