r51242 - in /branches/upstream/libtext-markdown-perl/current: Changes META.yml Makefile.PL lib/Text/Markdown.pm t/21fulldocs-text-markdown.t t/34commandlinemarkdown.t

jawnsy-guest at users.alioth.debian.org jawnsy-guest at users.alioth.debian.org
Mon Jan 18 21:34:40 UTC 2010 

Author: jawnsy-guest
Date: Mon Jan 18 21:34:31 2010
New Revision: 51242

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=51242
Log:
[svn-upgrade] Integrating new upstream version, libtext-markdown-perl (1.000030)

Modified:
    branches/upstream/libtext-markdown-perl/current/Changes
    branches/upstream/libtext-markdown-perl/current/META.yml
    branches/upstream/libtext-markdown-perl/current/Makefile.PL
    branches/upstream/libtext-markdown-perl/current/lib/Text/Markdown.pm
    branches/upstream/libtext-markdown-perl/current/t/21fulldocs-text-markdown.t
    branches/upstream/libtext-markdown-perl/current/t/34commandlinemarkdown.t

Modified: branches/upstream/libtext-markdown-perl/current/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libtext-markdown-perl/current/Changes?rev=51242&op=diff
==============================================================================
--- branches/upstream/libtext-markdown-perl/current/Changes (original)
+++ branches/upstream/libtext-markdown-perl/current/Changes Mon Jan 18 21:34:31 2010
@@ -1,4 +1,8 @@
 This file documents the revision history for Perl extension Text::Markdown.
+
+1.0.30 2010-01-18T12:19:49
+        - Removed File::Slurp dependency (v. 9999.13 fails tests on
+          Strawberry 5.10.1) (dandv)
 
 1.0.29 2009-10-28T15:19:26
         - Note Test::Differences is needed for tests to run (RT#50918)

Modified: branches/upstream/libtext-markdown-perl/current/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libtext-markdown-perl/current/META.yml?rev=51242&op=diff
==============================================================================
--- branches/upstream/libtext-markdown-perl/current/META.yml (original)
+++ branches/upstream/libtext-markdown-perl/current/META.yml Mon Jan 18 21:34:31 2010
@@ -4,7 +4,6 @@
   - 'Tomas Doran <bobtfish at bobtfish.net>'
 build_requires:
   ExtUtils::MakeMaker: 6.42
-  File::Slurp: 9999.08
   FindBin: 0
   List::MoreUtils: 0
   Test::Differences: 0
@@ -32,4 +31,4 @@
   bugtracker: http://github.com/bobtfish/text-markdown/issues
   license: http://opensource.org/licenses/bsd-license.php
   repository: http://github.com/bobtfish/text-markdown/
-version: 1.000029
+version: 1.000030

Modified: branches/upstream/libtext-markdown-perl/current/Makefile.PL
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libtext-markdown-perl/current/Makefile.PL?rev=51242&op=diff
==============================================================================
--- branches/upstream/libtext-markdown-perl/current/Makefile.PL (original)
+++ branches/upstream/libtext-markdown-perl/current/Makefile.PL Mon Jan 18 21:34:31 2010
@@ -18,7 +18,6 @@
 test_requires  'Test::More'      => '0.42';
 test_requires  'Test::Exception' => undef;
 test_requires  'List::MoreUtils' => undef;
-test_requires  'File::Slurp'     => '9999.08';
 test_requires 'Test::Differences' => undef;
 test_requires  'FindBin'         => undef;
 

Modified: branches/upstream/libtext-markdown-perl/current/lib/Text/Markdown.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libtext-markdown-perl/current/lib/Text/Markdown.pm?rev=51242&op=diff
==============================================================================
--- branches/upstream/libtext-markdown-perl/current/lib/Text/Markdown.pm (original)
+++ branches/upstream/libtext-markdown-perl/current/lib/Text/Markdown.pm Mon Jan 18 21:34:31 2010
@@ -9,7 +9,7 @@
 use Carp        qw(croak);
 use base        'Exporter';
 
-our $VERSION   = '1.000029'; # 1.0.29
+our $VERSION   = '1.000030'; # 1.0.30
 $VERSION = eval $VERSION;
 our @EXPORT_OK = qw(markdown);
 

Modified: branches/upstream/libtext-markdown-perl/current/t/21fulldocs-text-markdown.t
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libtext-markdown-perl/current/t/21fulldocs-text-markdown.t?rev=51242&op=diff
==============================================================================
--- branches/upstream/libtext-markdown-perl/current/t/21fulldocs-text-markdown.t (original)
+++ branches/upstream/libtext-markdown-perl/current/t/21fulldocs-text-markdown.t Mon Jan 18 21:34:31 2010
@@ -4,7 +4,6 @@
 use FindBin qw($Bin);
 
 use List::MoreUtils qw(uniq);
-use File::Slurp qw(slurp);
 use Encode;
 
 our $TIDY = 0;
@@ -47,16 +46,16 @@
 ### being run when this file is required by other tests
 
 unless (caller) {
-	my $docsdir = "$Bin/Text-Markdown.mdtest";
-	my @files = get_files($docsdir);
+    my $docsdir = "$Bin/Text-Markdown.mdtest";
+    my @files = get_files($docsdir);
 
-	plan tests => scalar(@files) + 1;
+    plan tests => scalar(@files) + 1;
 
-	use_ok('Text::Markdown');
+    use_ok('Text::Markdown');
 
-	my $m = Text::Markdown->new();
+    my $m = Text::Markdown->new();
 
-	run_tests($m, $docsdir, @files);
+    run_tests($m, $docsdir, @files);
 }
 
 sub get_files {
@@ -67,6 +66,13 @@
     closedir($DH);
     return @files;
 }
+
+sub slurp {
+    my ($filename) = @_;
+    open my $file, '<', $filename or die "Couldn't open $filename: $!";
+    local $/ = undef;
+    return <$file>;
+}    
 
 sub run_tests {
     my ($m, $docsdir, @files) = @_;

Modified: branches/upstream/libtext-markdown-perl/current/t/34commandlinemarkdown.t
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libtext-markdown-perl/current/t/34commandlinemarkdown.t?rev=51242&op=diff
==============================================================================
--- branches/upstream/libtext-markdown-perl/current/t/34commandlinemarkdown.t (original)
+++ branches/upstream/libtext-markdown-perl/current/t/34commandlinemarkdown.t Mon Jan 18 21:34:31 2010
@@ -1,12 +1,13 @@
 use strict;
 use warnings;
 use FindBin qw($Bin);
-use File::Slurp qw(slurp);
 use Test::More tests => 2;
 use Test::Exception;
 
-unshift(@ARGV, "$Bin/Markdown-from-MDTest1.1.mdtest/Markdown_Documentation_-_Syntax.text");
-my $expected = slurp("$Bin/Markdown-from-MDTest1.1.mdtest//Markdown_Documentation_-_Syntax.xhtml");
+my $filename = "$Bin/Markdown-from-MDTest1.1.mdtest/Markdown_Documentation_-_Syntax";
+unshift(@ARGV, "$filename.text");
+open my $file, '<', "$filename.xhtml" or die "Couldn't open $filename: $!";
+my $expected = do { local $/; <$file> };
 
 lives_ok {
     require "$Bin/../script/Markdown.pl";

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