[Rt-commit] rtir branch, 2.6-trunk, updated. 2.6.1-19-gbac8888
Ruslan Zakirov
ruz at bestpractical.com
Thu Jul 12 07:50:33 EDT 2012
The branch, 2.6-trunk has been updated
via bac8888387e957310be8e7548968a56ac020dc34 (commit)
via 0be7a7705be1225e31933fc3e09708e0a13fba15 (commit)
via 0a5eafc3b90bdc615782c2f7c0130b5878fc6f7f (commit)
from 0ba865f978fe105082bba1deeef732fa21b2d98b (commit)
Summary of changes:
.gitignore | 1 +
META.yml | 7 +-
inc/Module/AutoInstall.pm | 150 +++++++++++++++++++++++++++++++++-----
inc/Module/Install.pm | 6 +-
inc/Module/Install/AutoInstall.pm | 13 +++-
inc/Module/Install/Base.pm | 2 +-
inc/Module/Install/Can.pm | 85 +++++++++++++++++++--
inc/Module/Install/Fetch.pm | 2 +-
inc/Module/Install/Include.pm | 2 +-
inc/Module/Install/Makefile.pm | 27 ++++---
inc/Module/Install/Metadata.pm | 22 ++++--
inc/Module/Install/Win32.pm | 2 +-
inc/Module/Install/WriteAll.pm | 2 +-
lib/RT/IR.pm | 14 +++-
t/custom-fields/ipv6.t | 56 ++++++++------
15 files changed, 308 insertions(+), 83 deletions(-)
- Log -----------------------------------------------------------------
commit 0a5eafc3b90bdc615782c2f7c0130b5878fc6f7f
Author: Ruslan Zakirov <ruz at bestpractical.com>
Date: Thu Jul 12 14:16:26 2012 +0300
shorten IPv6 addresses before displaying
diff --git a/lib/RT/IR.pm b/lib/RT/IR.pm
index 658958e..3a36025 100644
--- a/lib/RT/IR.pm
+++ b/lib/RT/IR.pm
@@ -544,10 +544,18 @@ wrap 'RT::ObjectCustomFieldValue::Content',
my $eIP = sprintf "%d.%d.%d.%d", split /\./, $1;
$$val .= '-'. $eIP unless $$val eq $eIP;
} elsif ( $$val =~ /^\s*($IPv6_re)\s*$/o ) {
+ my @values = ($$val);
+
my $large_content = $obj->__Value('LargeContent');
- return if !$large_content || $large_content eq $$val
- || $large_content !~ /^\s*($IPv6_re)\s*$/o;
- $$val .= '-'. $1;
+ push @values, $large_content if $large_content && $large_content ne $$val
+ && $large_content =~ /^\s*($IPv6_re)\s*$/o;
+
+ foreach my $v (@values) {
+ $v = lc $v;
+ $v =~ s/(:|^)0+(?=[a-f0-9]+(:|$))/$1/g;
+ $v =~ s/(:|^)(0(:0){$_})(:|$)/::/ and last foreach reverse 1..7;
+ }
+ $$val = join "-", @values;
}
return;
};
diff --git a/t/custom-fields/ipv6.t b/t/custom-fields/ipv6.t
index 38df66a..226097c 100644
--- a/t/custom-fields/ipv6.t
+++ b/t/custom-fields/ipv6.t
@@ -29,6 +29,18 @@ my %test_cidr = (
'abcd:' x 7 . 'abcd/32' => 'abcd:abcd'. ':0000' x 6 .'-'. 'abcd:abcd'. ':ffff' x 6,
'::192.168.1.1/120' => '0000:' x 6 . 'c0a8:0100' .'-'. '0000:' x 6 . 'c0a8:01ff',
);
+my %shorten = (
+ 'abcd:' x 7 . 'abcd' => 'abcd:' x 7 . 'abcd',
+ '034:' x 7 . '034' => '34:' x 7 . '34',
+ 'abcd::' => 'abcd::',
+ '::abcd' => '::abcd',
+ 'abcd::034' => 'abcd::34',
+ 'abcd::192.168.1.1' => 'abcd::c0a8:101',
+ '::192.168.1.1' => '::c0a8:101',
+ 'abcd:' x 7 . 'abcd/32' => 'abcd:abcd::-abcd:abcd'. ':ffff' x 6,
+ '::192.168.1.1/120' => '::c0a8:100-::c0a8:1ff',
+ 'abcd::034' => 'abcd::34',
+);
my $cf;
diag "load and check basic properties of the IP CF" if $ENV{'TEST_VERBOSE'};
@@ -74,12 +86,12 @@ while ( my ($short, $full) = each %valid ) {
$incident_id = $id if $queue eq 'Incidents';
$agent->display_ticket( $id);
- $agent->content_like( qr/\Q$full/, "IP on the page" );
+ $agent->content_like( qr/\Q$shorten{$short}/, "IP on the page" );
my $ticket = RT::Ticket->new( $RT::SystemUser );
$ticket->Load( $id );
ok( $ticket->id, 'loaded ticket' );
- is( $ticket->FirstCustomFieldValue('IP'), $full, 'correct value' );
+ is( $ticket->FirstCustomFieldValue('IP'), $shorten{$short}, 'correct value' );
}
}
@@ -100,12 +112,12 @@ while ( my ($short, $full) = each %test_set ) {
$incident_id = $id if $queue eq 'Incidents';
$agent->display_ticket( $id );
- $agent->content_like( qr/\Q$full/, "IP on the page" );
+ $agent->content_like( qr/\Q$shorten{$short}/, "IP on the page" );
my $ticket = RT::Ticket->new( $RT::SystemUser );
$ticket->Load( $id );
ok( $ticket->id, 'loaded ticket' );
- is( $ticket->FirstCustomFieldValue('IP'), $full, 'correct value' );
+ is( $ticket->FirstCustomFieldValue('IP'), $shorten{$short}, 'correct value' );
}
}
@@ -126,14 +138,14 @@ while ( my ($short, $full) = each %test_cidr ) {
$incident_id = $id if $queue eq 'Incidents';
$agent->display_ticket( $id);
- $agent->content_like( qr/\Q$full/, "IP range on the page" );
+ $agent->content_like( qr/\Q$shorten{$short}/, "IP range on the page" );
my $ticket = RT::Ticket->new( $RT::SystemUser );
$ticket->Load( $id );
ok( $ticket->id, 'loaded ticket' );
my $values = $ticket->CustomFieldValues('IP');
my %has = map { $_->Content => 1 } @{ $values->ItemsArrayRef };
- ok( $has{ $full }, "has value" )
+ ok( $has{ $shorten{$short} }, "has value" )
or diag "but has values ". join ", ", keys %has;
}
}
@@ -155,14 +167,14 @@ while ( my ($short, $full) = each %test_cidr ) {
$incident_id = $id if $queue eq 'Incidents';
$agent->display_ticket( $id);
- $agent->content_like( qr/\Q$full/, "IP range on the page" );
+ $agent->content_like( qr/\Q$shorten{$short}/, "IP range on the page" );
my $ticket = RT::Ticket->new( $RT::SystemUser );
$ticket->Load( $id );
ok( $ticket->id, 'loaded ticket' );
my $values = $ticket->CustomFieldValues('IP');
my %has = map { $_->Content => 1 } @{ $values->ItemsArrayRef };
- ok( $has{ $full }, "has value" )
+ ok( $has{ $shorten{$short} }, "has value" )
or diag "but has values ". join ", ", keys %has;
}
}
@@ -194,7 +206,7 @@ diag "set IP" if $ENV{'TEST_VERBOSE'};
$agent->field( $field_name => $val );
$agent->click('SaveChanges');
- $agent->content_like( qr/\Q$valid{$val}/, "IP on the page" );
+ $agent->content_like( qr/\Q$shorten{$val}/, "IP on the page" );
my $ticket = RT::Ticket->new( $RT::SystemUser );
$ticket->Load( $id );
@@ -202,18 +214,18 @@ diag "set IP" if $ENV{'TEST_VERBOSE'};
my $values = $ticket->CustomFieldValues('IP');
my %has = map { $_->Content => 1 } @{ $values->ItemsArrayRef };
is( scalar values %has, 1, "one IP were added");
- ok( $has{ $valid{ $val } }, "has value" )
+ ok( $has{ $shorten{ $val } }, "has value" )
or diag "but has values ". join ", ", keys %has;
diag "set IP with spaces around" if $ENV{'TEST_VERBOSE'};
$val = " ::192.168.1.1 \n ";
$agent->follow_link_ok({text => 'Edit', n => "1"}, "Followed 'Edit' link");
$agent->form_number(3);
- like( $agent->value($field_name), qr/^\s*\Q$valid{'abcd::192.168.1.1'}\E\s*$/, 'IP is in input box' );
+ like( $agent->value($field_name), qr/^\s*\Q$shorten{'abcd::192.168.1.1'}\E\s*$/, 'IP is in input box' );
$agent->field( $field_name => $val );
$agent->click('SaveChanges');
- $agent->content_like( qr/\Q$valid{'::192.168.1.1'}/, "IP on the page" );
+ $agent->content_like( qr/\Q$shorten{'::192.168.1.1'}/, "IP on the page" );
$ticket = RT::Ticket->new( $RT::SystemUser );
$ticket->Load( $id );
@@ -221,18 +233,18 @@ diag "set IP with spaces around" if $ENV{'TEST_VERBOSE'};
$values = $ticket->CustomFieldValues('IP');
%has = map { $_->Content => 1 } @{ $values->ItemsArrayRef };
is( scalar values %has, 1, "one IP were added");
- ok( $has{ $valid{'::192.168.1.1'} }, "has value" )
+ ok( $has{ $shorten{'::192.168.1.1'} }, "has value" )
or diag "but has values ". join ", ", keys %has;
diag "replace IP with a range" if $ENV{'TEST_VERBOSE'};
$val = '::192.168.1.1/120';
$agent->follow_link_ok({text => 'Edit', n => "1"}, "Followed 'Edit' link");
$agent->form_number(3);
- like( $agent->value($field_name), qr/^\s*\Q$valid{'::192.168.1.1'}\E\s*$/, 'IP is in input box' );
+ like( $agent->value($field_name), qr/^\s*\Q$shorten{'::192.168.1.1'}\E\s*$/, 'old IP is in input box' );
$agent->field( $field_name => $val );
$agent->click('SaveChanges');
- $agent->content_like( qr/\Q$test_cidr{ $val }/, "IP on the page" );
+ $agent->content_like( qr/\Q$shorten{ $val }/, "IP on the page" );
$ticket = RT::Ticket->new( $RT::SystemUser );
$ticket->Load( $id );
@@ -240,7 +252,7 @@ diag "replace IP with a range" if $ENV{'TEST_VERBOSE'};
$values = $ticket->CustomFieldValues('IP');
%has = map { $_->Content => 1 } @{ $values->ItemsArrayRef };
is( scalar values %has, 1, "one IP were added");
- ok( $has{ $test_cidr{ $val } }, "has value" )
+ ok( $has{ $shorten{ $val } }, "has value" )
or diag "but has values ". join ", ", keys %has;
}
}
@@ -266,7 +278,7 @@ diag "check that IPs in messages don't add duplicates" if $ENV{'TEST_VERBOSE'};
is(scalar values %has, 1, "one IP were added");
ok(!grep( $_ != 1, values %has ), "no duplicated values")
or diag "duplicates: ". join ',', grep $has{$_}>1, keys %has;
- ok($has{ $valid{ 'abcd::192.168.1.1' } }, "IP is there")
+ ok($has{ $shorten{ 'abcd::192.168.1.1' } }, "IP is there")
or diag "but has values ". join ", ", keys %has;
}
@@ -285,7 +297,7 @@ diag "search tickets by IP" if $ENV{'TEST_VERBOSE'};
my $flag = 1;
while ( my $ticket = $tickets->Next ) {
my %has = map { $_->Content => 1 } @{ $ticket->CustomFieldValues('IP')->ItemsArrayRef };
- next if $has{ $test_cidr{'::192.168.1.1/120'} };
+ next if $has{ $shorten{'::192.168.1.1/120'} };
$flag = 0;
ok(0, "ticket #". $ticket->id ." has no range ::192.168.1.1/120, but should")
or diag "but has values ". join ", ", keys %has;
@@ -309,7 +321,7 @@ diag "search tickets by IP range" if $ENV{'TEST_VERBOSE'};
my $flag = 1;
while ( my $ticket = $tickets->Next ) {
my %has = map { $_->Content => 1 } @{ $ticket->CustomFieldValues('IP')->ItemsArrayRef };
- next if grep /^0000(:0000){5}:c0a8:01/, keys %has;
+ next if grep /^::c0a8:1/, keys %has;
$flag = 0;
ok(0, "ticket #". $ticket->id ." has no IP from '::c0a8::-::c0a8:01ff', but should");
last;
@@ -512,9 +524,9 @@ diag "merge ticket, IPs should be merged";
my $values = $ticket->CustomFieldValues('IP');
my %has = map { $_->Content => 1 } @{ $values->ItemsArrayRef };
is( scalar values %has, 2, "both IPs are there");
- ok( $has{ '0000:'x6 .'ac10:0001' }, "has value" )
+ ok( $has{ '::ac10:1' }, "has value" )
or diag "but has values ". join ", ", keys %has;
- ok( $has{ '0000:'x6 .'ac10:0002' }, "has value" )
+ ok( $has{ '::ac10:2' }, "has value" )
or diag "but has values ". join ", ", keys %has;
}
@@ -552,6 +564,6 @@ diag "merge ticket with the same IP";
my $values = $ticket->CustomFieldValues('IP');
my @has = map $_->Content, @{ $values->ItemsArrayRef };
is( scalar @has, 1, "only one IP") or diag "values: @has";
- is( $has[0], '0000:'x6 .'ac10:0001', "has value" );
+ is( $has[0], '::ac10:1', "has value" );
}
commit 0be7a7705be1225e31933fc3e09708e0a13fba15
Author: Ruslan Zakirov <ruz at bestpractical.com>
Date: Thu Jul 12 14:17:08 2012 +0300
ignore MYMETA files
diff --git a/.gitignore b/.gitignore
index b26b11f..fd8a132 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ blib/
pm_to_blib
t/tmp
*.swp
+MYMETA.*
commit bac8888387e957310be8e7548968a56ac020dc34
Author: Ruslan Zakirov <ruz at bestpractical.com>
Date: Thu Jul 12 14:17:28 2012 +0300
upgrade M::I
diff --git a/META.yml b/META.yml
index c000001..8a3511b 100644
--- a/META.yml
+++ b/META.yml
@@ -3,14 +3,15 @@ abstract: 'RT IR Extension'
author:
- 'Best Practical Solutions <sales at bestpractical.com>'
build_requires:
- ExtUtils::MakeMaker: 6.42
+ ExtUtils::MakeMaker: 6.59
File::Find: 0
File::Temp: 0
Test::More: 0
configure_requires:
- ExtUtils::MakeMaker: 6.42
+ ExtUtils::MakeMaker: 6.59
distribution_type: module
-generated_by: 'Module::Install version 1.01'
+dynamic_config: 1
+generated_by: 'Module::Install version 1.06'
license: gpl
meta-spec:
url: http://module-build.sourceforge.net/META-spec-v1.4.html
diff --git a/inc/Module/AutoInstall.pm b/inc/Module/AutoInstall.pm
index 60b90ea..aa7aa92 100644
--- a/inc/Module/AutoInstall.pm
+++ b/inc/Module/AutoInstall.pm
@@ -3,11 +3,12 @@ package Module::AutoInstall;
use strict;
use Cwd ();
+use File::Spec ();
use ExtUtils::MakeMaker ();
use vars qw{$VERSION};
BEGIN {
- $VERSION = '1.03';
+ $VERSION = '1.06';
}
# special map on pre-defined feature sets
@@ -17,11 +18,14 @@ my %FeatureMap = (
);
# various lexical flags
-my ( @Missing, @Existing, %DisabledTests, $UnderCPAN, $HasCPANPLUS );
+my ( @Missing, @Existing, %DisabledTests, $UnderCPAN, $InstallDepsTarget, $HasCPANPLUS );
my (
- $Config, $CheckOnly, $SkipInstall, $AcceptDefault, $TestOnly, $AllDeps
+ $Config, $CheckOnly, $SkipInstall, $AcceptDefault, $TestOnly, $AllDeps,
+ $UpgradeDeps
);
-my ( $PostambleActions, $PostambleUsed );
+my ( $PostambleActions, $PostambleActionsNoTest, $PostambleActionsUpgradeDeps,
+ $PostambleActionsUpgradeDepsNoTest, $PostambleActionsListDeps,
+ $PostambleActionsListAllDeps, $PostambleUsed, $NoTest);
# See if it's a testing or non-interactive session
_accept_default( $ENV{AUTOMATED_TESTING} or ! -t STDIN );
@@ -31,6 +35,10 @@ sub _accept_default {
$AcceptDefault = shift;
}
+sub _installdeps_target {
+ $InstallDepsTarget = shift;
+}
+
sub missing_modules {
return @Missing;
}
@@ -63,6 +71,11 @@ sub _init {
__PACKAGE__->install( $Config, @Missing = split( /,/, $1 ) );
exit 0;
}
+ elsif ( $arg =~ /^--upgradedeps=(.*)$/ ) {
+ $UpgradeDeps = 1;
+ __PACKAGE__->install( $Config, @Missing = split( /,/, $1 ) );
+ exit 0;
+ }
elsif ( $arg =~ /^--default(?:deps)?$/ ) {
$AcceptDefault = 1;
}
@@ -125,7 +138,7 @@ sub import {
# check entirely since we don't want to have to load (and configure)
# an old CPAN just for a cosmetic message
- $UnderCPAN = _check_lock(1) unless $SkipInstall;
+ $UnderCPAN = _check_lock(1) unless $SkipInstall || $InstallDepsTarget;
while ( my ( $feature, $modules ) = splice( @args, 0, 2 ) ) {
my ( @required, @tests, @skiptests );
@@ -175,7 +188,7 @@ sub import {
}
# XXX: check for conflicts and uninstalls(!) them.
- my $cur = _load($mod);
+ my $cur = _version_of($mod);
if (_version_cmp ($cur, $arg) >= 0)
{
print "loaded. ($cur" . ( $arg ? " >= $arg" : '' ) . ")\n";
@@ -207,6 +220,7 @@ sub import {
$CheckOnly
or ($mandatory and $UnderCPAN)
or $AllDeps
+ or $InstallDepsTarget
or _prompt(
qq{==> Auto-install the }
. ( @required / 2 )
@@ -237,10 +251,17 @@ sub import {
}
}
- if ( @Missing and not( $CheckOnly or $UnderCPAN ) ) {
+ if ( @Missing and not( $CheckOnly or $UnderCPAN) ) {
require Config;
- print
-"*** Dependencies will be installed the next time you type '$Config::Config{make}'.\n";
+ my $make = $Config::Config{make};
+ if ($InstallDepsTarget) {
+ print
+"*** To install dependencies type '$make installdeps' or '$make installdeps_notest'.\n";
+ }
+ else {
+ print
+"*** Dependencies will be installed the next time you type '$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"
@@ -271,6 +292,10 @@ END_MESSAGE
sub _check_lock {
return unless @Missing or @_;
+ if ($ENV{PERL5_CPANM_IS_RUNNING}) {
+ return _running_under('cpanminus');
+ }
+
my $cpan_env = $ENV{PERL5_CPAN_IS_RUNNING};
if ($ENV{PERL5_CPANPLUS_IS_RUNNING}) {
@@ -324,7 +349,7 @@ sub install {
while ( my ( $pkg, $ver ) = splice( @_, 0, 2 ) ) {
# grep out those already installed
- if ( _version_cmp( _load($pkg), $ver ) >= 0 ) {
+ if ( _version_cmp( _version_of($pkg), $ver ) >= 0 ) {
push @installed, $pkg;
}
else {
@@ -332,6 +357,11 @@ sub install {
}
}
+ if ($UpgradeDeps) {
+ push @modules, @installed;
+ @installed = ();
+ }
+
return @installed unless @modules; # nothing to do
return @installed if _check_lock(); # defer to the CPAN shell
@@ -363,7 +393,7 @@ sub install {
# see if we have successfully installed them
while ( my ( $pkg, $ver ) = splice( @modules, 0, 2 ) ) {
- if ( _version_cmp( _load($pkg), $ver ) >= 0 ) {
+ if ( _version_cmp( _version_of($pkg), $ver ) >= 0 ) {
push @installed, $pkg;
}
elsif ( $args{do_once} and open( FAILED, '>> .#autoinstall.failed' ) ) {
@@ -463,6 +493,11 @@ sub _cpanplus_config {
} else {
die "*** Cannot convert option $key = '$value' to CPANPLUS version.\n";
}
+ push @config, 'prereqs', $value;
+ } elsif ( $key eq 'force' ) {
+ push @config, $key, $value;
+ } elsif ( $key eq 'notest' ) {
+ push @config, 'skiptest', $value;
} else {
die "*** Cannot convert option $key to CPANPLUS version.\n";
}
@@ -497,10 +532,14 @@ sub _install_cpan {
# set additional options
while ( my ( $opt, $arg ) = splice( @config, 0, 2 ) ) {
( $args{$opt} = $arg, next )
- if $opt =~ /^force$/; # pseudo-option
+ if $opt =~ /^(?:force|notest)$/; # pseudo-option
$CPAN::Config->{$opt} = $arg;
}
+ if ($args{notest} && (not CPAN::Shell->can('notest'))) {
+ die "Your version of CPAN is too old to support the 'notest' pragma";
+ }
+
local $CPAN::Config->{prerequisites_policy} = 'follow';
while ( my ( $pkg, $ver ) = splice( @modules, 0, 2 ) ) {
@@ -519,8 +558,16 @@ sub _install_cpan {
delete $INC{$inc};
}
- my $rv = $args{force} ? CPAN::Shell->force( install => $pkg )
- : CPAN::Shell->install($pkg);
+ my $rv = do {
+ if ($args{force}) {
+ CPAN::Shell->force( install => $pkg )
+ } elsif ($args{notest}) {
+ CPAN::Shell->notest( install => $pkg )
+ } else {
+ CPAN::Shell->install($pkg)
+ }
+ };
+
$rv ||= eval {
$CPAN::META->instance( 'CPAN::Distribution', $obj->cpan_file, )
->{install}
@@ -575,7 +622,7 @@ sub _update_to {
my $ver = shift;
return
- if _version_cmp( _load($class), $ver ) >= 0; # no need to upgrade
+ if _version_cmp( _version_of($class), $ver ) >= 0; # no need to upgrade
if (
_prompt( "==> A newer version of $class ($ver) is required. Install?",
@@ -660,16 +707,30 @@ sub _can_write {
# load a module and return the version it reports
sub _load {
- my $mod = pop; # class/instance doesn't matter
+ my $mod = pop; # method/function doesn't matter
my $file = $mod;
-
$file =~ s|::|/|g;
$file .= '.pm';
-
local $@;
return eval { require $file; $mod->VERSION } || ( $@ ? undef: 0 );
}
+# report version without loading a module
+sub _version_of {
+ my $mod = pop; # method/function doesn't matter
+ my $file = $mod;
+ $file =~ s|::|/|g;
+ $file .= '.pm';
+ foreach my $dir ( @INC ) {
+ next if ref $dir;
+ my $path = File::Spec->catfile($dir, $file);
+ next unless -e $path;
+ require ExtUtils::MM_Unix;
+ return ExtUtils::MM_Unix->parse_version($path);
+ }
+ return undef;
+}
+
# Load CPAN.pm and it's configuration
sub _load_cpan {
return if $CPAN::VERSION and $CPAN::Config and not @_;
@@ -763,6 +824,35 @@ sub _make_args {
: "\$(NOECHO) \$(NOOP)"
);
+ my $deps_list = join( ',', @Missing, @Existing );
+
+ $PostambleActionsUpgradeDeps =
+ "\$(PERL) $0 --config=$config --upgradedeps=$deps_list";
+
+ my $config_notest =
+ join( ',', (UNIVERSAL::isa( $Config, 'HASH' ) ? %{$Config} : @{$Config}),
+ 'notest', 1 )
+ if $Config;
+
+ $PostambleActionsNoTest = (
+ ($missing and not $UnderCPAN)
+ ? "\$(PERL) $0 --config=$config_notest --installdeps=$missing"
+ : "\$(NOECHO) \$(NOOP)"
+ );
+
+ $PostambleActionsUpgradeDepsNoTest =
+ "\$(PERL) $0 --config=$config_notest --upgradedeps=$deps_list";
+
+ $PostambleActionsListDeps =
+ '@$(PERL) -le "print for @ARGV" '
+ . join(' ', map $Missing[$_], grep $_ % 2 == 0, 0..$#Missing);
+
+ my @all = (@Missing, @Existing);
+
+ $PostambleActionsListAllDeps =
+ '@$(PERL) -le "print for @ARGV" '
+ . join(' ', map $all[$_], grep $_ % 2 == 0, 0..$#all);
+
return %args;
}
@@ -797,11 +887,15 @@ sub Write {
sub postamble {
$PostambleUsed = 1;
+ my $fragment;
- return <<"END_MAKE";
+ $fragment .= <<"AUTO_INSTALL" if !$InstallDepsTarget;
config :: installdeps
\t\$(NOECHO) \$(NOOP)
+AUTO_INSTALL
+
+ $fragment .= <<"END_MAKE";
checkdeps ::
\t\$(PERL) $0 --checkdeps
@@ -809,12 +903,28 @@ checkdeps ::
installdeps ::
\t$PostambleActions
+installdeps_notest ::
+\t$PostambleActionsNoTest
+
+upgradedeps ::
+\t$PostambleActionsUpgradeDeps
+
+upgradedeps_notest ::
+\t$PostambleActionsUpgradeDepsNoTest
+
+listdeps ::
+\t$PostambleActionsListDeps
+
+listalldeps ::
+\t$PostambleActionsListAllDeps
+
END_MAKE
+ return $fragment;
}
1;
__END__
-#line 1071
+#line 1193
diff --git a/inc/Module/Install.pm b/inc/Module/Install.pm
index 74caf9c..4ecf46b 100644
--- a/inc/Module/Install.pm
+++ b/inc/Module/Install.pm
@@ -31,7 +31,7 @@ BEGIN {
# 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.01';
+ $VERSION = '1.06';
# Storage for the pseudo-singleton
$MAIN = undef;
@@ -451,7 +451,7 @@ sub _version ($) {
}
sub _cmp ($$) {
- _version($_[0]) <=> _version($_[1]);
+ _version($_[1]) <=> _version($_[2]);
}
# Cloned from Params::Util::_CLASS
@@ -467,4 +467,4 @@ sub _CLASS ($) {
1;
-# Copyright 2008 - 2011 Adam Kennedy.
+# Copyright 2008 - 2012 Adam Kennedy.
diff --git a/inc/Module/Install/AutoInstall.pm b/inc/Module/Install/AutoInstall.pm
index bc3d172..6efe4fe 100644
--- a/inc/Module/Install/AutoInstall.pm
+++ b/inc/Module/Install/AutoInstall.pm
@@ -6,7 +6,7 @@ use Module::Install::Base ();
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '1.01';
+ $VERSION = '1.06';
@ISA = 'Module::Install::Base';
$ISCORE = 1;
}
@@ -73,6 +73,17 @@ sub auto_install {
);
}
+sub installdeps_target {
+ my ($self, @args) = @_;
+
+ $self->include('Module::AutoInstall');
+ require Module::AutoInstall;
+
+ Module::AutoInstall::_installdeps_target(1);
+
+ $self->auto_install(@args);
+}
+
sub auto_install_now {
my $self = shift;
$self->auto_install(@_);
diff --git a/inc/Module/Install/Base.pm b/inc/Module/Install/Base.pm
index d3662c9..802844a 100644
--- a/inc/Module/Install/Base.pm
+++ b/inc/Module/Install/Base.pm
@@ -4,7 +4,7 @@ package Module::Install::Base;
use strict 'vars';
use vars qw{$VERSION};
BEGIN {
- $VERSION = '1.01';
+ $VERSION = '1.06';
}
# Suspend handler for "redefined" warnings
diff --git a/inc/Module/Install/Can.pm b/inc/Module/Install/Can.pm
index 276409a..22167b8 100644
--- a/inc/Module/Install/Can.pm
+++ b/inc/Module/Install/Can.pm
@@ -3,13 +3,12 @@ package Module::Install::Can;
use strict;
use Config ();
-use File::Spec ();
use ExtUtils::MakeMaker ();
use Module::Install::Base ();
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '1.01';
+ $VERSION = '1.06';
@ISA = 'Module::Install::Base';
$ISCORE = 1;
}
@@ -29,7 +28,7 @@ sub can_use {
eval { require $mod; $pkg->VERSION($ver || 0); 1 };
}
-# check if we can run some command
+# Check if we can run some command
sub can_run {
my ($self, $cmd) = @_;
@@ -38,14 +37,88 @@ sub can_run {
for my $dir ((split /$Config::Config{path_sep}/, $ENV{PATH}), '.') {
next if $dir eq '';
- my $abs = File::Spec->catfile($dir, $_[1]);
+ require File::Spec;
+ my $abs = File::Spec->catfile($dir, $cmd);
return $abs if (-x $abs or $abs = MM->maybe_command($abs));
}
return;
}
-# can we locate a (the) C compiler
+# Can our C compiler environment build XS files
+sub can_xs {
+ my $self = shift;
+
+ # Ensure we have the CBuilder module
+ $self->configure_requires( 'ExtUtils::CBuilder' => 0.27 );
+
+ # Do we have the configure_requires checker?
+ local $@;
+ eval "require ExtUtils::CBuilder;";
+ if ( $@ ) {
+ # They don't obey configure_requires, so it is
+ # someone old and delicate. Try to avoid hurting
+ # them by falling back to an older simpler test.
+ return $self->can_cc();
+ }
+
+ # Do we have a working C compiler
+ my $builder = ExtUtils::CBuilder->new(
+ quiet => 1,
+ );
+ unless ( $builder->have_compiler ) {
+ # No working C compiler
+ return 0;
+ }
+
+ # Write a C file representative of what XS becomes
+ require File::Temp;
+ my ( $FH, $tmpfile ) = File::Temp::tempfile(
+ "compilexs-XXXXX",
+ SUFFIX => '.c',
+ );
+ binmode $FH;
+ print $FH <<'END_C';
+#include "EXTERN.h"
+#include "perl.h"
+#include "XSUB.h"
+
+int main(int argc, char **argv) {
+ return 0;
+}
+
+int boot_sanexs() {
+ return 1;
+}
+
+END_C
+ close $FH;
+
+ # Can the C compiler access the same headers XS does
+ my @libs = ();
+ my $object = undef;
+ eval {
+ local $^W = 0;
+ $object = $builder->compile(
+ source => $tmpfile,
+ );
+ @libs = $builder->link(
+ objects => $object,
+ module_name => 'sanexs',
+ );
+ };
+ my $result = $@ ? 0 : 1;
+
+ # Clean up all the build files
+ foreach ( $tmpfile, $object, @libs ) {
+ next unless defined $_;
+ 1 while unlink;
+ }
+
+ return $result;
+}
+
+# Can we locate a (the) C compiler
sub can_cc {
my $self = shift;
my @chunks = split(/ /, $Config::Config{cc}) or return;
@@ -78,4 +151,4 @@ if ( $^O eq 'cygwin' ) {
__END__
-#line 156
+#line 236
diff --git a/inc/Module/Install/Fetch.pm b/inc/Module/Install/Fetch.pm
index 093cb7a..bee0c4f 100644
--- a/inc/Module/Install/Fetch.pm
+++ b/inc/Module/Install/Fetch.pm
@@ -6,7 +6,7 @@ use Module::Install::Base ();
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '1.01';
+ $VERSION = '1.06';
@ISA = 'Module::Install::Base';
$ISCORE = 1;
}
diff --git a/inc/Module/Install/Include.pm b/inc/Module/Install/Include.pm
index 90cc979..8310e4c 100644
--- a/inc/Module/Install/Include.pm
+++ b/inc/Module/Install/Include.pm
@@ -6,7 +6,7 @@ use Module::Install::Base ();
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '1.01';
+ $VERSION = '1.06';
@ISA = 'Module::Install::Base';
$ISCORE = 1;
}
diff --git a/inc/Module/Install/Makefile.pm b/inc/Module/Install/Makefile.pm
index 4c71003..7052f36 100644
--- a/inc/Module/Install/Makefile.pm
+++ b/inc/Module/Install/Makefile.pm
@@ -8,7 +8,7 @@ use Fcntl qw/:flock :seek/;
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '1.01';
+ $VERSION = '1.06';
@ISA = 'Module::Install::Base';
$ISCORE = 1;
}
@@ -215,18 +215,22 @@ sub write {
require ExtUtils::MakeMaker;
if ( $perl_version and $self->_cmp($perl_version, '5.006') >= 0 ) {
- # MakeMaker can complain about module versions that include
- # 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 );
+ # This previous attempted to inherit the version of
+ # ExtUtils::MakeMaker in use by the module author, but this
+ # was found to be untenable as some authors build releases
+ # using future dev versions of EU:MM that nobody else has.
+ # Instead, #toolchain suggests we use 6.59 which is the most
+ # stable version on CPAN at time of writing and is, to quote
+ # ribasushi, "not terminally fucked, > and tested enough".
+ # TODO: We will now need to maintain this over time to push
+ # the version up as new versions are released.
+ $self->build_requires( 'ExtUtils::MakeMaker' => 6.59 );
+ $self->configure_requires( 'ExtUtils::MakeMaker' => 6.59 );
} 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->configure_requires( 'ExtUtils::MakeMaker' => 6.42 );
+ $self->build_requires( 'ExtUtils::MakeMaker' => 6.36 );
+ $self->configure_requires( 'ExtUtils::MakeMaker' => 6.36 );
}
# Generate the MakeMaker params
@@ -241,7 +245,6 @@ 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;
@@ -412,4 +415,4 @@ sub postamble {
__END__
-#line 541
+#line 544
diff --git a/inc/Module/Install/Metadata.pm b/inc/Module/Install/Metadata.pm
index 3b01e09..58430f3 100644
--- a/inc/Module/Install/Metadata.pm
+++ b/inc/Module/Install/Metadata.pm
@@ -6,7 +6,7 @@ use Module::Install::Base ();
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '1.01';
+ $VERSION = '1.06';
@ISA = 'Module::Install::Base';
$ISCORE = 1;
}
@@ -151,15 +151,21 @@ sub install_as_site { $_[0]->installdirs('site') }
sub install_as_vendor { $_[0]->installdirs('vendor') }
sub dynamic_config {
- my $self = shift;
- unless ( @_ ) {
- warn "You MUST provide an explicit true/false value to dynamic_config\n";
- return $self;
+ my $self = shift;
+ my $value = @_ ? shift : 1;
+ if ( $self->{values}->{dynamic_config} ) {
+ # Once dynamic we never change to static, for safety
+ return 0;
}
- $self->{values}->{dynamic_config} = $_[0] ? 1 : 0;
+ $self->{values}->{dynamic_config} = $value ? 1 : 0;
return 1;
}
+# Convenience command
+sub static_config {
+ shift->dynamic_config(0);
+}
+
sub perl_version {
my $self = shift;
return $self->{values}->{perl_version} unless @_;
@@ -170,7 +176,7 @@ sub perl_version {
# Normalize the version
$version = $self->_perl_version($version);
- # We don't support the reall old versions
+ # We don't support the really old versions
unless ( $version >= 5.005 ) {
die "Module::Install only supports 5.005 or newer (use ExtUtils::MakeMaker)\n";
}
@@ -582,7 +588,7 @@ sub bugtracker_from {
sub requires_from {
my $self = shift;
my $content = Module::Install::_readperl($_[0]);
- my @requires = $content =~ m/^use\s+([^\W\d]\w*(?:::\w+)*)\s+([\d\.]+)/mg;
+ my @requires = $content =~ m/^use\s+([^\W\d]\w*(?:::\w+)*)\s+(v?[\d\.]+)/mg;
while ( @requires ) {
my $module = shift @requires;
my $version = shift @requires;
diff --git a/inc/Module/Install/Win32.pm b/inc/Module/Install/Win32.pm
index 3139a63..eeaa3fe 100644
--- a/inc/Module/Install/Win32.pm
+++ b/inc/Module/Install/Win32.pm
@@ -6,7 +6,7 @@ use Module::Install::Base ();
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '1.01';
+ $VERSION = '1.06';
@ISA = 'Module::Install::Base';
$ISCORE = 1;
}
diff --git a/inc/Module/Install/WriteAll.pm b/inc/Module/Install/WriteAll.pm
index 1f724a7..85d8018 100644
--- a/inc/Module/Install/WriteAll.pm
+++ b/inc/Module/Install/WriteAll.pm
@@ -6,7 +6,7 @@ use Module::Install::Base ();
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '1.01';
+ $VERSION = '1.06';
@ISA = qw{Module::Install::Base};
$ISCORE = 1;
}
-----------------------------------------------------------------------
More information about the Rt-commit
mailing list