r44333 - in /branches/upstream/libmime-lite-perl/current: META.yml Makefile.PL changes.pod lib/MIME/Lite.pm t/types.t
gregoa at users.alioth.debian.org
gregoa at users.alioth.debian.org
Sat Sep 19 20:07:23 UTC 2009
Author: gregoa
Date: Sat Sep 19 20:07:18 2009
New Revision: 44333
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=44333
Log:
[svn-upgrade] Integrating new upstream version, libmime-lite-perl (3.026)
Modified:
branches/upstream/libmime-lite-perl/current/META.yml
branches/upstream/libmime-lite-perl/current/Makefile.PL
branches/upstream/libmime-lite-perl/current/changes.pod
branches/upstream/libmime-lite-perl/current/lib/MIME/Lite.pm
branches/upstream/libmime-lite-perl/current/t/types.t
Modified: branches/upstream/libmime-lite-perl/current/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libmime-lite-perl/current/META.yml?rev=44333&op=diff
==============================================================================
--- branches/upstream/libmime-lite-perl/current/META.yml (original)
+++ branches/upstream/libmime-lite-perl/current/META.yml Sat Sep 19 20:07:18 2009
@@ -1,6 +1,6 @@
--- #YAML:1.0
name: MIME-Lite
-version: 3.025
+version: 3.026
abstract: ~
author: []
license: perl
@@ -16,7 +16,7 @@
Mail::Address: 1.62
MIME::Base64: ~
MIME::QuotedPrint: ~
- MIME::Types: 1.13
+ MIME::Types: 1.28
resources:
Repository: http://github.com/rjbs/mime-lite
no_index:
Modified: branches/upstream/libmime-lite-perl/current/Makefile.PL
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libmime-lite-perl/current/Makefile.PL?rev=44333&op=diff
==============================================================================
--- branches/upstream/libmime-lite-perl/current/Makefile.PL (original)
+++ branches/upstream/libmime-lite-perl/current/Makefile.PL Sat Sep 19 20:07:18 2009
@@ -24,7 +24,7 @@
if (prompt("Add prereqs?",'Yes')=~/y/i) {
%prereq=( %prereq,
'Mail::Address' => 1.62,
- 'MIME::Types' => 1.13,
+ 'MIME::Types' => 1.28,
'File::Basename' => undef,
'MIME::Base64' => undef,
'MIME::QuotedPrint' => undef,
Modified: branches/upstream/libmime-lite-perl/current/changes.pod
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libmime-lite-perl/current/changes.pod?rev=44333&op=diff
==============================================================================
--- branches/upstream/libmime-lite-perl/current/changes.pod (original)
+++ branches/upstream/libmime-lite-perl/current/changes.pod Sat Sep 19 20:07:18 2009
@@ -1,6 +1,10 @@
=head1 CHANGE LOG
=over 4
+
+=item Version 3.025
+
+Fix tests to pass with MIME::Types 1.28
=item Version 3.025
Modified: branches/upstream/libmime-lite-perl/current/lib/MIME/Lite.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libmime-lite-perl/current/lib/MIME/Lite.pm?rev=44333&op=diff
==============================================================================
--- branches/upstream/libmime-lite-perl/current/lib/MIME/Lite.pm (original)
+++ branches/upstream/libmime-lite-perl/current/lib/MIME/Lite.pm Sat Sep 19 20:07:18 2009
@@ -344,7 +344,7 @@
# GLOBALS, EXTERNAL/CONFIGURATION...
-$VERSION = '3.025';
+$VERSION = '3.026';
### Automatically interpret CC/BCC for SMTP:
$AUTO_CC = 1;
@@ -436,7 +436,7 @@
### See if we have/want MIME::Types
my $HaveMimeTypes = 0;
-if ( !$PARANOID and eval "require MIME::Types; MIME::Types->VERSION(1.004);" ) {
+if ( !$PARANOID and eval "require MIME::Types; MIME::Types->VERSION(1.28);" ) {
$HaveMimeTypes = 1;
push @Uses, "T$MIME::Types::VERSION";
}
@@ -3609,7 +3609,7 @@
=head1 VERSION
-Version: 3.01_06 (Dev Test Release)
+Version: 3.026
=head1 CHANGE LOG
Modified: branches/upstream/libmime-lite-perl/current/t/types.t
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libmime-lite-perl/current/t/types.t?rev=44333&op=diff
==============================================================================
--- branches/upstream/libmime-lite-perl/current/t/types.t (original)
+++ branches/upstream/libmime-lite-perl/current/t/types.t Sat Sep 19 20:07:18 2009
@@ -1,48 +1,45 @@
#!/usr/bin/perl
use lib "lib", "t";
-BEGIN {
- $::SKIP=!eval("require MIME::Types; 1");
-}
use MIME::Lite;
-use ExtUtils::TBone;
+use Test::More;
use Utils;
-# Make a tester... here are 3 different alternatives:
-my $T = typical ExtUtils::TBone; # standard log
-$MIME::Lite::VANILLA = 1;
-# Begin testing:
-$T->begin(1);
-if ($::SKIP) {
- warn "#\n#Interaction with MIME::Types has not been tested\n#as it doesn't seem to be present.\n";
- $T->ok(1,"MIME::Types not available.");
-} elsif (eval { MIME::Types->VERSION(1.004) }) {
- # warn "#\n#Testing MIME::Types interaction\n";
- my $msg;
- $msg = MIME::Lite->new(
- From =>'me at myhost.com',
- To =>'you at yourhost.com',
- Cc =>'some at other.com, some at more.com',
- Subject =>'Helloooooo, nurse!',
- Data =>"How's it goin', eh?"
- );
+if (eval { require MIME::Types; MIME::Types->VERSION(1.28); 1 }) {
+ plan tests => 1;
+} else {
+ plan skip_all => "MIME::Types >= 1.28 not available";
+}
- # this test requires output in a particular order, so specify it
- $msg->field_order(qw(Content-Transfer-Encoding
- Content-Type
- MIME-Version
- From
- To
- Cc
- Subject));
+$MIME::Lite::VANILLA = 1;
- $msg->attach(
- Type => 'AUTO',
- Path => "./testin/test.html",
- ReadNow => 1,
- Filename => "test.html");
+# warn "#\n#Testing MIME::Types interaction\n";
+my $msg = MIME::Lite->new(
+ From => 'me at myhost.com',
+ To => 'you at yourhost.com',
+ Cc => 'some at other.com, some at more.com',
+ Subject => 'Helloooooo, nurse!',
+ Data => "How's it goin', eh?"
+);
- (my $ret=$msg->stringify)=~s/^Date:.*\n//m;
- $T->msg("!!!MESSAGE\n".$ret."!!!/MESSAGE\n");
+# this test requires output in a particular order, so specify it
+$msg->field_order(qw(
+ Content-Transfer-Encoding
+ Content-Type
+ MIME-Version
+ From
+ To
+ Cc
+ Subject
+));
+
+$msg->attach(
+ Type => 'AUTO',
+ Path => "./testin/test.html",
+ ReadNow => 1,
+ Filename => "test.html",
+);
+
+(my $ret=$msg->stringify)=~s/^Date:.*\n//m;
my $expect=<<'EOFEXPECT';
Content-Transfer-Encoding: 7bit
@@ -57,8 +54,7 @@
--_----------=_0
Content-Disposition: inline
-Content-Length: 19
-Content-Transfer-Encoding: binary
+Content-Transfer-Encoding: 8bit
Content-Type: text/plain
How's it goin', eh?
@@ -72,14 +68,5 @@
EOFEXPECT
+is($ret, $expect, "we got the message we expected");
- $T->msg("!!!EXPECT\n".$expect."!!!/EXPECT\n");
-
- $T->ok_eq($ret,$expect);
-
-} else {
- warn "#\n#Your version of MIME::Types (".($MIME::Types::VERSION||'undef??').") is too old to use. Please upgrade to the latest.\n";
- $T->ok(1,"Your version of MIME::Types (".($MIME::Types::VERSION||'undef??').") is too old to use. Please upgrade to the latest.");
-}
-$T->end;
-__DATA__
More information about the Pkg-perl-cvs-commits
mailing list