Merge branch 'Perl-Toolchain-Gang:master' into master

Author: khwilliamson

.travis.yml

@@ -72,20 +72,16 @@ Once installed, here are some dzil commands you might try:
 You can learn more about Dist::Zilla at http://dzil.org/.
 
 The code for this distribution is hosted at GitHub. The repository is:
+
 https://github.com/Perl-Toolchain-Gang/Module-Metadata
+
 You can submit code changes by forking the repository, pushing your code
 changes to your clone, and then submitting a pull request. Please include a
 suitable end-user-oriented entry in the Changes file describing your change.
 Detailed instructions for doing that is available here:
 
 https://help.github.com/articles/creating-a-pull-request
 
-All pull requests for this distribution will be automatically tested on Linux
-by Travis at: https://travis-ci.com/Perl-Toolchain-Gang/Module-Metadata
-Results will be visible in the pull request on GitHub. Follow the appropriate
-links for details when tests fail. Changes will not be mergeable until all
-tests pass.
-
 If you have found a bug, but do not have an accompanying patch to fix it, you
 can submit an issue report here:
 https://rt.cpan.org/Public/Dist/Display.html?Name=Module-Metadata
@@ -103,5 +99,5 @@ wish to be listed under a different name or address, you should submit a pull
 request to the .mailmap file to contain the correct mapping.
 
 
-This file was generated via Dist::Zilla::Plugin::GenerateFile::FromShareDir 0.014
-from a template file originating in Dist-Zilla-PluginBundle-Author-ETHER-0.150.
+This file was generated via Dist::Zilla::Plugin::GenerateFile::FromShareDir 0.015
+from a template file originating in Dist-Zilla-PluginBundle-Author-ETHER-0.162.

CONTRIBUTING

@@ -2,6 +2,9 @@ Revision history for Module-Metadata
 
 {{$NEXT}}
 
+1.000038  2023-04-28 11:25:40Z
+  - detects "class" syntax
+
 1.000037  2019-09-07 18:32:44Z
   - add decode_pod option for automatic =encoding handling
 

Changes

@@ -21,8 +21,11 @@ Alternatively, if your CPAN shell is set up, you should just be able to do:
 
 ## Manual installation
 
-As a last resort, you can manually install it. Download the tarball, untar it,
-install configure prerequisites (see below), then build it:
+As a last resort, you can manually install it. If you have not already
+downloaded the release tarball, you can find the download link on the module's
+MetaCPAN page: https://metacpan.org/pod/Module::Metadata
+
+Untar the tarball, install configure prerequisites (see below), then build it:
 
     % perl Makefile.PL
     % make && make test

INSTALL

@@ -292,21 +292,21 @@ Definitions:
 
   - "Package" refers to the collection of files distributed by the Copyright
     Holder, and derivatives of that collection of files created through
-    textual modification. 
+    textual modification.
   - "Standard Version" refers to such a Package if it has not been modified,
     or has been modified in accordance with the wishes of the Copyright
-    Holder. 
+    Holder.
   - "Copyright Holder" is whoever is named in the copyright or copyrights for
-    the package. 
+    the package.
   - "You" is you, if you're thinking about copying or distributing this Package.
   - "Reasonable copying fee" is whatever you can justify on the basis of media
     cost, duplication charges, time of people involved, and so on. (You will
     not be required to justify it to the Copyright Holder, but only to the
-    computing community at large as a market that must bear the fee.) 
+    computing community at large as a market that must bear the fee.)
   - "Freely Available" means that no fee is charged for the item itself, though
     there may be fees involved in handling the item. It also means that
     recipients of the item may redistribute it under the same conditions they
-    received it. 
+    received it.
 
 1. You may make and give away verbatim copies of the source form of the
 Standard Version of this Package without restriction, provided that you
@@ -373,7 +373,7 @@ products derived from this software without specific prior written permission.
 
 9. THIS PACKAGE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED
 WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
-MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 
 The End
 

LICENCE

@@ -8,7 +8,7 @@ Module::Metadata - Gather package and POD information from perl module files
 
 =head1 VERSION
 
-version 1.000037
+version 1.000038
 
 =head1 SYNOPSIS
 
@@ -240,7 +240,7 @@ assistance from David Golden (xdg) <[email protected]>.
 
 =head1 CONTRIBUTORS
 
-=for stopwords Karen Etheridge David Golden Vincent Pit Matt S Trout Chris Nehren Tomas Doran Olivier Mengué Graham Knop tokuhirom Tatsuhiko Miyagawa Christian Walde Leon Timmermans Peter Rabbitson Steve Hay Jerry D. Hedden Craig A. Berry Mitchell Steinbrunner Edward Zborowski Gareth Harper James Raspass 'BinGOs' Williams Josh Jore Kent Fredric
+=for stopwords Karen Etheridge David Golden Vincent Pit Matt S Trout Chris Nehren Graham Knop Olivier Mengué Tomas Doran Christian Walde Craig A. Berry Tatsuhiko Miyagawa tokuhirom 'BinGOs' Williams Mitchell Steinbrunner Edward Zborowski Gareth Harper James Raspass Jerry D. Hedden Josh Jore Kent Fredric Leon Timmermans Peter Rabbitson Steve Hay
 
 =over 4
 
@@ -266,83 +266,79 @@ Chris Nehren <[email protected]>
 
 =item *
 
-Tomas Doran <[email protected]>
+Graham Knop <[email protected]>
 
 =item *
 
 Olivier Mengué <[email protected]>
 
 =item *
 
-Graham Knop <[email protected]>
-
-=item *
-
-tokuhirom <[email protected]>
+Tomas Doran <[email protected]>
 
 =item *
 
-Tatsuhiko Miyagawa <[email protected]>
+Christian Walde <[email protected]>
 
 =item *
 
-Christian Walde <[email protected]>
+Craig A. Berry <[email protected]>
 
 =item *
 
-Leon Timmermans <[email protected]>
+Tatsuhiko Miyagawa <[email protected]>
 
 =item *
 
-Peter Rabbitson <[email protected]>
+tokuhirom <[email protected]>
 
 =item *
 
-Steve Hay <[email protected]>
+Chris 'BinGOs' Williams <[email protected]>
 
 =item *
 
-Jerry D. Hedden <[email protected]>
+David Mitchell <[email protected]>
 
 =item *
 
-Craig A. Berry <[email protected]>
+David Steinbrunner <[email protected]>
 
 =item *
 
-Craig A. Berry <craigberry@mac.com>
+Edward Zborowski <ed@rubensteintech.com>
 
 =item *
 
-David Mitchell <davem@iabyn.com>
+Gareth Harper <gareth@broadbean.com>
 
 =item *
 
-David Steinbrunner <dsteinbrunner@pobox.com>
+James Raspass <jraspass@gmail.com>
 
 =item *
 
-Edward Zborowski <[email protected]>
+Jerry D. Hedden <[email protected]>
 
 =item *
 
-Gareth Harper <[email protected]>
+Josh Jore <[email protected]>
 
 =item *
 
-James Raspass <[email protected]>
+Kent Fredric <[email protected]>
 
 =item *
 
-Chris 'BinGOs' Williams <[email protected]>
+Leon Timmermans <[email protected]>
 
 =item *
 
-Josh Jore <jjore@cpan.org>
+Peter Rabbitson <ribasushi@cpan.org>
 
 =item *
 
-Kent Fredric <[email protected]>
+Steve Hay <[email protected]>
 
 =back
 

README.pod

@@ -14,7 +14,7 @@ sub __clean_eval { eval $_[0] }
 use strict;
 use warnings;
 
-our $VERSION = '1.000038';
+our $VERSION = '1.000039';
 
 use Carp qw/croak/;
 use File::Spec;
@@ -74,11 +74,22 @@ my $PKG_REGEXP  = qr{   # match a package declaration
   \s+                   # whitespace
   ($PKG_NAME_REGEXP)    # a package name
   \s*                   # optional whitespace
-  ($V_NUM_REGEXP)?        # optional version number
-  \s*                   # optional whitesapce
+  ($V_NUM_REGEXP)?      # optional version number
+  \s*                   # optional whitespace
   [;\{]                 # semicolon line terminator or block start (since 5.16)
 }x;
 
+my $CLASS_REGEXP = qr{  # match a class declaration (core since 5.38)
+  ^[\s\{;]*             # intro chars on a line
+  class                 # the word 'class'
+  \s+                   # whitespace
+  ($PKG_NAME_REGEXP)    # a package name
+  \s*                   # optional whitespace
+  ($V_NUM_REGEXP)?      # optional version number
+  \s*                   # optional whitespace
+  [;\{]                 # semicolon line terminator or block start
+}x;
+
 my $VARNAME_REGEXP = qr{ # match fully-qualified VERSION name
   ([\$*])         # sigil - $ or *
   (
@@ -627,7 +638,7 @@ sub _parse_fh {
         ? $self->_parse_version_expression( $line )
         : ();
 
-    if ( $line =~ /$PKG_REGEXP/o ) {
+    if ( $line =~ /$PKG_REGEXP/o or $line =~ /$CLASS_REGEXP/ ) {
       $package = $1;
       my $version = $2;
       push( @packages, $package ) unless grep( $package eq $_, @packages );

lib/Module/Metadata.pm

@@ -127,6 +127,29 @@ $VERSION = '999';
 $::VERSION = 0.01;
 ---
 },
+{
+  name => 'class NAME::SUBNAME',
+  package => [ 'Simple::Edward' ],
+  code => <<'---',
+class Simple::Edward;
+---
+},
+{
+  name => 'class NAME::SUBNAME',
+  package => [ 'main', 'Simple::Edward' ],
+  code => <<'---',
+our $foo = 1;
+class Simple::Edward;
+---
+},
+{
+  name => 'package and class declarations',
+  package => [ 'Ticket::Widget::Entry' ],
+  code => <<'---',
+package Ticket::Widget::Entry 0.36;
+class Ticket::Widget::Entry :strict(params) :isa(Tickit::Widget);
+---
+},
 );
 
 my $test_num = 0;