r22056 - in /trunk/libfile-mimeinfo-perl: ./ MimeInfo/ debian/ lib/ t/ t/default/ t/magic/ t/mime/
dmn at users.alioth.debian.org
dmn at users.alioth.debian.org
Mon Jun 23 08:28:00 UTC 2008
Author: dmn
Date: Mon Jun 23 08:28:00 2008
New Revision: 22056
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=22056
Log:
New upstream release
Added:
trunk/libfile-mimeinfo-perl/Build.PL
- copied unchanged from r22055, branches/upstream/libfile-mimeinfo-perl/current/Build.PL
trunk/libfile-mimeinfo-perl/lib/
- copied from r22055, branches/upstream/libfile-mimeinfo-perl/current/lib/
trunk/libfile-mimeinfo-perl/t/00_use_ok.t
- copied unchanged from r22055, branches/upstream/libfile-mimeinfo-perl/current/t/00_use_ok.t
trunk/libfile-mimeinfo-perl/t/06_pod_ok.t
- copied unchanged from r22055, branches/upstream/libfile-mimeinfo-perl/current/t/06_pod_ok.t
trunk/libfile-mimeinfo-perl/t/07_pod_cover.t
- copied unchanged from r22055, branches/upstream/libfile-mimeinfo-perl/current/t/07_pod_cover.t
trunk/libfile-mimeinfo-perl/t/default/encoding_breakage
- copied unchanged from r22055, branches/upstream/libfile-mimeinfo-perl/current/t/default/encoding_breakage
trunk/libfile-mimeinfo-perl/t/default/utf8_text
- copied unchanged from r22055, branches/upstream/libfile-mimeinfo-perl/current/t/default/utf8_text
trunk/libfile-mimeinfo-perl/t/magic/application_vnd.corel-draw
- copied unchanged from r22055, branches/upstream/libfile-mimeinfo-perl/current/t/magic/application_vnd.corel-draw
Removed:
trunk/libfile-mimeinfo-perl/MimeInfo/
trunk/libfile-mimeinfo-perl/MimeInfo.pm
Modified:
trunk/libfile-mimeinfo-perl/Changes
trunk/libfile-mimeinfo-perl/MANIFEST
trunk/libfile-mimeinfo-perl/META.yml
trunk/libfile-mimeinfo-perl/Makefile.PL
trunk/libfile-mimeinfo-perl/README
trunk/libfile-mimeinfo-perl/debian/changelog
trunk/libfile-mimeinfo-perl/mimeopen
trunk/libfile-mimeinfo-perl/mimetype
trunk/libfile-mimeinfo-perl/t/01_normal.t
trunk/libfile-mimeinfo-perl/t/02_magic.t
trunk/libfile-mimeinfo-perl/t/05_more.t
trunk/libfile-mimeinfo-perl/t/mime/magic
Modified: trunk/libfile-mimeinfo-perl/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libfile-mimeinfo-perl/Changes?rev=22056&op=diff
==============================================================================
--- trunk/libfile-mimeinfo-perl/Changes (original)
+++ trunk/libfile-mimeinfo-perl/Changes Mon Jun 23 08:28:00 2008
@@ -1,9 +1,31 @@
Revision history for Perl extension File::MimeInfo.
Jaap Karssenberg <pardus at cpan.org>
-0.13 Sun Feb 26 2005
- - Fixed a bug in F:M::Applications for mimetypes containing a '+'
- - Fixed a bug in F:M::Applications when dir non-existent (debian #347462)
+0.15 Wed Feb 13 2008
+ A special thanks to Chapman Flack for bug reports and patches.
+ - Added some empty pod declarations to satisfy Pod::Coverage (RT 33099)
+ - Fixed typo \xF7 => \x7F in ascii control char check (RT 30959)
+ - Adapted new File::BaseDir API
+ - Added DesktopEntry as a mandatory dependency
+ - Added support for endian conversion (RT 28618)
+ - Fixed mask behavior by making it a bit-wise regex (RT 28620 28635)
+ - Reduced range by 1 byte to match ref implementation (RT 28634)
+ - Added "--no-ask" switch to the mimeopen command
+ - Added "mime_applications_custom()" to set custom commands
+ - Made Magic load magic data when needed, not at startup
+ - Made MimeInfo load glob data when needed, not at startup
+
+0.14 Fri Jun 08 2007
+ - Changed syntax for open() to 3 argument form
+ - Fixed bug for filenames like "0"
+ - Fixed bug with "-l" for Win32
+ - Fixed bug with malformed utf8 chars in default() method
+ derived from suggestions by mcummings_gentoo.org and jonas_cpan.org
+ - Moved from Makefile.PL to Build.pl
+
+0.13 Mon Jan 30 2006
+ Version bump for File::MimeInfo to keep CPAN happy
+ - Fixed a bug with F:M::Applications when dir non-existent
0.12 Sat Oct 8 2005
Updated to version 0.13 of the shared mimeinfo specification
Modified: trunk/libfile-mimeinfo-perl/MANIFEST
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libfile-mimeinfo-perl/MANIFEST?rev=22056&op=diff
==============================================================================
--- trunk/libfile-mimeinfo-perl/MANIFEST (original)
+++ trunk/libfile-mimeinfo-perl/MANIFEST Mon Jun 23 08:28:00 2008
@@ -1,27 +1,34 @@
+Build.PL
Changes
configure
+lib/File/MimeInfo.pm
+lib/File/MimeInfo/Applications.pm
+lib/File/MimeInfo/Cookbook.pod
+lib/File/MimeInfo/Magic.pm
+lib/File/MimeInfo/Rox.pm
Makefile.PL
MANIFEST
META.yml
-MimeInfo.pm
-MimeInfo/Applications.pm
-MimeInfo/Cookbook.pod
-MimeInfo/Magic.pm
-MimeInfo/Rox.pm
mimeopen
mimetype
README
+t/00_use_ok.t
t/01_normal.t
t/02_magic.t
t/03_rox.t
t/04_IO_objects.t
t/05_more.t
+t/06_pod_ok.t
+t/07_pod_cover.t
t/applications/foo.desktop
t/applications/mimeinfo.cache
t/default/binary_file
t/default/empty_file
+t/default/encoding_breakage
t/default/plain_text
+t/default/utf8_text
t/magic/application_msword
+t/magic/application_vnd.corel-draw
t/magic/application_x-executable
t/magic/application_x-perl
t/magic/application_x-perl.txt
Modified: trunk/libfile-mimeinfo-perl/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libfile-mimeinfo-perl/META.yml?rev=22056&op=diff
==============================================================================
--- trunk/libfile-mimeinfo-perl/META.yml (original)
+++ trunk/libfile-mimeinfo-perl/META.yml Mon Jun 23 08:28:00 2008
@@ -1,15 +1,33 @@
-# http://module-build.sourceforge.net/META-spec.html
-#XXXXXXX This is a prototype!!! It will change in the future!!! XXXXX#
-name: File-MimeInfo
-version: 0.13
-version_from: MimeInfo.pm
-installdirs: site
+---
+name: File-MimeInfo
+version: 0.15
+author:
+ - 'Jaap Karssenberg <pardus at cpan.org>'
+abstract: Determine file type
+license: perl
+resources:
+ license: http://dev.perl.org/licenses/
requires:
- Carp: 0
- Exporter: 0
- Fcntl: 0
- File::BaseDir: 0
- Pod::Usage: 0
-
-distribution_type: module
-generated_by: ExtUtils::MakeMaker version 6.30
+ Carp: 0
+ Exporter: 0
+ Fcntl: 0
+ File::BaseDir: 0.03
+ File::DesktopEntry: 0.04
+ Pod::Usage: 0
+provides:
+ File::MimeInfo:
+ file: lib/File/MimeInfo.pm
+ version: 0.15
+ File::MimeInfo::Applications:
+ file: lib/File/MimeInfo/Applications.pm
+ version: 0.15
+ File::MimeInfo::Magic:
+ file: lib/File/MimeInfo/Magic.pm
+ version: 0.15
+ File::MimeInfo::Rox:
+ file: lib/File/MimeInfo/Rox.pm
+ version: 0.15
+generated_by: Module::Build version 0.2806
+meta-spec:
+ url: http://module-build.sourceforge.net/META-spec-v1.2.html
+ version: 1.2
Modified: trunk/libfile-mimeinfo-perl/Makefile.PL
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libfile-mimeinfo-perl/Makefile.PL?rev=22056&op=diff
==============================================================================
--- trunk/libfile-mimeinfo-perl/Makefile.PL (original)
+++ trunk/libfile-mimeinfo-perl/Makefile.PL Mon Jun 23 08:28:00 2008
@@ -1,19 +1,31 @@
-
-use ExtUtils::MakeMaker;
-
-WriteMakefile(
- 'NAME' => 'File::MimeInfo',
- 'VERSION_FROM' => 'MimeInfo.pm',
- 'PREREQ_PM' => {
- 'Carp' => 0,
- 'Exporter' => 0,
- 'Fcntl' => 0,
- 'Pod::Usage' => 0,
- 'File::BaseDir' => 0,
- },
- ($] >= 5.005
- ? (AUTHOR => 'Jaap Karssenberg <pardus at cpan.org>')
- : ()
- ),
- 'EXE_FILES' => [qw/mimetype mimeopen/],
-);
+# Note: this file was auto-generated by Module::Build::Compat version 0.03
+
+ unless (eval "use Module::Build::Compat 0.02; 1" ) {
+ print "This module requires Module::Build to install itself.\n";
+
+ require ExtUtils::MakeMaker;
+ my $yn = ExtUtils::MakeMaker::prompt
+ (' Install Module::Build now from CPAN?', 'y');
+
+ unless ($yn =~ /^y/i) {
+ die " *** Cannot install without Module::Build. Exiting ...\n";
+ }
+
+ require Cwd;
+ require File::Spec;
+ require CPAN;
+
+ # Save this 'cause CPAN will chdir all over the place.
+ my $cwd = Cwd::cwd();
+
+ CPAN::Shell->install('Module::Build::Compat');
+ CPAN::Shell->expand("Module", "Module::Build::Compat")->uptodate
+ or die "Couldn't install Module::Build, giving up.\n";
+
+ chdir $cwd or die "Cannot chdir() back to $cwd: $!";
+ }
+ eval "use Module::Build::Compat 0.02; 1" or die $@;
+
+ Module::Build::Compat->run_build_pl(args => \@ARGV);
+ require Module::Build;
+ Module::Build::Compat->write_makefile(build_class => 'Module::Build');
Modified: trunk/libfile-mimeinfo-perl/README
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libfile-mimeinfo-perl/README?rev=22056&op=diff
==============================================================================
--- trunk/libfile-mimeinfo-perl/README (original)
+++ trunk/libfile-mimeinfo-perl/README Mon Jun 23 08:28:00 2008
@@ -1,5 +1,5 @@
-File-MimeInfo version 0.12
-==========================
+File-MimeInfo
+=============
This module can be used to determine the mime type of a file; it's a
replacement for File::MMagic trying to implement the freedesktop
@@ -15,6 +15,12 @@
make
make test
make install
+
+or alternatively:
+
+ perl Build.pl
+ perl Build test
+ perl Build install
DEPENDENCIES
@@ -34,10 +40,11 @@
Pod::Usage
File::Basename
File::BaseDir
+ File::DesktopEntry
COPYRIGHT AND LICENCE
-Copyright (c) 2003 Jaap G Karssenberg. All rights reserved.
+Copyright (c) 2003,2008 Jaap G Karssenberg. All rights reserved.
This program is free software; you can redistribute it and/or
modify it under the same terms as Perl itself.
Modified: trunk/libfile-mimeinfo-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libfile-mimeinfo-perl/debian/changelog?rev=22056&op=diff
==============================================================================
--- trunk/libfile-mimeinfo-perl/debian/changelog (original)
+++ trunk/libfile-mimeinfo-perl/debian/changelog Mon Jun 23 08:28:00 2008
@@ -1,5 +1,6 @@
-libfile-mimeinfo-perl (0.13-2) UNRELEASED; urgency=low
+libfile-mimeinfo-perl (0.15-1) UNRELEASED; urgency=low
+ [ gregor herrmann ]
* Take over for the Debian Perl Group with maintainer's permission
(http://lists.debian.org/debian-perl/2008/06/msg00039.html)
* debian/control: Added: Vcs-Svn field (source stanza); Vcs-Browser
@@ -10,7 +11,10 @@
Uploaders.
* Add debian/watch.
- -- gregor herrmann <gregoa at debian.org> Sun, 15 Jun 2008 15:57:43 +0200
+ [ Damyan Ivanov ]
+ * New upstream release
+
+ -- Damyan Ivanov <dmn at debian.org> Mon, 23 Jun 2008 11:17:23 +0300
libfile-mimeinfo-perl (0.13-1) unstable; urgency=low
Modified: trunk/libfile-mimeinfo-perl/mimeopen
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libfile-mimeinfo-perl/mimeopen?rev=22056&op=diff
==============================================================================
--- trunk/libfile-mimeinfo-perl/mimeopen (original)
+++ trunk/libfile-mimeinfo-perl/mimeopen Mon Jun 23 08:28:00 2008
@@ -1,8 +1,7 @@
#!/usr/bin/perl
use strict;
-use File::BaseDir;
-our $VERSION = '0.02';
+our $VERSION = '0.15';
$|++;
# ########## #
@@ -21,6 +20,7 @@
'magic-only' => ['M'],
'ask' => ['a'],
'ask-default' => ['d'],
+ 'no-ask' => ['n'],
);
while ((@ARGV) && ($ARGV[0] =~ /^-/)) {
@@ -66,7 +66,7 @@
if ($args{version}) {
print "mimeopen $VERSION\n\n", << 'EOV';
-Copyright (c) 2005 Jaap G Karssenberg. All rights reserved.
+Copyright (c) 2005,2008 Jaap G Karssenberg. All rights reserved.
This program is free software; you can redistribute it and/or
modify it under the same terms as Perl.
@@ -86,13 +86,19 @@
# --database
@File::MimeInfo::DIRS = split /:/, $args{database} if $args{database};
+## Actually use our modules ##
+eval 'use File::MimeInfo::Magic qw/mimetype magic/;';
+die $@ if $@;
+eval 'use File::MimeInfo::Applications;';
+die $@ if $@;
+
+*default = \&File::MimeInfo::default;
+
# --debug
if ($args{debug}) {
$File::MimeInfo::DEBUG++;
$File::MimeInfo::Magic::DEBUG++;
- $File::MimeInfo::Applications::DEBUG++;
- print STDERR "> mimeopen version $VERSION\n";
- print STDERR '> Data dirs are: ', join( ', ',
+ print '> Data dirs are: ', join( ', ',
$args{database}
? ( split /:/, $args{database} )
: (
@@ -102,22 +108,6 @@
), "\n";
}
-## Actually use our modules ##
-eval 'use File::MimeInfo::Magic qw/mimetype magic/;';
-die $@ if $@;
-eval 'use File::MimeInfo::Applications;';
-die $@ if $@;
-
-*default = \&File::MimeInfo::default;
-
-if ($args{debug}) {
- no strict 'refs';
- print STDERR "> $_ version ".${$_.'::VERSION'}."\n" for qw/
- File::MimeInfo
- File::MimeInfo::Magic
- File::MimeInfo::Applications /;
-}
-
# --dereference
if ($args{dereference}) {
eval 'use File::Spec';
@@ -150,7 +140,10 @@
exit 6;
}
-if ($args{ask}) {
+if ($args{'no-ask'}) {
+ $default = defined($default) ? $default : $other[0];
+}
+elsif ($args{'ask'}) {
$default = choose($mimetype, 0, grep defined($_), $default, @other);
}
elsif ($args{'ask-default'}) {
@@ -179,13 +172,14 @@
# ########### #
sub choose {
- my ($mime, $is_default, @app) = @_;
- print $is_default ?
+ my ($mime, $set_default, @app) = @_;
+ print $set_default ?
"Please choose a default application for files of type $mime\n\n" :
"Please choose an application\n\n" ;
my @done;
for my $i (0 .. $#app) {
- my (undef, undef, $file) = File::Spec->splitpath( $app[$i]->{file} );
+ my (undef, undef, $file) =
+ File::Spec->splitpath( $app[$i]->{file} );
$file =~ s/\.desktop$//;
if (grep {$_ eq $file} @done) {
$app[$i] = undef;
@@ -193,10 +187,11 @@
else {
push @done, $file;
print "\t", scalar(@done), ") ",
- $app[$i]->get_value('Name'), " ($file) \n";
+ $app[$i]->get_value('Name'), " ($file)\n";
}
}
@app = grep defined($_), @app;
+ print "\t", scalar(@done)+1, ") Other...\n" if $set_default;
print "\nuse application #";
my $c = <STDIN>;
chomp $c;
@@ -205,13 +200,26 @@
print STDERR "Cancelled\n";
exit 8;
}
- $c--;
-
- if ($is_default) {
+ $c--; # base-1 => base-0
+
+ if ($set_default and $c == scalar(@done)) {
+ # ask for custom command
+ print "use command: ";
+ my $cmd = <STDIN>;
+ chomp $cmd;
+ push @app,
+ eval { mime_applications_set_custom($mime => $cmd) };
+ warn $@ if $@;
+ }
+ elsif ($c > scalar(@app)) {
+ print STDERR "Cancelled\n";
+ exit 8;
+ }
+ elsif ($set_default) {
eval { mime_applications_set_default($mime => $app[$c]) };
- warn if $@;
- }
-
+ warn $@ if $@;
+ }
+
return $app[$c];
}
@@ -272,6 +280,22 @@
Let the user choose a new default program for given files.
+=item B<-n>, B<--no-ask>
+
+Don't ask the user which program to use. Choose the default program or the
+first program known to handle the file mimetype. This does not set the
+default application.
+
+=item B<-L>, B<--dereference>
+
+Follow symbolic links.
+
+=item B<-M>, B<--magic-only>
+
+Do not check for extensions, globs or inode type, only look at the content
+of the file. This is particularly useful if for some reason you don't trust
+the name or the extension a file has.
+
=item B<--database>=I<mimedir>:I<mimedir>:...
Force the program to look in these directories for the shared mime-info
@@ -287,16 +311,6 @@
=item B<-u>, B<--usage>
Print a help message and exits.
-
-=item B<-L>, B<--dereference>
-
-Follow symbolic links.
-
-=item B<-M>, B<--magic-only>
-
-Do not check for extensions, globs or inode type, only look at the content
-of the file. This is particularly useful if for some reason you don't trust
-the name or the extension a file has.
=item B<-v>, B<--version>
Modified: trunk/libfile-mimeinfo-perl/mimetype
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libfile-mimeinfo-perl/mimetype?rev=22056&op=diff
==============================================================================
--- trunk/libfile-mimeinfo-perl/mimetype (original)
+++ trunk/libfile-mimeinfo-perl/mimetype Mon Jun 23 08:28:00 2008
@@ -4,8 +4,7 @@
if 0; # not running under some shell
use strict;
-use File::BaseDir;
-our $VERSION = '0.12';
+our $VERSION = '0.15';
$|++;
# ########## #
@@ -102,12 +101,17 @@
# --database
@File::MimeInfo::DIRS = split /:/, $args{database} if $args{database};
+## Actually use our module ##
+eval 'use File::MimeInfo::Magic qw/mimetype globs inodetype magic describe/;';
+die $@ if $@;
+
+*default = \&File::MimeInfo::default;
+
# --debug
if ($args{debug}) {
$File::MimeInfo::DEBUG++;
$File::MimeInfo::Magic::DEBUG++;
- print STDERR "> mimetype version $VERSION\n";
- print STDERR '> Data dirs are: ', join( ', ',
+ print '> Data dirs are: ', join( ', ',
$args{database}
? ( split /:/, $args{database} )
: (
@@ -117,19 +121,6 @@
), "\n";
}
-## Actually use our module ##
-eval 'use File::MimeInfo::Magic qw/mimetype globs inodetype magic describe/;';
-die $@ if $@;
-
-*default = \&File::MimeInfo::default;
-
-if ($args{debug}) {
- no strict 'refs';
- print STDERR "> $_ version ".${$_.'::VERSION'}."\n" for qw/
- File::MimeInfo
- File::MimeInfo::Magic /;
-}
-
# --file-compat
$args{describe}++ if $args{'file-compat'} && !$args{mimetype};
@@ -462,7 +453,7 @@
=head1 COPYRIGHT
-Copyright (c) 2003 Jaap G Karssenberg. All rights reserved.
+Copyright (c) 2003,2008 Jaap G Karssenberg. All rights reserved.
This program is free software; you can redistribute it and/or
modify it under the same terms as Perl.
Modified: trunk/libfile-mimeinfo-perl/t/01_normal.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libfile-mimeinfo-perl/t/01_normal.t?rev=22056&op=diff
==============================================================================
--- trunk/libfile-mimeinfo-perl/t/01_normal.t (original)
+++ trunk/libfile-mimeinfo-perl/t/01_normal.t Mon Jun 23 08:28:00 2008
@@ -1,7 +1,7 @@
use strict;
-use Test::More tests => 27;
+use Test::More tests => 30;
$ENV{XDG_DATA_HOME} = './t/';
$ENV{XDG_DATA_DIRS} = './t/'; # forceing non default value
@@ -11,6 +11,7 @@
# test what was read
{
no warnings; # don't bug me because I use these vars only once
+ File::MimeInfo::rehash();
ok(scalar(keys %File::MimeInfo::literal) == 1, 'literal data is there'); # 2
ok(scalar(@File::MimeInfo::globs) == 1, 'globs data is there'); # 3
}
@@ -22,14 +23,14 @@
[ '*.h++', '(?-xism:^.*\.h\+\+$)' ], # 5
[ '*.[tar].*', '(?-xism:^.*\.[tar]\..*$)'], # 6
[ '*.?', '(?-xism:^.*\..?$)'], # 7
-) { ok( File::MimeInfo::_glob_to_regexp($_->[0]) eq $_->[1], 'glob '.++$i ) }
+) { is( File::MimeInfo::_glob_to_regexp($_->[0]), $_->[1], 'glob '.++$i ) }
# test parsing file names
$i = 0;
for (
['script.pl', 'application/x-perl'], # 8
['script.old.pl', 'application/x-perl'], # 9
- ['script.PL', 'application/x-perl'], # 10
+ ['script.PL', 'application/x-perl'], # 10 - case insensitive use of glob
['script.tar.pl', 'application/x-perl'], # 11
['script.gz', 'application/x-gzip'], # 12
['script.tar.gz', 'application/x-compressed-tar'], # 13
@@ -38,27 +39,38 @@
['script.foo.tar.gz', 'application/x-compressed-tar'], # 16
['makefile', 'text/x-makefile'], # 17
['./makefile', 'text/x-makefile'], # 18
-) { ok( mimetype($_->[0]) eq $_->[1], 'file '.++$i ) }
+) { is( mimetype($_->[0]), $_->[1], 'file '.++$i ) }
# test OO interface
my $ref = File::MimeInfo->new ;
-ok(ref($ref) eq q/File::MimeInfo/, 'constructor works'); # 19
-ok( $ref->mimetype('script.pl') eq 'application/x-perl', 'OO syntax works'); # 20
+is(ref($ref), q/File::MimeInfo/, 'constructor works'); # 19
+is( $ref->mimetype('script.pl'), 'application/x-perl', 'OO syntax works'); # 20
# test default
-ok( mimetype('t/default/binary_file') eq 'application/octet-stream', 'default works for binary data'); # 21
-ok( mimetype('t/default/plain_text') eq 'text/plain', 'default works for plain text'); # 22
-ok( mimetype('t/default/empty_file') eq 'text/plain', 'default works for empty file'); # 23
+is( mimetype('t/default/binary_file'), 'application/octet-stream', 'default works for binary data'); # 21
+is( mimetype('t/default/plain_text'), 'text/plain', 'default works for plain text'); # 22
+is( mimetype('t/default/empty_file'), 'text/plain', 'default works for empty file'); # 23
ok( ! defined mimetype('t/non_existing_file'), 'default works for non existing file'); # 24
+is( mimetype('t/default/utf8_text'), 'text/plain', 'we speak utf8' ); # 25
+is( mimetype('t/default/encoding_breakage'), 'application/octet-stream', 'encoding bug gone' ); # 26
# test inode thingy
-ok( mimetype('t') eq 'inode/directory', 'directories are recognized'); # 25
+is( mimetype('t'), 'inode/directory', 'directories are recognized'); # 27
+
+SKIP: {
+ unlink 't/symlink' or die "Could not unlink t/symlink"
+ if -l 't/symlink';
+ skip('symlink not supported', 1)
+ unless eval { symlink("",""); 1 }
+ and symlink('t/default' => 't/symlink') ;
+ is( mimetype('t/symlink'), 'inode/symlink', 'symlinks are recognized'); # 28
+}
# test describe
-ok( describe('text/plain') eq 'Plain Text', 'describe works' ); # 26
+ok( describe('text/plain') eq 'Plain Text', 'describe works' ); # 29
{
no warnings; # don't bug me because I use this var only once
$File::MimeInfo::LANG = 'nl';
}
-ok( describe('text/plain') eq 'Platte tekst', 'describe works with other languages' ); # 27
+ok( describe('text/plain') eq 'Platte tekst', 'describe works with other languages' ); # 30
Modified: trunk/libfile-mimeinfo-perl/t/02_magic.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libfile-mimeinfo-perl/t/02_magic.t?rev=22056&op=diff
==============================================================================
--- trunk/libfile-mimeinfo-perl/t/02_magic.t (original)
+++ trunk/libfile-mimeinfo-perl/t/02_magic.t Mon Jun 23 08:28:00 2008
@@ -2,9 +2,10 @@
no warnings;
@File::MimeInfo::DIRS = ('./t/mime'); # forceing non default value
+#$File::MimeInfo::DEBUG = 1;
opendir MAGIC, 't/magic/';
-my @files = grep {$_ !~ /^\./ and $_ ne 'CVS'} readdir MAGIC;
+my @files = grep {$_ !~ /^\./} readdir MAGIC;
closedir MAGIC;
Test::More->import( tests => (2 * scalar(@files) + 1) );
Modified: trunk/libfile-mimeinfo-perl/t/05_more.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libfile-mimeinfo-perl/t/05_more.t?rev=22056&op=diff
==============================================================================
--- trunk/libfile-mimeinfo-perl/t/05_more.t (original)
+++ trunk/libfile-mimeinfo-perl/t/05_more.t Mon Jun 23 08:28:00 2008
@@ -8,13 +8,14 @@
## test reverse extension lookup
+ok( extensions('text/plain') eq 'asc', 'extenions works'); # 2
+is_deeply( [extensions('text/plain')], [qw#asc txt#], 'wantarray extensions works' ); # 3
+
{
+ # call above should have triggered rehash()
no warnings; # don't bug me because I use these vars only once
- ok(scalar(keys %File::MimeInfo::extension) == 6, 'extension data is there'); # 2
+ ok(scalar(keys %File::MimeInfo::extension) == 6, 'extension data is there'); # 4
}
-
-ok( extensions('text/plain') eq 'asc', 'extenions works'); # 2
-is_deeply( [extensions('text/plain')], [qw#asc txt#], 'wantarray extensions works' ); # 4
## test alias lookup
ok(mimetype_canon('text/plain') eq 'text/plain', 'canon is transparent'); # 5
@@ -28,7 +29,7 @@
is_deeply([mimetype_isa('application/x-perl')], [qw(application/x-executable text/plain application/octet-stream)], 'subclass list from file'); # 11
-## Tests for Apllications
+## Tests for Applications
SKIP: {
eval { require File::DesktopEntry };
skip "File::DesktopEntry not installed", 3 if $@;
Modified: trunk/libfile-mimeinfo-perl/t/mime/magic
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libfile-mimeinfo-perl/t/mime/magic?rev=22056&op=diff
==============================================================================
Binary files - no diff available.
More information about the Pkg-perl-cvs-commits
mailing list