Hello community, here is the log from the commit of package perl-Devel-REPL for openSUSE:Factory checked in at 2012-06-05 15:34:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/perl-Devel-REPL (Old) and /work/SRC/openSUSE:Factory/.perl-Devel-REPL.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "perl-Devel-REPL", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/perl-Devel-REPL/perl-Devel-REPL.changes 2012-01-05 13:49:16.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.perl-Devel-REPL.new/perl-Devel-REPL.changes 2012-06-05 15:34:05.000000000 +0200 @@ -1,0 +2,7 @@ +Fri Jun 1 20:19:30 UTC 2012 - [email protected] + +- updated to 1.003013 + - Make Sys::SigAction optional dependency for Win32 systems + - Apply some plugin related patchs from Caleb Cushing + +------------------------------------------------------------------- Old: ---- Devel-REPL-1.003012.tar.gz New: ---- Devel-REPL-1.003013.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-Devel-REPL.spec ++++++ --- /var/tmp/diff_new_pack.MyY71j/_old 2012-06-05 15:34:06.000000000 +0200 +++ /var/tmp/diff_new_pack.MyY71j/_new 2012-06-05 15:34:06.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package perl-Devel-REPL # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,26 +17,21 @@ Name: perl-Devel-REPL -Version: 1.003012 +Version: 1.003013 Release: 0 %define cpan_name Devel-REPL Summary: Modern perl interactive shell License: Artistic-1.0 or GPL-1.0+ Group: Development/Libraries/Perl Url: http://search.cpan.org/dist/Devel-REPL/ -Source: http://www.cpan.org/authors/id/D/DO/DOY/%{cpan_name}-%{version}.tar.gz +Source: http://www.cpan.org/authors/id/C/CH/CHM/%{cpan_name}-%{version}.tar.gz BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: perl BuildRequires: perl-macros -BuildRequires: perl(App::Nopaste) -BuildRequires: perl(B::Keywords) BuildRequires: perl(Data::Dump::Streamer) -BuildRequires: perl(Data::Dumper::Concise) BuildRequires: perl(File::HomeDir) -BuildRequires: perl(File::Next) BuildRequires: perl(Lexical::Persistence) -BuildRequires: perl(Module::Refresh) BuildRequires: perl(Moose) >= 0.74 BuildRequires: perl(MooseX::AttributeHelpers) >= 0.16 BuildRequires: perl(MooseX::Getopt) >= 0.18 @@ -45,42 +40,14 @@ BuildRequires: perl(Sys::SigAction) BuildRequires: perl(Task::Weaken) BuildRequires: perl(namespace::clean) -#BuildRequires: perl(CPANPLUS::Backend) -#BuildRequires: perl(Devel::REPL) -#BuildRequires: perl(Devel::REPL::Error) -#BuildRequires: perl(Devel::REPL::Meta::Plugin) -#BuildRequires: perl(Devel::REPL::Plugin) -#BuildRequires: perl(Devel::REPL::Profile) -#BuildRequires: perl(Devel::REPL::Script) -#BuildRequires: perl(inc::Module::Install) >= 0.91 -#BuildRequires: perl(JSON) -#BuildRequires: perl(LWP::Simple) -#BuildRequires: perl(Module::AutoInstall) -#BuildRequires: perl(Module::Build) -#BuildRequires: perl(Module::Install::Base) -#BuildRequires: perl(Moose::Meta::Role) -#BuildRequires: perl(Moose::Role) -#BuildRequires: perl(Moose::Util::TypeConstraints) -#BuildRequires: perl(Parse::CPAN::Meta) -#BuildRequires: perl(PPI::Dumper) -#BuildRequires: perl(Project::Schema) -#BuildRequires: perl(YAML::Tiny) -Requires: perl(App::Nopaste) -Requires: perl(B::Keywords) -Requires: perl(Data::Dumper::Concise) -Requires: perl(Data::Dump::Streamer) Requires: perl(File::HomeDir) -Requires: perl(File::Next) Requires: perl(Lexical::Persistence) -Requires: perl(Module::Refresh) Requires: perl(Moose) >= 0.74 Requires: perl(MooseX::AttributeHelpers) >= 0.16 Requires: perl(MooseX::Getopt) >= 0.18 Requires: perl(MooseX::Object::Pluggable) >= 0.0009 -Requires: perl(namespace::clean) -Requires: perl(PPI) -Requires: perl(Sys::SigAction) Requires: perl(Task::Weaken) +Requires: perl(namespace::clean) %{perl_requires} %description ++++++ Devel-REPL-1.003012.tar.gz -> Devel-REPL-1.003013.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Devel-REPL-1.003012/Changes new/Devel-REPL-1.003013/Changes --- old/Devel-REPL-1.003012/Changes 2010-09-27 21:43:18.000000000 +0200 +++ new/Devel-REPL-1.003013/Changes 2012-05-19 19:27:53.000000000 +0200 @@ -1,3 +1,6 @@ +1.003013 + - Make Sys::SigAction optional dependency for Win32 systems + - Apply some plugin related patchs from Caleb Cushing 1.003012 - Remove some old code to avoid a future Moose warning 1.003011 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Devel-REPL-1.003012/MANIFEST new/Devel-REPL-1.003013/MANIFEST --- old/Devel-REPL-1.003012/MANIFEST 2010-09-27 21:44:45.000000000 +0200 +++ new/Devel-REPL-1.003013/MANIFEST 2012-05-19 19:22:43.000000000 +0200 @@ -39,9 +39,9 @@ lib/Devel/REPL/Plugin/NewlineHack.pm lib/Devel/REPL/Plugin/Nopaste.pm lib/Devel/REPL/Plugin/OutputCache.pm +lib/Devel/REPL/Plugin/PPI.pm lib/Devel/REPL/Plugin/Packages.pm lib/Devel/REPL/Plugin/Peek.pm -lib/Devel/REPL/Plugin/PPI.pm lib/Devel/REPL/Plugin/ReadLineHistory.pm lib/Devel/REPL/Plugin/Refresh.pm lib/Devel/REPL/Plugin/ShowClass.pm @@ -49,10 +49,11 @@ lib/Devel/REPL/Plugin/Turtles.pm lib/Devel/REPL/Profile.pm lib/Devel/REPL/Profile/Default.pm +lib/Devel/REPL/Profile/Minimal.pm lib/Devel/REPL/Script.pm -Makefile.PL MANIFEST This list of files META.yml +Makefile.PL README script/re.pl t/load_core.t diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Devel-REPL-1.003012/META.yml new/Devel-REPL-1.003013/META.yml --- old/Devel-REPL-1.003012/META.yml 2010-09-27 21:44:40.000000000 +0200 +++ new/Devel-REPL-1.003013/META.yml 2010-06-13 19:54:26.000000000 +0200 @@ -8,7 +8,7 @@ configure_requires: ExtUtils::MakeMaker: 6.42 distribution_type: module -generated_by: 'Module::Install version 1.00' +generated_by: 'Module::Install version 0.91' license: perl meta-spec: url: http://module-build.sourceforge.net/META-spec-v1.4.html @@ -20,23 +20,14 @@ - inc - t requires: - App::Nopaste: 0 B::Concise: 0 - B::Keywords: 0 - Data::Dump::Streamer: 0 - Data::Dumper::Concise: 0 Devel::Peek: 0 File::HomeDir: 0 - File::Next: 0 File::Spec: 0 - Lexical::Persistence: 0 - Module::Refresh: 0 Moose: 0.74 MooseX::AttributeHelpers: 0.16 MooseX::Getopt: 0.18 MooseX::Object::Pluggable: 0.0009 - PPI: 0 - Sys::SigAction: 0 Task::Weaken: 0 Term::ANSIColor: 0 Term::ReadLine: 0 @@ -44,4 +35,4 @@ perl: 5.8.1 resources: license: http://dev.perl.org/licenses/ -version: 1.003012 +version: 1.003010_02 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Devel-REPL-1.003012/Makefile.PL new/Devel-REPL-1.003013/Makefile.PL --- old/Devel-REPL-1.003012/Makefile.PL 2010-09-27 19:24:04.000000000 +0200 +++ new/Devel-REPL-1.003013/Makefile.PL 2011-02-18 04:39:05.000000000 +0100 @@ -41,7 +41,7 @@ 'File::Next' => 0; feature 'Interrupt plugin - traps SIGINT to kill long-running lines', - -default => 1, + -default => (($^O =~ /Win32/) ? 0 : 1), 'Sys::SigAction' => 0; feature 'Keywords completion driver - tab complete Perl keywords and operators', diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Devel-REPL-1.003012/inc/Module/AutoInstall.pm new/Devel-REPL-1.003013/inc/Module/AutoInstall.pm --- old/Devel-REPL-1.003012/inc/Module/AutoInstall.pm 2010-09-27 21:44:40.000000000 +0200 +++ new/Devel-REPL-1.003013/inc/Module/AutoInstall.pm 2010-06-13 19:54:22.000000000 +0200 @@ -253,8 +253,6 @@ # import to main:: no strict 'refs'; *{'main::WriteMakefile'} = \&Write if caller(0) eq 'main'; - - return (@Existing, @Missing); } sub _running_under { @@ -674,20 +672,7 @@ sub _load_cpan { return if $CPAN::VERSION and $CPAN::Config and not @_; require CPAN; - - # CPAN-1.82+ adds CPAN::Config::AUTOLOAD to redirect to - # CPAN::HandleConfig->load. CPAN reports that the redirection - # is deprecated in a warning printed at the user. - - # CPAN-1.81 expects CPAN::HandleConfig->load, does not have - # $CPAN::HandleConfig::VERSION but cannot handle - # CPAN::Config->load - - # Which "versions expect CPAN::Config->load? - - if ( $CPAN::HandleConfig::VERSION - || CPAN::HandleConfig->can('load') - ) { + if ( $CPAN::HandleConfig::VERSION ) { # Newer versions of CPAN have a HandleConfig module CPAN::HandleConfig->load; } else { @@ -817,4 +802,4 @@ __END__ -#line 1071 +#line 1056 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Devel-REPL-1.003012/inc/Module/Install/AutoInstall.pm new/Devel-REPL-1.003013/inc/Module/Install/AutoInstall.pm --- old/Devel-REPL-1.003012/inc/Module/Install/AutoInstall.pm 2010-09-27 21:44:40.000000000 +0200 +++ new/Devel-REPL-1.003013/inc/Module/Install/AutoInstall.pm 2010-06-13 19:54:22.000000000 +0200 @@ -6,7 +6,7 @@ use vars qw{$VERSION @ISA $ISCORE}; BEGIN { - $VERSION = '1.00'; + $VERSION = '0.91'; @ISA = 'Module::Install::Base'; $ISCORE = 1; } @@ -37,33 +37,12 @@ $self->include('Module::AutoInstall'); require Module::AutoInstall; - my @features_require = Module::AutoInstall->import( + Module::AutoInstall->import( (@config ? (-config => \@config) : ()), (@core ? (-core => \@core) : ()), $self->features, ); - my %seen; - my @requires = map @$_, map @$_, grep ref, $self->requires; - while (my ($mod, $ver) = splice(@requires, 0, 2)) { - $seen{$mod}{$ver}++; - } - my @build_requires = map @$_, map @$_, grep ref, $self->build_requires; - while (my ($mod, $ver) = splice(@build_requires, 0, 2)) { - $seen{$mod}{$ver}++; - } - my @configure_requires = map @$_, map @$_, grep ref, $self->configure_requires; - while (my ($mod, $ver) = splice(@configure_requires, 0, 2)) { - $seen{$mod}{$ver}++; - } - - my @deduped; - while (my ($mod, $ver) = splice(@features_require, 0, 2)) { - push @deduped, $mod => $ver unless $seen{$mod}{$ver}++; - } - - $self->requires(@deduped); - $self->makemaker_args( Module::AutoInstall::_make_args() ); my $class = ref($self); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Devel-REPL-1.003012/inc/Module/Install/Base.pm new/Devel-REPL-1.003013/inc/Module/Install/Base.pm --- old/Devel-REPL-1.003012/inc/Module/Install/Base.pm 2010-09-27 21:44:40.000000000 +0200 +++ new/Devel-REPL-1.003013/inc/Module/Install/Base.pm 2010-06-13 19:54:22.000000000 +0200 @@ -4,7 +4,7 @@ use strict 'vars'; use vars qw{$VERSION}; BEGIN { - $VERSION = '1.00'; + $VERSION = '0.91'; } # Suspend handler for "redefined" warnings @@ -51,18 +51,13 @@ #line 106 sub is_admin { - ! $_[0]->admin->isa('Module::Install::Base::FakeAdmin'); + $_[0]->admin->VERSION; } sub DESTROY {} package Module::Install::Base::FakeAdmin; -use vars qw{$VERSION}; -BEGIN { - $VERSION = $Module::Install::Base::VERSION; -} - my $fake; sub new { @@ -80,4 +75,4 @@ 1; -#line 159 +#line 154 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Devel-REPL-1.003012/inc/Module/Install/Can.pm new/Devel-REPL-1.003013/inc/Module/Install/Can.pm --- old/Devel-REPL-1.003012/inc/Module/Install/Can.pm 2010-09-27 21:44:40.000000000 +0200 +++ new/Devel-REPL-1.003013/inc/Module/Install/Can.pm 2010-06-13 19:54:26.000000000 +0200 @@ -9,7 +9,7 @@ use vars qw{$VERSION @ISA $ISCORE}; BEGIN { - $VERSION = '1.00'; + $VERSION = '0.91'; @ISA = 'Module::Install::Base'; $ISCORE = 1; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Devel-REPL-1.003012/inc/Module/Install/Fetch.pm new/Devel-REPL-1.003013/inc/Module/Install/Fetch.pm --- old/Devel-REPL-1.003012/inc/Module/Install/Fetch.pm 2010-09-27 21:44:40.000000000 +0200 +++ new/Devel-REPL-1.003013/inc/Module/Install/Fetch.pm 2010-06-13 19:54:26.000000000 +0200 @@ -6,7 +6,7 @@ use vars qw{$VERSION @ISA $ISCORE}; BEGIN { - $VERSION = '1.00'; + $VERSION = '0.91'; @ISA = 'Module::Install::Base'; $ISCORE = 1; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Devel-REPL-1.003012/inc/Module/Install/Include.pm new/Devel-REPL-1.003013/inc/Module/Install/Include.pm --- old/Devel-REPL-1.003012/inc/Module/Install/Include.pm 2010-09-27 21:44:40.000000000 +0200 +++ new/Devel-REPL-1.003013/inc/Module/Install/Include.pm 2010-06-13 19:54:22.000000000 +0200 @@ -6,7 +6,7 @@ use vars qw{$VERSION @ISA $ISCORE}; BEGIN { - $VERSION = '1.00'; + $VERSION = '0.91'; @ISA = 'Module::Install::Base'; $ISCORE = 1; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Devel-REPL-1.003012/inc/Module/Install/Makefile.pm new/Devel-REPL-1.003013/inc/Module/Install/Makefile.pm --- old/Devel-REPL-1.003012/inc/Module/Install/Makefile.pm 2010-09-27 21:44:40.000000000 +0200 +++ new/Devel-REPL-1.003013/inc/Module/Install/Makefile.pm 2010-06-13 19:54:22.000000000 +0200 @@ -4,11 +4,10 @@ use strict 'vars'; use ExtUtils::MakeMaker (); use Module::Install::Base (); -use Fcntl qw/:flock :seek/; use vars qw{$VERSION @ISA $ISCORE}; BEGIN { - $VERSION = '1.00'; + $VERSION = '0.91'; @ISA = 'Module::Install::Base'; $ISCORE = 1; } @@ -26,8 +25,8 @@ die "Caught an potential prompt infinite loop ($c[1]|$c[2]|$_[0])"; } - # In automated testing or non-interactive session, always use defaults - if ( ($ENV{AUTOMATED_TESTING} or -! -t STDIN) and ! $ENV{PERL_MM_USE_DEFAULT} ) { + # In automated testing, always use defaults + if ( $ENV{AUTOMATED_TESTING} and ! $ENV{PERL_MM_USE_DEFAULT} ) { local $ENV{PERL_MM_USE_DEFAULT} = 1; goto &ExtUtils::MakeMaker::prompt; } else { @@ -35,112 +34,21 @@ } } -# Store a cleaned up version of the MakeMaker version, -# since we need to behave differently in a variety of -# ways based on the MM version. -my $makemaker = eval $ExtUtils::MakeMaker::VERSION; - -# If we are passed a param, do a "newer than" comparison. -# Otherwise, just return the MakeMaker version. -sub makemaker { - ( @_ < 2 or $makemaker >= eval($_[1]) ) ? $makemaker : 0 -} - -# Ripped from ExtUtils::MakeMaker 6.56, and slightly modified -# as we only need to know here whether the attribute is an array -# or a hash or something else (which may or may not be appendable). -my %makemaker_argtype = ( - C => 'ARRAY', - CONFIG => 'ARRAY', -# CONFIGURE => 'CODE', # ignore - DIR => 'ARRAY', - DL_FUNCS => 'HASH', - DL_VARS => 'ARRAY', - EXCLUDE_EXT => 'ARRAY', - EXE_FILES => 'ARRAY', - FUNCLIST => 'ARRAY', - H => 'ARRAY', - IMPORTS => 'HASH', - INCLUDE_EXT => 'ARRAY', - LIBS => 'ARRAY', # ignore '' - MAN1PODS => 'HASH', - MAN3PODS => 'HASH', - META_ADD => 'HASH', - META_MERGE => 'HASH', - PL_FILES => 'HASH', - PM => 'HASH', - PMLIBDIRS => 'ARRAY', - PMLIBPARENTDIRS => 'ARRAY', - PREREQ_PM => 'HASH', - CONFIGURE_REQUIRES => 'HASH', - SKIP => 'ARRAY', - TYPEMAPS => 'ARRAY', - XS => 'HASH', -# VERSION => ['version',''], # ignore -# _KEEP_AFTER_FLUSH => '', - - clean => 'HASH', - depend => 'HASH', - dist => 'HASH', - dynamic_lib=> 'HASH', - linkext => 'HASH', - macro => 'HASH', - postamble => 'HASH', - realclean => 'HASH', - test => 'HASH', - tool_autosplit => 'HASH', - - # special cases where you can use makemaker_append - CCFLAGS => 'APPENDABLE', - DEFINE => 'APPENDABLE', - INC => 'APPENDABLE', - LDDLFLAGS => 'APPENDABLE', - LDFROM => 'APPENDABLE', -); - sub makemaker_args { - my ($self, %new_args) = @_; + my $self = shift; my $args = ( $self->{makemaker_args} ||= {} ); - foreach my $key (keys %new_args) { - if ($makemaker_argtype{$key}) { - if ($makemaker_argtype{$key} eq 'ARRAY') { - $args->{$key} = [] unless defined $args->{$key}; - unless (ref $args->{$key} eq 'ARRAY') { - $args->{$key} = [$args->{$key}] - } - push @{$args->{$key}}, - ref $new_args{$key} eq 'ARRAY' - ? @{$new_args{$key}} - : $new_args{$key}; - } - elsif ($makemaker_argtype{$key} eq 'HASH') { - $args->{$key} = {} unless defined $args->{$key}; - foreach my $skey (keys %{ $new_args{$key} }) { - $args->{$key}{$skey} = $new_args{$key}{$skey}; - } - } - elsif ($makemaker_argtype{$key} eq 'APPENDABLE') { - $self->makemaker_append($key => $new_args{$key}); - } - } - else { - if (defined $args->{$key}) { - warn qq{MakeMaker attribute "$key" is overriden; use "makemaker_append" to append values\n}; - } - $args->{$key} = $new_args{$key}; - } - } + %$args = ( %$args, @_ ); return $args; } # For mm args that take multiple space-seperated args, # append an argument to the current list. sub makemaker_append { - my $self = shift; + my $self = sShift; my $name = shift; my $args = $self->makemaker_args; - $args->{$name} = defined $args->{$name} - ? join( ' ', $args->{$name}, @_ ) + $args->{name} = defined $args->{$name} + ? join( ' ', $args->{name}, @_ ) : join( ' ', @_ ); } @@ -181,22 +89,25 @@ $self->makemaker_args( INC => shift ); } +my %test_dir = (); + sub _wanted_t { + /\.t$/ and -f $_ and $test_dir{$File::Find::dir} = 1; } sub tests_recursive { my $self = shift; + if ( $self->tests ) { + die "tests_recursive will not work if tests are already defined"; + } my $dir = shift || 't'; unless ( -d $dir ) { die "tests_recursive dir '$dir' does not exist"; } - my %tests = map { $_ => 1 } split / /, ($self->tests || ''); + %test_dir = (); require File::Find; - File::Find::find( - sub { /\.t$/ and -f $_ and $tests{"$File::Find::dir/*.t"} = 1 }, - $dir - ); - $self->tests( join ' ', sort keys %tests ); + File::Find::find( \&_wanted_t, $dir ); + $self->tests( join ' ', map { "$_/*.t" } sort keys %test_dir ); } sub write { @@ -219,13 +130,12 @@ # an underscore, even though its own version may contain one! # Hence the funny regexp to get rid of it. See RT #35800 # for details. - my $v = $ExtUtils::MakeMaker::VERSION =~ /^(\d+\.\d+)/; - $self->build_requires( 'ExtUtils::MakeMaker' => $v ); - $self->configure_requires( 'ExtUtils::MakeMaker' => $v ); + $self->build_requires( 'ExtUtils::MakeMaker' => $ExtUtils::MakeMaker::VERSION =~ /^(\d+\.\d+)/ ); + $self->configure_requires( 'ExtUtils::MakeMaker' => $ExtUtils::MakeMaker::VERSION =~ /^(\d+\.\d+)/ ); } else { # Allow legacy-compatibility with 5.005 by depending on the # most recent EU:MM that supported 5.005. - $self->build_requires( 'ExtUtils::MakeMaker' => 6.42 ); + $self->build_requires( 'ExtUtils::MakeMaker' => 6.42 ); $self->configure_requires( 'ExtUtils::MakeMaker' => 6.42 ); } @@ -233,115 +143,59 @@ my $args = $self->makemaker_args; $args->{DISTNAME} = $self->name; $args->{NAME} = $self->module_name || $self->name; + $args->{VERSION} = $self->version; $args->{NAME} =~ s/-/::/g; - $args->{VERSION} = $self->version or die <<'EOT'; -ERROR: Can't determine distribution version. Please specify it -explicitly via 'version' in Makefile.PL, or set a valid $VERSION -in a module, and provide its file path via 'version_from' (or -'all_from' if you prefer) in Makefile.PL. -EOT - - $DB::single = 1; if ( $self->tests ) { - my @tests = split ' ', $self->tests; - my %seen; - $args->{test} = { - TESTS => (join ' ', grep {!$seen{$_}++} @tests), - }; - } elsif ( $Module::Install::ExtraTests::use_extratests ) { - # Module::Install::ExtraTests doesn't set $self->tests and does its own tests via harness. - # So, just ignore our xt tests here. - } elsif ( -d 'xt' and ($Module::Install::AUTHOR or $ENV{RELEASE_TESTING}) ) { - $args->{test} = { - TESTS => join( ' ', map { "$_/*.t" } grep { -d $_ } qw{ t xt } ), - }; + $args->{test} = { TESTS => $self->tests }; } if ( $] >= 5.005 ) { $args->{ABSTRACT} = $self->abstract; - $args->{AUTHOR} = join ', ', @{$self->author || []}; + $args->{AUTHOR} = $self->author; } - if ( $self->makemaker(6.10) ) { - $args->{NO_META} = 1; - #$args->{NO_MYMETA} = 1; + if ( eval($ExtUtils::MakeMaker::VERSION) >= 6.10 ) { + $args->{NO_META} = 1; } - if ( $self->makemaker(6.17) and $self->sign ) { + if ( eval($ExtUtils::MakeMaker::VERSION) > 6.17 and $self->sign ) { $args->{SIGN} = 1; } unless ( $self->is_admin ) { delete $args->{SIGN}; } - if ( $self->makemaker(6.31) and $self->license ) { - $args->{LICENSE} = $self->license; - } + # Merge both kinds of requires into prereq_pm my $prereq = ($args->{PREREQ_PM} ||= {}); %$prereq = ( %$prereq, - map { @$_ } # flatten [module => version] + map { @$_ } map { @$_ } grep $_, - ($self->requires) + ($self->configure_requires, $self->build_requires, $self->requires) ); # Remove any reference to perl, PREREQ_PM doesn't support it delete $args->{PREREQ_PM}->{perl}; - # Merge both kinds of requires into BUILD_REQUIRES - my $build_prereq = ($args->{BUILD_REQUIRES} ||= {}); - %$build_prereq = ( %$build_prereq, - map { @$_ } # flatten [module => version] - map { @$_ } - grep $_, - ($self->configure_requires, $self->build_requires) - ); - - # Remove any reference to perl, BUILD_REQUIRES doesn't support it - delete $args->{BUILD_REQUIRES}->{perl}; - - # Delete bundled dists from prereq_pm, add it to Makefile DIR - my $subdirs = ($args->{DIR} || []); + # merge both kinds of requires into prereq_pm + my $subdirs = ($args->{DIR} ||= []); if ($self->bundles) { - my %processed; foreach my $bundle (@{ $self->bundles }) { - my ($mod_name, $dist_dir) = @$bundle; - delete $prereq->{$mod_name}; - $dist_dir = File::Basename::basename($dist_dir); # dir for building this module - if (not exists $processed{$dist_dir}) { - if (-d $dist_dir) { - # List as sub-directory to be processed by make - push @$subdirs, $dist_dir; - } - # Else do nothing: the module is already present on the system - $processed{$dist_dir} = undef; - } + my ($file, $dir) = @$bundle; + push @$subdirs, $dir if -d $dir; + delete $prereq->{$file}; } } - unless ( $self->makemaker('6.55_03') ) { - %$prereq = (%$prereq,%$build_prereq); - delete $args->{BUILD_REQUIRES}; - } - if ( my $perl_version = $self->perl_version ) { eval "use $perl_version; 1" or die "ERROR: perl: Version $] is installed, " . "but we need version >= $perl_version"; - - if ( $self->makemaker(6.48) ) { - $args->{MIN_PERL_VERSION} = $perl_version; - } } - if ($self->installdirs) { - warn qq{old INSTALLDIRS (probably set by makemaker_args) is overriden by installdirs\n} if $args->{INSTALLDIRS}; - $args->{INSTALLDIRS} = $self->installdirs; - } + $args->{INSTALLDIRS} = $self->installdirs; - my %args = map { - ( $_ => $args->{$_} ) } grep {defined($args->{$_} ) - } keys %$args; + my %args = map { ( $_ => $args->{$_} ) } grep {defined($args->{$_})} keys %$args; my $user_preop = delete $args{dist}->{PREOP}; - if ( my $preop = $self->admin->preop($user_preop) ) { + if (my $preop = $self->admin->preop($user_preop)) { foreach my $key ( keys %$preop ) { $args{dist}->{$key} = $preop->{$key}; } @@ -365,9 +219,9 @@ . ($self->postamble || ''); local *MAKEFILE; - open MAKEFILE, "+< $makefile_name" or die "fix_up_makefile: Couldn't open $makefile_name: $!"; - eval { flock MAKEFILE, LOCK_EX }; + open MAKEFILE, "< $makefile_name" or die "fix_up_makefile: Couldn't open $makefile_name: $!"; my $makefile = do { local $/; <MAKEFILE> }; + close MAKEFILE or die $!; $makefile =~ s/\b(test_harness\(\$\(TEST_VERBOSE\), )/$1'inc', /; $makefile =~ s/( -I\$\(INST_ARCHLIB\))/ -Iinc$1/g; @@ -387,8 +241,7 @@ # XXX - This is currently unused; not sure if it breaks other MM-users # $makefile =~ s/^pm_to_blib\s+:\s+/pm_to_blib :: /mg; - seek MAKEFILE, 0, SEEK_SET; - truncate MAKEFILE, 0; + open MAKEFILE, "> $makefile_name" or die "fix_up_makefile: Couldn't open $makefile_name: $!"; print MAKEFILE "$preamble$makefile$postamble" or die $!; close MAKEFILE or die $!; @@ -412,4 +265,4 @@ __END__ -#line 541 +#line 394 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Devel-REPL-1.003012/inc/Module/Install/Metadata.pm new/Devel-REPL-1.003013/inc/Module/Install/Metadata.pm --- old/Devel-REPL-1.003012/inc/Module/Install/Metadata.pm 2010-09-27 21:44:40.000000000 +0200 +++ new/Devel-REPL-1.003013/inc/Module/Install/Metadata.pm 2010-06-13 19:54:22.000000000 +0200 @@ -6,7 +6,7 @@ use vars qw{$VERSION @ISA $ISCORE}; BEGIN { - $VERSION = '1.00'; + $VERSION = '0.91'; @ISA = 'Module::Install::Base'; $ISCORE = 1; } @@ -19,6 +19,7 @@ name module_name abstract + author version distribution_type tests @@ -42,11 +43,8 @@ my @array_keys = qw{ keywords - author }; -*authors = \&author; - sub Meta { shift } sub Meta_BooleanKeys { @boolean_keys } sub Meta_ScalarKeys { @scalar_keys } @@ -178,6 +176,43 @@ $self->{values}->{perl_version} = $version; } +#Stolen from M::B +my %license_urls = ( + perl => 'http://dev.perl.org/licenses/', + apache => 'http://apache.org/licenses/LICENSE-2.0', + artistic => 'http://opensource.org/licenses/artistic-license.php', + artistic_2 => 'http://opensource.org/licenses/artistic-license-2.0.php', + lgpl => 'http://opensource.org/licenses/lgpl-license.php', + lgpl2 => 'http://opensource.org/licenses/lgpl-2.1.php', + lgpl3 => 'http://opensource.org/licenses/lgpl-3.0.html', + bsd => 'http://opensource.org/licenses/bsd-license.php', + gpl => 'http://opensource.org/licenses/gpl-license.php', + gpl2 => 'http://opensource.org/licenses/gpl-2.0.php', + gpl3 => 'http://opensource.org/licenses/gpl-3.0.html', + mit => 'http://opensource.org/licenses/mit-license.php', + mozilla => 'http://opensource.org/licenses/mozilla1.1.php', + open_source => undef, + unrestricted => undef, + restrictive => undef, + unknown => undef, +); + +sub license { + my $self = shift; + return $self->{values}->{license} unless @_; + my $license = shift or die( + 'Did not provide a value to license()' + ); + $self->{values}->{license} = $license; + + # Automatically fill in license URLs + if ( $license_urls{$license} ) { + $self->resources( license => $license_urls{$license} ); + } + + return 1; +} + sub all_from { my ( $self, $file ) = @_; @@ -195,8 +230,6 @@ die("The path '$file' does not exist, or is not a file"); } - $self->{values}{all_from} = $file; - # Some methods pull from POD instead of code. # If there is a matching .pod, use that instead my $pod = $file; @@ -207,7 +240,7 @@ $self->name_from($file) unless $self->name; $self->version_from($file) unless $self->version; $self->perl_version_from($file) unless $self->perl_version; - $self->author_from($pod) unless @{$self->author || []}; + $self->author_from($pod) unless $self->author; $self->license_from($pod) unless $self->license; $self->abstract_from($pod) unless $self->abstract; @@ -317,9 +350,6 @@ require ExtUtils::MM_Unix; my ( $self, $file ) = @_; $self->version( ExtUtils::MM_Unix->parse_version($file) ); - - # for version integrity check - $self->makemaker_args( VERSION_FROM => $file ); } sub abstract_from { @@ -330,7 +360,7 @@ { DISTNAME => $self->name }, 'ExtUtils::MM_Unix' )->parse_abstract($file) - ); + ); } # Add both distribution and module name @@ -355,10 +385,11 @@ } } -sub _extract_perl_version { +sub perl_version_from { + my $self = shift; if ( - $_[0] =~ m/ - ^\s* + Module::Install::_read($_[0]) =~ m/ + ^ (?:use|require) \s* v? ([\d_\.]+) @@ -367,16 +398,6 @@ ) { my $perl_version = $1; $perl_version =~ s{_}{}g; - return $perl_version; - } else { - return; - } -} - -sub perl_version_from { - my $self = shift; - my $perl_version=_extract_perl_version(Module::Install::_read($_[0])); - if ($perl_version) { $self->perl_version($perl_version); } else { warn "Cannot determine perl version info from $_[0]\n"; @@ -396,164 +417,59 @@ ([^\n]*) /ixms) { my $author = $1 || $2; - - # XXX: ugly but should work anyway... - if (eval "require Pod::Escapes; 1") { - # Pod::Escapes has a mapping table. - # It's in core of perl >= 5.9.3, and should be installed - # as one of the Pod::Simple's prereqs, which is a prereq - # of Pod::Text 3.x (see also below). - $author =~ s{ E<( (\d+) | ([A-Za-z]+) )> } - { - defined $2 - ? chr($2) - : defined $Pod::Escapes::Name2character_number{$1} - ? chr($Pod::Escapes::Name2character_number{$1}) - : do { - warn "Unknown escape: E<$1>"; - "E<$1>"; - }; - }gex; - } - elsif (eval "require Pod::Text; 1" && $Pod::Text::VERSION < 3) { - # Pod::Text < 3.0 has yet another mapping table, - # though the table name of 2.x and 1.x are different. - # (1.x is in core of Perl < 5.6, 2.x is in core of - # Perl < 5.9.3) - my $mapping = ($Pod::Text::VERSION < 2) - ? \%Pod::Text::HTML_Escapes - : \%Pod::Text::ESCAPES; - $author =~ s{ E<( (\d+) | ([A-Za-z]+) )> } - { - defined $2 - ? chr($2) - : defined $mapping->{$1} - ? $mapping->{$1} - : do { - warn "Unknown escape: E<$1>"; - "E<$1>"; - }; - }gex; - } - else { - $author =~ s{E<lt>}{<}g; - $author =~ s{E<gt>}{>}g; - } + $author =~ s{E<lt>}{<}g; + $author =~ s{E<gt>}{>}g; $self->author($author); } else { warn "Cannot determine author info from $_[0]\n"; } } -#Stolen from M::B -my %license_urls = ( - perl => 'http://dev.perl.org/licenses/', - apache => 'http://apache.org/licenses/LICENSE-2.0', - apache_1_1 => 'http://apache.org/licenses/LICENSE-1.1', - artistic => 'http://opensource.org/licenses/artistic-license.php', - artistic_2 => 'http://opensource.org/licenses/artistic-license-2.0.php', - lgpl => 'http://opensource.org/licenses/lgpl-license.php', - lgpl2 => 'http://opensource.org/licenses/lgpl-2.1.php', - lgpl3 => 'http://opensource.org/licenses/lgpl-3.0.html', - bsd => 'http://opensource.org/licenses/bsd-license.php', - gpl => 'http://opensource.org/licenses/gpl-license.php', - gpl2 => 'http://opensource.org/licenses/gpl-2.0.php', - gpl3 => 'http://opensource.org/licenses/gpl-3.0.html', - mit => 'http://opensource.org/licenses/mit-license.php', - mozilla => 'http://opensource.org/licenses/mozilla1.1.php', - open_source => undef, - unrestricted => undef, - restrictive => undef, - unknown => undef, -); - -sub license { +sub license_from { my $self = shift; - return $self->{values}->{license} unless @_; - my $license = shift or die( - 'Did not provide a value to license()' - ); - $license = __extract_license($license) || lc $license; - $self->{values}->{license} = $license; - - # Automatically fill in license URLs - if ( $license_urls{$license} ) { - $self->resources( license => $license_urls{$license} ); - } - - return 1; -} - -sub _extract_license { - my $pod = shift; - my $matched; - return __extract_license( - ($matched) = $pod =~ m/ - (=head \d \s+ L(?i:ICEN[CS]E|ICENSING)\b.*?) - (=head \d.*|=cut.*|)\z - /xms - ) || __extract_license( - ($matched) = $pod =~ m/ - (=head \d \s+ (?:C(?i:OPYRIGHTS?)|L(?i:EGAL))\b.*?) - (=head \d.*|=cut.*|)\z - /xms - ); -} - -sub __extract_license { - my $license_text = shift or return; - my @phrases = ( - '(?:under )?the same (?:terms|license) as (?:perl|the perl (?:\d )?programming language)' => 'perl', 1, - '(?:under )?the terms of (?:perl|the perl programming language) itself' => 'perl', 1, - 'Artistic and GPL' => 'perl', 1, - 'GNU general public license' => 'gpl', 1, - 'GNU public license' => 'gpl', 1, - 'GNU lesser general public license' => 'lgpl', 1, - 'GNU lesser public license' => 'lgpl', 1, - 'GNU library general public license' => 'lgpl', 1, - 'GNU library public license' => 'lgpl', 1, - 'GNU Free Documentation license' => 'unrestricted', 1, - 'GNU Affero General Public License' => 'open_source', 1, - '(?:Free)?BSD license' => 'bsd', 1, - 'Artistic license' => 'artistic', 1, - 'Apache (?:Software )?license' => 'apache', 1, - 'GPL' => 'gpl', 1, - 'LGPL' => 'lgpl', 1, - 'BSD' => 'bsd', 1, - 'Artistic' => 'artistic', 1, - 'MIT' => 'mit', 1, - 'Mozilla Public License' => 'mozilla', 1, - 'Q Public License' => 'open_source', 1, - 'OpenSSL License' => 'unrestricted', 1, - 'SSLeay License' => 'unrestricted', 1, - 'zlib License' => 'open_source', 1, - 'proprietary' => 'proprietary', 0, - ); - while ( my ($pattern, $license, $osi) = splice(@phrases, 0, 3) ) { - $pattern =~ s#\s+#\\s+#gs; - if ( $license_text =~ /\b$pattern\b/i ) { - return $license; + if ( + Module::Install::_read($_[0]) =~ 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|the perl programming language) itself' => 'perl', 1, + 'GNU general public license' => 'gpl', 1, + 'GNU public license' => 'gpl', 1, + 'GNU lesser general public license' => 'lgpl', 1, + 'GNU lesser public license' => 'lgpl', 1, + 'GNU library general public license' => 'lgpl', 1, + 'GNU library public license' => 'lgpl', 1, + 'BSD license' => 'bsd', 1, + 'Artistic license' => 'artistic', 1, + 'GPL' => 'gpl', 1, + 'LGPL' => 'lgpl', 1, + 'BSD' => 'bsd', 1, + 'Artistic' => 'artistic', 1, + 'MIT' => 'mit', 1, + 'proprietary' => 'proprietary', 0, + ); + while ( my ($pattern, $license, $osi) = splice(@phrases, 0, 3) ) { + $pattern =~ s{\s+}{\\s+}g; + if ( $license_text =~ /\b$pattern\b/i ) { + $self->license($license); + return 1; + } } } - return ''; -} -sub license_from { - my $self = shift; - if (my $license=_extract_license(Module::Install::_read($_[0]))) { - $self->license($license); - } else { - warn "Cannot determine license info from $_[0]\n"; - return 'unknown'; - } + warn "Cannot determine license info from $_[0]\n"; + return 'unknown'; } sub _extract_bugtracker { - my @links = $_[0] =~ m#L<( - \Qhttp://rt.cpan.org/\E[^>]+| - \Qhttp://github.com/\E[\w_]+/[\w_]+/issues| - \Qhttp://code.google.com/p/\E[\w_\-]+/issues/list - )>#gx; + my @links = $_[0] =~ m#L<(\Qhttp://rt.cpan.org/\E[^>]+)>#g; my %links; @links{@links}=(); @links=keys %links; @@ -569,7 +485,7 @@ return 0; } if ( @links > 1 ) { - warn "Found more than one bugtracker link in $_[0]\n"; + warn "Found more than on rt.cpan.org link in $_[0]\n"; return 0; } @@ -616,15 +532,8 @@ return $v; } -sub add_metadata { - my $self = shift; - my %hash = @_; - for my $key (keys %hash) { - warn "add_metadata: $key is not prefixed with 'x_'.\n" . - "Use appopriate function to add non-private metadata.\n" unless $key =~ /^x_/; - $self->{values}->{$key} = $hash{$key}; - } -} + + ###################################################################### diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Devel-REPL-1.003012/inc/Module/Install/Scripts.pm new/Devel-REPL-1.003013/inc/Module/Install/Scripts.pm --- old/Devel-REPL-1.003012/inc/Module/Install/Scripts.pm 2010-09-27 21:44:40.000000000 +0200 +++ new/Devel-REPL-1.003013/inc/Module/Install/Scripts.pm 2010-06-13 19:54:22.000000000 +0200 @@ -6,7 +6,7 @@ use vars qw{$VERSION @ISA $ISCORE}; BEGIN { - $VERSION = '1.00'; + $VERSION = '0.91'; @ISA = 'Module::Install::Base'; $ISCORE = 1; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Devel-REPL-1.003012/inc/Module/Install/Win32.pm new/Devel-REPL-1.003013/inc/Module/Install/Win32.pm --- old/Devel-REPL-1.003012/inc/Module/Install/Win32.pm 2010-09-27 21:44:40.000000000 +0200 +++ new/Devel-REPL-1.003013/inc/Module/Install/Win32.pm 2010-06-13 19:54:26.000000000 +0200 @@ -6,7 +6,7 @@ use vars qw{$VERSION @ISA $ISCORE}; BEGIN { - $VERSION = '1.00'; + $VERSION = '0.91'; @ISA = 'Module::Install::Base'; $ISCORE = 1; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Devel-REPL-1.003012/inc/Module/Install/WriteAll.pm new/Devel-REPL-1.003013/inc/Module/Install/WriteAll.pm --- old/Devel-REPL-1.003012/inc/Module/Install/WriteAll.pm 2010-09-27 21:44:40.000000000 +0200 +++ new/Devel-REPL-1.003013/inc/Module/Install/WriteAll.pm 2010-06-13 19:54:26.000000000 +0200 @@ -6,7 +6,7 @@ use vars qw{$VERSION @ISA $ISCORE}; BEGIN { - $VERSION = '1.00'; + $VERSION = '0.91';; @ISA = qw{Module::Install::Base}; $ISCORE = 1; } @@ -26,10 +26,7 @@ $self->check_nmake if $args{check_nmake}; unless ( $self->makemaker_args->{PL_FILES} ) { - # XXX: This still may be a bit over-defensive... - unless ($self->makemaker(6.25)) { - $self->makemaker_args( PL_FILES => {} ) if -f 'Build.PL'; - } + $self->makemaker_args( PL_FILES => {} ); } # Until ExtUtils::MakeMaker support MYMETA.yml, make sure diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Devel-REPL-1.003012/inc/Module/Install.pm new/Devel-REPL-1.003013/inc/Module/Install.pm --- old/Devel-REPL-1.003012/inc/Module/Install.pm 2010-09-27 21:44:39.000000000 +0200 +++ new/Devel-REPL-1.003013/inc/Module/Install.pm 2010-06-13 19:54:21.000000000 +0200 @@ -19,9 +19,6 @@ use 5.005; use strict 'vars'; -use Cwd (); -use File::Find (); -use File::Path (); use vars qw{$VERSION $MAIN}; BEGIN { @@ -31,7 +28,7 @@ # This is not enforced yet, but will be some time in the next few # releases once we can make sure it won't clash with custom # Module::Install extensions. - $VERSION = '1.00'; + $VERSION = '0.91'; # Storage for the pseudo-singleton $MAIN = undef; @@ -41,25 +38,18 @@ } -sub import { - my $class = shift; - my $self = $class->new(@_); - my $who = $self->_caller; - #------------------------------------------------------------- - # all of the following checks should be included in import(), - # to allow "eval 'require Module::Install; 1' to test - # installation of Module::Install. (RT #51267) - #------------------------------------------------------------- - - # Whether or not inc::Module::Install is actually loaded, the - # $INC{inc/Module/Install.pm} is what will still get set as long as - # the caller loaded module this in the documented manner. - # If not set, the caller may NOT have loaded the bundled version, and thus - # they may not have a MI version that works with the Makefile.PL. This would - # result in false errors or unexpected behaviour. And we don't want that. - my $file = join( '/', 'inc', split /::/, __PACKAGE__ ) . '.pm'; - unless ( $INC{$file} ) { die <<"END_DIE" } + + + +# Whether or not inc::Module::Install is actually loaded, the +# $INC{inc/Module/Install.pm} is what will still get set as long as +# the caller loaded module this in the documented manner. +# If not set, the caller may NOT have loaded the bundled version, and thus +# they may not have a MI version that works with the Makefile.PL. This would +# result in false errors or unexpected behaviour. And we don't want that. +my $file = join( '/', 'inc', split /::/, __PACKAGE__ ) . '.pm'; +unless ( $INC{$file} ) { die <<"END_DIE" } Please invoke ${\__PACKAGE__} with: @@ -71,28 +61,26 @@ END_DIE - # This reportedly fixes a rare Win32 UTC file time issue, but - # as this is a non-cross-platform XS module not in the core, - # we shouldn't really depend on it. See RT #24194 for detail. - # (Also, this module only supports Perl 5.6 and above). - eval "use Win32::UTCFileTime" if $^O eq 'MSWin32' && $] >= 5.006; - - # If the script that is loading Module::Install is from the future, - # then make will detect this and cause it to re-run over and over - # again. This is bad. Rather than taking action to touch it (which - # is unreliable on some platforms and requires write permissions) - # for now we should catch this and refuse to run. - if ( -f $0 ) { - my $s = (stat($0))[9]; - - # If the modification time is only slightly in the future, - # sleep briefly to remove the problem. - my $a = $s - time; - if ( $a > 0 and $a < 5 ) { sleep 5 } - - # Too far in the future, throw an error. - my $t = time; - if ( $s > $t ) { die <<"END_DIE" } + + + + +# If the script that is loading Module::Install is from the future, +# then make will detect this and cause it to re-run over and over +# again. This is bad. Rather than taking action to touch it (which +# is unreliable on some platforms and requires write permissions) +# for now we should catch this and refuse to run. +if ( -f $0 ) { + my $s = (stat($0))[9]; + + # If the modification time is only slightly in the future, + # sleep briefly to remove the problem. + my $a = $s - time; + if ( $a > 0 and $a < 5 ) { sleep 5 } + + # Too far in the future, throw an error. + my $t = time; + if ( $s > $t ) { die <<"END_DIE" } Your installer $0 has a modification time in the future ($s > $t). @@ -101,12 +89,15 @@ Please correct this, then run $0 again. END_DIE - } +} - # Build.PL was formerly supported, but no longer is due to excessive - # difficulty in implementing every single feature twice. - if ( $0 =~ /Build.PL$/i ) { die <<"END_DIE" } + + + +# Build.PL was formerly supported, but no longer is due to excessive +# difficulty in implementing every single feature twice. +if ( $0 =~ /Build.PL$/i ) { die <<"END_DIE" } Module::Install no longer supports Build.PL. @@ -116,42 +107,23 @@ END_DIE - #------------------------------------------------------------- - # To save some more typing in Module::Install installers, every... - # use inc::Module::Install - # ...also acts as an implicit use strict. - $^H |= strict::bits(qw(refs subs vars)); - #------------------------------------------------------------- - unless ( -f $self->{file} ) { - foreach my $key (keys %INC) { - delete $INC{$key} if $key =~ /Module\/Install/; - } - local $^W; - require "$self->{path}/$self->{dispatch}.pm"; - File::Path::mkpath("$self->{prefix}/$self->{author}"); - $self->{admin} = "$self->{name}::$self->{dispatch}"->new( _top => $self ); - $self->{admin}->init; - @_ = ($class, _self => $self); - goto &{"$self->{name}::import"}; - } +# To save some more typing in Module::Install installers, every... +# use inc::Module::Install +# ...also acts as an implicit use strict. +$^H |= strict::bits(qw(refs subs vars)); - local $^W; - *{"${who}::AUTOLOAD"} = $self->autoload; - $self->preload; - # Unregister loader and worker packages so subdirs can use them again - delete $INC{'inc/Module/Install.pm'}; - delete $INC{'Module/Install.pm'}; - # Save to the singleton - $MAIN = $self; - return 1; -} + +use Cwd (); +use File::Find (); +use File::Path (); +use FindBin; sub autoload { my $self = shift; @@ -164,21 +136,7 @@ # Delegate back to parent dirs goto &$code unless $cwd eq $pwd; } - unless ($$sym =~ s/([^:]+)$//) { - # XXX: it looks like we can't retrieve the missing function - # via $$sym (usually $main::AUTOLOAD) in this case. - # I'm still wondering if we should slurp Makefile.PL to - # get some context or not ... - my ($package, $file, $line) = caller; - die <<"EOT"; -Unknown function is found at $file line $line. -Execution of $file aborted due to runtime errors. - -If you're a contributor to a project, you may need to install -some Module::Install extensions from CPAN (or other repository). -If you're a user of a module, please contact the author. -EOT - } + $$sym =~ /([^:]+)$/ or die "Cannot autoload $who - $sym"; my $method = $1; if ( uc($method) eq $method ) { # Do nothing @@ -194,6 +152,33 @@ }; } +sub import { + my $class = shift; + my $self = $class->new(@_); + my $who = $self->_caller; + + unless ( -f $self->{file} ) { + require "$self->{path}/$self->{dispatch}.pm"; + File::Path::mkpath("$self->{prefix}/$self->{author}"); + $self->{admin} = "$self->{name}::$self->{dispatch}"->new( _top => $self ); + $self->{admin}->init; + @_ = ($class, _self => $self); + goto &{"$self->{name}::import"}; + } + + *{"${who}::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"}; + + # Save to the singleton + $MAIN = $self; + + return 1; +} + sub preload { my $self = shift; unless ( $self->{extensions} ) { @@ -219,7 +204,6 @@ my $who = $self->_caller; foreach my $name ( sort keys %seen ) { - local $^W; *{"${who}::$name"} = sub { ${"${who}::AUTOLOAD"} = "${who}::$name"; goto &{"${who}::AUTOLOAD"}; @@ -230,18 +214,12 @@ sub new { my ($class, %args) = @_; - delete $INC{'FindBin.pm'}; - { - # to suppress the redefine warning - local $SIG{__WARN__} = sub {}; - require FindBin; - } - # 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'; @@ -294,10 +272,8 @@ sub load_extensions { my ($self, $path, $top) = @_; - my $should_reload = 0; unless ( grep { ! ref $_ and lc $_ eq lc $self->{prefix} } @INC ) { unshift @INC, $self->{prefix}; - $should_reload = 1; } foreach my $rv ( $self->find_extensions($path) ) { @@ -305,13 +281,12 @@ next if $self->{pathnames}{$pkg}; local $@; - my $new = eval { local $^W; require $file; $pkg->can('new') }; + my $new = eval { require $file; $pkg->can('new') }; unless ( $new ) { warn $@ if $@; next; } - $self->{pathnames}{$pkg} = - $should_reload ? delete $INC{$file} : $INC{$file}; + $self->{pathnames}{$pkg} = delete $INC{$file}; push @{$self->{extensions}}, &{$new}($pkg, _top => $top ); } @@ -373,24 +348,17 @@ return $call; } -# Done in evals to avoid confusing Perl::MinimumVersion -eval( $] >= 5.006 ? <<'END_NEW' : <<'END_OLD' ); die $@ if $@; -sub _read { - local *FH; - open( FH, '<', $_[0] ) or die "open($_[0]): $!"; - my $string = do { local $/; <FH> }; - close FH or die "close($_[0]): $!"; - return $string; -} -END_NEW sub _read { local *FH; - open( FH, "< $_[0]" ) or die "open($_[0]): $!"; + if ( $] >= 5.006 ) { + open( FH, '<', $_[0] ) or die "open($_[0]): $!"; + } else { + open( FH, "< $_[0]" ) or die "open($_[0]): $!"; + } my $string = do { local $/; <FH> }; close FH or die "close($_[0]): $!"; return $string; } -END_OLD sub _readperl { my $string = Module::Install::_read($_[0]); @@ -411,26 +379,18 @@ return $string; } -# Done in evals to avoid confusing Perl::MinimumVersion -eval( $] >= 5.006 ? <<'END_NEW' : <<'END_OLD' ); die $@ if $@; sub _write { local *FH; - open( FH, '>', $_[0] ) or die "open($_[0]): $!"; - foreach ( 1 .. $#_ ) { - print FH $_[$_] or die "print($_[0]): $!"; + if ( $] >= 5.006 ) { + open( FH, '>', $_[0] ) or die "open($_[0]): $!"; + } else { + open( FH, "> $_[0]" ) or die "open($_[0]): $!"; } - close FH or die "close($_[0]): $!"; -} -END_NEW -sub _write { - local *FH; - open( FH, "> $_[0]" ) or die "open($_[0]): $!"; foreach ( 1 .. $#_ ) { print FH $_[$_] or die "print($_[0]): $!"; } close FH or die "close($_[0]): $!"; } -END_OLD # _version is for processing module versions (eg, 1.03_05) not # Perl versions (eg, 5.8.1). @@ -467,4 +427,4 @@ 1; -# Copyright 2008 - 2010 Adam Kennedy. +# Copyright 2008 - 2009 Adam Kennedy. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Devel-REPL-1.003012/lib/Devel/REPL/Profile/Default.pm new/Devel-REPL-1.003013/lib/Devel/REPL/Profile/Default.pm --- old/Devel-REPL-1.003012/lib/Devel/REPL/Profile/Default.pm 2010-09-27 19:24:04.000000000 +0200 +++ new/Devel-REPL-1.003013/lib/Devel/REPL/Profile/Default.pm 2011-02-14 03:30:33.000000000 +0100 @@ -5,9 +5,21 @@ with 'Devel::REPL::Profile'; -sub plugins { - qw(History LexEnv DDS Packages Commands MultiLine::PPI); -} +sub plugins { qw( + Colors + Completion + CompletionDriver::INC + CompletionDriver::LexEnv + CompletionDriver::Keywords + CompletionDriver::Methods + History + LexEnv + DDS + Packages + Commands + MultiLine::PPI + ReadLineHistory +);} sub apply_profile { my ($self, $repl) = @_; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Devel-REPL-1.003012/lib/Devel/REPL/Profile/Minimal.pm new/Devel-REPL-1.003013/lib/Devel/REPL/Profile/Minimal.pm --- old/Devel-REPL-1.003012/lib/Devel/REPL/Profile/Minimal.pm 1970-01-01 01:00:00.000000000 +0100 +++ new/Devel-REPL-1.003013/lib/Devel/REPL/Profile/Minimal.pm 2011-02-14 03:26:03.000000000 +0100 @@ -0,0 +1,17 @@ +package Devel::REPL::Profile::Minimal; + +use Moose; +use namespace::clean -except => [ 'meta' ]; + +with 'Devel::REPL::Profile'; + +sub plugins { + qw(History LexEnv DDS Packages Commands MultiLine::PPI); +} + +sub apply_profile { + my ($self, $repl) = @_; + $repl->load_plugin($_) for $self->plugins; +} + +1; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Devel-REPL-1.003012/lib/Devel/REPL.pm new/Devel-REPL-1.003013/lib/Devel/REPL.pm --- old/Devel-REPL-1.003012/lib/Devel/REPL.pm 2010-09-27 21:43:32.000000000 +0200 +++ new/Devel-REPL-1.003013/lib/Devel/REPL.pm 2012-05-19 19:23:51.000000000 +0200 @@ -5,7 +5,7 @@ use namespace::clean -except => [ 'meta' ]; use 5.008001; # backwards compat, doesn't warn like 5.8.1 -our $VERSION = '1.003012'; +our $VERSION = '1.003013'; with 'MooseX::Object::Pluggable'; @@ -287,6 +287,34 @@ L<Devel::REPL::Plugin::MultiLine::PPI> +=item * + +L<Devel::REPL::Plugin::Colors> + +=item * + +L<Devel::REPL::Plugin::Completion> + +=item * + +L<Devel::REPL::Plugin::CompletionDriver::INC> + +=item * + +L<Devel::REPL::Plugin::CompletionDriver::LexEnv> + +=item * + +L<Devel::REPL::Plugin::CompletionDriver::Keywords> + +=item * + +L<Devel::REPL::Plugin::CompletionDriver::Methods> + +=item * + +L<Devel::REPL::Plugin::ReadlineHistory> + =back =head2 Plugins @@ -299,7 +327,9 @@ A number of plugins ship with C<Devel::REPL>, and more are available on the CPAN. Some of the shipped plugins are loaded in the default profile, mentioned -above. +above. These plugins can be loaded in your C<< $HOME/.re.pl/repl.rc >> like: + + load_plugin qw( CompletionDriver::Global DumpHistory ); Writing your own plugins is not difficult, and is discussed in the L<Devel::REPL::Plugin> manual page, along with links to the manual pages of -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
