r2247 - in
packages/libclass-default-perl/branches/upstream/current: .
inc/Module inc/Module/Install lib/Class t
Krzysztof Krzyzaniak
eloy at costa.debian.org
Wed Mar 1 15:54:02 UTC 2006
Author: eloy
Date: 2006-03-01 15:53:20 +0000 (Wed, 01 Mar 2006)
New Revision: 2247
Added:
packages/libclass-default-perl/branches/upstream/current/inc/Module/AutoInstall.pm
packages/libclass-default-perl/branches/upstream/current/inc/Module/Install/Include.pm
packages/libclass-default-perl/branches/upstream/current/t/01_compile.t
packages/libclass-default-perl/branches/upstream/current/t/02_main.t
packages/libclass-default-perl/branches/upstream/current/t/99_pod.t
Removed:
packages/libclass-default-perl/branches/upstream/current/t/00_compile.t
packages/libclass-default-perl/branches/upstream/current/t/01_main.t
Modified:
packages/libclass-default-perl/branches/upstream/current/Changes
packages/libclass-default-perl/branches/upstream/current/LICENSE
packages/libclass-default-perl/branches/upstream/current/MANIFEST
packages/libclass-default-perl/branches/upstream/current/META.yml
packages/libclass-default-perl/branches/upstream/current/Makefile.PL
packages/libclass-default-perl/branches/upstream/current/README
packages/libclass-default-perl/branches/upstream/current/inc/Module/Install.pm
packages/libclass-default-perl/branches/upstream/current/inc/Module/Install/AutoInstall.pm
packages/libclass-default-perl/branches/upstream/current/inc/Module/Install/Base.pm
packages/libclass-default-perl/branches/upstream/current/inc/Module/Install/Can.pm
packages/libclass-default-perl/branches/upstream/current/inc/Module/Install/Fetch.pm
packages/libclass-default-perl/branches/upstream/current/inc/Module/Install/Makefile.pm
packages/libclass-default-perl/branches/upstream/current/inc/Module/Install/Metadata.pm
packages/libclass-default-perl/branches/upstream/current/inc/Module/Install/Win32.pm
packages/libclass-default-perl/branches/upstream/current/inc/Module/Install/WriteAll.pm
packages/libclass-default-perl/branches/upstream/current/lib/Class/Default.pm
Log:
Load /tmp/tmp.JN49ET/libclass-default-perl-1.4 into
packages/libclass-default-perl/branches/upstream/current.
Modified: packages/libclass-default-perl/branches/upstream/current/Changes
===================================================================
--- packages/libclass-default-perl/branches/upstream/current/Changes 2006-02-27 08:52:29 UTC (rev 2246)
+++ packages/libclass-default-perl/branches/upstream/current/Changes 2006-03-01 15:53:20 UTC (rev 2247)
@@ -1,5 +1,12 @@
Revision history for Perl extension Class::Default.
+1.4 Fri 24 Feb 2006
+ - No functional changes.
+ - Upgrading to Module::Install 0.57.
+ - Resolved #16946: Incorrect examples in documentation (DJERIUS)
+ - Moved over from older CVS repository to newer SVN one
+ - Changes to test to handle the new directory structure.
+
1.3 Tue Feb 15 2005
- Removing braindead Build.PL
Property changes on: packages/libclass-default-perl/branches/upstream/current/Changes
___________________________________________________________________
Name: svn:executable
+ *
Modified: packages/libclass-default-perl/branches/upstream/current/LICENSE
===================================================================
--- packages/libclass-default-perl/branches/upstream/current/LICENSE 2006-02-27 08:52:29 UTC (rev 2246)
+++ packages/libclass-default-perl/branches/upstream/current/LICENSE 2006-03-01 15:53:20 UTC (rev 2247)
@@ -1,3 +1,4 @@
+
Terms of Perl itself
a) the GNU General Public License as published by the Free
Modified: packages/libclass-default-perl/branches/upstream/current/MANIFEST
===================================================================
--- packages/libclass-default-perl/branches/upstream/current/MANIFEST 2006-02-27 08:52:29 UTC (rev 2246)
+++ packages/libclass-default-perl/branches/upstream/current/MANIFEST 2006-03-01 15:53:20 UTC (rev 2247)
@@ -1,9 +1,11 @@
Changes
+inc/Module/AutoInstall.pm
inc/Module/Install.pm
inc/Module/Install/AutoInstall.pm
inc/Module/Install/Base.pm
inc/Module/Install/Can.pm
inc/Module/Install/Fetch.pm
+inc/Module/Install/Include.pm
inc/Module/Install/Makefile.pm
inc/Module/Install/Metadata.pm
inc/Module/Install/Win32.pm
@@ -14,5 +16,6 @@
MANIFEST This list of files
META.yml
README
-t/00_compile.t
-t/01_main.t
+t/01_compile.t
+t/02_main.t
+t/99_pod.t
Modified: packages/libclass-default-perl/branches/upstream/current/META.yml
===================================================================
--- packages/libclass-default-perl/branches/upstream/current/META.yml 2006-02-27 08:52:29 UTC (rev 2246)
+++ packages/libclass-default-perl/branches/upstream/current/META.yml 2006-03-01 15:53:20 UTC (rev 2247)
@@ -1,15 +1,17 @@
+
+no_index:
+ directory:
+ - inc
+ - t
+generated_by: Module::Install version 0.57
+distribution_type: module
+version: 1.4
name: Class-Default
-version: 1.3
-abstract: Static methods apply to a default instantiation
-author: Adam Kennedy<cpan at ali.as>
+author: Adam Kennedy <cpan at ali.as>
license: perl
-distribution_type: module
-build_requires:
+build_requires:
Test::More: 0.47
File::Spec: 0.82
-requires:
+requires:
perl: 5.005
-no_index:
- directory:
- - inc
-generated_by: Module::Install version 0.36
+abstract: Static calls apply to a default instantiation
Modified: packages/libclass-default-perl/branches/upstream/current/Makefile.PL
===================================================================
--- packages/libclass-default-perl/branches/upstream/current/Makefile.PL 2006-02-27 08:52:29 UTC (rev 2246)
+++ packages/libclass-default-perl/branches/upstream/current/Makefile.PL 2006-03-01 15:53:20 UTC (rev 2247)
@@ -1,16 +1,10 @@
use inc::Module::Install;
-name ( 'Class-Default');
-abstract ( 'Static methods apply to a default instantiation');
-author ( 'Adam Kennedy<cpan at ali.as>');
-version_from ( 'lib/Class/Default.pm');
-license ( 'perl');
+name 'Class-Default';
+all_from 'lib/Class/Default.pm';
-requires ( 'perl' => '5.005' );
+build_requires 'Test::More' => '0.47';
+build_requires 'File::Spec' => '0.82';
-build_requires( 'Test::More' => '0.47' );
-build_requires( 'File::Spec' => '0.82' );
-
-auto_install();
-
-&WriteAll;
+auto_install;
+WriteAll;
Property changes on: packages/libclass-default-perl/branches/upstream/current/Makefile.PL
___________________________________________________________________
Name: svn:executable
+ *
Modified: packages/libclass-default-perl/branches/upstream/current/README
===================================================================
--- packages/libclass-default-perl/branches/upstream/current/README 2006-02-27 08:52:29 UTC (rev 2246)
+++ packages/libclass-default-perl/branches/upstream/current/README 2006-03-01 15:53:20 UTC (rev 2247)
@@ -120,8 +120,13 @@
return $self;
}
- sub name { $_[0]->{name} }
- sub favourite_color { $_[0]->{favourite_color} }
+ sub name {
+ $_[0]->_self->{name};
+ }
+
+ sub favourite_color {
+ $_[0]->_self->{favourite_color};
+ }
That provides a statically accessible default object that could be used
as in the following manner.
@@ -163,18 +168,22 @@
SUPPORT
Bugs should be reported via the CPAN bug tracker at
- <http://rt.cpan.org/NoAuth/ReportBug.html?Queue=Class%3ADefault>
+ <http://rt.cpan.org/NoAuth/ReportBug.html?Queue=Class-Default>
- Contact the author
+ For other issues, contact the author
AUTHOR
- Adam Kennedy (Maintainer), <http://ali.as/>, cpan at ali.as
+ Adam Kennedy <cpan at ali.as>
+SEE ALSO
+ <http://ali.as/>, Class::Singleton
+
COPYRIGHT
- Copyright (c) 2002 Adam Kennedy. All rights reserved. This program is
- free software; you can redistribute it and/or modify it under the same
- terms as Perl itself.
+ Copyright (c) 2002 - 2006 Adam Kennedy. All rights reserved.
+ This program is free software; you can redistribute it and/or modify it
+ under the same terms as Perl itself.
+
The full text of the license can be found in the LICENSE file included
with this module.
Added: packages/libclass-default-perl/branches/upstream/current/inc/Module/AutoInstall.pm
===================================================================
--- packages/libclass-default-perl/branches/upstream/current/inc/Module/AutoInstall.pm 2006-02-27 08:52:29 UTC (rev 2246)
+++ packages/libclass-default-perl/branches/upstream/current/inc/Module/AutoInstall.pm 2006-03-01 15:53:20 UTC (rev 2247)
@@ -0,0 +1,750 @@
+#line 1 "inc/Module/AutoInstall.pm - /usr/local/share/perl/5.8.4/Module/AutoInstall.pm"
+package Module::AutoInstall;
+$Module::AutoInstall::VERSION = '1.01';
+
+use strict;
+use Cwd ();
+use ExtUtils::MakeMaker ();
+
+#line 218
+
+# special map on pre-defined feature sets
+my %FeatureMap = (
+ '' => 'Core Features', # XXX: deprecated
+ '-core' => 'Core Features',
+);
+
+# various lexical flags
+my ( @Missing, @Existing, %DisabledTests, $UnderCPAN, $HasCPANPLUS );
+my ( $Config, $CheckOnly, $SkipInstall, $AcceptDefault, $TestOnly );
+my ( $PostambleActions, $PostambleUsed );
+
+_accept_default( !-t STDIN ); # see if it's a non-interactive session
+_init();
+
+sub _accept_default {
+ $AcceptDefault = shift;
+}
+
+sub missing_modules {
+ return @Missing;
+}
+
+sub do_install {
+ __PACKAGE__->install(
+ [
+ $Config
+ ? ( UNIVERSAL::isa( $Config, 'HASH' ) ? %{$Config} : @{$Config} )
+ : ()
+ ],
+ @Missing,
+ );
+}
+
+# initialize various flags, and/or perform install
+sub _init {
+ foreach my $arg (
+ @ARGV,
+ split(
+ /[\s\t]+/,
+ $ENV{PERL_AUTOINSTALL} || $ENV{PERL_EXTUTILS_AUTOINSTALL} || ''
+ )
+ )
+ {
+ if ( $arg =~ /^--config=(.*)$/ ) {
+ $Config = [ split( ',', $1 ) ];
+ }
+ elsif ( $arg =~ /^--installdeps=(.*)$/ ) {
+ __PACKAGE__->install( $Config, @Missing = split( /,/, $1 ) );
+ exit 0;
+ }
+ elsif ( $arg =~ /^--default(?:deps)?$/ ) {
+ $AcceptDefault = 1;
+ }
+ elsif ( $arg =~ /^--check(?:deps)?$/ ) {
+ $CheckOnly = 1;
+ }
+ elsif ( $arg =~ /^--skip(?:deps)?$/ ) {
+ $SkipInstall = 1;
+ }
+ elsif ( $arg =~ /^--test(?:only)?$/ ) {
+ $TestOnly = 1;
+ }
+ }
+}
+
+# overrides MakeMaker's prompt() to automatically accept the default choice
+sub _prompt {
+ goto &ExtUtils::MakeMaker::prompt unless $AcceptDefault;
+
+ my ( $prompt, $default ) = @_;
+ my $y = ( $default =~ /^[Yy]/ );
+
+ print $prompt, ' [', ( $y ? 'Y' : 'y' ), '/', ( $y ? 'n' : 'N' ), '] ';
+ print "$default\n";
+ return $default;
+}
+
+# the workhorse
+sub import {
+ my $class = shift;
+ my @args = @_ or return;
+ my $core_all;
+
+ print "*** $class version " . $class->VERSION . "\n";
+ print "*** Checking for dependencies...\n";
+
+ my $cwd = Cwd::cwd();
+
+ $Config = [];
+
+ my $maxlen = length(
+ (
+ sort { length($b) <=> length($a) }
+ grep { /^[^\-]/ }
+ map {
+ ref($_)
+ ? ( ( ref($_) eq 'HASH' ) ? keys(%$_) : @{$_} )
+ : ''
+ }
+ map { +{@args}->{$_} }
+ grep { /^[^\-]/ or /^-core$/i } keys %{ +{@args} }
+ )[0]
+ );
+
+ while ( my ( $feature, $modules ) = splice( @args, 0, 2 ) ) {
+ my ( @required, @tests, @skiptests );
+ my $default = 1;
+ my $conflict = 0;
+
+ if ( $feature =~ m/^-(\w+)$/ ) {
+ my $option = lc($1);
+
+ # check for a newer version of myself
+ _update_to( $modules, @_ ) and return if $option eq 'version';
+
+ # sets CPAN configuration options
+ $Config = $modules if $option eq 'config';
+
+ # promote every features to core status
+ $core_all = ( $modules =~ /^all$/i ) and next
+ if $option eq 'core';
+
+ next unless $option eq 'core';
+ }
+
+ print "[" . ( $FeatureMap{ lc($feature) } || $feature ) . "]\n";
+
+ $modules = [ %{$modules} ] if UNIVERSAL::isa( $modules, 'HASH' );
+
+ unshift @$modules, -default => &{ shift(@$modules) }
+ if ( ref( $modules->[0] ) eq 'CODE' ); # XXX: bugward combatability
+
+ while ( my ( $mod, $arg ) = splice( @$modules, 0, 2 ) ) {
+ if ( $mod =~ m/^-(\w+)$/ ) {
+ my $option = lc($1);
+
+ $default = $arg if ( $option eq 'default' );
+ $conflict = $arg if ( $option eq 'conflict' );
+ @tests = @{$arg} if ( $option eq 'tests' );
+ @skiptests = @{$arg} if ( $option eq 'skiptests' );
+
+ next;
+ }
+
+ printf( "- %-${maxlen}s ...", $mod );
+
+ if ( $arg and $arg =~ /^\D/ ) {
+ unshift @$modules, $arg;
+ $arg = 0;
+ }
+
+ # XXX: check for conflicts and uninstalls(!) them.
+ if (
+ defined( my $cur = _version_check( _load($mod), $arg ||= 0 ) ) )
+ {
+ print "loaded. ($cur" . ( $arg ? " >= $arg" : '' ) . ")\n";
+ push @Existing, $mod => $arg;
+ $DisabledTests{$_} = 1 for map { glob($_) } @skiptests;
+ }
+ else {
+ print "missing." . ( $arg ? " (would need $arg)" : '' ) . "\n";
+ push @required, $mod => $arg;
+ }
+ }
+
+ next unless @required;
+
+ my $mandatory = ( $feature eq '-core' or $core_all );
+
+ if (
+ !$SkipInstall
+ and (
+ $CheckOnly
+ or _prompt(
+ qq{==> Auto-install the }
+ . ( @required / 2 )
+ . ( $mandatory ? ' mandatory' : ' optional' )
+ . qq{ module(s) from CPAN?},
+ $default ? 'y' : 'n',
+ ) =~ /^[Yy]/
+ )
+ )
+ {
+ push( @Missing, @required );
+ $DisabledTests{$_} = 1 for map { glob($_) } @skiptests;
+ }
+
+ elsif ( !$SkipInstall
+ and $default
+ and $mandatory
+ and
+ _prompt( qq{==> The module(s) are mandatory! Really skip?}, 'n', )
+ =~ /^[Nn]/ )
+ {
+ push( @Missing, @required );
+ $DisabledTests{$_} = 1 for map { glob($_) } @skiptests;
+ }
+
+ else {
+ $DisabledTests{$_} = 1 for map { glob($_) } @tests;
+ }
+ }
+
+ _check_lock(); # check for $UnderCPAN
+
+ if ( @Missing and not( $CheckOnly or $UnderCPAN ) ) {
+ require Config;
+ print
+"*** Dependencies will be installed the next time you type '$Config::Config{make}'.\n";
+
+ # make an educated guess of whether we'll need root permission.
+ print " (You may need to do that as the 'root' user.)\n"
+ if eval '$>';
+ }
+ print "*** $class configuration finished.\n";
+
+ chdir $cwd;
+
+ # import to main::
+ no strict 'refs';
+ *{'main::WriteMakefile'} = \&Write if caller(0) eq 'main';
+}
+
+# CPAN.pm is non-reentrant, so check if we're under it and have no CPANPLUS
+sub _check_lock {
+ return unless @Missing;
+ _load_cpan();
+
+ # Find the CPAN lock-file
+ my $lock = MM->catfile( $CPAN::Config->{cpan_home}, ".lock" );
+ return unless -f $lock;
+
+ # Check the lock
+ local *LOCK;
+ return unless open(LOCK, $lock);
+
+ if (
+ ( $^O eq 'MSWin32' ? _under_cpan() : <LOCK> == getppid() )
+ and ( $CPAN::Config->{prerequisites_policy} || '' ) ne 'ignore'
+ ) {
+ print <<'END_MESSAGE';
+
+*** Since we're running under CPAN, I'll just let it take care
+ of the dependency's installation later.
+END_MESSAGE
+ $UnderCPAN = 1;
+ }
+
+ close LOCK;
+}
+
+sub install {
+ my $class = shift;
+
+ my $i; # used below to strip leading '-' from config keys
+ my @config = ( map { s/^-// if ++$i; $_ } @{ +shift } );
+
+ my ( @modules, @installed );
+ while ( my ( $pkg, $ver ) = splice( @_, 0, 2 ) ) {
+
+ # grep out those already installed
+ if ( defined( _version_check( _load($pkg), $ver ) ) ) {
+ push @installed, $pkg;
+ }
+ else {
+ push @modules, $pkg, $ver;
+ }
+ }
+
+ return @installed unless @modules; # nothing to do
+
+ print "*** Installing dependencies...\n";
+
+ return unless _connected_to('cpan.org');
+
+ my %args = @config;
+ my %failed;
+ local *FAILED;
+ if ( $args{do_once} and open( FAILED, '.#autoinstall.failed' ) ) {
+ while (<FAILED>) { chomp; $failed{$_}++ }
+ close FAILED;
+
+ my @newmod;
+ while ( my ( $k, $v ) = splice( @modules, 0, 2 ) ) {
+ push @newmod, ( $k => $v ) unless $failed{$k};
+ }
+ @modules = @newmod;
+ }
+
+ if ( ! $UnderCPAN and _has_cpanplus() ) {
+ _install_cpanplus( \@modules, \@config );
+ } else {
+ _install_cpan( \@modules, \@config );
+ }
+
+ print "*** $class installation finished.\n";
+
+ # see if we have successfully installed them
+ while ( my ( $pkg, $ver ) = splice( @modules, 0, 2 ) ) {
+ if ( defined( _version_check( _load($pkg), $ver ) ) ) {
+ push @installed, $pkg;
+ }
+ elsif ( $args{do_once} and open( FAILED, '>> .#autoinstall.failed' ) ) {
+ print FAILED "$pkg\n";
+ }
+ }
+
+ close FAILED if $args{do_once};
+
+ return @installed;
+}
+
+sub _install_cpanplus {
+ my @modules = @{ +shift };
+ my @config = _cpanplus_config( @{ +shift } );
+ my $installed = 0;
+
+ require CPANPLUS::Backend;
+ my $cp = CPANPLUS::Backend->new;
+ my $conf = $cp->configure_object;
+
+ return unless $conf->can('conf') # 0.05x+ with "sudo" support
+ or _can_write($conf->_get_build('base')); # 0.04x
+
+ # if we're root, set UNINST=1 to avoid trouble unless user asked for it.
+ my $makeflags = $conf->get_conf('makeflags') || '';
+ if ( UNIVERSAL::isa( $makeflags, 'HASH' ) ) {
+ # 0.03+ uses a hashref here
+ $makeflags->{UNINST} = 1 unless exists $makeflags->{UNINST};
+
+ } else {
+ # 0.02 and below uses a scalar
+ $makeflags = join( ' ', split( ' ', $makeflags ), 'UNINST=1' )
+ if ( $makeflags !~ /\bUNINST\b/ and eval qq{ $> eq '0' } );
+
+ }
+ $conf->set_conf( makeflags => $makeflags );
+ $conf->set_conf( prereqs => 1 );
+
+
+
+ while ( my ( $key, $val ) = splice( @config, 0, 2 ) ) {
+ $conf->set_conf( $key, $val );
+ }
+
+ my $modtree = $cp->module_tree;
+ while ( my ( $pkg, $ver ) = splice( @modules, 0, 2 ) ) {
+ print "*** Installing $pkg...\n";
+
+ MY::preinstall( $pkg, $ver ) or next if defined &MY::preinstall;
+
+ my $success;
+ my $obj = $modtree->{$pkg};
+
+ if ( $obj and defined( _version_check( $obj->{version}, $ver ) ) ) {
+ my $pathname = $pkg;
+ $pathname =~ s/::/\\W/;
+
+ foreach my $inc ( grep { m/$pathname.pm/i } keys(%INC) ) {
+ delete $INC{$inc};
+ }
+
+ my $rv = $cp->install( modules => [ $obj->{module} ] );
+
+ if ( $rv and ( $rv->{ $obj->{module} } or $rv->{ok} ) ) {
+ print "*** $pkg successfully installed.\n";
+ $success = 1;
+ } else {
+ print "*** $pkg installation cancelled.\n";
+ $success = 0;
+ }
+
+ $installed += $success;
+ } else {
+ print << ".";
+*** Could not find a version $ver or above for $pkg; skipping.
+.
+ }
+
+ MY::postinstall( $pkg, $ver, $success ) if defined &MY::postinstall;
+ }
+
+ return $installed;
+}
+
+sub _cpanplus_config {
+ my @config = ();
+ while ( @_ ) {
+ my ($key, $value) = (shift(), shift());
+ if ( $key eq 'prerequisites_policy' ) {
+ if ( $value eq 'follow' ) {
+ $value = CPANPLUS::Internals::Constants::PREREQ_INSTALL();
+ } elsif ( $value eq 'ask' ) {
+ $value = CPANPLUS::Internals::Constants::PREREQ_ASK();
+ } elsif ( $value eq 'ignore' ) {
+ $value = CPANPLUS::Internals::Constants::PREREQ_IGNORE();
+ } else {
+ die "*** Cannot convert option $key = '$value' to CPANPLUS version.\n";
+ }
+ } else {
+ die "*** Cannot convert option $key to CPANPLUS version.\n";
+ }
+ }
+ return @config;
+}
+
+sub _install_cpan {
+ my @modules = @{ +shift };
+ my @config = @{ +shift };
+ my $installed = 0;
+ my %args;
+
+ _load_cpan();
+ require Config;
+
+ if (CPAN->VERSION < 1.80) {
+ # no "sudo" support, probe for writableness
+ return unless _can_write( MM->catfile( $CPAN::Config->{cpan_home}, 'sources' ) )
+ and _can_write( $Config::Config{sitelib} );
+ }
+
+ # if we're root, set UNINST=1 to avoid trouble unless user asked for it.
+ my $makeflags = $CPAN::Config->{make_install_arg} || '';
+ $CPAN::Config->{make_install_arg} =
+ join( ' ', split( ' ', $makeflags ), 'UNINST=1' )
+ if ( $makeflags !~ /\bUNINST\b/ and eval qq{ $> eq '0' } );
+
+ # don't show start-up info
+ $CPAN::Config->{inhibit_startup_message} = 1;
+
+ # set additional options
+ while ( my ( $opt, $arg ) = splice( @config, 0, 2 ) ) {
+ ( $args{$opt} = $arg, next )
+ if $opt =~ /^force$/; # pseudo-option
+ $CPAN::Config->{$opt} = $arg;
+ }
+
+ local $CPAN::Config->{prerequisites_policy} = 'follow';
+
+ while ( my ( $pkg, $ver ) = splice( @modules, 0, 2 ) ) {
+ MY::preinstall( $pkg, $ver ) or next if defined &MY::preinstall;
+
+ print "*** Installing $pkg...\n";
+
+ my $obj = CPAN::Shell->expand( Module => $pkg );
+ my $success = 0;
+
+ if ( $obj and defined( _version_check( $obj->cpan_version, $ver ) ) ) {
+ my $pathname = $pkg;
+ $pathname =~ s/::/\\W/;
+
+ foreach my $inc ( grep { m/$pathname.pm/i } keys(%INC) ) {
+ delete $INC{$inc};
+ }
+
+ $obj->force('install') if $args{force};
+
+ my $rv = $obj->install || eval {
+ $CPAN::META->instance( 'CPAN::Distribution', $obj->cpan_file, )
+ ->{install}
+ if $CPAN::META;
+ };
+
+ if ( $rv eq 'YES' ) {
+ print "*** $pkg successfully installed.\n";
+ $success = 1;
+ }
+ else {
+ print "*** $pkg installation failed.\n";
+ $success = 0;
+ }
+
+ $installed += $success;
+ }
+ else {
+ print << ".";
+*** Could not find a version $ver or above for $pkg; skipping.
+.
+ }
+
+ MY::postinstall( $pkg, $ver, $success ) if defined &MY::postinstall;
+ }
+
+ return $installed;
+}
+
+sub _has_cpanplus {
+ return (
+ $HasCPANPLUS = (
+ $INC{'CPANPLUS/Config.pm'}
+ or _load('CPANPLUS::Shell::Default')
+ )
+ );
+}
+
+# make guesses on whether we're under the CPAN installation directory
+sub _under_cpan {
+ require Cwd;
+ require File::Spec;
+
+ my $cwd = File::Spec->canonpath( Cwd::cwd() );
+ my $cpan = File::Spec->canonpath( $CPAN::Config->{cpan_home} );
+
+ return ( index( $cwd, $cpan ) > -1 );
+}
+
+sub _update_to {
+ my $class = __PACKAGE__;
+ my $ver = shift;
+
+ return
+ if defined( _version_check( _load($class), $ver ) ); # no need to upgrade
+
+ if (
+ _prompt( "==> A newer version of $class ($ver) is required. Install?",
+ 'y' ) =~ /^[Nn]/
+ )
+ {
+ die "*** Please install $class $ver manually.\n";
+ }
+
+ print << ".";
+*** Trying to fetch it from CPAN...
+.
+
+ # install ourselves
+ _load($class) and return $class->import(@_)
+ if $class->install( [], $class, $ver );
+
+ print << '.'; exit 1;
+
+*** Cannot bootstrap myself. :-( Installation terminated.
+.
+}
+
+# check if we're connected to some host, using inet_aton
+sub _connected_to {
+ my $site = shift;
+
+ return (
+ ( _load('Socket') and Socket::inet_aton($site) ) or _prompt(
+ qq(
+*** Your host cannot resolve the domain name '$site', which
+ probably means the Internet connections are unavailable.
+==> Should we try to install the required module(s) anyway?), 'n'
+ ) =~ /^[Yy]/
+ );
+}
+
+# check if a directory is writable; may create it on demand
+sub _can_write {
+ my $path = shift;
+ mkdir( $path, 0755 ) unless -e $path;
+
+ return 1 if -w $path;
+
+ print << ".";
+*** You are not allowed to write to the directory '$path';
+ the installation may fail due to insufficient permissions.
+.
+
+ if (
+ eval '$>' and lc(`sudo -V`) =~ /version/ and _prompt(
+ qq(
+==> Should we try to re-execute the autoinstall process with 'sudo'?),
+ ((-t STDIN) ? 'y' : 'n')
+ ) =~ /^[Yy]/
+ )
+ {
+
+ # try to bootstrap ourselves from sudo
+ print << ".";
+*** Trying to re-execute the autoinstall process with 'sudo'...
+.
+ my $missing = join( ',', @Missing );
+ my $config = join( ',',
+ UNIVERSAL::isa( $Config, 'HASH' ) ? %{$Config} : @{$Config} )
+ if $Config;
+
+ return
+ unless system( 'sudo', $^X, $0, "--config=$config",
+ "--installdeps=$missing" );
+
+ print << ".";
+*** The 'sudo' command exited with error! Resuming...
+.
+ }
+
+ return _prompt(
+ qq(
+==> Should we try to install the required module(s) anyway?), 'n'
+ ) =~ /^[Yy]/;
+}
+
+# load a module and return the version it reports
+sub _load {
+ my $mod = pop; # class/instance doesn't matter
+ my $file = $mod;
+
+ $file =~ s|::|/|g;
+ $file .= '.pm';
+
+ local $@;
+ return eval { require $file; $mod->VERSION } || ( $@ ? undef: 0 );
+}
+
+# Load CPAN.pm and it's configuration
+sub _load_cpan {
+ return if $CPAN::VERSION;
+ require CPAN;
+ if ( $CPAN::HandleConfig::VERSION ) {
+ # Newer versions of CPAN have a HandleConfig module
+ CPAN::HandleConfig->load;
+ } else {
+ # Older versions had the load method in Config directly
+ CPAN::Config->load;
+ }
+}
+
+# compare two versions, either use Sort::Versions or plain comparison
+sub _version_check {
+ my ( $cur, $min ) = @_;
+ return unless defined $cur;
+
+ $cur =~ s/\s+$//;
+
+ # check for version numbers that are not in decimal format
+ if ( ref($cur) or ref($min) or $cur =~ /v|\..*\./ or $min =~ /v|\..*\./ ) {
+ if ( $version::VERSION or defined( _load('version') ) ) {
+
+ # use version.pm if it is installed.
+ return (
+ ( version->new($cur) >= version->new($min) ) ? $cur : undef );
+ }
+ elsif ( $Sort::Versions::VERSION or defined( _load('Sort::Versions') ) )
+ {
+
+ # use Sort::Versions as the sorting algorithm for a.b.c versions
+ return ( ( Sort::Versions::versioncmp( $cur, $min ) != -1 )
+ ? $cur
+ : undef );
+ }
+
+ warn "Cannot reliably compare non-decimal formatted versions.\n"
+ . "Please install version.pm or Sort::Versions.\n";
+ }
+
+ # plain comparison
+ local $^W = 0; # shuts off 'not numeric' bugs
+ return ( $cur >= $min ? $cur : undef );
+}
+
+# nothing; this usage is deprecated.
+sub main::PREREQ_PM { return {}; }
+
+sub _make_args {
+ my %args = @_;
+
+ $args{PREREQ_PM} = { %{ $args{PREREQ_PM} || {} }, @Existing, @Missing }
+ if $UnderCPAN or $TestOnly;
+
+ if ( $args{EXE_FILES} and -e 'MANIFEST' ) {
+ require ExtUtils::Manifest;
+ my $manifest = ExtUtils::Manifest::maniread('MANIFEST');
+
+ $args{EXE_FILES} =
+ [ grep { exists $manifest->{$_} } @{ $args{EXE_FILES} } ];
+ }
+
+ $args{test}{TESTS} ||= 't/*.t';
+ $args{test}{TESTS} = join( ' ',
+ grep { !exists( $DisabledTests{$_} ) }
+ map { glob($_) } split( /\s+/, $args{test}{TESTS} ) );
+
+ my $missing = join( ',', @Missing );
+ my $config =
+ join( ',', UNIVERSAL::isa( $Config, 'HASH' ) ? %{$Config} : @{$Config} )
+ if $Config;
+
+ $PostambleActions = (
+ $missing
+ ? "\$(PERL) $0 --config=$config --installdeps=$missing"
+ : "\@\$(NOOP)"
+ );
+
+ return %args;
+}
+
+# a wrapper to ExtUtils::MakeMaker::WriteMakefile
+sub Write {
+ require Carp;
+ Carp::croak "WriteMakefile: Need even number of args" if @_ % 2;
+
+ if ($CheckOnly) {
+ print << ".";
+*** Makefile not written in check-only mode.
+.
+ return;
+ }
+
+ my %args = _make_args(@_);
+
+ no strict 'refs';
+
+ $PostambleUsed = 0;
+ local *MY::postamble = \&postamble unless defined &MY::postamble;
+ ExtUtils::MakeMaker::WriteMakefile(%args);
+
+ print << "." unless $PostambleUsed;
+*** WARNING: Makefile written with customized MY::postamble() without
+ including contents from Module::AutoInstall::postamble() --
+ auto installation features disabled. Please contact the author.
+.
+
+ return 1;
+}
+
+sub postamble {
+ $PostambleUsed = 1;
+
+ return << ".";
+
+config :: installdeps
+\t\@\$(NOOP)
+
+checkdeps ::
+\t\$(PERL) $0 --checkdeps
+
+installdeps ::
+\t$PostambleActions
+
+.
+
+}
+
+1;
+
+__END__
+
+#line 979
Modified: packages/libclass-default-perl/branches/upstream/current/inc/Module/Install/AutoInstall.pm
===================================================================
--- packages/libclass-default-perl/branches/upstream/current/inc/Module/Install/AutoInstall.pm 2006-02-27 08:52:29 UTC (rev 2246)
+++ packages/libclass-default-perl/branches/upstream/current/inc/Module/Install/AutoInstall.pm 2006-03-01 15:53:20 UTC (rev 2247)
@@ -1,7 +1,13 @@
#line 1 "inc/Module/Install/AutoInstall.pm - /usr/local/share/perl/5.8.4/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};
+
+$VERSION = '0.57';
+
+use strict;
+
sub AutoInstall { $_[0] }
sub run {
@@ -18,45 +24,35 @@
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;
- while ( @core and @_ > 1 and $_[0] =~ /^-\w+$/ ) {
- push @core, splice(@_, 0, 2);
- }
+ my @config = @_;
- ExtUtils::AutoInstall->import(
- (@core ? (-core => \@core) : ()), @_, $self->features
+ # We'll need Module::AutoInstall
+ $self->include('Module::AutoInstall');
+ require Module::AutoInstall;
+
+ Module::AutoInstall->import(
+ (@config ? (-config => \@config) : ()),
+ (@core ? (-core => \@core) : ()),
+ $self->features,
);
- $self->makemaker_args( ExtUtils::AutoInstall::_make_args() );
+ $self->makemaker_args( Module::AutoInstall::_make_args() );
my $class = ref($self);
$self->postamble(
"# --- $class section:\n" .
- ExtUtils::AutoInstall::postamble()
+ Module::AutoInstall::postamble()
);
}
sub auto_install_now {
my $self = shift;
- $self->auto_install;
- ExtUtils::AutoInstall::do_install();
+ $self->auto_install(@_);
+ Module::AutoInstall::do_install();
}
1;
Modified: packages/libclass-default-perl/branches/upstream/current/inc/Module/Install/Base.pm
===================================================================
--- packages/libclass-default-perl/branches/upstream/current/inc/Module/Install/Base.pm 2006-02-27 08:52:29 UTC (rev 2246)
+++ packages/libclass-default-perl/branches/upstream/current/inc/Module/Install/Base.pm 2006-03-01 15:53:20 UTC (rev 2247)
@@ -1,41 +1,52 @@
#line 1 "inc/Module/Install/Base.pm - /usr/local/share/perl/5.8.4/Module/Install/Base.pm"
package Module::Install::Base;
-#line 28
+$VERSION = '0.57';
+# Suspend handler for "redefined" warnings
+BEGIN {
+ my $w = $SIG{__WARN__};
+ $SIG{__WARN__} = sub { $w };
+}
+
+### This is the ONLY module that shouldn't have strict on
+# use strict;
+
+#line 41
+
sub new {
my ($class, %args) = @_;
- foreach my $method (qw(call load)) {
+ foreach my $method ( qw(call load) ) {
*{"$class\::$method"} = sub {
- +shift->_top->$method(@_);
+ shift()->_top->$method(@_);
} unless defined &{"$class\::$method"};
}
- bless(\%args, $class);
+ bless( \%args, $class );
}
-#line 46
+#line 61
sub AUTOLOAD {
my $self = shift;
- goto &{$self->_top->autoload};
+ local $@;
+ my $autoload = eval { $self->_top->autoload } or return;
+ goto &$autoload;
}
-#line 57
+#line 76
sub _top { $_[0]->{_top} }
-#line 68
+#line 89
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 {}
@@ -44,11 +55,16 @@
my $Fake;
sub new { $Fake ||= bless(\@_, $_[0]) }
+
sub AUTOLOAD {}
+
sub DESTROY {}
+# Restore warning handler
+BEGIN {
+ $SIG{__WARN__} = $SIG{__WARN__}->();
+}
+
1;
-__END__
-
-#line 112
+#line 138
Modified: packages/libclass-default-perl/branches/upstream/current/inc/Module/Install/Can.pm
===================================================================
--- packages/libclass-default-perl/branches/upstream/current/inc/Module/Install/Can.pm 2006-02-27 08:52:29 UTC (rev 2246)
+++ packages/libclass-default-perl/branches/upstream/current/inc/Module/Install/Can.pm 2006-03-01 15:53:20 UTC (rev 2247)
@@ -1,13 +1,33 @@
#line 1 "inc/Module/Install/Can.pm - /usr/local/share/perl/5.8.4/Module/Install/Can.pm"
package Module::Install::Can;
-use Module::Install::Base; @ISA = qw(Module::Install::Base);
-$VERSION = '0.01';
+use Module::Install::Base;
+ at ISA = qw(Module::Install::Base);
+
+$VERSION = '0.57';
+
use strict;
use Config ();
-use File::Spec ();
use ExtUtils::MakeMaker ();
+# This may introduce a 5.005 dependency, or at the very least it may
+# not bootstrap properly under 5.004.
+use File::Spec ();
+
+# check if we can load some module
+sub can_use {
+ my ($self, $mod, $ver) = @_;
+ $mod =~ s{::|\\}{/}g;
+ $mod .= ".pm" unless $mod =~ /\.pm$/i;
+
+ my $pkg = $mod;
+ $pkg =~ s{/}{::}g;
+ $pkg =~ s{\.pm$}{}i;
+
+ local $@;
+ eval { require $mod; $pkg->VERSION($ver || 0); 1 };
+}
+
# check if we can run some command
sub can_run {
my ($self, $cmd) = @_;
@@ -35,4 +55,21 @@
return;
}
+# Fix Cygwin bug on maybe_command();
+if ($^O eq 'cygwin') {
+ require ExtUtils::MM_Cygwin;
+ require ExtUtils::MM_Win32;
+ if ( ! defined(&ExtUtils::MM_Cygwin::maybe_command) ) {
+ *ExtUtils::MM_Cygwin::maybe_command = sub {
+ my ($self, $file) = @_;
+ if ($file =~ m{^/cygdrive/}i and ExtUtils::MM_Win32->can('maybe_command')) {
+ ExtUtils::MM_Win32->maybe_command($file);
+ }
+ else {
+ ExtUtils::MM_Unix->maybe_command($file);
+ }
+ }
+ }
+}
+
1;
Modified: packages/libclass-default-perl/branches/upstream/current/inc/Module/Install/Fetch.pm
===================================================================
--- packages/libclass-default-perl/branches/upstream/current/inc/Module/Install/Fetch.pm 2006-02-27 08:52:29 UTC (rev 2246)
+++ packages/libclass-default-perl/branches/upstream/current/inc/Module/Install/Fetch.pm 2006-03-01 15:53:20 UTC (rev 2247)
@@ -1,15 +1,17 @@
#line 1 "inc/Module/Install/Fetch.pm - /usr/local/share/perl/5.8.4/Module/Install/Fetch.pm"
package Module::Install::Fetch;
-use Module::Install::Base; @ISA = qw(Module::Install::Base);
-$VERSION = '0.01';
+use Module::Install::Base;
+ at ISA = qw(Module::Install::Base);
+$VERSION = '0.57';
+
sub get_file {
my ($self, %args) = @_;
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) =
Added: packages/libclass-default-perl/branches/upstream/current/inc/Module/Install/Include.pm
===================================================================
--- packages/libclass-default-perl/branches/upstream/current/inc/Module/Install/Include.pm 2006-02-27 08:52:29 UTC (rev 2246)
+++ packages/libclass-default-perl/branches/upstream/current/inc/Module/Install/Include.pm 2006-03-01 15:53:20 UTC (rev 2247)
@@ -0,0 +1,31 @@
+#line 1 "inc/Module/Install/Include.pm - /usr/local/share/perl/5.8.4/Module/Install/Include.pm"
+package Module::Install::Include;
+
+use Module::Install::Base;
+ at ISA = qw(Module::Install::Base);
+
+$VERSION = '0.57';
+
+use strict;
+
+sub include {
+ shift()->admin->include(@_);
+}
+
+sub include_deps {
+ shift()->admin->include_deps(@_);
+}
+
+sub auto_include {
+ shift()->admin->auto_include(@_);
+}
+
+sub auto_include_deps {
+ shift()->admin->auto_include_deps(@_);
+}
+
+sub auto_include_dependent_dists {
+ shift()->admin->auto_include_dependent_dists(@_);
+}
+
+1;
Modified: packages/libclass-default-perl/branches/upstream/current/inc/Module/Install/Makefile.pm
===================================================================
--- packages/libclass-default-perl/branches/upstream/current/inc/Module/Install/Makefile.pm 2006-02-27 08:52:29 UTC (rev 2246)
+++ packages/libclass-default-perl/branches/upstream/current/inc/Module/Install/Makefile.pm 2006-03-01 15:53:20 UTC (rev 2247)
@@ -1,17 +1,19 @@
#line 1 "inc/Module/Install/Makefile.pm - /usr/local/share/perl/5.8.4/Module/Install/Makefile.pm"
package Module::Install::Makefile;
-use Module::Install::Base; @ISA = qw(Module::Install::Base);
-$VERSION = '0.01';
-
use strict 'vars';
-use vars '$VERSION';
-
+use Module::Install::Base;
use ExtUtils::MakeMaker ();
+use vars qw{$VERSION @ISA};
+BEGIN {
+ $VERSION = '0.57';
+ @ISA = qw{Module::Install::Base};
+}
+
sub Makefile { $_[0] }
-sub prompt {
+sub prompt {
shift;
goto &ExtUtils::MakeMaker::prompt;
}
@@ -23,18 +25,37 @@
$args;
}
+# For mm args that take multiple space-seperated args,
+# append an argument to the current list.
+sub makemaker_append {
+ my $self = shift;
+ my $name = shift;
+ my $args = $self->makemaker_args;
+ $args->{name} = defined $args->{$name}
+ ? join( ' ', $args->{name}, @_ )
+ : join( ' ', @_ );
+}
+
+sub build_subdirs {
+ my $self = shift;
+ my $subdirs = $self->makemaker_args->{DIR} ||= [];
+ for my $subdir (@_) {
+ push @$subdirs, $subdir;
+ }
+}
+
sub clean_files {
- my $self = shift;
+ my $self = shift;
my $clean = $self->makemaker_args->{clean} ||= {};
%$clean = (
%$clean,
- FILES => join(" ", grep length, $clean->{FILES}, @_),
+ FILES => join(' ', grep length, $clean->{FILES}, @_),
);
}
sub libs {
my $self = shift;
- my $libs = ref $_[0] ? shift : [shift];
+ my $libs = ref $_[0] ? shift : [ shift ];
$self->makemaker_args( LIBS => $libs );
}
@@ -54,15 +75,17 @@
$args->{VERSION} = $self->version || $self->determine_VERSION($args);
$args->{NAME} =~ s/-/::/g;
+ $args->{test} = {TESTS => $self->tests} if $self->tests;
+
if ($] >= 5.005) {
- $args->{ABSTRACT} = $self->abstract;
- $args->{AUTHOR} = $self->author;
+ $args->{ABSTRACT} = $self->abstract;
+ $args->{AUTHOR} = $self->author;
}
if ( eval($ExtUtils::MakeMaker::VERSION) >= 6.10 ) {
$args->{NO_META} = 1;
}
if ( eval($ExtUtils::MakeMaker::VERSION) > 6.17 ) {
- $args->{SIGN} = 1 if $self->sign;
+ $args->{SIGN} = 1 if $self->sign;
}
delete $args->{SIGN} unless $self->is_admin;
@@ -72,10 +95,13 @@
($self->build_requires, $self->requires) );
# merge both kinds of requires into prereq_pm
- my $dir = ($args->{DIR} ||= []);
+ my $subdirs = ($args->{DIR} ||= []);
if ($self->bundles) {
- push @$dir, map "$_->[1]", @{$self->bundles};
- delete $prereq->{$_->[0]} for @{$self->bundles};
+ foreach my $bundle (@{ $self->bundles }) {
+ my ($file, $dir) = @$bundle;
+ push @$subdirs, $dir if -d $dir;
+ delete $prereq->{$file};
+ }
}
if (my $perl_version = $self->perl_version) {
@@ -106,9 +132,10 @@
my $postamble = "# Postamble by $top_class $top_version\n" .
($self->postamble || '');
+ local *MAKEFILE;
open MAKEFILE, '< Makefile' or die $!;
my $makefile = do { local $/; <MAKEFILE> };
- close MAKEFILE;
+ close MAKEFILE or die $!;
$makefile =~ s/\b(test_harness\(\$\(TEST_VERBOSE\), )/$1'inc', /;
$makefile =~ s/( -I\$\(INST_ARCHLIB\))/ -Iinc$1/g;
@@ -118,8 +145,10 @@
$makefile =~ s/^(PERL = .*)/$1 -Iinc/m;
open MAKEFILE, '> Makefile' or die $!;
- print MAKEFILE "$preamble$makefile$postamble";
- close MAKEFILE;
+ print MAKEFILE "$preamble$makefile$postamble" or die $!;
+ close MAKEFILE or die $!;
+
+ 1;
}
sub preamble {
@@ -130,7 +159,6 @@
sub postamble {
my ($self, $text) = @_;
-
$self->{postamble} ||= $self->admin->postamble;
$self->{postamble} .= $text if defined $text;
$self->{postamble}
@@ -140,4 +168,4 @@
__END__
-#line 273
+#line 295
Modified: packages/libclass-default-perl/branches/upstream/current/inc/Module/Install/Metadata.pm
===================================================================
--- packages/libclass-default-perl/branches/upstream/current/inc/Module/Install/Metadata.pm 2006-02-27 08:52:29 UTC (rev 2246)
+++ packages/libclass-default-perl/branches/upstream/current/inc/Module/Install/Metadata.pm 2006-03-01 15:53:20 UTC (rev 2247)
@@ -1,25 +1,31 @@
#line 1 "inc/Module/Install/Metadata.pm - /usr/local/share/perl/5.8.4/Module/Install/Metadata.pm"
package Module::Install::Metadata;
-use Module::Install::Base; @ISA = qw(Module::Install::Base);
-$VERSION = '0.04';
+use Module::Install::Base;
+ at ISA = qw{Module::Install::Base};
+$VERSION = '0.57';
+
use strict 'vars';
-use vars qw($VERSION);
-sub Meta { shift }
+my @scalar_keys = qw{
+ name module_name abstract author version license
+ distribution_type perl_version tests
+};
-my @scalar_keys = qw(
- name module_name version abstract author license
- distribution_type sign perl_version
-);
-my @tuple_keys = qw(build_requires requires recommends bundles);
+my @tuple_keys = qw{
+ build_requires requires recommends bundles
+};
+sub Meta { shift }
+sub Meta_ScalarKeys { @scalar_keys }
+sub Meta_TupleKeys { @tuple_keys }
+
foreach my $key (@scalar_keys) {
*$key = sub {
my $self = shift;
- return $self->{'values'}{$key} unless @_;
- $self->{'values'}{$key} = shift;
+ return $self->{values}{$key} if defined wantarray and !@_;
+ $self->{values}{$key} = shift;
return $self;
};
}
@@ -27,122 +33,161 @@
foreach my $key (@tuple_keys) {
*$key = sub {
my $self = shift;
- return $self->{'values'}{$key} unless @_;
+ return $self->{values}{$key} unless @_;
+
my @rv;
while (@_) {
- my $module = shift or last;
+ my $module = shift or last;
my $version = shift || 0;
- if ($module eq 'perl') {
+ if ( $module eq 'perl' ) {
$version =~ s{^(\d+)\.(\d+)\.(\d+)}
{$1 + $2/1_000 + $3/1_000_000}e;
$self->perl_version($version);
next;
}
- my $rv = [$module, $version];
- push @{$self->{'values'}{$key}}, $rv;
+ my $rv = [ $module, $version ];
push @rv, $rv;
}
- return @rv;
+ push @{ $self->{values}{$key} }, @rv;
+ @rv;
};
}
-sub features {
+sub sign {
my $self = shift;
- while (my ($name, $mods) = splice(@_, 0, 2)) {
- my $count = 0;
- push @{$self->{'values'}{'features'}}, ($name => [
- map { (++$count % 2 and ref($_) and ($count += $#$_)) ? @$_ : $_ } @$mods
- ] );
+ return $self->{'values'}{'sign'} if defined wantarray and !@_;
+ $self->{'values'}{'sign'} = ( @_ ? $_[0] : 1 );
+ return $self;
+}
+
+sub dynamic_config {
+ my $self = shift;
+ unless ( @_ ) {
+ warn "You MUST provide an explicit true/false value to dynamic_config, skipping\n";
+ return $self;
+ }
+ $self->{'values'}{'dynamic_config'} = $_[0] ? 1 : 0;
+ return $self;
+}
+
+sub all_from {
+ my ( $self, $file ) = @_;
+
+ unless ( defined($file) ) {
+ my $name = $self->name
+ or die "all_from called with no args without setting name() first";
+ $file = join('/', 'lib', split(/-/, $name)) . '.pm';
+ $file =~ s{.*/}{} unless -e $file;
+ die "all_from: cannot find $file from $name" unless -e $file;
}
- return @{$self->{'values'}{'features'}};
+
+ $self->version_from($file) unless $self->version;
+ $self->perl_version_from($file) unless $self->perl_version;
+
+ # The remaining probes read from POD sections; if the file
+ # has an accompanying .pod, use that instead
+ my $pod = $file;
+ if ( $pod =~ s/\.pm$/.pod/i and -e $pod ) {
+ $file = $pod;
+ }
+
+ $self->author_from($file) unless $self->author;
+ $self->license_from($file) unless $self->license;
+ $self->abstract_from($file) unless $self->abstract;
}
-sub no_index {
- my $self = shift;
- my $type = shift;
- push @{$self->{'values'}{'no_index'}{$type}}, @_ if $type;
- return $self->{'values'}{'no_index'};
+sub provides {
+ my $self = shift;
+ my $provides = ( $self->{values}{provides} ||= {} );
+ %$provides = (%$provides, @_) if @_;
+ return $provides;
}
-sub _dump {
+sub auto_provides {
my $self = shift;
- my $package = ref($self->_top);
- my $version = $self->_top->VERSION;
- my %values = %{$self->{'values'}};
+ return $self unless $self->is_admin;
- delete $values{sign};
- if (my $perl_version = delete $values{perl_version}) {
- # Always canonical to three-dot version
- $perl_version =~ s{^(\d+)\.(\d\d\d)(\d*)}{join('.', $1, int($2), int($3))}e
- if $perl_version >= 5.006;
- $values{requires} = [
- [perl => $perl_version],
- @{$values{requires}||[]},
- ];
+ unless (-e 'MANIFEST') {
+ warn "Cannot deduce auto_provides without a MANIFEST, skipping\n";
+ return $self;
}
- warn "No license specified, setting license = 'unknown'\n"
- unless $values{license};
+ # Avoid spurious warnings as we are not checking manifest here.
- $values{license} ||= 'unknown';
- $values{distribution_type} ||= 'module';
- $values{name} ||= do {
- my $name = $values{module_name};
- $name =~ s/::/-/g;
- $name;
- } if $values{module_name};
+ local $SIG{__WARN__} = sub {1};
+ require ExtUtils::Manifest;
+ local *ExtUtils::Manifest::manicheck = sub { return };
- if ($values{name} =~ /::/) {
- my $name = $values{name};
- $name =~ s/::/-/g;
- die "Error in name(): '$values{name}' should be '$name'!\n";
- }
+ require Module::Build;
+ my $build = Module::Build->new(
+ dist_name => $self->{name},
+ dist_version => $self->{version},
+ license => $self->{license},
+ );
+ $self->provides(%{ $build->find_dist_packages || {} });
+}
- my $dump = '';
- foreach my $key (@scalar_keys) {
- $dump .= "$key: $values{$key}\n" if exists $values{$key};
+sub feature {
+ my $self = shift;
+ my $name = shift;
+ my $features = ( $self->{values}{features} ||= [] );
+
+ my $mods;
+
+ if ( @_ == 1 and ref( $_[0] ) ) {
+ # The user used ->feature like ->features by passing in the second
+ # argument as a reference. Accomodate for that.
+ $mods = $_[0];
+ } else {
+ $mods = \@_;
}
- foreach my $key (@tuple_keys) {
- next unless exists $values{$key};
- $dump .= "$key:\n";
- foreach (@{$values{$key}}) {
- $dump .= " $_->[0]: $_->[1]\n";
- }
- }
- if (my $no_index = $values{no_index}) {
- push @{$no_index->{'directory'}}, 'inc';
- require YAML;
- local $YAML::UseHeader = 0;
- $dump .= YAML::Dump({ no_index => $no_index});
+ my $count = 0;
+ push @$features, (
+ $name => [
+ map {
+ ref($_) ? ( ref($_) eq 'HASH' ) ? %$_
+ : @$_
+ : $_
+ } @$mods
+ ]
+ );
+
+ return @$features;
+}
+
+sub features {
+ my $self = shift;
+ while ( my ( $name, $mods ) = splice( @_, 0, 2 ) ) {
+ $self->feature( $name, @$mods );
}
- else {
- $dump .= << "META";
-no_index:
- directory:
- - inc
-META
- }
-
- $dump .= "generated_by: $package version $version\n";
- return $dump;
+ return @{ $self->{values}{features} };
}
+sub no_index {
+ my $self = shift;
+ my $type = shift;
+ push @{ $self->{values}{no_index}{$type} }, @_ if $type;
+ return $self->{values}{no_index};
+}
+
sub read {
my $self = shift;
$self->include_deps( 'YAML', 0 );
+
require YAML;
- my $data = YAML::LoadFile( 'META.yml' );
+ my $data = YAML::LoadFile('META.yml');
+
# Call methods explicitly in case user has already set some values.
- while ( my ($key, $value) = each %$data ) {
- next unless $self->can( $key );
- if (ref $value eq 'HASH') {
- while (my ($module, $version) = each %$value) {
- $self->$key( $module => $version );
+ while ( my ( $key, $value ) = each %$data ) {
+ next unless $self->can($key);
+ if ( ref $value eq 'HASH' ) {
+ while ( my ( $module, $version ) = each %$value ) {
+ $self->can($key)->($self, $module => $version );
}
}
else {
- $self->$key( $value );
+ $self->can($key)->($self, $value);
}
}
return $self;
@@ -151,37 +196,113 @@
sub write {
my $self = shift;
return $self unless $self->is_admin;
-
- META_NOT_OURS: {
- local *FH;
- if (open FH, "META.yml") {
- while (<FH>) {
- last META_NOT_OURS if /^generated_by: Module::Install\b/;
- }
- return $self if -s FH;
- }
- }
-
- warn "Writing META.yml\n";
- open META, "> META.yml" or warn "Cannot write to META.yml: $!";
- print META $self->_dump;
- close META;
+ $self->admin->write_meta;
return $self;
}
sub version_from {
- my ($self, $version_from) = @_;
+ my ( $self, $file ) = @_;
require ExtUtils::MM_Unix;
- $self->version(ExtUtils::MM_Unix->parse_version($version_from));
+ $self->version( ExtUtils::MM_Unix->parse_version($file) );
}
sub abstract_from {
- my ($self, $abstract_from) = @_;
+ my ( $self, $file ) = @_;
require ExtUtils::MM_Unix;
$self->abstract(
- bless( { DISTNAME => $self->name }, 'ExtUtils::MM_Unix')
- ->parse_abstract($abstract_from)
- );
+ bless(
+ { DISTNAME => $self->name },
+ 'ExtUtils::MM_Unix'
+ )->parse_abstract($file)
+ );
}
+sub _slurp {
+ my ( $self, $file ) = @_;
+
+ local *FH;
+ open FH, "< $file" or die "Cannot open $file.pod: $!";
+ do { local $/; <FH> };
+}
+
+sub perl_version_from {
+ my ( $self, $file ) = @_;
+
+ if (
+ $self->_slurp($file) =~ m/
+ ^
+ use \s*
+ v?
+ ([\d\.]+)
+ \s* ;
+ /ixms
+ )
+ {
+ $self->perl_version($1);
+ }
+ else {
+ warn "Cannot determine perl version info from $file\n";
+ return;
+ }
+}
+
+sub author_from {
+ my ( $self, $file ) = @_;
+ my $content = $self->_slurp($file);
+ if ($content =~ m/
+ =head \d \s+ (?:authors?)\b \s*
+ ([^\n]*)
+ |
+ =head \d \s+ (?:licen[cs]e|licensing|copyright|legal)\b \s*
+ .*? copyright .*? \d\d\d[\d.]+ \s* (?:\bby\b)? \s*
+ ([^\n]*)
+ /ixms) {
+ my $author = $1 || $2;
+ $author =~ s{E<lt>}{<}g;
+ $author =~ s{E<gt>}{>}g;
+ $self->author($author);
+ }
+ else {
+ warn "Cannot determine author info from $file\n";
+ }
+}
+
+sub license_from {
+ my ( $self, $file ) = @_;
+
+ if (
+ $self->_slurp($file) =~ m/
+ =head \d \s+
+ (?:licen[cs]e|licensing|copyright|legal)\b
+ (.*?)
+ (=head\\d.*|=cut.*|)
+ \z
+ /ixms
+ )
+ {
+ my $license_text = $1;
+ my @phrases = (
+ 'under the same (?:terms|license) as perl itself' => 'perl',
+ 'GNU public license' => 'gpl',
+ 'GNU lesser public license' => 'gpl',
+ 'BSD license' => 'bsd',
+ 'Artistic license' => 'artistic',
+ 'GPL' => 'gpl',
+ 'LGPL' => 'lgpl',
+ 'BSD' => 'bsd',
+ 'Artistic' => 'artistic',
+ );
+ while ( my ( $pattern, $license ) = splice( @phrases, 0, 2 ) ) {
+ $pattern =~ s{\s+}{\\s+}g;
+ if ( $license_text =~ /\b$pattern\b/i ) {
+ $self->license($license);
+ return 1;
+ }
+ }
+ }
+
+ warn "Cannot determine license info from $file\n";
+ return 'unknown';
+}
+
1;
Modified: packages/libclass-default-perl/branches/upstream/current/inc/Module/Install/Win32.pm
===================================================================
--- packages/libclass-default-perl/branches/upstream/current/inc/Module/Install/Win32.pm 2006-02-27 08:52:29 UTC (rev 2246)
+++ packages/libclass-default-perl/branches/upstream/current/inc/Module/Install/Win32.pm 2006-03-01 15:53:20 UTC (rev 2247)
@@ -1,9 +1,11 @@
#line 1 "inc/Module/Install/Win32.pm - /usr/local/share/perl/5.8.4/Module/Install/Win32.pm"
package Module::Install::Win32;
-use Module::Install::Base; @ISA = qw(Module::Install::Base);
-$VERSION = '0.02';
+use Module::Install::Base;
+ at ISA = qw(Module::Install::Base);
+$VERSION = '0.57';
+
use strict;
# determine if the user needs nmake, and download it if needed
Modified: packages/libclass-default-perl/branches/upstream/current/inc/Module/Install/WriteAll.pm
===================================================================
--- packages/libclass-default-perl/branches/upstream/current/inc/Module/Install/WriteAll.pm 2006-02-27 08:52:29 UTC (rev 2246)
+++ packages/libclass-default-perl/branches/upstream/current/inc/Module/Install/WriteAll.pm 2006-03-01 15:53:20 UTC (rev 2247)
@@ -1,33 +1,37 @@
#line 1 "inc/Module/Install/WriteAll.pm - /usr/local/share/perl/5.8.4/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);
+
+$VERSION = '0.57';
+
+use strict;
+
sub WriteAll {
my $self = shift;
my %args = (
- meta => 1,
- sign => 0,
- inline => 0,
+ meta => 1,
+ sign => 0,
+ inline => 0,
check_nmake => 1,
@_
);
- $self->sign(1) if $args{sign};
- $self->Meta->write if $args{meta};
+ $self->sign(1) if $args{sign};
+ $self->Meta->write if $args{meta};
$self->admin->WriteAll(%args) if $self->is_admin;
- if ($0 =~ /Build.PL$/i) {
- $self->Build->write;
- }
- else {
- $self->check_nmake if $args{check_nmake};
- $self->makemaker_args( PL_FILES => {} )
- unless $self->makemaker_args->{'PL_FILES'};
-
+ if ( $0 =~ /Build.PL$/i ) {
+ $self->Build->write;
+ } else {
+ $self->check_nmake if $args{check_nmake};
+ unless ( $self->makemaker_args->{'PL_FILES'} ) {
+ $self->makemaker_args( PL_FILES => {} );
+ }
if ($args{inline}) {
$self->Inline->write;
- }
- else {
+ } else {
$self->Makefile->write;
}
}
Modified: packages/libclass-default-perl/branches/upstream/current/inc/Module/Install.pm
===================================================================
--- packages/libclass-default-perl/branches/upstream/current/inc/Module/Install.pm 2006-02-27 08:52:29 UTC (rev 2246)
+++ packages/libclass-default-perl/branches/upstream/current/inc/Module/Install.pm 2006-03-01 15:53:20 UTC (rev 2247)
@@ -1,8 +1,23 @@
-#line 1 "inc/Module/Install.pm - /usr/local/share/perl/5.8.4/Module/Install.pm"
+#line 1 "/tmp/cpan2/Class-Default/inc/Module/Install.pm - /usr/local/share/perl/5.8.4/Module/Install.pm"
package Module::Install;
-$VERSION = '0.36';
-die << "." unless $INC{join('/', inc => split(/::/, __PACKAGE__)).'.pm'};
+use 5.004;
+use strict 'vars';
+
+use vars qw{$VERSION};
+BEGIN {
+ # All Module::Install core packages now require synchronised versions.
+ # This will be used to ensure we don't accidentally load old or
+ # different versions of modules.
+ # 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.57';
+}
+
+# inc::Module::Install must be loaded first
+unless ( $INC{join('/', inc => split(/::/, __PACKAGE__)).'.pm'} ) {
+ die <<"END_DIE";
Please invoke ${\__PACKAGE__} with:
use inc::${\__PACKAGE__};
@@ -11,23 +26,40 @@
use ${\__PACKAGE__};
-.
+END_DIE
+}
-use strict 'vars';
-use Cwd ();
+use Cwd ();
use File::Find ();
use File::Path ();
+use FindBin;
- at inc::Module::Install::ISA = 'Module::Install';
*inc::Module::Install::VERSION = *VERSION;
+ at inc::Module::Install::ISA = 'Module::Install';
-#line 129
+sub autoload {
+ my $self = shift;
+ my $caller = $self->_caller;
+ my $cwd = Cwd::cwd();
+ my $sym = "$caller\::AUTOLOAD";
+ $sym->{$cwd} = sub {
+ my $pwd = Cwd::cwd();
+ if ( my $code = $sym->{$pwd} ) {
+ # delegate back to parent dirs
+ goto &$code unless $cwd eq $pwd;
+ }
+ $$sym =~ /([^:]+)$/ or die "Cannot autoload $caller - $sym";
+ unshift @_, ($self, $1);
+ goto &{$self->can('call')} unless uc($1) eq $1;
+ };
+}
+
sub import {
my $class = shift;
- my $self = $class->new(@_);
+ my $self = $class->new(@_);
- if (not -f $self->{file}) {
+ unless ( -f $self->{file} ) {
require "$self->{path}/$self->{dispatch}.pm";
File::Path::mkpath("$self->{prefix}/$self->{author}");
$self->{admin} =
@@ -37,71 +69,87 @@
goto &{"$self->{name}::import"};
}
- *{caller(0) . "::AUTOLOAD"} = $self->autoload;
+ *{$self->_caller . "::AUTOLOAD"} = $self->autoload;
+ $self->preload;
# Unregister loader and worker packages so subdirs can use them again
delete $INC{"$self->{file}"};
delete $INC{"$self->{path}.pm"};
}
-#line 156
+sub preload {
+ my ($self) = @_;
-sub autoload {
- my $self = shift;
- my $caller = caller;
+ unless ( $self->{extensions} ) {
+ $self->load_extensions(
+ "$self->{prefix}/$self->{path}", $self
+ );
+ }
- my $cwd = Cwd::cwd();
- my $sym = "$caller\::AUTOLOAD";
+ my @exts = @{$self->{extensions}};
+ unless ( @exts ) {
+ my $admin = $self->{admin};
+ @exts = $admin->load_all_extensions;
+ }
- $sym->{$cwd} = sub {
- my $pwd = Cwd::cwd();
- if (my $code = $sym->{$pwd}) {
- goto &$code unless $cwd eq $pwd; # delegate back to parent dirs
+ my %seen;
+ foreach my $obj ( @exts ) {
+ while (my ($method, $glob) = each %{ref($obj) . '::'}) {
+ next unless defined *{$glob}{CODE};
+ next if $method =~ /^_/;
+ next if $method eq uc($method);
+ $seen{$method}++;
}
- $$sym =~ /([^:]+)$/ or die "Cannot autoload $caller";
- unshift @_, ($self, $1);
- goto &{$self->can('call')} unless uc($1) eq $1;
- };
+ }
+
+ my $caller = $self->_caller;
+ foreach my $name ( sort keys %seen ) {
+ *{"${caller}::$name"} = sub {
+ ${"${caller}::AUTOLOAD"} = "${caller}::$name";
+ goto &{"${caller}::AUTOLOAD"};
+ };
+ }
}
-#line 181
-
sub new {
my ($class, %args) = @_;
+ # ignore the prefix on extension modules built from top level.
+ my $base_path = Cwd::abs_path($FindBin::Bin);
+ unless ( Cwd::abs_path(Cwd::cwd()) eq $base_path ) {
+ delete $args{prefix};
+ }
+
return $args{_self} if $args{_self};
$args{dispatch} ||= 'Admin';
$args{prefix} ||= 'inc';
$args{author} ||= '.author';
$args{bundle} ||= 'inc/BUNDLES';
+ $args{base} ||= $base_path;
$class =~ s/^\Q$args{prefix}\E:://;
$args{name} ||= $class;
$args{version} ||= $class->VERSION;
- unless ($args{path}) {
+ unless ( $args{path} ) {
$args{path} = $args{name};
$args{path} =~ s!::!/!g;
}
- $args{file} ||= "$args{prefix}/$args{path}.pm";
+ $args{file} ||= "$args{base}/$args{prefix}/$args{path}.pm";
bless(\%args, $class);
}
-#line 210
-
sub call {
my $self = shift;
my $method = shift;
- my $obj = $self->load($method) or return;
+ my $obj = $self->load($method) or return;
unshift @_, $obj;
goto &{$obj->can($method)};
}
-#line 225
-
sub load {
my ($self, $method) = @_;
@@ -113,10 +161,10 @@
return $obj if $obj->can($method);
}
- my $admin = $self->{admin} or die << "END";
+ my $admin = $self->{admin} or die <<"END_DIE";
The '$method' method does not exist in the '$self->{prefix}' path!
Please remove the '$self->{prefix}' directory and run $0 again to load it.
-END
+END_DIE
my $obj = $admin->load($method, 1);
push @{$self->{extensions}}, $obj;
@@ -124,8 +172,6 @@
$obj;
}
-#line 255
-
sub load_extensions {
my ($self, $path, $top_obj) = @_;
@@ -137,33 +183,46 @@
my ($file, $pkg) = @{$rv};
next if $self->{pathnames}{$pkg};
- eval { require $file; 1 } or (warn($@), next);
+ local $@;
+ my $new = eval { require $file; $pkg->can('new') };
+ unless ( $new ) {
+ warn $@ if $@;
+ next;
+ }
$self->{pathnames}{$pkg} = delete $INC{$file};
- push @{$self->{extensions}}, $pkg->new( _top => $top_obj );
+ push @{$self->{extensions}}, &{$new}($pkg, _top => $top_obj );
}
+
+ $self->{extensions} ||= [];
}
-#line 279
-
sub find_extensions {
my ($self, $path) = @_;
+
my @found;
-
- File::Find::find(sub {
+ File::Find::find( sub {
my $file = $File::Find::name;
return unless $file =~ m!^\Q$path\E/(.+)\.pm\Z!is;
return if $1 eq $self->{dispatch};
$file = "$self->{path}/$1.pm";
my $pkg = "$self->{name}::$1"; $pkg =~ s!/!::!g;
- push @found, [$file, $pkg];
- }, $path) if -d $path;
+ push @found, [ $file, $pkg ];
+ }, $path ) if -d $path;
@found;
}
-1;
+sub _caller {
+ my $depth = 0;
+ my $caller = caller($depth);
-__END__
+ while ($caller eq __PACKAGE__) {
+ $depth++;
+ $caller = caller($depth);
+ }
-#line 617
+ $caller;
+}
+
+1;
Modified: packages/libclass-default-perl/branches/upstream/current/lib/Class/Default.pm
===================================================================
--- packages/libclass-default-perl/branches/upstream/current/lib/Class/Default.pm 2006-02-27 08:52:29 UTC (rev 2246)
+++ packages/libclass-default-perl/branches/upstream/current/lib/Class/Default.pm 2006-03-01 15:53:20 UTC (rev 2247)
@@ -12,7 +12,7 @@
# Define globals
use vars qw{$VERSION %DEFAULT};
BEGIN {
- $VERSION = '1.3';
+ $VERSION = '1.4';
# Create the default object storage.
%DEFAULT = ();
@@ -189,8 +189,13 @@
return $self;
}
- sub name { $_[0]->{name} }
- sub favourite_color { $_[0]->{favourite_color} }
+ sub name {
+ $_[0]->_self->{name};
+ }
+
+ sub favourite_color {
+ $_[0]->_self->{favourite_color};
+ }
That provides a statically accessible default object that could be used as in
the following manner.
@@ -240,17 +245,22 @@
Bugs should be reported via the CPAN bug tracker at
-L<http://rt.cpan.org/NoAuth/ReportBug.html?Queue=Class%3ADefault>
+L<http://rt.cpan.org/NoAuth/ReportBug.html?Queue=Class-Default>
-Contact the author
+For other issues, contact the author
=head1 AUTHOR
-Adam Kennedy (Maintainer), L<http://ali.as/>, cpan at ali.as
+Adam Kennedy E<lt>cpan at ali.asE<gt>
+=head1 SEE ALSO
+
+L<http://ali.as/>, L<Class::Singleton>
+
=head1 COPYRIGHT
-Copyright (c) 2002 Adam Kennedy. All rights reserved.
+Copyright (c) 2002 - 2006 Adam Kennedy. All rights reserved.
+
This program is free software; you can redistribute
it and/or modify it under the same terms as Perl itself.
Property changes on: packages/libclass-default-perl/branches/upstream/current/lib/Class/Default.pm
___________________________________________________________________
Name: svn:executable
+ *
Deleted: packages/libclass-default-perl/branches/upstream/current/t/00_compile.t
===================================================================
--- packages/libclass-default-perl/branches/upstream/current/t/00_compile.t 2006-02-27 08:52:29 UTC (rev 2246)
+++ packages/libclass-default-perl/branches/upstream/current/t/00_compile.t 2006-03-01 15:53:20 UTC (rev 2247)
@@ -1,26 +0,0 @@
-#!/usr/bin/perl -w
-
-# Load testing for Class::Default
-
-use strict;
-use lib ();
-use UNIVERSAL 'isa';
-use File::Spec::Functions ':ALL';
-BEGIN {
- $| = 1;
- unless ( $ENV{HARNESS_ACTIVE} ) {
- require FindBin;
- chdir ($FindBin::Bin = $FindBin::Bin); # Avoid a warning
- lib->import( catdir( updir(), updir(), 'modules') );
- }
-}
-
-use Test::More tests => 2;
-
-# Check their perl version
-ok( $] >= 5.005, "Your perl is new enough" );
-
-# Does the module load
-use_ok('Class::Default');
-
-exit(0);
Added: packages/libclass-default-perl/branches/upstream/current/t/01_compile.t
===================================================================
--- packages/libclass-default-perl/branches/upstream/current/t/01_compile.t 2006-02-27 08:52:29 UTC (rev 2246)
+++ packages/libclass-default-perl/branches/upstream/current/t/01_compile.t 2006-03-01 15:53:20 UTC (rev 2247)
@@ -0,0 +1,29 @@
+#!/usr/bin/perl -w
+
+# Load testing for Class::Default
+
+use strict;
+use lib ();
+use File::Spec::Functions ':ALL';
+BEGIN {
+ $| = 1;
+ unless ( $ENV{HARNESS_ACTIVE} ) {
+ require FindBin;
+ $FindBin::Bin = $FindBin::Bin; # Avoid a warning
+ chdir catdir( $FindBin::Bin, updir() );
+ lib->import(
+ catdir('blib', 'lib'),
+ 'lib',
+ );
+ }
+}
+
+use Test::More tests => 2;
+
+# Check their perl version
+ok( $] >= 5.005, "Your perl is new enough" );
+
+# Does the module load
+use_ok('Class::Default');
+
+exit(0);
Property changes on: packages/libclass-default-perl/branches/upstream/current/t/01_compile.t
___________________________________________________________________
Name: svn:executable
+ *
Deleted: packages/libclass-default-perl/branches/upstream/current/t/01_main.t
===================================================================
--- packages/libclass-default-perl/branches/upstream/current/t/01_main.t 2006-02-27 08:52:29 UTC (rev 2246)
+++ packages/libclass-default-perl/branches/upstream/current/t/01_main.t 2006-03-01 15:53:20 UTC (rev 2247)
@@ -1,107 +0,0 @@
-#!/usr/bin/perl
-
-# Formal testing for Class::Default
-
-use strict;
-use lib ();
-use UNIVERSAL 'isa';
-use File::Spec::Functions ':ALL';
-BEGIN {
- $| = 1;
- unless ( $ENV{HARNESS_ACTIVE} ) {
- require FindBin;
- chdir ($FindBin::Bin = $FindBin::Bin); # Avoid a warning
- lib->import( catdir( updir(), updir(), 'modules') );
- }
-}
-
-use Test::More tests => 20;
-
-# Set up any needed globals
-use vars qw{$cd $cdt};
-BEGIN {
- $cd = 'Class::Default';
- $cdt = 'Class::Default::Test1';
-}
-
-
-
-
-
-# Basic API existance
-ok( Class::Default->can( '_self' ), "Class::Default->_self exists" );
-ok( Class::Default->can( '_get_default' ), "Class::Default->_get_default exists" );
-ok( Class::Default->can( '_create_default_object' ), "Class::Default->_create_default_object exists" );
-ok( Class::Default::Test1->can( '_self' ), "Class::Default::Test1->_self exists" );
-ok( Class::Default::Test1->can( '_get_default' ), "Class::Default::Test1->_get_default exists" );
-ok( Class::Default::Test1->can( '_create_default_object' ),
- "Class::Default::Test1->_create_default_object exists" );
-
-# Object gets created...
-my $object = Class::Default::Test1->new();
-ok( isa( $object, "Class::Default::Test1" ), "Object isa Class::Default::Test1" );
-ok( isa( $object, "Class::Default" ), "Object isa Class::Default" );
-ok( ! scalar keys %Class::Default::DEFAULT, "DEFAULT hash remains empty after normal object creation" );
-
-# Default gets created
-my $default1 = Class::Default::Test1->_get_default;
-ok( $default1, "->_get_default returns something" );
-ok( (ref $default1 eq $cdt), "->_get_default returns the correct object type" );
-ok( scalar keys %Class::Default::DEFAULT, "DEFAULT hash contains something after _get_default" );
-ok( (scalar keys %Class::Default::DEFAULT == 1), "DEFAULT hash contains only one thing after _get_default" );
-ok( exists $Class::Default::DEFAULT{$cdt}, "DEFAULT hash contains the correct key after _get_Default" );
-ok( "$Class::Default::DEFAULT{$cdt}" eq "$default1",
- "DEFAULT hash entry matches that returned" );
-
-# Get another object and see if they match
-my $default2 = Class::Default::Test1->_get_default;
-ok( "$default1" eq "$default2", "Second object matches the first object" );
-
-# Check the response of a typical method as compared to the static
-ok( $object->hash eq "$object", "Result of basic object method matchs" );
-ok( Class::Default::Test1->hash eq "$default1", "Result of basic static method matchs" );
-
-# Check the result of the _class method
-ok( Class::Default::Test1->class eq 'Class::Default::Test1', "Static ->_class returns the class" );
-ok( $default1->class eq 'Class::Default::Test1', "Object ->_class returns the class" );
-
-
-
-
-
-
-# Define the testing package
-package Class::Default::Test1;
-
-use base 'Class::Default';
-
-sub new {
- my $class = shift;
- my $self = {
- name => undef,
- };
- bless $self, $class;
-}
-
-sub setName {
- my $self = shift->_self;
- my $value = shift;
- $self->{name} = $value;
- 1;
-}
-sub getName {
- my $self = shift->_self;
- $self->{name};
-}
-
-sub hash {
- my $self = shift->_self;
- "$self";
-}
-
-sub class {
- my $class = shift->_class;
- $class;
-}
-
-1;
Added: packages/libclass-default-perl/branches/upstream/current/t/02_main.t
===================================================================
--- packages/libclass-default-perl/branches/upstream/current/t/02_main.t 2006-02-27 08:52:29 UTC (rev 2246)
+++ packages/libclass-default-perl/branches/upstream/current/t/02_main.t 2006-03-01 15:53:20 UTC (rev 2247)
@@ -0,0 +1,110 @@
+#!/usr/bin/perl
+
+# Formal testing for Class::Default
+
+use strict;
+use lib ();
+use File::Spec::Functions ':ALL';
+BEGIN {
+ $| = 1;
+ unless ( $ENV{HARNESS_ACTIVE} ) {
+ require FindBin;
+ $FindBin::Bin = $FindBin::Bin; # Avoid a warning
+ chdir catdir( $FindBin::Bin, updir() );
+ lib->import(
+ catdir('blib', 'lib'),
+ 'lib',
+ );
+ }
+}
+
+use Test::More tests => 20;
+
+# Set up any needed globals
+use vars qw{$cd $cdt};
+BEGIN {
+ $cd = 'Class::Default';
+ $cdt = 'Class::Default::Test1';
+}
+
+
+
+
+
+# Basic API existance
+ok( Class::Default->can( '_self' ), "Class::Default->_self exists" );
+ok( Class::Default->can( '_get_default' ), "Class::Default->_get_default exists" );
+ok( Class::Default->can( '_create_default_object' ), "Class::Default->_create_default_object exists" );
+ok( Class::Default::Test1->can( '_self' ), "Class::Default::Test1->_self exists" );
+ok( Class::Default::Test1->can( '_get_default' ), "Class::Default::Test1->_get_default exists" );
+ok( Class::Default::Test1->can( '_create_default_object' ),
+ "Class::Default::Test1->_create_default_object exists" );
+
+# Object gets created...
+my $object = Class::Default::Test1->new();
+isa_ok( $object, "Class::Default::Test1" );
+isa_ok( $object, "Class::Default" );
+ok( ! scalar keys %Class::Default::DEFAULT, "DEFAULT hash remains empty after normal object creation" );
+
+# Default gets created
+my $default1 = Class::Default::Test1->_get_default;
+ok( $default1, "->_get_default returns something" );
+ok( (ref $default1 eq $cdt), "->_get_default returns the correct object type" );
+ok( scalar keys %Class::Default::DEFAULT, "DEFAULT hash contains something after _get_default" );
+ok( (scalar keys %Class::Default::DEFAULT == 1), "DEFAULT hash contains only one thing after _get_default" );
+ok( exists $Class::Default::DEFAULT{$cdt}, "DEFAULT hash contains the correct key after _get_Default" );
+ok( "$Class::Default::DEFAULT{$cdt}" eq "$default1",
+ "DEFAULT hash entry matches that returned" );
+
+# Get another object and see if they match
+my $default2 = Class::Default::Test1->_get_default;
+ok( "$default1" eq "$default2", "Second object matches the first object" );
+
+# Check the response of a typical method as compared to the static
+ok( $object->hash eq "$object", "Result of basic object method matchs" );
+ok( Class::Default::Test1->hash eq "$default1", "Result of basic static method matchs" );
+
+# Check the result of the _class method
+ok( Class::Default::Test1->class eq 'Class::Default::Test1', "Static ->_class returns the class" );
+ok( $default1->class eq 'Class::Default::Test1', "Object ->_class returns the class" );
+
+
+
+
+
+
+# Define the testing package
+package Class::Default::Test1;
+
+use base 'Class::Default';
+
+sub new {
+ my $class = shift;
+ my $self = {
+ name => undef,
+ };
+ bless $self, $class;
+}
+
+sub setName {
+ my $self = shift->_self;
+ my $value = shift;
+ $self->{name} = $value;
+ 1;
+}
+sub getName {
+ my $self = shift->_self;
+ $self->{name};
+}
+
+sub hash {
+ my $self = shift->_self;
+ "$self";
+}
+
+sub class {
+ my $class = shift->_class;
+ $class;
+}
+
+1;
Property changes on: packages/libclass-default-perl/branches/upstream/current/t/02_main.t
___________________________________________________________________
Name: svn:executable
+ *
Added: packages/libclass-default-perl/branches/upstream/current/t/99_pod.t
===================================================================
--- packages/libclass-default-perl/branches/upstream/current/t/99_pod.t 2006-02-27 08:52:29 UTC (rev 2246)
+++ packages/libclass-default-perl/branches/upstream/current/t/99_pod.t 2006-03-01 15:53:20 UTC (rev 2247)
@@ -0,0 +1,35 @@
+use Test::More;
+eval "use Test::Pod 1.00";
+plan skip_all => "Test::Pod 1.00 required for testing POD" if $@;
+
+#####################################################################
+# WARNING: INSANE BLACK MAGIC
+#####################################################################
+
+# Hack Pod::Simple::BlackBox to ignore the Test::Inline "=begin has more than one word errors"
+my $begin = \&Pod::Simple::BlackBox::_ponder_begin;
+sub mybegin {
+ my $para = $_[1];
+ my $content = join ' ', splice @$para, 2;
+ $content =~ s/^\s+//s;
+ $content =~ s/\s+$//s;
+ my @words = split /\s+/, $content;
+ if ( $words[0] =~ /^test(?:ing)?\z/s ) {
+ foreach ( 2 .. $#$para ) {
+ $para->[$_] = '';
+ }
+ $para->[2] = $words[0];
+ }
+
+ # Continue as normal
+ return &$begin(@_);
+}
+
+local $^W = 0;
+*Pod::Simple::BlackBox::_ponder_begin = \&mybegin;
+
+#####################################################################
+# END BLACK MAGIC
+#####################################################################
+
+all_pod_files_ok();
More information about the Pkg-perl-cvs-commits
mailing list