r38952 - in /branches/upstream/libmoosex-types-perl/current: ./ inc/Module/ inc/Module/Install/ lib/MooseX/
jawnsy-guest at users.alioth.debian.org
jawnsy-guest at users.alioth.debian.org
Tue Jun 30 01:59:42 UTC 2009
Author: jawnsy-guest
Date: Tue Jun 30 01:59:37 2009
New Revision: 38952
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=38952
Log:
[svn-upgrade] Integrating new upstream version, libmoosex-types-perl (0.16)
Added:
branches/upstream/libmoosex-types-perl/current/.gitignore
Modified:
branches/upstream/libmoosex-types-perl/current/Changes
branches/upstream/libmoosex-types-perl/current/MANIFEST
branches/upstream/libmoosex-types-perl/current/META.yml
branches/upstream/libmoosex-types-perl/current/Makefile.PL
branches/upstream/libmoosex-types-perl/current/inc/Module/AutoInstall.pm
branches/upstream/libmoosex-types-perl/current/inc/Module/Install.pm
branches/upstream/libmoosex-types-perl/current/inc/Module/Install/AutoInstall.pm
branches/upstream/libmoosex-types-perl/current/inc/Module/Install/Base.pm
branches/upstream/libmoosex-types-perl/current/inc/Module/Install/Can.pm
branches/upstream/libmoosex-types-perl/current/inc/Module/Install/Fetch.pm
branches/upstream/libmoosex-types-perl/current/inc/Module/Install/Include.pm
branches/upstream/libmoosex-types-perl/current/inc/Module/Install/Makefile.pm
branches/upstream/libmoosex-types-perl/current/inc/Module/Install/Metadata.pm
branches/upstream/libmoosex-types-perl/current/inc/Module/Install/Win32.pm
branches/upstream/libmoosex-types-perl/current/inc/Module/Install/WriteAll.pm
branches/upstream/libmoosex-types-perl/current/lib/MooseX/Types.pm
Added: branches/upstream/libmoosex-types-perl/current/.gitignore
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libmoosex-types-perl/current/.gitignore?rev=38952&op=file
==============================================================================
--- branches/upstream/libmoosex-types-perl/current/.gitignore (added)
+++ branches/upstream/libmoosex-types-perl/current/.gitignore Tue Jun 30 01:59:37 2009
@@ -1,0 +1,11 @@
+README
+MANIFEST
+MANIFEST.bak
+Makefile
+Makefile.old
+blib
+pm_to_blib
+inc
+META.yml
+.*
+!.gitignore
Modified: branches/upstream/libmoosex-types-perl/current/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libmoosex-types-perl/current/Changes?rev=38952&op=diff
==============================================================================
--- branches/upstream/libmoosex-types-perl/current/Changes (original)
+++ branches/upstream/libmoosex-types-perl/current/Changes Tue Jun 30 01:59:37 2009
@@ -1,4 +1,7 @@
Revision history for MooseX-Types
+
+0.16 Mon Jun 29 10:50:41 PDT 2009
+ - Ship with Module::Install 0.91
0.15 Sun Jun 27 15:50:00 EDT 2009
- Change all uses of croak in TypeDecorator to use the Moose
Modified: branches/upstream/libmoosex-types-perl/current/MANIFEST
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libmoosex-types-perl/current/MANIFEST?rev=38952&op=diff
==============================================================================
--- branches/upstream/libmoosex-types-perl/current/MANIFEST (original)
+++ branches/upstream/libmoosex-types-perl/current/MANIFEST Tue Jun 30 01:59:37 2009
@@ -1,3 +1,4 @@
+.gitignore
Changes
inc/Module/AutoInstall.pm
inc/Module/Install.pm
Modified: branches/upstream/libmoosex-types-perl/current/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libmoosex-types-perl/current/META.yml?rev=38952&op=diff
==============================================================================
--- branches/upstream/libmoosex-types-perl/current/META.yml (original)
+++ branches/upstream/libmoosex-types-perl/current/META.yml Tue Jun 30 01:59:37 2009
@@ -10,7 +10,7 @@
configure_requires:
ExtUtils::MakeMaker: 6.42
distribution_type: module
-generated_by: 'Module::Install version 0.88'
+generated_by: 'Module::Install version 0.91'
license: perl
meta-spec:
url: http://module-build.sourceforge.net/META-spec-v1.4.html
@@ -20,6 +20,26 @@
directory:
- inc
- t
+provides:
+ MooseX::Types:
+ file: lib/MooseX/Types.pm
+ version: 0.16
+ MooseX::Types::Base:
+ file: lib/MooseX/Types/Base.pm
+ MooseX::Types::CheckedUtilExports:
+ file: lib/MooseX/Types/CheckedUtilExports.pm
+ MooseX::Types::Combine:
+ file: lib/MooseX/Types/Combine.pm
+ MooseX::Types::Moose:
+ file: lib/MooseX/Types/Moose.pm
+ MooseX::Types::TypeDecorator:
+ file: lib/MooseX/Types/TypeDecorator.pm
+ MooseX::Types::UndefinedType:
+ file: lib/MooseX/Types/UndefinedType.pm
+ MooseX::Types::Util:
+ file: lib/MooseX/Types/Util.pm
+ MooseX::Types::Wrapper:
+ file: lib/MooseX/Types/Wrapper.pm
requires:
Carp: 0
Carp::Clan: 6.00
@@ -31,4 +51,4 @@
perl: 5.8.0
resources:
license: http://dev.perl.org/licenses/
-version: 0.15
+version: 0.16
Modified: branches/upstream/libmoosex-types-perl/current/Makefile.PL
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libmoosex-types-perl/current/Makefile.PL?rev=38952&op=diff
==============================================================================
--- branches/upstream/libmoosex-types-perl/current/Makefile.PL (original)
+++ branches/upstream/libmoosex-types-perl/current/Makefile.PL Tue Jun 30 01:59:37 2009
@@ -2,7 +2,7 @@
use warnings;
use strict;
-use inc::Module::Install 0.67;
+use inc::Module::Install 0.91;
name q{MooseX-Types};
license q{perl};
Modified: branches/upstream/libmoosex-types-perl/current/inc/Module/AutoInstall.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libmoosex-types-perl/current/inc/Module/AutoInstall.pm?rev=38952&op=diff
==============================================================================
--- branches/upstream/libmoosex-types-perl/current/inc/Module/AutoInstall.pm (original)
+++ branches/upstream/libmoosex-types-perl/current/inc/Module/AutoInstall.pm Tue Jun 30 01:59:37 2009
@@ -670,7 +670,7 @@
# Load CPAN.pm and it's configuration
sub _load_cpan {
- return if $CPAN::VERSION and not @_;
+ return if $CPAN::VERSION and $CPAN::Config and not @_;
require CPAN;
if ( $CPAN::HandleConfig::VERSION ) {
# Newer versions of CPAN have a HandleConfig module
Modified: branches/upstream/libmoosex-types-perl/current/inc/Module/Install.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libmoosex-types-perl/current/inc/Module/Install.pm?rev=38952&op=diff
==============================================================================
--- branches/upstream/libmoosex-types-perl/current/inc/Module/Install.pm (original)
+++ branches/upstream/libmoosex-types-perl/current/inc/Module/Install.pm Tue Jun 30 01:59:37 2009
@@ -28,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 = '0.88';
+ $VERSION = '0.91';
# Storage for the pseudo-singleton
$MAIN = undef;
Modified: branches/upstream/libmoosex-types-perl/current/inc/Module/Install/AutoInstall.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libmoosex-types-perl/current/inc/Module/Install/AutoInstall.pm?rev=38952&op=diff
==============================================================================
--- branches/upstream/libmoosex-types-perl/current/inc/Module/Install/AutoInstall.pm (original)
+++ branches/upstream/libmoosex-types-perl/current/inc/Module/Install/AutoInstall.pm Tue Jun 30 01:59:37 2009
@@ -2,13 +2,13 @@
package Module::Install::AutoInstall;
use strict;
-use Module::Install::Base;
+use Module::Install::Base ();
-use vars qw{$VERSION $ISCORE @ISA};
+use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '0.88';
+ $VERSION = '0.91';
+ @ISA = 'Module::Install::Base';
$ISCORE = 1;
- @ISA = qw{Module::Install::Base};
}
sub AutoInstall { $_[0] }
Modified: branches/upstream/libmoosex-types-perl/current/inc/Module/Install/Base.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libmoosex-types-perl/current/inc/Module/Install/Base.pm?rev=38952&op=diff
==============================================================================
--- branches/upstream/libmoosex-types-perl/current/inc/Module/Install/Base.pm (original)
+++ branches/upstream/libmoosex-types-perl/current/inc/Module/Install/Base.pm Tue Jun 30 01:59:37 2009
@@ -4,7 +4,7 @@
use strict 'vars';
use vars qw{$VERSION};
BEGIN {
- $VERSION = '0.88';
+ $VERSION = '0.91';
}
# Suspend handler for "redefined" warnings
@@ -13,42 +13,34 @@
$SIG{__WARN__} = sub { $w };
}
-### This is the ONLY module that shouldn't have strict on
-# use strict;
-
-#line 45
+#line 42
sub new {
- my ($class, %args) = @_;
-
- foreach my $method ( qw(call load) ) {
- next if defined &{"$class\::$method"};
- *{"$class\::$method"} = sub {
- shift()->_top->$method(@_);
- };
+ my $class = shift;
+ unless ( defined &{"${class}::call"} ) {
+ *{"${class}::call"} = sub { shift->_top->call(@_) };
}
-
- bless( \%args, $class );
+ unless ( defined &{"${class}::load"} ) {
+ *{"${class}::load"} = sub { shift->_top->load(@_) };
+ }
+ bless { @_ }, $class;
}
-#line 66
+#line 61
sub AUTOLOAD {
- my $self = shift;
local $@;
- my $autoload = eval {
- $self->_top->autoload
- } or return;
- goto &$autoload;
+ my $func = eval { shift->_top->autoload } or return;
+ goto &$func;
}
-#line 83
+#line 75
sub _top {
$_[0]->{_top};
}
-#line 98
+#line 90
sub admin {
$_[0]->_top->{admin}
@@ -56,7 +48,7 @@
Module::Install::Base::FakeAdmin->new;
}
-#line 114
+#line 106
sub is_admin {
$_[0]->admin->VERSION;
@@ -83,4 +75,4 @@
1;
-#line 162
+#line 154
Modified: branches/upstream/libmoosex-types-perl/current/inc/Module/Install/Can.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libmoosex-types-perl/current/inc/Module/Install/Can.pm?rev=38952&op=diff
==============================================================================
--- branches/upstream/libmoosex-types-perl/current/inc/Module/Install/Can.pm (original)
+++ branches/upstream/libmoosex-types-perl/current/inc/Module/Install/Can.pm Tue Jun 30 01:59:37 2009
@@ -2,16 +2,16 @@
package Module::Install::Can;
use strict;
-use Module::Install::Base;
-use Config ();
-use File::Spec ();
-use ExtUtils::MakeMaker ();
+use Config ();
+use File::Spec ();
+use ExtUtils::MakeMaker ();
+use Module::Install::Base ();
-use vars qw{$VERSION $ISCORE @ISA};
+use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '0.88';
+ $VERSION = '0.91';
+ @ISA = 'Module::Install::Base';
$ISCORE = 1;
- @ISA = qw{Module::Install::Base};
}
# check if we can load some module
Modified: branches/upstream/libmoosex-types-perl/current/inc/Module/Install/Fetch.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libmoosex-types-perl/current/inc/Module/Install/Fetch.pm?rev=38952&op=diff
==============================================================================
--- branches/upstream/libmoosex-types-perl/current/inc/Module/Install/Fetch.pm (original)
+++ branches/upstream/libmoosex-types-perl/current/inc/Module/Install/Fetch.pm Tue Jun 30 01:59:37 2009
@@ -2,13 +2,13 @@
package Module::Install::Fetch;
use strict;
-use Module::Install::Base;
+use Module::Install::Base ();
-use vars qw{$VERSION $ISCORE @ISA};
+use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '0.88';
+ $VERSION = '0.91';
+ @ISA = 'Module::Install::Base';
$ISCORE = 1;
- @ISA = qw{Module::Install::Base};
}
sub get_file {
Modified: branches/upstream/libmoosex-types-perl/current/inc/Module/Install/Include.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libmoosex-types-perl/current/inc/Module/Install/Include.pm?rev=38952&op=diff
==============================================================================
--- branches/upstream/libmoosex-types-perl/current/inc/Module/Install/Include.pm (original)
+++ branches/upstream/libmoosex-types-perl/current/inc/Module/Install/Include.pm Tue Jun 30 01:59:37 2009
@@ -2,13 +2,13 @@
package Module::Install::Include;
use strict;
-use Module::Install::Base;
+use Module::Install::Base ();
-use vars qw{$VERSION $ISCORE @ISA};
+use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '0.88';
+ $VERSION = '0.91';
+ @ISA = 'Module::Install::Base';
$ISCORE = 1;
- @ISA = qw{Module::Install::Base};
}
sub include {
Modified: branches/upstream/libmoosex-types-perl/current/inc/Module/Install/Makefile.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libmoosex-types-perl/current/inc/Module/Install/Makefile.pm?rev=38952&op=diff
==============================================================================
--- branches/upstream/libmoosex-types-perl/current/inc/Module/Install/Makefile.pm (original)
+++ branches/upstream/libmoosex-types-perl/current/inc/Module/Install/Makefile.pm Tue Jun 30 01:59:37 2009
@@ -2,14 +2,14 @@
package Module::Install::Makefile;
use strict 'vars';
-use Module::Install::Base;
-use ExtUtils::MakeMaker ();
-
-use vars qw{$VERSION $ISCORE @ISA};
+use ExtUtils::MakeMaker ();
+use Module::Install::Base ();
+
+use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '0.88';
+ $VERSION = '0.91';
+ @ISA = 'Module::Install::Base';
$ISCORE = 1;
- @ISA = qw{Module::Install::Base};
}
sub Makefile { $_[0] }
Modified: branches/upstream/libmoosex-types-perl/current/inc/Module/Install/Metadata.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libmoosex-types-perl/current/inc/Module/Install/Metadata.pm?rev=38952&op=diff
==============================================================================
--- branches/upstream/libmoosex-types-perl/current/inc/Module/Install/Metadata.pm (original)
+++ branches/upstream/libmoosex-types-perl/current/inc/Module/Install/Metadata.pm Tue Jun 30 01:59:37 2009
@@ -2,18 +2,17 @@
package Module::Install::Metadata;
use strict 'vars';
-use Module::Install::Base;
+use Module::Install::Base ();
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '0.88';
- @ISA = qw{Module::Install::Base};
+ $VERSION = '0.91';
+ @ISA = 'Module::Install::Base';
$ISCORE = 1;
}
my @boolean_keys = qw{
sign
- mymeta
};
my @scalar_keys = qw{
@@ -440,21 +439,21 @@
/ixms ) {
my $license_text = $1;
my @phrases = (
- 'under the same (?:terms|license) as perl 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,
+ '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;
@@ -503,6 +502,17 @@
my $module = shift @requires;
my $version = shift @requires;
$self->requires( $module => $version );
+ }
+}
+
+sub test_requires_from {
+ my $self = shift;
+ my $content = Module::Install::_readperl($_[0]);
+ my @requires = $content =~ m/^use\s+([^\W\d]\w*(?:::\w+)*)\s+([\d\.]+)/mg;
+ while ( @requires ) {
+ my $module = shift @requires;
+ my $version = shift @requires;
+ $self->test_requires( $module => $version );
}
}
@@ -516,7 +526,8 @@
$v =~ s/(\.\d\d\d)000$/$1/;
$v =~ s/_.+$//;
if ( ref($v) ) {
- $v = $v + 0; # Numify
+ # Numify
+ $v = $v + 0;
}
return $v;
}
@@ -526,21 +537,56 @@
######################################################################
-# MYMETA.yml Support
+# MYMETA Support
sub WriteMyMeta {
die "WriteMyMeta has been deprecated";
}
-sub write_mymeta {
- my $self = shift;
-
- # If there's no existing META.yml there is nothing we can do
- return unless -f 'META.yml';
+sub write_mymeta_yaml {
+ my $self = shift;
# We need YAML::Tiny to write the MYMETA.yml file
unless ( eval { require YAML::Tiny; 1; } ) {
return 1;
+ }
+
+ # Generate the data
+ my $meta = $self->_write_mymeta_data or return 1;
+
+ # Save as the MYMETA.yml file
+ print "Writing MYMETA.yml\n";
+ YAML::Tiny::DumpFile('MYMETA.yml', $meta);
+}
+
+sub write_mymeta_json {
+ my $self = shift;
+
+ # We need JSON to write the MYMETA.json file
+ unless ( eval { require JSON; 1; } ) {
+ return 1;
+ }
+
+ # Generate the data
+ my $meta = $self->_write_mymeta_data or return 1;
+
+ # Save as the MYMETA.yml file
+ print "Writing MYMETA.json\n";
+ Module::Install::_write(
+ 'MYMETA.json',
+ JSON->new->pretty(1)->canonical->encode($meta),
+ );
+}
+
+sub _write_mymeta_data {
+ my $self = shift;
+
+ # If there's no existing META.yml there is nothing we can do
+ return undef unless -f 'META.yml';
+
+ # We need Parse::CPAN::Meta to load the file
+ unless ( eval { require Parse::CPAN::Meta; 1; } ) {
+ return undef;
}
# Merge the perl version into the dependencies
@@ -558,7 +604,7 @@
}
# Load the advisory META.yml file
- my @yaml = YAML::Tiny::LoadFile('META.yml');
+ my @yaml = Parse::CPAN::Meta::LoadFile('META.yml');
my $meta = $yaml[0];
# Overwrite the non-configure dependency hashs
@@ -572,9 +618,7 @@
$meta->{build_requires} = { map { @$_ } @{ $val->{build_requires} } };
}
- # Save as the MYMETA.yml file
- print "Writing MYMETA.yml\n";
- YAML::Tiny::DumpFile('MYMETA.yml', $meta);
+ return $meta;
}
1;
Modified: branches/upstream/libmoosex-types-perl/current/inc/Module/Install/Win32.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libmoosex-types-perl/current/inc/Module/Install/Win32.pm?rev=38952&op=diff
==============================================================================
--- branches/upstream/libmoosex-types-perl/current/inc/Module/Install/Win32.pm (original)
+++ branches/upstream/libmoosex-types-perl/current/inc/Module/Install/Win32.pm Tue Jun 30 01:59:37 2009
@@ -2,12 +2,12 @@
package Module::Install::Win32;
use strict;
-use Module::Install::Base;
+use Module::Install::Base ();
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '0.88';
- @ISA = qw{Module::Install::Base};
+ $VERSION = '0.91';
+ @ISA = 'Module::Install::Base';
$ISCORE = 1;
}
Modified: branches/upstream/libmoosex-types-perl/current/inc/Module/Install/WriteAll.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libmoosex-types-perl/current/inc/Module/Install/WriteAll.pm?rev=38952&op=diff
==============================================================================
--- branches/upstream/libmoosex-types-perl/current/inc/Module/Install/WriteAll.pm (original)
+++ branches/upstream/libmoosex-types-perl/current/inc/Module/Install/WriteAll.pm Tue Jun 30 01:59:37 2009
@@ -2,11 +2,11 @@
package Module::Install::WriteAll;
use strict;
-use Module::Install::Base;
+use Module::Install::Base ();
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '0.88';
+ $VERSION = '0.91';;
@ISA = qw{Module::Install::Base};
$ISCORE = 1;
}
@@ -41,8 +41,18 @@
# The Makefile write process adds a couple of dependencies,
# so write the META.yml files after the Makefile.
- $self->Meta->write if $args{meta};
- $self->Meta->write_mymeta if $self->mymeta;
+ if ( $args{meta} ) {
+ $self->Meta->write;
+ }
+
+ # Experimental support for MYMETA
+ if ( $ENV{X_MYMETA} ) {
+ if ( $ENV{X_MYMETA} eq 'JSON' ) {
+ $self->Meta->write_mymeta_json;
+ } else {
+ $self->Meta->write_mymeta_yaml;
+ }
+ }
return 1;
}
Modified: branches/upstream/libmoosex-types-perl/current/lib/MooseX/Types.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libmoosex-types-perl/current/lib/MooseX/Types.pm?rev=38952&op=diff
==============================================================================
--- branches/upstream/libmoosex-types-perl/current/lib/MooseX/Types.pm (original)
+++ branches/upstream/libmoosex-types-perl/current/lib/MooseX/Types.pm Tue Jun 30 01:59:37 2009
@@ -20,7 +20,7 @@
use namespace::clean -except => [qw( meta )];
use 5.008;
-our $VERSION = '0.15';
+our $VERSION = '0.16';
my $UndefMsg = q{Action for type '%s' not yet defined in library '%s'};
=head1 SYNOPSIS
More information about the Pkg-perl-cvs-commits
mailing list