X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FModule%2FMetadata.pm;h=2016967d09a8dfc91503443c8db543deff9b3bc5;hb=38b7ba308a07e8889ea6703b261d8e0e3161df54;hp=917af0ad3fd81fd1e01bbebe19c6a1bef8b63952;hpb=cd41f0db48f41ce1ca1809281d4c7fe3fb5d91f2;p=p5sagit%2FModule-Metadata.git diff --git a/lib/Module/Metadata.pm b/lib/Module/Metadata.pm index 917af0a..2016967 100644 --- a/lib/Module/Metadata.pm +++ b/lib/Module/Metadata.pm @@ -11,7 +11,7 @@ package Module::Metadata; use strict; use vars qw($VERSION); -$VERSION = '1.000002'; +$VERSION = '1.000006'; $VERSION = eval $VERSION; use File::Spec; @@ -36,7 +36,7 @@ my $PKG_REGEXP = qr{ # match a package declaration \s* # optional whitespace ($V_NUM_REGEXP)? # optional version number \s* # optional whitesapce - ; # semicolon line terminator + [;\{] # semicolon line terminator or block start (since 5.16) }x; my $VARNAME_REGEXP = qr{ # match fully-qualified VERSION name @@ -69,6 +69,18 @@ sub new_from_file { return $class->_init(undef, $filename, @_); } +sub new_from_handle { + my $class = shift; + my $handle = shift; + my $filename = shift; + return undef unless defined($handle) && defined($filename); + $filename = File::Spec->rel2abs( $filename ); + + return $class->_init(undef, $filename, @_, handle => $handle); + +} + + sub new_from_module { my $class = shift; my $module = shift; @@ -183,7 +195,6 @@ sub new_from_module { if ( $package eq $prime_package ) { if ( exists( $prime{$package} ) ) { - # M::B::ModuleInfo will handle this conflict die "Unexpected conflict in '$package'; multiple versions found.\n"; } else { $prime{$package}{file} = $mapped_filename; @@ -282,6 +293,7 @@ sub _init { my $filename = shift; my %props = @_; + my $handle = delete $props{handle}; my( %valid_props, @valid_props ); @valid_props = qw( collect_pod inc ); @valid_props{@valid_props} = delete( @props{@valid_props} ); @@ -302,7 +314,12 @@ sub _init { my $self = bless(\%data, $class); - $self->_parse_file(); + if ( $handle ) { + $self->_parse_fh($handle); + } + else { + $self->_parse_file(); + } unless($self->{module} and length($self->{module})) { my ($v, $d, $f) = File::Spec->splitpath($self->{filename}); @@ -517,9 +534,9 @@ sub _evaluate_version_line { use version; no strict; - local $sigil$var; - \$$var=undef; \$vsub = sub { + local $sigil$var; + \$$var=undef; $line; \$$var }; @@ -648,60 +665,54 @@ sub pod { Module::Metadata - Gather package and POD information from perl module files -=head1 DESCRIPTION - -=over 4 +=head1 SYNOPSIS -=item new_from_file($filename, collect_pod => 1) + use Module::Metadata; -Construct a C object given the path to a file. Takes an optional -argument C which is a boolean that determines whether -POD data is collected and stored for reference. POD data is not -collected by default. POD headings are always collected. + # information about a .pm file + my $info = Module::Metadata->new_from_file( $file ); + my $version = $info->version; -=item new_from_module($module, collect_pod => 1, inc => \@dirs) + # information about a directory full of .pm files + my $provides = + Module::Metadata->package_versions_from_directory('lib'); -Construct a C object given a module or package name. In addition -to accepting the C argument as described above, this -method accepts a C argument which is a reference to an array of -of directories to search for the module. If none are given, the -default is @INC. - -=item name() - -Returns the name of the package represented by this module. If there -are more than one packages, it makes a best guess based on the -filename. If it's a script (i.e. not a *.pm) the package name is -'main'. - -=item version($package) - -Returns the version as defined by the $VERSION variable for the -package as returned by the C method if no arguments are -given. If given the name of a package it will attempt to return the -version of that package if it is specified in the file. +=head1 DESCRIPTION -=item filename() +This module provides a standard way to gather metadata about a .pm file +without executing unsafe code. -Returns the absolute path to the file. +=head1 USAGE -=item packages_inside() +=head2 Class methods -Returns a list of packages. +=over 4 -=item pod_inside() +=item C<< new_from_file($filename, collect_pod => 1) >> -Returns a list of POD sections. +Construct a C object given the path to a file. Takes an +optional argument C which is a boolean that determines whether POD +data is collected and stored for reference. POD data is not collected by +default. POD headings are always collected. Returns undef if the filename +does not exist. -=item contains_pod() +=item C<< new_from_handle($handle, $filename, collect_pod => 1) >> -Returns true if there is any POD in the file. +This works just like C, except that a handle can be provided +as the first argument. Note that there is no validation to confirm that the +handle is a handle or something that can act like one. Passing something that +isn't a handle will cause a exception when trying to read from it. The +C argument is mandatory or undef will be returned. -=item pod($section) +=item C<< new_from_module($module, collect_pod => 1, inc => \@dirs) >> -Returns the POD data in the given section. +Construct a C object given a module or package name. In addition +to accepting the C argument as described above, this +method accepts a C argument which is a reference to an array of +of directories to search for the module. If none are given, the +default is @INC. Returns undef if the module cannot be found. -=item find_module_by_name($module, \@dirs) +=item C<< find_module_by_name($module, \@dirs) >> Returns the path to a module given the module or package name. A list of directories can be passed in as an optional parameter, otherwise @@ -709,7 +720,7 @@ of directories can be passed in as an optional parameter, otherwise Can be called as either an object or a class method. -=item find_module_dir_by_name($module, \@dirs) +=item C<< find_module_dir_by_name($module, \@dirs) >> Returns the entry in C<@dirs> (or C<@INC> by default) that contains the module C<$module>. A list of directories can be passed in as an @@ -717,7 +728,7 @@ optional parameter, otherwise @INC is searched. Can be called as either an object or a class method. -=item package_versions_from_directory($dir, \@files?) +=item C<< package_versions_from_directory($dir, \@files?) >> Scans C<$dir> for .pm files (unless C<@files> is given, in which case looks for those files in C<$dir> - and reads each file for packages and versions, @@ -731,23 +742,66 @@ returning a hashref of the form: 'OtherPackage::Name' => ... } -=item log_info (internal) +=item C<< log_info (internal) >> Used internally to perform logging; imported from Log::Contextual if Log::Contextual has already been loaded, otherwise simply calls warn. =back +=head2 Object methods + +=over 4 + +=item C<< name() >> + +Returns the name of the package represented by this module. If there +are more than one packages, it makes a best guess based on the +filename. If it's a script (i.e. not a *.pm) the package name is +'main'. + +=item C<< version($package) >> + +Returns the version as defined by the $VERSION variable for the +package as returned by the C method if no arguments are +given. If given the name of a package it will attempt to return the +version of that package if it is specified in the file. + +=item C<< filename() >> + +Returns the absolute path to the file. + +=item C<< packages_inside() >> + +Returns a list of packages. + +=item C<< pod_inside() >> + +Returns a list of POD sections. + +=item C<< contains_pod() >> + +Returns true if there is any POD in the file. + +=item C<< pod($section) >> + +Returns the POD data in the given section. + +=back + =head1 AUTHOR -Ken Williams , Randy W. Sims +Original code from Module::Build::ModuleInfo by Ken Williams +, Randy W. Sims Released as Module::Metadata by Matt S Trout (mst) with -assistance from David Golden (xdg) +assistance from David Golden (xdg) . =head1 COPYRIGHT -Copyright (c) 2001-2011 Ken Williams. All rights reserved. +Original code Copyright (c) 2001-2011 Ken Williams. +Additional code Copyright (c) 2010-2011 Matt Trout and David Golden. +All rights reserved. This library is free software; you can redistribute it and/or modify it under the same terms as Perl itself.