[Jifty-commit] r598 - in jifty/trunk: . inc/Module
jifty-commit at lists.jifty.org
jifty-commit at lists.jifty.org
Sat Feb 18 16:24:32 EST 2006
Author: alexmv
Date: Sat Feb 18 16:24:30 2006
New Revision: 598
Modified:
jifty/trunk/ (props changed)
jifty/trunk/MANIFEST
jifty/trunk/META.yml
jifty/trunk/inc/Module/AutoInstall.pm
jifty/trunk/inc/Module/Install.pm
jifty/trunk/inc/Module/Install/AutoInstall.pm
jifty/trunk/inc/Module/Install/Base.pm
jifty/trunk/inc/Module/Install/Can.pm
jifty/trunk/inc/Module/Install/Fetch.pm
jifty/trunk/inc/Module/Install/Include.pm
jifty/trunk/inc/Module/Install/Makefile.pm
jifty/trunk/inc/Module/Install/Metadata.pm
jifty/trunk/inc/Module/Install/Scripts.pm
jifty/trunk/inc/Module/Install/Share.pm
jifty/trunk/inc/Module/Install/Win32.pm
jifty/trunk/inc/Module/Install/WriteAll.pm
Log:
r9162 at zoq-fot-pik: chmrr | 2006-02-18 16:23:52 -0500
* Module::Install bump
* Updated MANIFEST and META.yml
Modified: jifty/trunk/MANIFEST
==============================================================================
--- jifty/trunk/MANIFEST (original)
+++ jifty/trunk/MANIFEST Sat Feb 18 16:24:30 2006
@@ -46,6 +46,7 @@
lib/Jifty/Manual/Glossary.pod
lib/Jifty/Manual/ObjectModel.pod
lib/Jifty/Manual/Tutorial.pod
+lib/Jifty/Manual/Tutorial_ja.pod
lib/Jifty/Mason/Halo.pm
lib/Jifty/MasonHandler.pm
lib/Jifty/Model/Schema.pm
@@ -185,6 +186,7 @@
share/web/templates/autohandler
share/web/templates/dhandler
share/web/templates/favicon.ico
+share/web/templates/helpers/calendar.html
share/web/templates/index.html
t/01-dependencies.t
t/02-connect.t
@@ -219,13 +221,17 @@
t/Mapper/web/templates/autohandler
t/Mapper/web/templates/index.html
t/TestApp/bin/jifty
+t/TestApp/lib/TestApp/Dispatcher.pm
t/TestApp/lib/TestApp/Model/User.pm
t/TestApp/t/00-load.t
t/TestApp/t/00-model-User.t
t/TestApp/t/00-prototype.t
t/TestApp/t/01-config.t
t/TestApp/t/01-trivial.t
+t/TestApp/t/02-dispatch.t
t/TestApp/t/16-images.t
t/TestApp/testapp
t/TestApp/web/static/images/pony.jpg
t/TestApp/web/templates/index.html
+t/TestApp/web/templates/dispatch/basic
+t/TestApp/web/templates/dispatch/basic-show
Modified: jifty/trunk/META.yml
==============================================================================
--- jifty/trunk/META.yml (original)
+++ jifty/trunk/META.yml Sat Feb 18 16:24:30 2006
@@ -1,5 +1,5 @@
distribution_type: module
-generated_by: Module::Install version 0.520
+generated_by: Module::Install version 0.560
license: unknown
name: Jifty
no_index:
@@ -12,6 +12,7 @@
CGI: 0
CGI::Cookie: 0
Cache::Cache: 0
+ Calendar::Simple: 0
Carp: 0
Class::Accessor: 0
Class::Container: 0
@@ -71,4 +72,4 @@
perl: 5.8.3
version: 0
tests: t/*.t t/*/t/*.t
-version: 0.51228
+version: 0.60213
Modified: jifty/trunk/inc/Module/AutoInstall.pm
==============================================================================
--- jifty/trunk/inc/Module/AutoInstall.pm (original)
+++ jifty/trunk/inc/Module/AutoInstall.pm Sat Feb 18 16:24:30 2006
@@ -1,4 +1,4 @@
-#line 1 "inc/Module/AutoInstall.pm - /usr/local/share/perl/5.8.7/Module/AutoInstall.pm"
+#line 1 "inc/Module/AutoInstall.pm - /usr/lib/perl5/site_perl/5.8.7/Module/AutoInstall.pm"
package Module::AutoInstall;
$Module::AutoInstall::VERSION = '1.01';
Modified: jifty/trunk/inc/Module/Install.pm
==============================================================================
--- jifty/trunk/inc/Module/Install.pm (original)
+++ jifty/trunk/inc/Module/Install.pm Sat Feb 18 16:24:30 2006
@@ -1,4 +1,4 @@
-#line 1 "/home/jesse/svk/jifty.org/jifty/trunk/inc/Module/Install.pm - /usr/local/share/perl/5.8.7/Module/Install.pm"
+#line 1 "/home/chmrr/work/rt/local/jifty/inc/Module/Install.pm - /usr/lib/perl5/site_perl/5.8.7/Module/Install.pm"
package Module::Install;
use 5.004;
@@ -6,7 +6,7 @@
use vars qw{$VERSION};
BEGIN {
# Don't forget to update Module::Install::Admin too!
- $VERSION = '0.52';
+ $VERSION = '0.56';
}
# inc::Module::Install must be loaded first
Modified: jifty/trunk/inc/Module/Install/AutoInstall.pm
==============================================================================
--- jifty/trunk/inc/Module/Install/AutoInstall.pm (original)
+++ jifty/trunk/inc/Module/Install/AutoInstall.pm Sat Feb 18 16:24:30 2006
@@ -1,6 +1,8 @@
-#line 1 "inc/Module/Install/AutoInstall.pm - /usr/local/share/perl/5.8.7/Module/Install/AutoInstall.pm"
+#line 1 "inc/Module/Install/AutoInstall.pm - /usr/lib/perl5/site_perl/5.8.7/Module/Install/AutoInstall.pm"
package Module::Install::AutoInstall;
-use Module::Install::Base; @ISA = qw(Module::Install::Base);
+
+use Module::Install::Base;
+ at ISA = qw{Module::Install::Base};
sub AutoInstall { $_[0] }
Modified: jifty/trunk/inc/Module/Install/Base.pm
==============================================================================
--- jifty/trunk/inc/Module/Install/Base.pm (original)
+++ jifty/trunk/inc/Module/Install/Base.pm Sat Feb 18 16:24:30 2006
@@ -1,10 +1,13 @@
-#line 1 "inc/Module/Install/Base.pm - /usr/local/share/perl/5.8.7/Module/Install/Base.pm"
+#line 1 "inc/Module/Install/Base.pm - /usr/lib/perl5/site_perl/5.8.7/Module/Install/Base.pm"
package Module::Install::Base;
# Suspend handler for "redefined" warnings
-BEGIN { my $w = $SIG{__WARN__}; $SIG{__WARN__} = sub { $w } };
+BEGIN {
+ my $w = $SIG{__WARN__};
+ $SIG{__WARN__} = sub { $w };
+}
-#line 30
+#line 36
sub new {
my ($class, %args) = @_;
@@ -18,7 +21,7 @@
bless(\%args, $class);
}
-#line 48
+#line 56
sub AUTOLOAD {
my $self = shift;
@@ -28,20 +31,18 @@
goto &$autoload;
}
-#line 62
+#line 72
sub _top { $_[0]->{_top} }
-#line 73
+#line 85
sub admin {
- my $self = shift;
- $self->_top->{admin} or Module::Install::Base::FakeAdmin->new;
+ $_[0]->_top->{admin} or Module::Install::Base::FakeAdmin->new;
}
sub is_admin {
- my $self = shift;
- $self->admin->VERSION;
+ $_[0]->admin->VERSION;
}
sub DESTROY {}
@@ -50,14 +51,16 @@
my $Fake;
sub new { $Fake ||= bless(\@_, $_[0]) }
+
sub AUTOLOAD {}
-sub DESTROY {}
-1;
+sub DESTROY {}
# Restore warning handler
-BEGIN { $SIG{__WARN__} = $SIG{__WARN__}->() };
+BEGIN {
+ $SIG{__WARN__} = $SIG{__WARN__}->();
+}
-__END__
+1;
-#line 120
+#line 134
Modified: jifty/trunk/inc/Module/Install/Can.pm
==============================================================================
--- jifty/trunk/inc/Module/Install/Can.pm (original)
+++ jifty/trunk/inc/Module/Install/Can.pm Sat Feb 18 16:24:30 2006
@@ -1,6 +1,9 @@
-#line 1 "inc/Module/Install/Can.pm - /usr/local/share/perl/5.8.7/Module/Install/Can.pm"
+#line 1 "inc/Module/Install/Can.pm - /usr/lib/perl5/site_perl/5.8.7/Module/Install/Can.pm"
package Module::Install::Can;
-use Module::Install::Base; @ISA = qw(Module::Install::Base);
+
+use Module::Install::Base;
+ at ISA = qw(Module::Install::Base);
+
$VERSION = '0.01';
use strict;
@@ -53,14 +56,14 @@
if ($^O eq 'cygwin') {
require ExtUtils::MM_Cygwin;
require ExtUtils::MM_Win32;
- if (!defined(&ExtUtils::MM_Cygwin::maybe_command)) {
+ if ( ! defined(&ExtUtils::MM_Cygwin::maybe_command) ) {
*ExtUtils::MM_Cygwin::maybe_command = sub {
my ($self, $file) = @_;
- if ($file =~ m{^/cygdrive/}i) {
+ if ($file =~ m{^/cygdrive/}i and ExtUtils::MM_Win32->can('maybe_command')) {
ExtUtils::MM_Win32->maybe_command($file);
}
else {
- $self->SUPER::maybe_command($file);
+ ExtUtils::MM_Unix->maybe_command($file);
}
}
}
Modified: jifty/trunk/inc/Module/Install/Fetch.pm
==============================================================================
--- jifty/trunk/inc/Module/Install/Fetch.pm (original)
+++ jifty/trunk/inc/Module/Install/Fetch.pm Sat Feb 18 16:24:30 2006
@@ -1,6 +1,8 @@
-#line 1 "inc/Module/Install/Fetch.pm - /usr/local/share/perl/5.8.7/Module/Install/Fetch.pm"
+#line 1 "inc/Module/Install/Fetch.pm - /usr/lib/perl5/site_perl/5.8.7/Module/Install/Fetch.pm"
package Module::Install::Fetch;
-use Module::Install::Base; @ISA = qw(Module::Install::Base);
+
+use Module::Install::Base;
+ at ISA = qw(Module::Install::Base);
$VERSION = '0.01';
@@ -9,7 +11,7 @@
my ($scheme, $host, $path, $file) =
$args{url} =~ m|^(\w+)://([^/]+)(.+)/(.+)| or return;
- if ($scheme eq 'http' and !eval { require LWP::Simple; 1 }) {
+ if ( $scheme eq 'http' and ! eval { require LWP::Simple; 1 } ) {
$args{url} = $args{ftp_url}
or (warn("LWP support unavailable!\n"), return);
($scheme, $host, $path, $file) =
Modified: jifty/trunk/inc/Module/Install/Include.pm
==============================================================================
--- jifty/trunk/inc/Module/Install/Include.pm (original)
+++ jifty/trunk/inc/Module/Install/Include.pm Sat Feb 18 16:24:30 2006
@@ -1,6 +1,8 @@
-#line 1 "inc/Module/Install/Include.pm - /usr/local/share/perl/5.8.7/Module/Install/Include.pm"
+#line 1 "inc/Module/Install/Include.pm - /usr/lib/perl5/site_perl/5.8.7/Module/Install/Include.pm"
package Module::Install::Include;
-use Module::Install::Base; @ISA = qw(Module::Install::Base);
+
+use Module::Install::Base;
+ at ISA = qw(Module::Install::Base);
sub include { +shift->admin->include(@_) };
sub include_deps { +shift->admin->include_deps(@_) };
Modified: jifty/trunk/inc/Module/Install/Makefile.pm
==============================================================================
--- jifty/trunk/inc/Module/Install/Makefile.pm (original)
+++ jifty/trunk/inc/Module/Install/Makefile.pm Sat Feb 18 16:24:30 2006
@@ -1,6 +1,8 @@
-#line 1 "inc/Module/Install/Makefile.pm - /usr/local/share/perl/5.8.7/Module/Install/Makefile.pm"
+#line 1 "inc/Module/Install/Makefile.pm - /usr/lib/perl5/site_perl/5.8.7/Module/Install/Makefile.pm"
package Module::Install::Makefile;
-use Module::Install::Base; @ISA = qw(Module::Install::Base);
+
+use Module::Install::Base;
+ at ISA = qw(Module::Install::Base);
$VERSION = '0.01';
@@ -154,4 +156,4 @@
__END__
-#line 286
+#line 288
Modified: jifty/trunk/inc/Module/Install/Metadata.pm
==============================================================================
--- jifty/trunk/inc/Module/Install/Metadata.pm (original)
+++ jifty/trunk/inc/Module/Install/Metadata.pm Sat Feb 18 16:24:30 2006
@@ -1,14 +1,12 @@
-#line 1 "inc/Module/Install/Metadata.pm - /usr/local/share/perl/5.8.7/Module/Install/Metadata.pm"
+#line 1 "inc/Module/Install/Metadata.pm - /usr/lib/perl5/site_perl/5.8.7/Module/Install/Metadata.pm"
package Module::Install::Metadata;
-use strict 'vars';
use Module::Install::Base;
+ at ISA = qw{Module::Install::Base};
-use vars qw($VERSION @ISA);
-BEGIN {
- $VERSION = '0.06';
- @ISA = 'Module::Install::Base';
-}
+$VERSION = '0.06';
+
+use strict 'vars';
my @scalar_keys = qw{
name module_name abstract author version license
Modified: jifty/trunk/inc/Module/Install/Scripts.pm
==============================================================================
--- jifty/trunk/inc/Module/Install/Scripts.pm (original)
+++ jifty/trunk/inc/Module/Install/Scripts.pm Sat Feb 18 16:24:30 2006
@@ -1,7 +1,11 @@
-#line 1 "inc/Module/Install/Scripts.pm - /usr/local/share/perl/5.8.7/Module/Install/Scripts.pm"
+#line 1 "inc/Module/Install/Scripts.pm - /usr/lib/perl5/site_perl/5.8.7/Module/Install/Scripts.pm"
package Module::Install::Scripts;
-use Module::Install::Base; @ISA = qw(Module::Install::Base);
+
+use Module::Install::Base;
+ at ISA = qw(Module::Install::Base);
+
$VERSION = '0.02';
+
use strict;
use File::Basename ();
Modified: jifty/trunk/inc/Module/Install/Share.pm
==============================================================================
--- jifty/trunk/inc/Module/Install/Share.pm (original)
+++ jifty/trunk/inc/Module/Install/Share.pm Sat Feb 18 16:24:30 2006
@@ -1,30 +1,31 @@
-#line 1 "inc/Module/Install/Share.pm - /usr/local/share/perl/5.8.7/Module/Install/Share.pm"
+#line 1 "inc/Module/Install/Share.pm - /usr/lib/perl5/site_perl/5.8.7/Module/Install/Share.pm"
package Module::Install::Share;
use Module::Install::Base;
@ISA = qw(Module::Install::Base);
-$VERSION = '0.01';
+$VERSION = '0.02';
use strict;
sub install_share {
- my $self = shift;
- my $dir = shift;
+ my ($self, $dir) = @_;
if ( ! defined $dir ) {
die "Cannot find the 'share' directory" unless -d 'share';
$dir = 'share';
}
- $self->postamble(<<".");
+ $self->postamble(<<"END_MAKEFILE");
config ::
\t\$(NOECHO) \$(MOD_INSTALL) \\
-\t\t\"$dir\" \$(INST_ARCHAUTODIR)
+\t\t\"$dir\" \$(INST_AUTODIR)
-.
+END_MAKEFILE
}
+1;
+
__END__
-#line 62
+#line 65
Modified: jifty/trunk/inc/Module/Install/Win32.pm
==============================================================================
--- jifty/trunk/inc/Module/Install/Win32.pm (original)
+++ jifty/trunk/inc/Module/Install/Win32.pm Sat Feb 18 16:24:30 2006
@@ -1,6 +1,8 @@
-#line 1 "inc/Module/Install/Win32.pm - /usr/local/share/perl/5.8.7/Module/Install/Win32.pm"
+#line 1 "inc/Module/Install/Win32.pm - /usr/lib/perl5/site_perl/5.8.7/Module/Install/Win32.pm"
package Module::Install::Win32;
-use Module::Install::Base; @ISA = qw(Module::Install::Base);
+
+use Module::Install::Base;
+ at ISA = qw(Module::Install::Base);
$VERSION = '0.02';
Modified: jifty/trunk/inc/Module/Install/WriteAll.pm
==============================================================================
--- jifty/trunk/inc/Module/Install/WriteAll.pm (original)
+++ jifty/trunk/inc/Module/Install/WriteAll.pm Sat Feb 18 16:24:30 2006
@@ -1,6 +1,8 @@
-#line 1 "inc/Module/Install/WriteAll.pm - /usr/local/share/perl/5.8.7/Module/Install/WriteAll.pm"
+#line 1 "inc/Module/Install/WriteAll.pm - /usr/lib/perl5/site_perl/5.8.7/Module/Install/WriteAll.pm"
package Module::Install::WriteAll;
-use Module::Install::Base; @ISA = qw(Module::Install::Base);
+
+use Module::Install::Base;
+ at ISA = qw(Module::Install::Base);
sub WriteAll {
my $self = shift;
More information about the Jifty-commit
mailing list