r55342 - in /trunk/libany-moose-perl: ./ debian/ debian/source/ lib/Any/ t/ t/lib/
jawnsy-guest at users.alioth.debian.org
jawnsy-guest at users.alioth.debian.org
Sat Apr 3 04:10:43 UTC 2010
Author: jawnsy-guest
Date: Sat Apr 3 04:10:33 2010
New Revision: 55342
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=55342
Log:
* New upstream release
* Standards-Version 3.8.4 (no changes)
* Drop version deps where satisfied by oldstable
* Use 3.0 (quilt) source format
* Update copyright to DEP5 format
* Rewrite short description
Added:
trunk/libany-moose-perl/debian/source/
trunk/libany-moose-perl/debian/source/format
trunk/libany-moose-perl/t/000-version.t
- copied unchanged from r55336, branches/upstream/libany-moose-perl/current/t/000-version.t
trunk/libany-moose-perl/t/005-aliases-moose.t
- copied unchanged from r55336, branches/upstream/libany-moose-perl/current/t/005-aliases-moose.t
trunk/libany-moose-perl/t/005-aliases-mouse.t
- copied unchanged from r55336, branches/upstream/libany-moose-perl/current/t/005-aliases-mouse.t
trunk/libany-moose-perl/t/lib/
- copied from r55336, branches/upstream/libany-moose-perl/current/t/lib/
Removed:
trunk/libany-moose-perl/t/005-is_class_loaded-moose.t
trunk/libany-moose-perl/t/005-is_class_loaded-mouse.t
Modified:
trunk/libany-moose-perl/Changes
trunk/libany-moose-perl/LICENSE
trunk/libany-moose-perl/MANIFEST
trunk/libany-moose-perl/META.yml
trunk/libany-moose-perl/Makefile.PL
trunk/libany-moose-perl/README
trunk/libany-moose-perl/debian/changelog
trunk/libany-moose-perl/debian/control
trunk/libany-moose-perl/debian/copyright
trunk/libany-moose-perl/dist.ini
trunk/libany-moose-perl/lib/Any/Moose.pm
Modified: trunk/libany-moose-perl/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libany-moose-perl/Changes?rev=55342&op=diff
==============================================================================
--- trunk/libany-moose-perl/Changes (original)
+++ trunk/libany-moose-perl/Changes Sat Apr 3 04:10:33 2010
@@ -1,3 +1,15 @@
+0.12 Fri 02 Apr 2010
+ * t/000-version.t for better diagnostics (tokuhirom)
+ * Slight performance improvements for is_class_loaded,
+ lazily loading Carp, etc (Sartak)
+ * Start some real documentation (Sartak)
+ * Document $ENV{ANY_MOOSE} (Sartak)
+ - fixes [rt.cpan.org #52339]
+ * Test that Moose is loaded, not CMOP (Sartak)
+ - fixes [rt.cpan.org #56093]
+ * Alias class_of and more functions (Sartak)
+ - requested by [rt.cpan.org #52275]
+
0.11 Sun 19 Dec 2009
* Support "use Any::Moose '::Util::TypeConstraints'" (gfx)
* Support "no Any::Moose '::Util::TypeConstraints'" (gfx)
Modified: trunk/libany-moose-perl/LICENSE
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libany-moose-perl/LICENSE?rev=55342&op=diff
==============================================================================
--- trunk/libany-moose-perl/LICENSE (original)
+++ trunk/libany-moose-perl/LICENSE Sat Apr 3 04:10:33 2010
@@ -1,9 +1,9 @@
-This software is copyright (c) 2009 by Best Practical Solutions.
+This software is copyright (c) 2010 by Best Practical Solutions.
This is free software; you can redistribute it and/or modify it under
-the same terms as perl itself.
-
-Terms of Perl itself
+the same terms as the Perl 5 programming language system itself.
+
+Terms of the Perl programming language system itself
a) the GNU General Public License as published by the Free
Software Foundation; either version 1, or (at your option) any
@@ -12,7 +12,7 @@
--- The GNU General Public License, Version 1, February 1989 ---
-This software is Copyright (c) 2009 by Best Practical Solutions.
+This software is Copyright (c) 2010 by Best Practical Solutions.
This is free software, licensed under:
@@ -270,7 +270,7 @@
--- The Artistic License 1.0 ---
-This software is Copyright (c) 2009 by Best Practical Solutions.
+This software is Copyright (c) 2010 by Best Practical Solutions.
This is free software, licensed under:
Modified: trunk/libany-moose-perl/MANIFEST
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libany-moose-perl/MANIFEST?rev=55342&op=diff
==============================================================================
--- trunk/libany-moose-perl/MANIFEST (original)
+++ trunk/libany-moose-perl/MANIFEST Sat Apr 3 04:10:33 2010
@@ -6,6 +6,7 @@
README
dist.ini
lib/Any/Moose.pm
+t/000-version.t
t/001-basic-moose.t
t/001-basic-mouse.t
t/002-other-modules-moose.t
@@ -13,8 +14,8 @@
t/003-is_moose_loaded.t
t/004-x-modules-moose.t
t/004-x-modules-mouse.t
-t/005-is_class_loaded-moose.t
-t/005-is_class_loaded-mouse.t
+t/005-aliases-moose.t
+t/005-aliases-mouse.t
t/010-use_mouse_roles.t
t/011-use_moose_roles.t
t/012-use_moose_util.t
@@ -22,5 +23,6 @@
t/020-strict.t
t/100-canonicalize-fragments.t
t/101-localize-errvar.t
+t/lib/AnyMooseTest.pm
t/release-pod-coverage.t
t/release-pod-syntax.t
Modified: trunk/libany-moose-perl/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libany-moose-perl/META.yml?rev=55342&op=diff
==============================================================================
--- trunk/libany-moose-perl/META.yml (original)
+++ trunk/libany-moose-perl/META.yml Sat Apr 3 04:10:33 2010
@@ -6,13 +6,17 @@
- 'Stevan Little <stevan at iinteractive.com>'
- 'Tokuhiro Matsuno <tokuhirom at gmail.com>'
- 'Goro Fuji <gfuji at cpan.org>'
-generated_by: 'Dist::Zilla version 1.093400'
+build_requires: {}
+configure_requires:
+ ExtUtils::MakeMaker: 6.31
+generated_by: 'Dist::Zilla version 2.100921'
license: perl
meta-spec:
url: http://module-build.sourceforge.net/META-spec-v1.4.html
version: 1.4
name: Any-Moose
+recommends: {}
requires:
Mouse: 0.40
perl: 5.006_002
-version: 0.11
+version: 0.12
Modified: trunk/libany-moose-perl/Makefile.PL
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libany-moose-perl/Makefile.PL?rev=55342&op=diff
==============================================================================
--- trunk/libany-moose-perl/Makefile.PL (original)
+++ trunk/libany-moose-perl/Makefile.PL Sat Apr 3 04:10:33 2010
@@ -4,19 +4,38 @@
BEGIN { require 5.006_002; }
-use ExtUtils::MakeMaker;
+use ExtUtils::MakeMaker 6.31;
-WriteMakefile(
- DISTNAME => 'Any-Moose',
- NAME => 'Any::Moose',
- AUTHOR => "Shawn\ M\ Moore\ \<sartak\@bestpractical\.com\>\,\ Florian\ Ragwitz\ \<rafl\@debian\.org\>\,\ Stevan\ Little\ \<stevan\@iinteractive\.com\>\,\ Tokuhiro\ Matsuno\ \<tokuhirom\@gmail\.com\>\,\ Goro\ Fuji\ \<gfuji\@cpan\.org\>",
- ABSTRACT => "use\ Moose\ or\ Mouse\ modules",
- VERSION => '0.11',
- EXE_FILES => [ qw() ],
- (eval { ExtUtils::MakeMaker->VERSION(6.31) } ? (LICENSE => 'perl') : ()),
- PREREQ_PM => {
- "Mouse" => '0.40',
- },
- test => {TESTS => 't/*.t'}
-);
+
+my %WriteMakefileArgs = (
+ 'test' => {
+ 'TESTS' => 't/*.t'
+ },
+ 'NAME' => 'Any::Moose',
+ 'DISTNAME' => 'Any-Moose',
+ 'CONFIGURE_REQUIRES' => {
+ 'ExtUtils::MakeMaker' => '6.31'
+ },
+ 'AUTHOR' => 'Shawn M Moore <sartak at bestpractical.com>, Florian Ragwitz <rafl at debian.org>, Stevan Little <stevan at iinteractive.com>, Tokuhiro Matsuno <tokuhirom at gmail.com>, Goro Fuji <gfuji at cpan.org>',
+ 'BUILD_REQUIRES' => {},
+ 'ABSTRACT' => 'use Moose or Mouse modules',
+ 'EXE_FILES' => [],
+ 'VERSION' => '0.12',
+ 'PREREQ_PM' => {
+ 'Mouse' => '0.40'
+ },
+ 'LICENSE' => 'perl'
+ );
+
+
+delete $WriteMakefileArgs{BUILD_REQUIRES}
+ unless eval { ExtUtils::MakeMaker->VERSION(6.56) };
+
+delete $WriteMakefileArgs{CONFIGURE_REQUIRES}
+ unless eval { ExtUtils::MakeMaker->VERSION(6.52) };
+
+WriteMakefile(%WriteMakefileArgs);
+
+
+
Modified: trunk/libany-moose-perl/README
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libany-moose-perl/README?rev=55342&op=diff
==============================================================================
--- trunk/libany-moose-perl/README (original)
+++ trunk/libany-moose-perl/README Sat Apr 3 04:10:33 2010
@@ -1,12 +1,13 @@
-This archive contains the distribution Any-Moose, version
-0.11:
+This archive contains the distribution Any-Moose,
+version 0.12:
use Moose or Mouse modules
-This software is copyright (c) 2009 by Best Practical Solutions.
+This software is copyright (c) 2010 by Best Practical Solutions.
This is free software; you can redistribute it and/or modify it under
-the same terms as perl itself.
+the same terms as the Perl 5 programming language system itself.
+
Modified: trunk/libany-moose-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libany-moose-perl/debian/changelog?rev=55342&op=diff
==============================================================================
--- trunk/libany-moose-perl/debian/changelog (original)
+++ trunk/libany-moose-perl/debian/changelog Sat Apr 3 04:10:33 2010
@@ -1,9 +1,15 @@
-libany-moose-perl (0.11-2) UNRELEASED; urgency=low
+libany-moose-perl (0.12-1) UNRELEASED; urgency=low
+ * New upstream release
+ * Standards-Version 3.8.4 (no changes)
* Depends satisfied by either Mouse or Moose (only one
is necessary)
+ * Drop version deps where satisfied by oldstable
+ * Use 3.0 (quilt) source format
+ * Update copyright to DEP5 format
+ * Rewrite short description
- -- Jonathan Yu <jawnsy at cpan.org> Fri, 01 Jan 2010 16:49:33 -0500
+ -- Jonathan Yu <jawnsy at cpan.org> Sat, 03 Apr 2010 00:43:30 -0400
libany-moose-perl (0.11-1) unstable; urgency=low
Modified: trunk/libany-moose-perl/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libany-moose-perl/debian/control?rev=55342&op=diff
==============================================================================
--- trunk/libany-moose-perl/debian/control (original)
+++ trunk/libany-moose-perl/debian/control Sat Apr 3 04:10:33 2010
@@ -2,21 +2,19 @@
Section: perl
Priority: optional
Build-Depends: debhelper (>= 7)
-Build-Depends-Indep: perl, libmouse-perl (>= 0.40), libmoose-perl,
- libmoosex-types-perl
+Build-Depends-Indep: perl, libmouse-perl, libmoose-perl, libmoosex-types-perl
Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
Uploaders: Ryan Niebur <ryan at debian.org>, Jonathan Yu <jawnsy at cpan.org>
-Standards-Version: 3.8.3
+Standards-Version: 3.8.4
Homepage: http://search.cpan.org/dist/Any-Moose/
Vcs-Svn: svn://svn.debian.org/pkg-perl/trunk/libany-moose-perl/
Vcs-Browser: http://svn.debian.org/viewsvn/pkg-perl/trunk/libany-moose-perl/
Package: libany-moose-perl
Architecture: all
-Depends: ${misc:Depends}, ${perl:Depends},
- libmouse-perl (>= 0.40) | libmoose-perl
-Recommends: libmouse-perl (>= 0.40)
-Description: Perl interface to use Moose or Mouse modules
+Depends: ${misc:Depends}, ${perl:Depends}, libmouse-perl | libmoose-perl
+Recommends: libmouse-perl
+Description: module to use either Moose or Mouse, based on availability
Any::Moose is a Perl module that intelligently loads either Moose or Mouse,
which provide nearly identical interfaces to the same modern object system.
This module takes advantage of the fact that anything that works with Mouse
Modified: trunk/libany-moose-perl/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libany-moose-perl/debian/copyright?rev=55342&op=diff
==============================================================================
--- trunk/libany-moose-perl/debian/copyright (original)
+++ trunk/libany-moose-perl/debian/copyright Sat Apr 3 04:10:33 2010
@@ -1,29 +1,30 @@
-Format-Specification:
- http://wiki.debian.org/Proposals/CopyrightFormat?action=recall&rev=196
-Upstream-Maintainer: Florian Ragwitz <rafl at debian.org>
-Upstream-Source: http://search.cpan.org/dist/Any-Moose/
-Upstream-Name: Any-Moose
+Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=59
+Maintainer: Florian Ragwitz <rafl at debian.org>
+Source: http://search.cpan.org/dist/Any-Moose/
+Name: Any-Moose
Files: *
-Copyright: 2009, Best Practical Solutions.
-License-Alias: Perl
-License: Artistic | GPL-1+
+Copyright: 2010, Best Practical Solutions
+License: Artistic or GPL-1+
Files: debian/*
-Copyright: 2009, Ryan Niebur <ryan at debian.org>
- 2009, Jonathan Yu <jawnsy at cpan.org>
-License: Artistic | GPL-1+
+Copyright: 2009-2010, Jonathan Yu <jawnsy at cpan.org>
+ 2009, Ryan Niebur <ryan at debian.org>
+License: Artistic or GPL-1+
License: Artistic
- This program is free software; you can redistribute it and/or modify
- it under the terms of the Artistic License, which comes with Perl.
- On Debian GNU/Linux systems, the complete text of the Artistic License
- can be found in `/usr/share/common-licenses/Artistic'
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the Artistic License, which comes with Perl.
+ .
+ On Debian GNU/Linux systems, the complete text of the Artistic License
+ can be found in `/usr/share/common-licenses/Artistic'
License: GPL-1+
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 1, or (at your option)
- any later version.
- On Debian GNU/Linux systems, the complete text of the GNU General
- Public License can be found in `/usr/share/common-licenses/GPL'
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 1, or (at your option)
+ any later version.
+ .
+ On Debian GNU/Linux systems, the complete text of the GNU General
+ Public License can be found in `/usr/share/common-licenses/GPL'
+
Added: trunk/libany-moose-perl/debian/source/format
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libany-moose-perl/debian/source/format?rev=55342&op=file
==============================================================================
--- trunk/libany-moose-perl/debian/source/format (added)
+++ trunk/libany-moose-perl/debian/source/format Sat Apr 3 04:10:33 2010
@@ -1,0 +1,1 @@
+3.0 (quilt)
Modified: trunk/libany-moose-perl/dist.ini
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libany-moose-perl/dist.ini?rev=55342&op=diff
==============================================================================
--- trunk/libany-moose-perl/dist.ini (original)
+++ trunk/libany-moose-perl/dist.ini Sat Apr 3 04:10:33 2010
@@ -1,5 +1,5 @@
name = Any-Moose
-version = 0.11
+version = 0.12
author = Shawn M Moore <sartak at bestpractical.com>
author = Florian Ragwitz <rafl at debian.org>
author = Stevan Little <stevan at iinteractive.com>
Modified: trunk/libany-moose-perl/lib/Any/Moose.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libany-moose-perl/lib/Any/Moose.pm?rev=55342&op=diff
==============================================================================
--- trunk/libany-moose-perl/lib/Any/Moose.pm (original)
+++ trunk/libany-moose-perl/lib/Any/Moose.pm Sat Apr 3 04:10:33 2010
@@ -1,14 +1,46 @@
package Any::Moose;
-our $VERSION = '0.11';
+BEGIN {
+ $Any::Moose::VERSION = '0.12';
+}
# ABSTRACT: use Moose or Mouse modules
use 5.006_002;
use strict;
use warnings;
-use Carp ();
-
-our $PREFERRED = $ENV{'ANY_MOOSE'};
+# decide which backend to use
+our $PREFERRED;
+do {
+ local $@;
+ if ($ENV{ANY_MOOSE}) {
+ $PREFERRED = $ENV{'ANY_MOOSE'};
+ warn "ANY_MOOSE is not set to Moose or Mouse"
+ unless $PREFERRED eq 'Moose'
+ || $PREFERRED eq 'Mouse';
+
+ # if we die here, then perl gives "unknown error" which doesn't tell
+ # you what the problem is at all. argh.
+ if ($PREFERRED eq 'Moose' && !eval { require Moose }) {
+ warn "\$ANY_MOOSE is set to Moose but we cannot load it";
+ }
+ elsif ($PREFERRED eq 'Mouse' && !eval { require Mouse }) {
+ warn "\$ANY_MOOSE is set to Mouse but we cannot load it";
+ }
+ }
+ elsif (_is_moose_loaded()) {
+ $PREFERRED = 'Moose';
+ }
+ elsif (eval { require Mouse }) {
+ $PREFERRED = 'Mouse';
+ }
+ elsif (eval { require Moose }) {
+ $PREFERRED = 'Moose';
+ }
+ else {
+ require Carp;
+ warn "Unable to locate Mouse or Moose in INC";
+ }
+};
sub import {
my $self = shift;
@@ -55,7 +87,12 @@
. '$module->unimport();';
$@;
};
- Carp::croak("Cannot unimport Any::Moose: $e") if $e;
+
+ if ($e) {
+ require Carp;
+ Carp::croak("Cannot unimport Any::Moose: $e");
+ }
+
return;
}
@@ -116,7 +153,10 @@
. '$module->import(@{ $options->{imports} });';
$@;
};
- Carp::croak("Cannot import Any::Moose: $e") if $e;
+ if ($e) {
+ require Carp;
+ Carp::croak("Cannot import Any::Moose: $e");
+ }
return;
}
@@ -135,45 +175,24 @@
return $fragment if $backer =~ /^Moose/;
- if (!$PREFERRED) {
- local $@;
- if (_is_moose_loaded()) {
- $PREFERRED = 'Moose';
- }
- elsif (eval { require Mouse }) {
- $PREFERRED = 'Mouse';
- }
- elsif (eval { require Moose }) {
- $PREFERRED = 'Moose';
- }
- else {
- require Carp;
- Carp::confess("Unable to locate Mouse or Moose in INC");
- }
- }
-
$fragment =~ s/^Moose/Mouse/ if mouse_is_preferred();
return $fragment;
}
-sub load_class {
- my ($class_name) = @_;
- return Class::MOP::load_class($class_name) if moose_is_preferred();
- return Mouse::load_class($class_name);
-}
-
-sub is_class_loaded {
- my ($class_name) = @_;
- return Class::MOP::is_class_loaded($class_name) if moose_is_preferred();
- return Mouse::is_class_loaded($class_name);
+for my $name (qw/load_class is_class_loaded class_of get_metaclass_by_name get_all_metaclass_instances get_all_metaclass_names/) {
+ no strict 'refs';
+ *{__PACKAGE__."::$name"} = moose_is_preferred()
+ ? *{"Class::MOP::$name"}
+ : *{"Mouse::Util::$name"};
}
sub moose_is_preferred { $PREFERRED eq 'Moose' }
sub mouse_is_preferred { $PREFERRED eq 'Mouse' }
-sub _is_moose_loaded { exists $INC{'Class/MOP.pm'} }
+sub _is_moose_loaded { exists $INC{'Moose.pm'} }
sub is_moose_loaded {
+ require Carp;
Carp::carp("Any::Moose::is_moose_loaded is deprecated. Please use Any::Moose::moose_is_preferred instead");
goto \&_is_moose_loaded;
}
@@ -209,21 +228,24 @@
=head1 VERSION
-version 0.11
+version 0.12
=head1 SYNOPSIS
+
=head2 BASIC
+
package Class;
- # uses Moose if it's loaded, Mouse otherwise
+ # uses Moose if it's loaded or demanded, Mouse otherwise
use Any::Moose;
# cleans the namespace up
no Any::Moose;
=head2 OTHER MODULES
+
package Other::Class;
use Any::Moose;
@@ -232,7 +254,16 @@
# Mouse::Util::TypeConstraints otherwise.
use Any::Moose '::Util::TypeConstraints';
+=head2 ROLES
+
+
+ package My::Sorter;
+ use Any::Moose 'Role';
+
+ requires 'cmp';
+
=head2 COMPLEX USAGE
+
package My::Meta::Class;
use Any::Moose;
@@ -245,7 +276,7 @@
'::Util' => ['does_role'],
);
- # uses MouseX::Types
+ # uses MouseX::Types or MooseX::Types
use Any::Moose 'X::Types';
# gives you the right class name depending on which Mo*se was loaded
@@ -253,14 +284,41 @@
=head1 DESCRIPTION
-Actual documentation is forthcoming, once we solidify all the bits of the API.
-The examples above are very likely to continue working.
+
+Though we recommend that people generally use L<Moose>, we accept that Moose
+cannot yet be used for everything everywhere. People generally like the Moose
+sugar, so many people use L<Mouse>, a lightweight replacement for parts of
+Moose.
+
+
+Because Mouse strives for compatibility with Moose, it's easy to substitute one
+for the other. This module facilitates that substitution. By default, Mouse
+will be provided to libraries, unless Moose is already loaded -or-
+explicitly requested by the end-user. The end-user can force the decision
+of which backend to use by setting the environment variable C<ANY_MOOSE> to
+be C<Moose> or C<Mouse>.
+
+
+Note that the decision of which backend to use is made only once, so that if
+Any-Moose picks Mouse, then a third-party library loads Moose, anything else
+that uses Any-Moose will continue to pick Mouse.
+
+
+So, if you have to use L<Mouse>, please be considerate to the Moose fanboys
+(like myself!) and use L<Any-Moose> instead. C<:)>
=head1 SEE ALSO
+
L<Moose>
+
L<Mouse>
+
+
+L<Squirrel> - a deprecated first-stab at Any-Moose-like logic. Its biggest
+fault was in making the decision of which backend to use every time it was
+used, rather than just once.
=head1 AUTHORS
@@ -272,10 +330,10 @@
=head1 COPYRIGHT AND LICENSE
-This software is copyright (c) 2009 by Best Practical Solutions.
+This software is copyright (c) 2010 by Best Practical Solutions.
This is free software; you can redistribute it and/or modify it under
-the same terms as perl itself.
+the same terms as the Perl 5 programming language system itself.
=cut
More information about the Pkg-perl-cvs-commits
mailing list