r48441 - in /branches/upstream/libtest-yaml-meta-perl/current: Changes META.yml lib/Test/YAML/Meta.pm lib/Test/YAML/Meta/Version.pm t/03metaversion.t t/samples/07-META.yml

jawnsy-guest at users.alioth.debian.org jawnsy-guest at users.alioth.debian.org
Tue Dec 8 15:41:13 UTC 2009


Author: jawnsy-guest
Date: Tue Dec  8 15:41:09 2009
New Revision: 48441

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=48441
Log:
[svn-upgrade] Integrating new upstream version, libtest-yaml-meta-perl (0.13)

Modified:
    branches/upstream/libtest-yaml-meta-perl/current/Changes
    branches/upstream/libtest-yaml-meta-perl/current/META.yml
    branches/upstream/libtest-yaml-meta-perl/current/lib/Test/YAML/Meta.pm
    branches/upstream/libtest-yaml-meta-perl/current/lib/Test/YAML/Meta/Version.pm
    branches/upstream/libtest-yaml-meta-perl/current/t/03metaversion.t
    branches/upstream/libtest-yaml-meta-perl/current/t/samples/07-META.yml

Modified: branches/upstream/libtest-yaml-meta-perl/current/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libtest-yaml-meta-perl/current/Changes?rev=48441&op=diff
==============================================================================
--- branches/upstream/libtest-yaml-meta-perl/current/Changes (original)
+++ branches/upstream/libtest-yaml-meta-perl/current/Changes Tue Dec  8 15:41:09 2009
@@ -1,4 +1,9 @@
 # Changes log for Test::YAML::Meta
+
+0.13    07/12/2009
+	- RT#46473: license url with fragment part (Kevin Ryde)
+	- RT#47393: "optional_features" as map rather than list (Kevin Ryde)
+	- above applied to 1.4, 1.3 and 1.2 version of the meta-spec.
 
 0.12    24/05/2009
 	- added version checking to standard 94metatest.t

Modified: branches/upstream/libtest-yaml-meta-perl/current/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libtest-yaml-meta-perl/current/META.yml?rev=48441&op=diff
==============================================================================
--- branches/upstream/libtest-yaml-meta-perl/current/META.yml (original)
+++ branches/upstream/libtest-yaml-meta-perl/current/META.yml Tue Dec  8 15:41:09 2009
@@ -1,6 +1,6 @@
 --- #YAML:1.0
 name:                     Test-YAML-Meta
-version:                  0.12
+version:                  0.13
 abstract:                 A test module to validate a META.yml file.
 author:
   - Barbie <barbie at cpan.org>
@@ -27,10 +27,10 @@
 provides:
   Test::YAML::Meta:
     file:     lib/Test/YAML/Meta.pm
-    version:  0.12
+    version:  0.13
   Test::YAML::Meta::Version:
     file:     lib/Test/YAML/Meta/Version.pm
-    version:  0.12
+    version:  0.13
 no_index:
   directory:
     - t

Modified: branches/upstream/libtest-yaml-meta-perl/current/lib/Test/YAML/Meta.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libtest-yaml-meta-perl/current/lib/Test/YAML/Meta.pm?rev=48441&op=diff
==============================================================================
--- branches/upstream/libtest-yaml-meta-perl/current/lib/Test/YAML/Meta.pm (original)
+++ branches/upstream/libtest-yaml-meta-perl/current/lib/Test/YAML/Meta.pm Tue Dec  8 15:41:09 2009
@@ -4,7 +4,7 @@
 use strict;
 
 use vars qw($VERSION);
-$VERSION = '0.12';
+$VERSION = '0.13';
 
 #----------------------------------------------------------------------------
 
@@ -178,7 +178,7 @@
 
 =head1 COPYRIGHT AND LICENSE
 
-  Copyright (C) 2007,2008 Barbie for Miss Barbell Productions
+  Copyright (C) 2007-2010 Barbie for Miss Barbell Productions
 
   This module is free software; you can redistribute it and/or
   modify it under the same terms as Perl itself.

Modified: branches/upstream/libtest-yaml-meta-perl/current/lib/Test/YAML/Meta/Version.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libtest-yaml-meta-perl/current/lib/Test/YAML/Meta/Version.pm?rev=48441&op=diff
==============================================================================
--- branches/upstream/libtest-yaml-meta-perl/current/lib/Test/YAML/Meta/Version.pm (original)
+++ branches/upstream/libtest-yaml-meta-perl/current/lib/Test/YAML/Meta/Version.pm Tue Dec  8 15:41:09 2009
@@ -4,7 +4,7 @@
 use strict;
 
 use vars qw($VERSION);
-$VERSION = '0.12';
+$VERSION = '0.13';
 
 #----------------------------------------------------------------------------
 
@@ -91,7 +91,7 @@
   'conflicts'           => $module_map2,
 
   'optional_features'   => {
-    list        => {
+    'map'       => {
         ':key'  => { name => \&word,
             'map'   => { description        => { value => \&string },
                          requires_packages  => { value => \&string },
@@ -152,7 +152,7 @@
   'conflicts'           => $module_map2,
 
   'optional_features'   => {
-    list        => {
+    'map'       => {
         ':key'  => { name => \&word,
             'map'   => { description        => { value => \&string },
                          requires_packages  => { value => \&string },
@@ -221,6 +221,22 @@
   'build_requires'      => $module_map1,
   'conflicts'           => $module_map2,
 
+  'optional_features'   => {
+    'map'       => {
+        ':key'  => { name => \&word,
+            'map'   => { description        => { value => \&string },
+                         requires_packages  => { value => \&string },
+                         requires_os        => { value => \&string },
+                         excludes_os        => { value => \&string },
+                         requires           => $module_map1,
+                         recommends         => $module_map1,
+                         build_requires     => $module_map1,
+                         conflicts          => $module_map2,
+            }
+        }
+     }
+  },
+
   'provides'    => {
     'map'       => { ':key' => { name  => \&module,
                                  'map' => { file    => { mandatory => 1, value => \&file },
@@ -551,7 +567,7 @@
 my $domain   = qr¬((($atom(($atom|-)*$atom)?)\.)*([a-zA-Z](($atom|-)*$atom)?))¬;
 my $ip       = qr¬((\d+)(\.(\d+)){3})(:(\d+))?¬;
 my $enc      = qr¬%[a-fA-F\d]{2}¬;
-my $legal1   = qr¬[a-zA-Z\d\$\-_.+!*'(),]¬; #' - this comment is to avoid syntax highlighting issues
+my $legal1   = qr¬[a-zA-Z\d\$\-_.+!*'(),#]¬; #' - this comment is to avoid syntax highlighting issues
 my $legal2   = qr¬[;:@&=]¬;
 my $legal3   = qr¬((($legal1|$enc)|$legal2)*)¬;
 my $path     = qr¬\/$legal3(\/$legal3)*¬;
@@ -756,7 +772,7 @@
 
 =head1 COPYRIGHT AND LICENSE
 
-  Copyright (C) 2007,2008 Barbie for Miss Barbell Productions
+  Copyright (C) 2007-2010 Barbie for Miss Barbell Productions
 
   This module is free software; you can redistribute it and/or
   modify it under the same terms as Perl itself.

Modified: branches/upstream/libtest-yaml-meta-perl/current/t/03metaversion.t
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libtest-yaml-meta-perl/current/t/03metaversion.t?rev=48441&op=diff
==============================================================================
--- branches/upstream/libtest-yaml-meta-perl/current/t/03metaversion.t (original)
+++ branches/upstream/libtest-yaml-meta-perl/current/t/03metaversion.t Tue Dec  8 15:41:09 2009
@@ -1,7 +1,7 @@
 #!/usr/bin/perl -w
 use strict;
 
-use Test::More  tests => 91;
+use Test::More  tests => 92;
 use Test::YAML::Meta::Version;
 
 my $spec = Test::YAML::Meta::Version->new(spec => '1.3');
@@ -18,6 +18,8 @@
 is($spec->url('url','test^example^com'),0);
 is($spec->url('url',''),0);
 is($spec->url('url',undef),0);
+
+is($spec->url('url','http://www.gnu.org/licenses/#GPL'),1,'valid URL: http://www.gnu.org/licenses/#GPL');
 
 is($spec->urlspec('spec','http://module-build.sourceforge.net/META-spec-v1.3.html'),1,'valid specification URL');
 is($spec->urlspec('spec','http://module-build.sourceforge.net/META-spec-v1.2.html'),0);

Modified: branches/upstream/libtest-yaml-meta-perl/current/t/samples/07-META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libtest-yaml-meta-perl/current/t/samples/07-META.yml?rev=48441&op=diff
==============================================================================
--- branches/upstream/libtest-yaml-meta-perl/current/t/samples/07-META.yml (original)
+++ branches/upstream/libtest-yaml-meta-perl/current/t/samples/07-META.yml Tue Dec  8 15:41:09 2009
@@ -38,16 +38,16 @@
 generated_by: Hand 1.0
 
 optional_features:
-  - foo:
-      description:        test
-      requires_packages:  test
-      requires_os:        test
-      excludes_os:        test
-      requires:
-        Test::More:       0.47
-      recommends:
-        Test::More:       0.47
-      build_requires:
-        Test::More:       0.47
-      conflicts:
-        Test::More:       0.47
+  foo:
+    description:        test
+    requires_packages:  test
+    requires_os:        test
+    excludes_os:        test
+    requires:
+      Test::More:       0.47
+    recommends:
+      Test::More:       0.47
+    build_requires:
+      Test::More:       0.47
+    conflicts:
+      Test::More:       0.47




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