Commit 5c181238 authored by Brian Cassidy's avatar Brian Cassidy

[svn-upgrade] Integrating new upstream version, libsoftware-license-perl (0.010)

parent a058a6ef
Revision history for Software-License
0.010 2009-04-14
add url methods where they were missing (Shlomi Fish)
0.009 2009-01-16
add repo loc to metadata
......
......@@ -39,6 +39,7 @@ MANIFEST This list of files
META.yml
README
t/basic.t
t/bsd-url.t
t/round-trip.t
t/utils.t
xt/release/pod-coverage.t
......
......@@ -3,7 +3,7 @@ abstract: 'packages that provide templated software licenses'
author:
- 'Ricardo Signes <rjbs@cpan.org>'
distribution_type: module
generated_by: 'Module::Install version 0.77'
generated_by: 'Module::Install version 0.79'
license: perl
meta-spec:
url: http://module-build.sourceforge.net/META-spec-v1.4.html
......@@ -21,4 +21,4 @@ requires:
resources:
license: http://dev.perl.org/licenses/
repository: http://github.com/rjbs/software-license
version: 0.009
version: 0.010
......@@ -30,7 +30,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 = '0.77';
$VERSION = '0.79';
*inc::Module::Install::VERSION = *VERSION;
@inc::Module::Install::ISA = __PACKAGE__;
......@@ -250,7 +250,7 @@ END_DIE
sub load_extensions {
my ($self, $path, $top) = @_;
unless ( grep { lc $_ eq lc $self->{prefix} } @INC ) {
unless ( grep { !ref $_ and lc $_ eq lc $self->{prefix} } @INC ) {
unshift @INC, $self->{prefix};
}
......@@ -366,4 +366,4 @@ sub _CLASS ($) {
1;
# Copyright 2008 Adam Kennedy.
# Copyright 2008 - 2009 Adam Kennedy.
#line 1
package Module::Install::Base;
$VERSION = '0.77';
$VERSION = '0.79';
# Suspend handler for "redefined" warnings
BEGIN {
......
......@@ -11,7 +11,7 @@ use ExtUtils::MakeMaker ();
use vars qw{$VERSION $ISCORE @ISA};
BEGIN {
$VERSION = '0.77';
$VERSION = '0.79';
$ISCORE = 1;
@ISA = qw{Module::Install::Base};
}
......
......@@ -6,7 +6,7 @@ package Module::Install::ExtraTests;
use Module::Install::Base;
BEGIN {
our $VERSION = '0.004';
our $VERSION = '0.006';
our $ISCORE = 1;
our @ISA = qw{Module::Install::Base};
}
......@@ -66,7 +66,7 @@ sub __harness {
# out on the command line can blow over its exec limit.
require ExtUtils::Command;
push @ARGV, __PACKAGE__->_deep_t($author_tests)
if $author_tests and $is_author;
if $author_tests and (exists $ENV{AUTHOR_TESTING} ? $ENV{AUTHOR_TESTING} : $is_author);
push @ARGV, __PACKAGE__->_deep_t($release_tests)
if $release_tests and $ENV{RELEASE_TESTING};
......
......@@ -6,20 +6,20 @@ use Module::Install::Base;
use vars qw{$VERSION $ISCORE @ISA};
BEGIN {
$VERSION = '0.77';
$VERSION = '0.79';
$ISCORE = 1;
@ISA = qw{Module::Install::Base};
}
sub get_file {
my ($self, %args) = @_;
my ($scheme, $host, $path, $file) =
my ($scheme, $host, $path, $file) =
$args{url} =~ m|^(\w+)://([^/]+)(.+)/(.+)| or return;
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) =
($scheme, $host, $path, $file) =
$args{url} =~ m|^(\w+)://([^/]+)(.+)/(.+)| or return;
}
......
......@@ -7,7 +7,7 @@ use ExtUtils::MakeMaker ();
use vars qw{$VERSION $ISCORE @ISA};
BEGIN {
$VERSION = '0.77';
$VERSION = '0.79';
$ISCORE = 1;
@ISA = qw{Module::Install::Base};
}
......@@ -64,7 +64,7 @@ sub clean_files {
my $self = shift;
my $clean = $self->makemaker_args->{clean} ||= {};
%$clean = (
%$clean,
%$clean,
FILES => join ' ', grep { length $_ } ($clean->{FILES} || (), @_),
);
}
......@@ -73,7 +73,7 @@ sub realclean_files {
my $self = shift;
my $realclean = $self->makemaker_args->{realclean} ||= {};
%$realclean = (
%$realclean,
%$realclean,
FILES => join ' ', grep { length $_ } ($realclean->{FILES} || (), @_),
);
}
......@@ -124,7 +124,7 @@ sub write {
$self->configure_requires( 'ExtUtils::MakeMaker' => $ExtUtils::MakeMaker::VERSION =~ /^(\d+\.\d+)/ );
# Generate the
# Generate the
my $args = $self->makemaker_args;
$args->{DISTNAME} = $self->name;
$args->{NAME} = $self->module_name || $self->name;
......@@ -196,7 +196,7 @@ sub fix_up_makefile {
my $top_class = ref($self->_top) || '';
my $top_version = $self->_top->VERSION || '';
my $preamble = $self->preamble
my $preamble = $self->preamble
? "# Preamble by $top_class $top_version\n"
. $self->preamble
: '';
......
......@@ -6,7 +6,7 @@ use Module::Install::Base;
use vars qw{$VERSION $ISCORE @ISA};
BEGIN {
$VERSION = '0.77';
$VERSION = '0.79';
$ISCORE = 1;
@ISA = qw{Module::Install::Base};
}
......@@ -176,18 +176,15 @@ sub perl_version {
"Did not provide a value to perl_version()"
);
# Convert triple-part versions (eg, 5.6.1 or 5.8.9) to
# numbers (eg, 5.006001 or 5.008009).
# Normalize the version
$version = $self->_perl_version($version);
$version =~ s/^(\d+)\.(\d+)\.(\d+)$/sprintf("%d.%03d%03d",$1,$2,$3)/e;
$version =~ s/_.+$//;
$version = $version + 0; # Numify
# We don't support the reall old versions
unless ( $version >= 5.005 ) {
die "Module::Install only supports 5.005 or newer (use ExtUtils::MakeMaker)\n";
}
$self->{values}{perl_version} = $version;
return 1;
}
sub license {
......@@ -451,9 +448,6 @@ sub license_from {
while ( my ($pattern, $license, $osi) = splice(@phrases, 0, 3) ) {
$pattern =~ s{\s+}{\\s+}g;
if ( $license_text =~ /\b$pattern\b/i ) {
if ( $osi and $license_text =~ /All rights reserved/i ) {
print "WARNING: 'All rights reserved' in copyright may invalidate Open Source license.\n";
}
$self->license($license);
return 1;
}
......@@ -482,19 +476,70 @@ sub bugtracker_from {
return 1;
}
sub install_script {
# Convert triple-part versions (eg, 5.6.1 or 5.8.9) to
# numbers (eg, 5.006001 or 5.008009).
# Also, convert double-part versions (eg, 5.8)
sub _perl_version {
my $v = $_[-1];
$v =~ s/^([1-9])\.([1-9]\d?\d?)$/sprintf("%d.%03d",$1,$2)/e;
$v =~ s/^([1-9])\.([1-9]\d?\d?)\.(0|[1-9]\d?\d?)$/sprintf("%d.%03d%03d",$1,$2,$3 || 0)/e;
$v =~ s/(\.\d\d\d)000$/$1/;
$v =~ s/_.+$//;
if ( ref($v) ) {
$v = $v + 0; # Numify
}
return $v;
}
######################################################################
# MYMETA.yml Support
sub WriteMyMeta {
$_[0]->write_mymeta;
}
sub write_mymeta {
my $self = shift;
my $args = $self->makemaker_args;
my $exe = $args->{EXE_FILES} ||= [];
foreach ( @_ ) {
if ( -f $_ ) {
push @$exe, $_;
} elsif ( -d 'script' and -f "script/$_" ) {
push @$exe, "script/$_";
} else {
die("Cannot find script '$_'");
# If there's no existing META.yml there is nothing we can do
return unless -f 'META.yml';
# Merge the perl version into the dependencies
my $val = $self->Meta->{values};
my $perl = delete $val->{perl_version};
if ( $perl ) {
$val->{requires} ||= [];
my $requires = $val->{requires};
# Canonize to three-dot version after Perl 5.6
if ( $perl >= 5.006 ) {
$perl =~ s{^(\d+)\.(\d\d\d)(\d*)}{join('.', $1, int($2||0), int($3||0))}e
}
unshift @$requires, [ perl => $perl ];
}
# Load the advisory META.yml file
require YAML::Tiny;
my @yaml = YAML::Tiny::LoadFile('META.yml');
my $meta = $yaml[0];
# Overwrite the non-configure dependency hashs
delete $meta->{requires};
delete $meta->{build_requires};
delete $meta->{recommends};
if ( exists $val->{requires} ) {
$meta->{requires} = { map { @$_ } @{ $val->{requires} } };
}
if ( exists $val->{build_requires} ) {
$meta->{build_requires} = { map { @$_ } @{ $val->{build_requires} } };
}
# Save as the MYMETA.yml file
YAML::Tiny::DumpFile('MYMETA.yml', $meta);
}
1;
......@@ -6,7 +6,7 @@ use Module::Install::Base;
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
$VERSION = '0.77';
$VERSION = '0.79';
@ISA = qw{Module::Install::Base};
$ISCORE = 1;
}
......
......@@ -6,7 +6,7 @@ use Module::Install::Base;
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
$VERSION = '0.77';
$VERSION = '0.79';
@ISA = qw{Module::Install::Base};
$ISCORE = 1;
}
......
......@@ -9,11 +9,11 @@ Software::License - packages that provide templated software licenses
=head1 VERSION
version 0.009
version 0.010
=cut
our $VERSION = '0.009';
our $VERSION = '0.010';
use Data::Section -setup => { header_re => qr/\A__([^_]+)__\Z/ };
use Sub::Install ();
......
......@@ -10,6 +10,7 @@ Software::License::BSD - The (three-clause) BSD License
=cut
sub name { 'The (three-clause) BSD License' }
sub url { 'http://www.opensource.org/licenses/bsd-license.php' }
sub meta_yml_name { 'bsd' }
1;
......
......@@ -10,6 +10,7 @@ Software::License::Mozilla_1_0 - Mozilla Public License 1.0
=cut
sub name { 'The Mozilla Public License 1.0' }
sub url { 'http://www.mozilla.org/MPL/MPL-1.0.txt' }
sub meta_yml_name { 'mozilla' }
1;
......
#!perl
use strict;
use warnings;
use Test::More tests => 2;
use Software::License::BSD;
use Software::License::Mozilla_1_0;
# TEST
is (scalar(Software::License::BSD->url()),
'http://www.opensource.org/licenses/bsd-license.php',
"BSD->url() is OK."
);
# TEST
is (scalar(Software::License::Mozilla_1_0->url()),
'http://www.mozilla.org/MPL/MPL-1.0.txt',
"Mozilla_1_0->url() is OK."
);
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment