r62646 - in /trunk/libmoosex-getopt-perl: ./ debian/ lib/MooseX/ lib/MooseX/Getopt/ lib/MooseX/Getopt/Meta/ lib/MooseX/Getopt/Meta/Attribute/ lib/MooseX/Getopt/Meta/Attribute/Trait/ t/

eloy at users.alioth.debian.org eloy at users.alioth.debian.org
Fri Sep 17 10:34:48 UTC 2010


Author: eloy
Date: Fri Sep 17 10:34:29 2010
New Revision: 62646

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=62646
Log:
new upstream version

Added:
    trunk/libmoosex-getopt-perl/t/107_union_bug.t
      - copied unchanged from r62645, branches/upstream/libmoosex-getopt-perl/current/t/107_union_bug.t
Modified:
    trunk/libmoosex-getopt-perl/ChangeLog
    trunk/libmoosex-getopt-perl/MANIFEST
    trunk/libmoosex-getopt-perl/META.json
    trunk/libmoosex-getopt-perl/META.yml
    trunk/libmoosex-getopt-perl/Makefile.PL
    trunk/libmoosex-getopt-perl/README
    trunk/libmoosex-getopt-perl/debian/changelog
    trunk/libmoosex-getopt-perl/debian/control
    trunk/libmoosex-getopt-perl/dist.ini
    trunk/libmoosex-getopt-perl/lib/MooseX/Getopt.pm
    trunk/libmoosex-getopt-perl/lib/MooseX/Getopt/Basic.pm
    trunk/libmoosex-getopt-perl/lib/MooseX/Getopt/Dashes.pm
    trunk/libmoosex-getopt-perl/lib/MooseX/Getopt/GLD.pm
    trunk/libmoosex-getopt-perl/lib/MooseX/Getopt/Meta/Attribute.pm
    trunk/libmoosex-getopt-perl/lib/MooseX/Getopt/Meta/Attribute/NoGetopt.pm
    trunk/libmoosex-getopt-perl/lib/MooseX/Getopt/Meta/Attribute/Trait.pm
    trunk/libmoosex-getopt-perl/lib/MooseX/Getopt/Meta/Attribute/Trait/NoGetopt.pm
    trunk/libmoosex-getopt-perl/lib/MooseX/Getopt/OptionTypeMap.pm
    trunk/libmoosex-getopt-perl/lib/MooseX/Getopt/Strict.pm
    trunk/libmoosex-getopt-perl/t/008_configfromfile.t
    trunk/libmoosex-getopt-perl/t/009_gld_and_explicit_options.t
    trunk/libmoosex-getopt-perl/t/100_gld_default_bug.t
    trunk/libmoosex-getopt-perl/t/107_no_auto_help.t

Modified: trunk/libmoosex-getopt-perl/ChangeLog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libmoosex-getopt-perl/ChangeLog?rev=62646&op=diff
==============================================================================
--- trunk/libmoosex-getopt-perl/ChangeLog (original)
+++ trunk/libmoosex-getopt-perl/ChangeLog Fri Sep 17 10:34:29 2010
@@ -1,4 +1,10 @@
 Revision history for Perl extension MooseX-Getopt
+
+0.33 Thu 26 Aug 2010
+  * Remove Test::Most from newly added test (RT#60766)
+
+0.32 Thu 26 Aug 2010
+  * Fix handling of Union types (RT#58417)
 
 0.31 Wed 7 Jul 2010
   * Fix issue causing tests to fail if MooseX::SimpleConfig isn't installed.

Modified: trunk/libmoosex-getopt-perl/MANIFEST
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libmoosex-getopt-perl/MANIFEST?rev=62646&op=diff
==============================================================================
--- trunk/libmoosex-getopt-perl/MANIFEST (original)
+++ trunk/libmoosex-getopt-perl/MANIFEST Fri Sep 17 10:34:29 2010
@@ -35,6 +35,7 @@
 t/105_uc_bug_more.t
 t/106_no_ignore_case.t
 t/107_no_auto_help.t
+t/107_union_bug.t
 t/108_usage_attr.t
 t/109_help_flag.t
 t/110_sort_usage_by_attr_order.t

Modified: trunk/libmoosex-getopt-perl/META.json
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libmoosex-getopt-perl/META.json?rev=62646&op=diff
==============================================================================
--- trunk/libmoosex-getopt-perl/META.json (original)
+++ trunk/libmoosex-getopt-perl/META.json Fri Sep 17 10:34:29 2010
@@ -10,7 +10,8 @@
       "Florian Ragwitz <rafl at debian.org>",
       "Dagfinn Ilmari Manns\u00c3\u00a5ker <ilmari at ilmari.org>",
       "\u00c3\u0086var Arnfj\u00c3\u00b6r\u00c3\u00b0 Bjarmason <avar at cpan.org>",
-      "Chris Prather <perigrin at cpan.org>"
+      "Chris Prather <perigrin at cpan.org>",
+      "Karen Etheridge <ether at cpan.org>"
    ],
    "dynamic_config" : 0,
    "generated_by" : "Dist::Zilla version 4.101612, CPAN::Meta::Converter version 2.101610",
@@ -39,6 +40,7 @@
          "requires" : {
             "Test::Exception" : "0.21",
             "Test::More" : "0.88",
+            "Test::Requires" : "0.05",
             "Test::Warn" : "0.21"
          }
       }
@@ -56,7 +58,7 @@
          "web" : "http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=gitmo/MooseX-Getopt.git;a=summary"
       }
    },
-   "version" : "0.31",
+   "version" : "0.33",
    "x_Dist_Zilla" : {
       "plugins" : [
          {

Modified: trunk/libmoosex-getopt-perl/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libmoosex-getopt-perl/META.yml?rev=62646&op=diff
==============================================================================
--- trunk/libmoosex-getopt-perl/META.yml (original)
+++ trunk/libmoosex-getopt-perl/META.yml Fri Sep 17 10:34:29 2010
@@ -11,9 +11,11 @@
   - 'Dagfinn Ilmari Mannsåker <ilmari at ilmari.org>'
   - 'Ævar Arnfjörð Bjarmason <avar at cpan.org>'
   - 'Chris Prather <perigrin at cpan.org>'
+  - 'Karen Etheridge <ether at cpan.org>'
 build_requires:
   Test::Exception: 0.21
   Test::More: 0.88
+  Test::Requires: 0.05
   Test::Warn: 0.21
 configure_requires:
   ExtUtils::MakeMaker: 6.31
@@ -32,7 +34,7 @@
   bugtracker: http://rt.cpan.org/Public/Dist/Display.html?Name=MooseX-Getopt
   homepage: http://search.cpan.org/dist/MooseX-Getopt
   repository: git://git.moose.perl.org/MooseX-Getopt.git
-version: 0.31
+version: 0.33
 x_Dist_Zilla:
   plugins:
     -

Modified: trunk/libmoosex-getopt-perl/Makefile.PL
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libmoosex-getopt-perl/Makefile.PL?rev=62646&op=diff
==============================================================================
--- trunk/libmoosex-getopt-perl/Makefile.PL (original)
+++ trunk/libmoosex-getopt-perl/Makefile.PL Fri Sep 17 10:34:29 2010
@@ -10,10 +10,11 @@
 
 my %WriteMakefileArgs = (
   'ABSTRACT' => 'A Moose role for processing command line options',
-  'AUTHOR' => 'Stevan Little <stevan at iinteractive.com>, Brandon L. Black <blblack at gmail.com>, Yuval Kogman <nothingmuch at woobling.org>, Ryan D Johnson <ryan at innerfence.com>, Drew Taylor <drew at drewtaylor.com>, Tomas Doran <bobtfish at bobtfish.net>, Florian Ragwitz <rafl at debian.org>, Dagfinn Ilmari Mannsåker <ilmari at ilmari.org>, Ævar Arnfjörð Bjarmason <avar at cpan.org>, Chris Prather <perigrin at cpan.org>',
+  'AUTHOR' => 'Stevan Little <stevan at iinteractive.com>, Brandon L. Black <blblack at gmail.com>, Yuval Kogman <nothingmuch at woobling.org>, Ryan D Johnson <ryan at innerfence.com>, Drew Taylor <drew at drewtaylor.com>, Tomas Doran <bobtfish at bobtfish.net>, Florian Ragwitz <rafl at debian.org>, Dagfinn Ilmari Mannsåker <ilmari at ilmari.org>, Ævar Arnfjörð Bjarmason <avar at cpan.org>, Chris Prather <perigrin at cpan.org>, Karen Etheridge <ether at cpan.org>',
   'BUILD_REQUIRES' => {
     'Test::Exception' => '0.21',
     'Test::More' => '0.88',
+    'Test::Requires' => '0.05',
     'Test::Warn' => '0.21'
   },
   'CONFIGURE_REQUIRES' => {
@@ -28,7 +29,7 @@
     'Getopt::Long::Descriptive' => '0.081',
     'Moose' => '0.56'
   },
-  'VERSION' => '0.31',
+  'VERSION' => '0.33',
   'test' => {
     'TESTS' => 't/*.t'
   }

Modified: trunk/libmoosex-getopt-perl/README
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libmoosex-getopt-perl/README?rev=62646&op=diff
==============================================================================
--- trunk/libmoosex-getopt-perl/README (original)
+++ trunk/libmoosex-getopt-perl/README Fri Sep 17 10:34:29 2010
@@ -1,7 +1,7 @@
 
 
 This archive contains the distribution MooseX-Getopt,
-version 0.31:
+version 0.33:
 
   A Moose role for processing command line options
 

Modified: trunk/libmoosex-getopt-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libmoosex-getopt-perl/debian/changelog?rev=62646&op=diff
==============================================================================
--- trunk/libmoosex-getopt-perl/debian/changelog (original)
+++ trunk/libmoosex-getopt-perl/debian/changelog Fri Sep 17 10:34:29 2010
@@ -1,3 +1,10 @@
+libmoosex-getopt-perl (0.33-1) UNRELEASED; urgency=low
+
+  * New upstream release
+  * Bump Standards-Version to 3.9.1 (no changes).
+
+ -- Krzysztof Krzyżaniak (eloy) <eloy at debian.org>  Fri, 17 Sep 2010 12:32:59 +0200
+
 libmoosex-getopt-perl (0.31-1) unstable; urgency=low
 
   * New upstream release.

Modified: trunk/libmoosex-getopt-perl/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libmoosex-getopt-perl/debian/control?rev=62646&op=diff
==============================================================================
--- trunk/libmoosex-getopt-perl/debian/control (original)
+++ trunk/libmoosex-getopt-perl/debian/control Fri Sep 17 10:34:29 2010
@@ -10,7 +10,7 @@
  Krzysztof Krzyżaniak (eloy) <eloy at debian.org>, Niko Tyni <ntyni at debian.org>,
  gregor herrmann <gregoa at debian.org>, Ryan Niebur <ryan at debian.org>,
  Ansgar Burchardt <ansgar at 43-1.org>
-Standards-Version: 3.9.0
+Standards-Version: 3.9.1
 Homepage: http://search.cpan.org/dist/MooseX-Getopt/
 Vcs-Svn: svn://svn.debian.org/pkg-perl/trunk/libmoosex-getopt-perl/
 Vcs-Browser: http://svn.debian.org/viewsvn/pkg-perl/trunk/libmoosex-getopt-perl/

Modified: trunk/libmoosex-getopt-perl/dist.ini
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libmoosex-getopt-perl/dist.ini?rev=62646&op=diff
==============================================================================
--- trunk/libmoosex-getopt-perl/dist.ini (original)
+++ trunk/libmoosex-getopt-perl/dist.ini Fri Sep 17 10:34:29 2010
@@ -1,5 +1,5 @@
 name = MooseX-Getopt
-version = 0.31
+version = 0.33
 author = Stevan Little <stevan at iinteractive.com>
 author = Brandon L. Black <blblack at gmail.com>
 author = Yuval Kogman <nothingmuch at woobling.org>
@@ -10,6 +10,7 @@
 author = Dagfinn Ilmari Mannsåker <ilmari at ilmari.org>
 author = Ævar Arnfjörð Bjarmason <avar at cpan.org>
 author = Chris Prather <perigrin at cpan.org>
+author = Karen Etheridge <ether at cpan.org>
 license = Perl_5
 copyright_holder = Infinity Interactive, Inc
 
@@ -28,3 +29,4 @@
 Test::Exception = 0.21
 Test::Warn = 0.21
 Test::More = 0.88
+Test::Requires = 0.05

Modified: trunk/libmoosex-getopt-perl/lib/MooseX/Getopt.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libmoosex-getopt-perl/lib/MooseX/Getopt.pm?rev=62646&op=diff
==============================================================================
--- trunk/libmoosex-getopt-perl/lib/MooseX/Getopt.pm (original)
+++ trunk/libmoosex-getopt-perl/lib/MooseX/Getopt.pm Fri Sep 17 10:34:29 2010
@@ -3,7 +3,7 @@
   $MooseX::Getopt::AUTHORITY = 'cpan:STEVAN';
 }
 BEGIN {
-  $MooseX::Getopt::VERSION = '0.31';
+  $MooseX::Getopt::VERSION = '0.33';
 }
 # ABSTRACT: A Moose role for processing command line options
 
@@ -294,6 +294,10 @@
 
 Chris Prather <perigrin at cpan.org>
 
+=item *
+
+Karen Etheridge <ether at cpan.org>
+
 =back
 
 =head1 COPYRIGHT AND LICENSE

Modified: trunk/libmoosex-getopt-perl/lib/MooseX/Getopt/Basic.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libmoosex-getopt-perl/lib/MooseX/Getopt/Basic.pm?rev=62646&op=diff
==============================================================================
--- trunk/libmoosex-getopt-perl/lib/MooseX/Getopt/Basic.pm (original)
+++ trunk/libmoosex-getopt-perl/lib/MooseX/Getopt/Basic.pm Fri Sep 17 10:34:29 2010
@@ -3,7 +3,7 @@
   $MooseX::Getopt::Basic::AUTHORITY = 'cpan:STEVAN';
 }
 BEGIN {
-  $MooseX::Getopt::Basic::VERSION = '0.31';
+  $MooseX::Getopt::Basic::VERSION = '0.33';
 }
 # ABSTRACT: MooseX::Getopt::Basic - role to implement the Getopt::Long functionality
 
@@ -323,6 +323,10 @@
 
 Chris Prather <perigrin at cpan.org>
 
+=item *
+
+Karen Etheridge <ether at cpan.org>
+
 =back
 
 =head1 COPYRIGHT AND LICENSE

Modified: trunk/libmoosex-getopt-perl/lib/MooseX/Getopt/Dashes.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libmoosex-getopt-perl/lib/MooseX/Getopt/Dashes.pm?rev=62646&op=diff
==============================================================================
--- trunk/libmoosex-getopt-perl/lib/MooseX/Getopt/Dashes.pm (original)
+++ trunk/libmoosex-getopt-perl/lib/MooseX/Getopt/Dashes.pm Fri Sep 17 10:34:29 2010
@@ -3,7 +3,7 @@
   $MooseX::Getopt::Dashes::AUTHORITY = 'cpan:STEVAN';
 }
 BEGIN {
-  $MooseX::Getopt::Dashes::VERSION = '0.31';
+  $MooseX::Getopt::Dashes::VERSION = '0.33';
 }
 # ABSTRACT: convert underscores in attribute names to dashes
 
@@ -115,6 +115,10 @@
 
 Chris Prather <perigrin at cpan.org>
 
+=item *
+
+Karen Etheridge <ether at cpan.org>
+
 =back
 
 =head1 COPYRIGHT AND LICENSE

Modified: trunk/libmoosex-getopt-perl/lib/MooseX/Getopt/GLD.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libmoosex-getopt-perl/lib/MooseX/Getopt/GLD.pm?rev=62646&op=diff
==============================================================================
--- trunk/libmoosex-getopt-perl/lib/MooseX/Getopt/GLD.pm (original)
+++ trunk/libmoosex-getopt-perl/lib/MooseX/Getopt/GLD.pm Fri Sep 17 10:34:29 2010
@@ -3,7 +3,7 @@
   $MooseX::Getopt::GLD::AUTHORITY = 'cpan:STEVAN';
 }
 BEGIN {
-  $MooseX::Getopt::GLD::VERSION = '0.31';
+  $MooseX::Getopt::GLD::VERSION = '0.33';
 }
 # ABSTRACT: A Moose role for processing command line options with Getopt::Long::Descriptive
 
@@ -152,6 +152,10 @@
 
 Chris Prather <perigrin at cpan.org>
 
+=item *
+
+Karen Etheridge <ether at cpan.org>
+
 =back
 
 =head1 COPYRIGHT AND LICENSE

Modified: trunk/libmoosex-getopt-perl/lib/MooseX/Getopt/Meta/Attribute.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libmoosex-getopt-perl/lib/MooseX/Getopt/Meta/Attribute.pm?rev=62646&op=diff
==============================================================================
--- trunk/libmoosex-getopt-perl/lib/MooseX/Getopt/Meta/Attribute.pm (original)
+++ trunk/libmoosex-getopt-perl/lib/MooseX/Getopt/Meta/Attribute.pm Fri Sep 17 10:34:29 2010
@@ -3,7 +3,7 @@
   $MooseX::Getopt::Meta::Attribute::AUTHORITY = 'cpan:STEVAN';
 }
 BEGIN {
-  $MooseX::Getopt::Meta::Attribute::VERSION = '0.31';
+  $MooseX::Getopt::Meta::Attribute::VERSION = '0.33';
 }
 # ABSTRACT: Optional meta attribute for custom option names
 
@@ -22,7 +22,7 @@
   $Moose::Meta::Attribute::Custom::Getopt::AUTHORITY = 'cpan:STEVAN';
 }
 BEGIN {
-  $Moose::Meta::Attribute::Custom::Getopt::VERSION = '0.31';
+  $Moose::Meta::Attribute::Custom::Getopt::VERSION = '0.33';
 }
 sub register_implementation { 'MooseX::Getopt::Meta::Attribute' }
 
@@ -142,6 +142,10 @@
 
 Chris Prather <perigrin at cpan.org>
 
+=item *
+
+Karen Etheridge <ether at cpan.org>
+
 =back
 
 =head1 COPYRIGHT AND LICENSE

Modified: trunk/libmoosex-getopt-perl/lib/MooseX/Getopt/Meta/Attribute/NoGetopt.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libmoosex-getopt-perl/lib/MooseX/Getopt/Meta/Attribute/NoGetopt.pm?rev=62646&op=diff
==============================================================================
--- trunk/libmoosex-getopt-perl/lib/MooseX/Getopt/Meta/Attribute/NoGetopt.pm (original)
+++ trunk/libmoosex-getopt-perl/lib/MooseX/Getopt/Meta/Attribute/NoGetopt.pm Fri Sep 17 10:34:29 2010
@@ -3,7 +3,7 @@
   $MooseX::Getopt::Meta::Attribute::NoGetopt::AUTHORITY = 'cpan:STEVAN';
 }
 BEGIN {
-  $MooseX::Getopt::Meta::Attribute::NoGetopt::VERSION = '0.31';
+  $MooseX::Getopt::Meta::Attribute::NoGetopt::VERSION = '0.33';
 }
 # ABSTRACT: Optional meta attribute for ignoring params
 
@@ -21,7 +21,7 @@
   $Moose::Meta::Attribute::Custom::NoGetopt::AUTHORITY = 'cpan:STEVAN';
 }
 BEGIN {
-  $Moose::Meta::Attribute::Custom::NoGetopt::VERSION = '0.31';
+  $Moose::Meta::Attribute::Custom::NoGetopt::VERSION = '0.33';
 }
 sub register_implementation { 'MooseX::Getopt::Meta::Attribute::NoGetopt' }
 
@@ -104,6 +104,10 @@
 
 Chris Prather <perigrin at cpan.org>
 
+=item *
+
+Karen Etheridge <ether at cpan.org>
+
 =back
 
 =head1 COPYRIGHT AND LICENSE

Modified: trunk/libmoosex-getopt-perl/lib/MooseX/Getopt/Meta/Attribute/Trait.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libmoosex-getopt-perl/lib/MooseX/Getopt/Meta/Attribute/Trait.pm?rev=62646&op=diff
==============================================================================
--- trunk/libmoosex-getopt-perl/lib/MooseX/Getopt/Meta/Attribute/Trait.pm (original)
+++ trunk/libmoosex-getopt-perl/lib/MooseX/Getopt/Meta/Attribute/Trait.pm Fri Sep 17 10:34:29 2010
@@ -3,7 +3,7 @@
   $MooseX::Getopt::Meta::Attribute::Trait::AUTHORITY = 'cpan:STEVAN';
 }
 BEGIN {
-  $MooseX::Getopt::Meta::Attribute::Trait::VERSION = '0.31';
+  $MooseX::Getopt::Meta::Attribute::Trait::VERSION = '0.33';
 }
 # ABSTRACT: Optional meta attribute trait for custom option names
 
@@ -41,7 +41,7 @@
   $Moose::Meta::Attribute::Custom::Trait::Getopt::AUTHORITY = 'cpan:STEVAN';
 }
 BEGIN {
-  $Moose::Meta::Attribute::Custom::Trait::Getopt::VERSION = '0.31';
+  $Moose::Meta::Attribute::Custom::Trait::Getopt::VERSION = '0.33';
 }
 sub register_implementation { 'MooseX::Getopt::Meta::Attribute::Trait' }
 
@@ -150,6 +150,10 @@
 
 Chris Prather <perigrin at cpan.org>
 
+=item *
+
+Karen Etheridge <ether at cpan.org>
+
 =back
 
 =head1 COPYRIGHT AND LICENSE

Modified: trunk/libmoosex-getopt-perl/lib/MooseX/Getopt/Meta/Attribute/Trait/NoGetopt.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libmoosex-getopt-perl/lib/MooseX/Getopt/Meta/Attribute/Trait/NoGetopt.pm?rev=62646&op=diff
==============================================================================
--- trunk/libmoosex-getopt-perl/lib/MooseX/Getopt/Meta/Attribute/Trait/NoGetopt.pm (original)
+++ trunk/libmoosex-getopt-perl/lib/MooseX/Getopt/Meta/Attribute/Trait/NoGetopt.pm Fri Sep 17 10:34:29 2010
@@ -3,7 +3,7 @@
   $MooseX::Getopt::Meta::Attribute::Trait::NoGetopt::AUTHORITY = 'cpan:STEVAN';
 }
 BEGIN {
-  $MooseX::Getopt::Meta::Attribute::Trait::NoGetopt::VERSION = '0.31';
+  $MooseX::Getopt::Meta::Attribute::Trait::NoGetopt::VERSION = '0.33';
 }
 # ABSTRACT: Optional meta attribute trait for ignoring params
 
@@ -17,7 +17,7 @@
   $Moose::Meta::Attribute::Custom::Trait::NoGetopt::AUTHORITY = 'cpan:STEVAN';
 }
 BEGIN {
-  $Moose::Meta::Attribute::Custom::Trait::NoGetopt::VERSION = '0.31';
+  $Moose::Meta::Attribute::Custom::Trait::NoGetopt::VERSION = '0.33';
 }
 sub register_implementation { 'MooseX::Getopt::Meta::Attribute::Trait::NoGetopt' }
 
@@ -100,6 +100,10 @@
 
 Chris Prather <perigrin at cpan.org>
 
+=item *
+
+Karen Etheridge <ether at cpan.org>
+
 =back
 
 =head1 COPYRIGHT AND LICENSE

Modified: trunk/libmoosex-getopt-perl/lib/MooseX/Getopt/OptionTypeMap.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libmoosex-getopt-perl/lib/MooseX/Getopt/OptionTypeMap.pm?rev=62646&op=diff
==============================================================================
--- trunk/libmoosex-getopt-perl/lib/MooseX/Getopt/OptionTypeMap.pm (original)
+++ trunk/libmoosex-getopt-perl/lib/MooseX/Getopt/OptionTypeMap.pm Fri Sep 17 10:34:29 2010
@@ -3,7 +3,7 @@
   $MooseX::Getopt::OptionTypeMap::AUTHORITY = 'cpan:STEVAN';
 }
 BEGIN {
-  $MooseX::Getopt::OptionTypeMap::VERSION = '0.31';
+  $MooseX::Getopt::OptionTypeMap::VERSION = '0.33';
 }
 # ABSTRACT: Storage for the option to type mappings
 
@@ -22,6 +22,15 @@
 sub has_option_type {
     my (undef, $type_or_name) = @_;
 
+    if (blessed($type_or_name)
+        && $type_or_name->isa('Moose::Meta::TypeConstraint::Union')) {
+        foreach my $union_type (@{$type_or_name->type_constraints}) {
+            return 1
+                if __PACKAGE__->has_option_type($union_type);
+        }
+        return 0;
+    }
+
     return 1 if exists $option_type_map{blessed($type_or_name) ? $type_or_name->name : $type_or_name};
 
     my $current = blessed($type_or_name) ? $type_or_name : find_type_constraint($type_or_name);
@@ -39,6 +48,16 @@
 
 sub get_option_type {
     my (undef, $type_or_name) = @_;
+
+    if (blessed($type_or_name)
+        && $type_or_name->isa('Moose::Meta::TypeConstraint::Union')) {
+        foreach my $union_type (@{$type_or_name->type_constraints}) {
+            my $option_type = __PACKAGE__->get_option_type($union_type);
+            return $option_type
+                if defined $option_type;
+        }
+        return;
+    }
 
     my $name = blessed($type_or_name) ? $type_or_name->name : $type_or_name;
 
@@ -144,6 +163,10 @@
 
 Chris Prather <perigrin at cpan.org>
 
+=item *
+
+Karen Etheridge <ether at cpan.org>
+
 =back
 
 =head1 COPYRIGHT AND LICENSE

Modified: trunk/libmoosex-getopt-perl/lib/MooseX/Getopt/Strict.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libmoosex-getopt-perl/lib/MooseX/Getopt/Strict.pm?rev=62646&op=diff
==============================================================================
--- trunk/libmoosex-getopt-perl/lib/MooseX/Getopt/Strict.pm (original)
+++ trunk/libmoosex-getopt-perl/lib/MooseX/Getopt/Strict.pm Fri Sep 17 10:34:29 2010
@@ -3,7 +3,7 @@
   $MooseX::Getopt::Strict::AUTHORITY = 'cpan:STEVAN';
 }
 BEGIN {
-  $MooseX::Getopt::Strict::VERSION = '0.31';
+  $MooseX::Getopt::Strict::VERSION = '0.33';
 }
 # ABSTRACT: only make options for attrs with the Getopt metaclass
 
@@ -83,6 +83,10 @@
 
 Chris Prather <perigrin at cpan.org>
 
+=item *
+
+Karen Etheridge <ether at cpan.org>
+
 =back
 
 =head1 COPYRIGHT AND LICENSE

Modified: trunk/libmoosex-getopt-perl/t/008_configfromfile.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libmoosex-getopt-perl/t/008_configfromfile.t?rev=62646&op=diff
==============================================================================
--- trunk/libmoosex-getopt-perl/t/008_configfromfile.t (original)
+++ trunk/libmoosex-getopt-perl/t/008_configfromfile.t Fri Sep 17 10:34:29 2010
@@ -3,18 +3,13 @@
 use strict;
 use warnings;
 
+use Test::More tests => 37;
 use Test::Exception;
-use Test::More;
 use File::Spec;
 
-if ( !eval { require MooseX::ConfigFromFile } )
-{
-    plan skip_all => 'Test requires MooseX::ConfigFromFile';
-}
-else
-{
-    plan tests => 37;
-}
+use Test::Requires {
+    'MooseX::ConfigFromFile' => 0.01, # skip all if not installed
+};
 
 {
     package App;

Modified: trunk/libmoosex-getopt-perl/t/009_gld_and_explicit_options.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libmoosex-getopt-perl/t/009_gld_and_explicit_options.t?rev=62646&op=diff
==============================================================================
--- trunk/libmoosex-getopt-perl/t/009_gld_and_explicit_options.t (original)
+++ trunk/libmoosex-getopt-perl/t/009_gld_and_explicit_options.t Fri Sep 17 10:34:29 2010
@@ -3,15 +3,14 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More tests => 5;
 use Test::Exception;
 
-BEGIN {
-    eval 'use Getopt::Long::Descriptive;';
-    plan skip_all => "Getopt::Long::Descriptive required for this test" if $@;
-    plan tests => 5;
-    use_ok('MooseX::Getopt');
-}
+use Test::Requires {
+    'Getopt::Long::Descriptive' => 0.01, # skip all if not installed
+};
+
+use_ok('MooseX::Getopt');
 
 {
     package Testing::Foo;

Modified: trunk/libmoosex-getopt-perl/t/100_gld_default_bug.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libmoosex-getopt-perl/t/100_gld_default_bug.t?rev=62646&op=diff
==============================================================================
--- trunk/libmoosex-getopt-perl/t/100_gld_default_bug.t (original)
+++ trunk/libmoosex-getopt-perl/t/100_gld_default_bug.t Fri Sep 17 10:34:29 2010
@@ -3,15 +3,14 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More tests => 5;
 use Test::Exception;
 
-BEGIN {
-    eval 'use Getopt::Long::Descriptive;';
-    plan skip_all => "Getopt::Long::Descriptive required for this test" if $@;
-    plan tests => 5;
-    use_ok('MooseX::Getopt');
-}
+use Test::Requires {
+    'Getopt::Long::Descriptive' => 0.01, # skip all if not installed
+};
+
+use_ok('MooseX::Getopt');
 
 {
     package Engine::Foo;

Modified: trunk/libmoosex-getopt-perl/t/107_no_auto_help.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libmoosex-getopt-perl/t/107_no_auto_help.t?rev=62646&op=diff
==============================================================================
--- trunk/libmoosex-getopt-perl/t/107_no_auto_help.t (original)
+++ trunk/libmoosex-getopt-perl/t/107_no_auto_help.t Fri Sep 17 10:34:29 2010
@@ -12,10 +12,9 @@
 
 use Test::More;
 
-BEGIN {
-plan skip_all => 'This test needs MooseX::SimpleConfig 0.07'
-    unless eval { require MooseX::SimpleConfig && MooseX::SimpleConfig->VERSION(0.07); };
-}
+use Test::Requires {
+    'MooseX::SimpleConfig' => 0.07, # skip all if not installed
+};
 
 my $fail_on_exit = 1;
 {




More information about the Pkg-perl-cvs-commits mailing list