[Bps-public-commit] HTML-Quoted branch, master, updated. 0.03-4-g9bb6694

Thomas Sibley trs at bestpractical.com
Tue May 21 14:53:07 EDT 2013


The branch, master has been updated
       via  9bb6694d5fff00d645055264b4db51d44b23fe47 (commit)
       via  a760c78d7a8de3615227bf4d8d994dd634b0e49a (commit)
       via  ce0cd7974e983ac0c3d5bf0ee681d6c42da119f6 (commit)
       via  8436d2ba5853d44316131d67913427152247435f (commit)
      from  70b740cf9de6d6ab0173033045f8dd60cd02b528 (commit)

Summary of changes:
 Changes                             |   4 ++
 META.yml                            |   9 +--
 README                              |   5 ++
 inc/Module/Install.pm               |   6 +-
 inc/Module/Install/Base.pm          |   2 +-
 inc/Module/Install/Can.pm           |  85 +++++++++++++++++++++++++--
 inc/Module/Install/Fetch.pm         |   2 +-
 inc/Module/Install/Makefile.pm      |  27 +++++----
 inc/Module/Install/Metadata.pm      |  29 ++++++----
 inc/Module/Install/ReadmeFromPod.pm | 112 ++++++++++++++++++++++++++++++++----
 inc/Module/Install/Win32.pm         |   2 +-
 inc/Module/Install/WriteAll.pm      |   2 +-
 lib/HTML/Quoted.pm                  |  17 +++++-
 t/blockquote.t                      |  11 +++-
 t/blocks.t                          |  15 ++++-
 t/lines.t                           |  19 +++++-
 16 files changed, 292 insertions(+), 55 deletions(-)

- Log -----------------------------------------------------------------
commit 8436d2ba5853d44316131d67913427152247435f
Author: Ricardo Signes <rjbs at cpan.org>
Date:   Tue May 21 14:44:37 2013 -0400

    add a combine_hunks method

diff --git a/Changes b/Changes
index 444b80d..ab9af41 100644
--- a/Changes
+++ b/Changes
@@ -1,3 +1,7 @@
+0.04
+
+    * add combine_hunks method
+
 0.03 2011-01-09
 
     * much more user friendlier documentation
diff --git a/lib/HTML/Quoted.pm b/lib/HTML/Quoted.pm
index 1fab525..8bcef76 100644
--- a/lib/HTML/Quoted.pm
+++ b/lib/HTML/Quoted.pm
@@ -94,6 +94,21 @@ sub extract {
     return $parser->{'html_quoted_parser'}{'result'};
 }
 
+=head2 combine_hunks
+
+  my $html = HTML::Quoted->combine_hunks( $arrayref_of_hunks );
+
+Takes the output of C<extract> and turns it back into HTML.
+
+=cut
+
+sub combine_hunks {
+    my ($self, $hunks) = @_;
+
+    join "",
+      map {; ref $_ eq 'HASH' ? $_->{raw} : $self->combine_hunks($_) } @$hunks;
+}
+
 package HTML::Quoted::Parser;
 use base "HTML::Parser";
 
diff --git a/t/blockquote.t b/t/blockquote.t
index d38c8f8..9294579 100644
--- a/t/blockquote.t
+++ b/t/blockquote.t
@@ -1,7 +1,7 @@
 use strict;
 use warnings;
 
-use Test::More tests => 1;
+use Test::More tests => 2;
 use HTML::Quoted;
 use Data::Dumper;
 
@@ -65,4 +65,13 @@ sub check {
          ];
 
     check( $text, $res );
+
+    # Really, we should not expect this to exactly round-trip in all cases, as
+    # we could be collapsing whitespace somewhere, I fear.  Rather than
+    # investigate that carefully, I will just write this comment.
+    # Other input might need more massaging.  -- rjbs, 2013-05-21
+    is(
+      HTML::Quoted->combine_hunks( HTML::Quoted->extract( $text ) ),
+      $text,
+    );
 }
diff --git a/t/blocks.t b/t/blocks.t
index 5beeb7f..378920d 100644
--- a/t/blocks.t
+++ b/t/blocks.t
@@ -1,22 +1,35 @@
 use strict;
 use warnings;
 
-use Test::More tests => 4;
+use Test::More tests => 7;
 BEGIN { use_ok('HTML::Quoted') };
 
+sub rt_ok { # C&P also in t/lines.t
+    my $text = shift;
+    local $Test::Builder::Level = $Test::Builder::Level + 1;
+    is(
+        HTML::Quoted->combine_hunks( HTML::Quoted->extract( $text ) ),
+        $text,
+        "round trips okay",
+    );
+}
+
 use Data::Dumper;
 {
     my $a = "<div>line1</div>";
     is_deeply(HTML::Quoted->extract($a),[{raw => '<div>line1</div>', block => 1 }])
         or diag Dumper(HTML::Quoted->extract($a));
+    rt_ok($a);
 }
 {
     my $a = "<div />";
     is_deeply(HTML::Quoted->extract($a),[{raw => '<div />', block => 1 }])
         or diag Dumper(HTML::Quoted->extract($a));
+    rt_ok($a);
 }
 {
     my $a = "<div></div><br />";
     is_deeply(HTML::Quoted->extract($a),[{raw => '<div></div>', block => 1 },{raw => '<br />'}])
         or diag Dumper(HTML::Quoted->extract($a));
+    rt_ok($a);
 }
diff --git a/t/lines.t b/t/lines.t
index cc426f6..197b64e 100644
--- a/t/lines.t
+++ b/t/lines.t
@@ -1,42 +1,59 @@
 use strict;
 use warnings;
 
-use Test::More tests => 8;
+use Test::More tests => 15;
 BEGIN { use_ok('HTML::Quoted') };
 
+sub rt_ok { # C&P also in t/blocks.t
+    my $text = shift;
+    local $Test::Builder::Level = $Test::Builder::Level + 1;
+    is(
+        HTML::Quoted->combine_hunks( HTML::Quoted->extract( $text ) ),
+        $text,
+        "round trips okay",
+    );
+}
+
 use Data::Dumper;
 {
     my $a = "line1";
     is_deeply(HTML::Quoted->extract($a),[{raw => 'line1'}]);
+    rt_ok($a);
 }
 
 {
     my $a = "line1<br>";
     is_deeply(HTML::Quoted->extract($a),[{raw => 'line1<br>'}])
         or diag Dumper(HTML::Quoted->extract($a));
+    rt_ok($a);
 }
 {
     my $a = "line1<br />";
     is_deeply(HTML::Quoted->extract($a),[{raw => 'line1<br />'}])
         or diag Dumper(HTML::Quoted->extract($a));
+    rt_ok($a);
 }
 {
     my $a = "line1<br></br>";
     is_deeply(HTML::Quoted->extract($a),[{raw => 'line1<br></br>'}])
         or diag Dumper(HTML::Quoted->extract($a));
+    rt_ok($a);
 }
 
 {
     my $a = "line1<br>line2";
     is_deeply(HTML::Quoted->extract($a),[{raw => 'line1<br>'}, {raw => 'line2'}])
         or diag Dumper(HTML::Quoted->extract($a));
+    rt_ok($a);
 }
 {
     my $a = "line1<br />line2";
     is_deeply(HTML::Quoted->extract($a),[{raw => 'line1<br />'}, {raw => 'line2'}]);
+    rt_ok($a);
 }
 {
     my $a = "line1<br></br>line2";
     is_deeply(HTML::Quoted->extract($a),[{raw => 'line1<br></br>'}, {raw => 'line2'}]);
+    rt_ok($a);
 }
 

commit ce0cd7974e983ac0c3d5bf0ee681d6c42da119f6
Merge: 70b740c 8436d2b
Author: Thomas Sibley <trs at bestpractical.com>
Date:   Tue May 21 11:50:47 2013 -0700

    Merge branch 'pr/1'


commit a760c78d7a8de3615227bf4d8d994dd634b0e49a
Author: Thomas Sibley <trs at bestpractical.com>
Date:   Tue May 21 11:51:17 2013 -0700

    Update build toolchain

diff --git a/META.yml b/META.yml
index eca5af0..3bf9b48 100644
--- a/META.yml
+++ b/META.yml
@@ -3,11 +3,12 @@ abstract: 'extract structure of quoted HTML mail message'
 author:
   - 'Ruslan.Zakirov <ruz at bestpractical.com>'
 build_requires:
-  ExtUtils::MakeMaker: 6.42
+  ExtUtils::MakeMaker: 6.59
 configure_requires:
-  ExtUtils::MakeMaker: 6.42
+  ExtUtils::MakeMaker: 6.59
 distribution_type: module
-generated_by: 'Module::Install version 1.00'
+dynamic_config: 1
+generated_by: 'Module::Install version 1.06'
 license: perl
 meta-spec:
   url: http://module-build.sourceforge.net/META-spec-v1.4.html
diff --git a/inc/Module/Install.pm b/inc/Module/Install.pm
index 8ee839d..4ecf46b 100644
--- a/inc/Module/Install.pm
+++ b/inc/Module/Install.pm
@@ -31,7 +31,7 @@ BEGIN {
 	# This is not enforced yet, but will be some time in the next few
 	# releases once we can make sure it won't clash with custom
 	# Module::Install extensions.
-	$VERSION = '1.00';
+	$VERSION = '1.06';
 
 	# Storage for the pseudo-singleton
 	$MAIN    = undef;
@@ -451,7 +451,7 @@ sub _version ($) {
 }
 
 sub _cmp ($$) {
-	_version($_[0]) <=> _version($_[1]);
+	_version($_[1]) <=> _version($_[2]);
 }
 
 # Cloned from Params::Util::_CLASS
@@ -467,4 +467,4 @@ sub _CLASS ($) {
 
 1;
 
-# Copyright 2008 - 2010 Adam Kennedy.
+# Copyright 2008 - 2012 Adam Kennedy.
diff --git a/inc/Module/Install/Base.pm b/inc/Module/Install/Base.pm
index b55bda3..802844a 100644
--- a/inc/Module/Install/Base.pm
+++ b/inc/Module/Install/Base.pm
@@ -4,7 +4,7 @@ package Module::Install::Base;
 use strict 'vars';
 use vars qw{$VERSION};
 BEGIN {
-	$VERSION = '1.00';
+	$VERSION = '1.06';
 }
 
 # Suspend handler for "redefined" warnings
diff --git a/inc/Module/Install/Can.pm b/inc/Module/Install/Can.pm
index 71ccc27..22167b8 100644
--- a/inc/Module/Install/Can.pm
+++ b/inc/Module/Install/Can.pm
@@ -3,13 +3,12 @@ package Module::Install::Can;
 
 use strict;
 use Config                ();
-use File::Spec            ();
 use ExtUtils::MakeMaker   ();
 use Module::Install::Base ();
 
 use vars qw{$VERSION @ISA $ISCORE};
 BEGIN {
-	$VERSION = '1.00';
+	$VERSION = '1.06';
 	@ISA     = 'Module::Install::Base';
 	$ISCORE  = 1;
 }
@@ -29,7 +28,7 @@ sub can_use {
 	eval { require $mod; $pkg->VERSION($ver || 0); 1 };
 }
 
-# check if we can run some command
+# Check if we can run some command
 sub can_run {
 	my ($self, $cmd) = @_;
 
@@ -38,14 +37,88 @@ sub can_run {
 
 	for my $dir ((split /$Config::Config{path_sep}/, $ENV{PATH}), '.') {
 		next if $dir eq '';
-		my $abs = File::Spec->catfile($dir, $_[1]);
+		require File::Spec;
+		my $abs = File::Spec->catfile($dir, $cmd);
 		return $abs if (-x $abs or $abs = MM->maybe_command($abs));
 	}
 
 	return;
 }
 
-# can we locate a (the) C compiler
+# Can our C compiler environment build XS files
+sub can_xs {
+	my $self = shift;
+
+	# Ensure we have the CBuilder module
+	$self->configure_requires( 'ExtUtils::CBuilder' => 0.27 );
+
+	# Do we have the configure_requires checker?
+	local $@;
+	eval "require ExtUtils::CBuilder;";
+	if ( $@ ) {
+		# They don't obey configure_requires, so it is
+		# someone old and delicate. Try to avoid hurting
+		# them by falling back to an older simpler test.
+		return $self->can_cc();
+	}
+
+	# Do we have a working C compiler
+	my $builder = ExtUtils::CBuilder->new(
+		quiet => 1,
+	);
+	unless ( $builder->have_compiler ) {
+		# No working C compiler
+		return 0;
+	}
+
+	# Write a C file representative of what XS becomes
+	require File::Temp;
+	my ( $FH, $tmpfile ) = File::Temp::tempfile(
+		"compilexs-XXXXX",
+		SUFFIX => '.c',
+	);
+	binmode $FH;
+	print $FH <<'END_C';
+#include "EXTERN.h"
+#include "perl.h"
+#include "XSUB.h"
+
+int main(int argc, char **argv) {
+    return 0;
+}
+
+int boot_sanexs() {
+    return 1;
+}
+
+END_C
+	close $FH;
+
+	# Can the C compiler access the same headers XS does
+	my @libs   = ();
+	my $object = undef;
+	eval {
+		local $^W = 0;
+		$object = $builder->compile(
+			source => $tmpfile,
+		);
+		@libs = $builder->link(
+			objects     => $object,
+			module_name => 'sanexs',
+		);
+	};
+	my $result = $@ ? 0 : 1;
+
+	# Clean up all the build files
+	foreach ( $tmpfile, $object, @libs ) {
+		next unless defined $_;
+		1 while unlink;
+	}
+
+	return $result;
+}
+
+# Can we locate a (the) C compiler
 sub can_cc {
 	my $self   = shift;
 	my @chunks = split(/ /, $Config::Config{cc}) or return;
@@ -78,4 +151,4 @@ if ( $^O eq 'cygwin' ) {
 
 __END__
 
-#line 156
+#line 236
diff --git a/inc/Module/Install/Fetch.pm b/inc/Module/Install/Fetch.pm
index ec1f106..bee0c4f 100644
--- a/inc/Module/Install/Fetch.pm
+++ b/inc/Module/Install/Fetch.pm
@@ -6,7 +6,7 @@ use Module::Install::Base ();
 
 use vars qw{$VERSION @ISA $ISCORE};
 BEGIN {
-	$VERSION = '1.00';
+	$VERSION = '1.06';
 	@ISA     = 'Module::Install::Base';
 	$ISCORE  = 1;
 }
diff --git a/inc/Module/Install/Makefile.pm b/inc/Module/Install/Makefile.pm
index 5dfd0e9..7052f36 100644
--- a/inc/Module/Install/Makefile.pm
+++ b/inc/Module/Install/Makefile.pm
@@ -8,7 +8,7 @@ use Fcntl qw/:flock :seek/;
 
 use vars qw{$VERSION @ISA $ISCORE};
 BEGIN {
-	$VERSION = '1.00';
+	$VERSION = '1.06';
 	@ISA     = 'Module::Install::Base';
 	$ISCORE  = 1;
 }
@@ -215,18 +215,22 @@ sub write {
 	require ExtUtils::MakeMaker;
 
 	if ( $perl_version and $self->_cmp($perl_version, '5.006') >= 0 ) {
-		# MakeMaker can complain about module versions that include
-		# an underscore, even though its own version may contain one!
-		# Hence the funny regexp to get rid of it.  See RT #35800
-		# for details.
-		my $v = $ExtUtils::MakeMaker::VERSION =~ /^(\d+\.\d+)/;
-		$self->build_requires(     'ExtUtils::MakeMaker' => $v );
-		$self->configure_requires( 'ExtUtils::MakeMaker' => $v );
+		# This previous attempted to inherit the version of
+		# ExtUtils::MakeMaker in use by the module author, but this
+		# was found to be untenable as some authors build releases
+		# using future dev versions of EU:MM that nobody else has.
+		# Instead, #toolchain suggests we use 6.59 which is the most
+		# stable version on CPAN at time of writing and is, to quote
+		# ribasushi, "not terminally fucked, > and tested enough".
+		# TODO: We will now need to maintain this over time to push
+		# the version up as new versions are released.
+		$self->build_requires(     'ExtUtils::MakeMaker' => 6.59 );
+		$self->configure_requires( 'ExtUtils::MakeMaker' => 6.59 );
 	} else {
 		# Allow legacy-compatibility with 5.005 by depending on the
 		# most recent EU:MM that supported 5.005.
-		$self->build_requires(     'ExtUtils::MakeMaker' => 6.42 );
-		$self->configure_requires( 'ExtUtils::MakeMaker' => 6.42 );
+		$self->build_requires(     'ExtUtils::MakeMaker' => 6.36 );
+		$self->configure_requires( 'ExtUtils::MakeMaker' => 6.36 );
 	}
 
 	# Generate the MakeMaker params
@@ -241,7 +245,6 @@ in a module, and provide its file path via 'version_from' (or
 'all_from' if you prefer) in Makefile.PL.
 EOT
 
-	$DB::single = 1;
 	if ( $self->tests ) {
 		my @tests = split ' ', $self->tests;
 		my %seen;
@@ -412,4 +415,4 @@ sub postamble {
 
 __END__
 
-#line 541
+#line 544
diff --git a/inc/Module/Install/Metadata.pm b/inc/Module/Install/Metadata.pm
index cfe45b3..58430f3 100644
--- a/inc/Module/Install/Metadata.pm
+++ b/inc/Module/Install/Metadata.pm
@@ -6,7 +6,7 @@ use Module::Install::Base ();
 
 use vars qw{$VERSION @ISA $ISCORE};
 BEGIN {
-	$VERSION = '1.00';
+	$VERSION = '1.06';
 	@ISA     = 'Module::Install::Base';
 	$ISCORE  = 1;
 }
@@ -151,15 +151,21 @@ sub install_as_site   { $_[0]->installdirs('site')   }
 sub install_as_vendor { $_[0]->installdirs('vendor') }
 
 sub dynamic_config {
-	my $self = shift;
-	unless ( @_ ) {
-		warn "You MUST provide an explicit true/false value to dynamic_config\n";
-		return $self;
+	my $self  = shift;
+	my $value = @_ ? shift : 1;
+	if ( $self->{values}->{dynamic_config} ) {
+		# Once dynamic we never change to static, for safety
+		return 0;
 	}
-	$self->{values}->{dynamic_config} = $_[0] ? 1 : 0;
+	$self->{values}->{dynamic_config} = $value ? 1 : 0;
 	return 1;
 }
 
+# Convenience command
+sub static_config {
+	shift->dynamic_config(0);
+}
+
 sub perl_version {
 	my $self = shift;
 	return $self->{values}->{perl_version} unless @_;
@@ -170,7 +176,7 @@ sub perl_version {
 	# Normalize the version
 	$version = $self->_perl_version($version);
 
-	# We don't support the reall old versions
+	# We don't support the really old versions
 	unless ( $version >= 5.005 ) {
 		die "Module::Install only supports 5.005 or newer (use ExtUtils::MakeMaker)\n";
 	}
@@ -515,6 +521,7 @@ sub __extract_license {
 		'GNU Free Documentation license'     => 'unrestricted', 1,
 		'GNU Affero General Public License'  => 'open_source',  1,
 		'(?:Free)?BSD license'               => 'bsd',          1,
+		'Artistic license 2\.0'              => 'artistic_2',   1,
 		'Artistic license'                   => 'artistic',     1,
 		'Apache (?:Software )?license'       => 'apache',       1,
 		'GPL'                                => 'gpl',          1,
@@ -550,9 +557,9 @@ sub license_from {
 
 sub _extract_bugtracker {
 	my @links   = $_[0] =~ m#L<(
-	 \Qhttp://rt.cpan.org/\E[^>]+|
-	 \Qhttp://github.com/\E[\w_]+/[\w_]+/issues|
-	 \Qhttp://code.google.com/p/\E[\w_\-]+/issues/list
+	 https?\Q://rt.cpan.org/\E[^>]+|
+	 https?\Q://github.com/\E[\w_]+/[\w_]+/issues|
+	 https?\Q://code.google.com/p/\E[\w_\-]+/issues/list
 	 )>#gx;
 	my %links;
 	@links{@links}=();
@@ -581,7 +588,7 @@ sub bugtracker_from {
 sub requires_from {
 	my $self     = shift;
 	my $content  = Module::Install::_readperl($_[0]);
-	my @requires = $content =~ m/^use\s+([^\W\d]\w*(?:::\w+)*)\s+([\d\.]+)/mg;
+	my @requires = $content =~ m/^use\s+([^\W\d]\w*(?:::\w+)*)\s+(v?[\d\.]+)/mg;
 	while ( @requires ) {
 		my $module  = shift @requires;
 		my $version = shift @requires;
diff --git a/inc/Module/Install/ReadmeFromPod.pm b/inc/Module/Install/ReadmeFromPod.pm
index 348531e..6a80818 100644
--- a/inc/Module/Install/ReadmeFromPod.pm
+++ b/inc/Module/Install/ReadmeFromPod.pm
@@ -7,29 +7,119 @@ use warnings;
 use base qw(Module::Install::Base);
 use vars qw($VERSION);
 
-$VERSION = '0.12';
+$VERSION = '0.20';
 
 sub readme_from {
   my $self = shift;
   return unless $self->is_admin;
 
-  my $file = shift || $self->_all_from
+  # Input file
+  my $in_file  = shift || $self->_all_from
     or die "Can't determine file to make readme_from";
-  my $clean = shift;
 
-  print "Writing README from $file\n";
+  # Get optional arguments
+  my ($clean, $format, $out_file, $options);
+  my $args = shift;
+  if ( ref $args ) {
+    # Arguments are in a hashref
+    if ( ref($args) ne 'HASH' ) {
+      die "Expected a hashref but got a ".ref($args)."\n";
+    } else {
+      $clean    = $args->{'clean'};
+      $format   = $args->{'format'};
+      $out_file = $args->{'output_file'};
+      $options  = $args->{'options'};
+    }
+  } else {
+    # Arguments are in a list
+    $clean    = $args;
+    $format   = shift;
+    $out_file = shift;
+    $options  = \@_;
+  }
+
+  # Default values;
+  $clean  ||= 0;
+  $format ||= 'txt';
+
+  # Generate README
+  print "readme_from $in_file to $format\n";
+  if ($format =~ m/te?xt/) {
+    $out_file = $self->_readme_txt($in_file, $out_file, $options);
+  } elsif ($format =~ m/html?/) {
+    $out_file = $self->_readme_htm($in_file, $out_file, $options);
+  } elsif ($format eq 'man') {
+    $out_file = $self->_readme_man($in_file, $out_file, $options);
+  } elsif ($format eq 'pdf') {
+    $out_file = $self->_readme_pdf($in_file, $out_file, $options);
+  }
 
-  require Pod::Text;
-  my $parser = Pod::Text->new();
-  open README, '> README' or die "$!\n";
-  $parser->output_fh( *README );
-  $parser->parse_file( $file );
   if ($clean) {
-    $self->clean_files('README');
+    $self->clean_files($out_file);
   }
+
   return 1;
 }
 
+
+sub _readme_txt {
+  my ($self, $in_file, $out_file, $options) = @_;
+  $out_file ||= 'README';
+  require Pod::Text;
+  my $parser = Pod::Text->new( @$options );
+  open my $out_fh, '>', $out_file or die "Could not write file $out_file:\n$!\n";
+  $parser->output_fh( *$out_fh );
+  $parser->parse_file( $in_file );
+  close $out_fh;
+  return $out_file;
+}
+
+
+sub _readme_htm {
+  my ($self, $in_file, $out_file, $options) = @_;
+  $out_file ||= 'README.htm';
+  require Pod::Html;
+  Pod::Html::pod2html(
+    "--infile=$in_file",
+    "--outfile=$out_file",
+    @$options,
+  );
+  # Remove temporary files if needed
+  for my $file ('pod2htmd.tmp', 'pod2htmi.tmp') {
+    if (-e $file) {
+      unlink $file or warn "Warning: Could not remove file '$file'.\n$!\n";
+    }
+  }
+  return $out_file;
+}
+
+
+sub _readme_man {
+  my ($self, $in_file, $out_file, $options) = @_;
+  $out_file ||= 'README.1';
+  require Pod::Man;
+  my $parser = Pod::Man->new( @$options );
+  $parser->parse_from_file($in_file, $out_file);
+  return $out_file;
+}
+
+
+sub _readme_pdf {
+  my ($self, $in_file, $out_file, $options) = @_;
+  $out_file ||= 'README.pdf';
+  eval { require App::pod2pdf; }
+    or die "Could not generate $out_file because pod2pdf could not be found\n";
+  my $parser = App::pod2pdf->new( @$options );
+  $parser->parse_from_file($in_file);
+  open my $out_fh, '>', $out_file or die "Could not write file $out_file:\n$!\n";
+  select $out_fh;
+  $parser->output;
+  select STDOUT;
+  close $out_fh;
+  return $out_file;
+}
+
+
 sub _all_from {
   my $self = shift;
   return unless $self->admin->{extensions};
@@ -44,5 +134,5 @@ sub _all_from {
 
 __END__
 
-#line 112
+#line 254
 
diff --git a/inc/Module/Install/Win32.pm b/inc/Module/Install/Win32.pm
index edc18b4..eeaa3fe 100644
--- a/inc/Module/Install/Win32.pm
+++ b/inc/Module/Install/Win32.pm
@@ -6,7 +6,7 @@ use Module::Install::Base ();
 
 use vars qw{$VERSION @ISA $ISCORE};
 BEGIN {
-	$VERSION = '1.00';
+	$VERSION = '1.06';
 	@ISA     = 'Module::Install::Base';
 	$ISCORE  = 1;
 }
diff --git a/inc/Module/Install/WriteAll.pm b/inc/Module/Install/WriteAll.pm
index d0f6599..85d8018 100644
--- a/inc/Module/Install/WriteAll.pm
+++ b/inc/Module/Install/WriteAll.pm
@@ -6,7 +6,7 @@ use Module::Install::Base ();
 
 use vars qw{$VERSION @ISA $ISCORE};
 BEGIN {
-	$VERSION = '1.00';
+	$VERSION = '1.06';
 	@ISA     = qw{Module::Install::Base};
 	$ISCORE  = 1;
 }

commit 9bb6694d5fff00d645055264b4db51d44b23fe47
Author: Thomas Sibley <trs at bestpractical.com>
Date:   Tue May 21 11:52:26 2013 -0700

    Releng for 0.04

diff --git a/Changes b/Changes
index ab9af41..f27b46d 100644
--- a/Changes
+++ b/Changes
@@ -1,6 +1,6 @@
-0.04
+0.04    Tue May 21 11:52:10 PDT 2013
 
-    * add combine_hunks method
+    * add combine_hunks method (RJBS)
 
 0.03 2011-01-09
 
diff --git a/META.yml b/META.yml
index 3bf9b48..10b9301 100644
--- a/META.yml
+++ b/META.yml
@@ -24,4 +24,4 @@ requires:
   perl: 5.8.0
 resources:
   license: http://dev.perl.org/licenses/
-version: 0.03
+version: 0.04
diff --git a/README b/README
index a371b7c..d38c86c 100644
--- a/README
+++ b/README
@@ -53,6 +53,11 @@ METHODS
     *   quoter_raw, quoter - raw and decoded (entities are converted) quoter
         if block is prefixed with quoting characters
 
+  combine_hunks
+      my $html = HTML::Quoted->combine_hunks( $arrayref_of_hunks );
+
+    Takes the output of "extract" and turns it back into HTML.
+
 AUTHOR
     Ruslan.Zakirov <ruz at bestpractical.com>
 
diff --git a/lib/HTML/Quoted.pm b/lib/HTML/Quoted.pm
index 8bcef76..a9da67c 100644
--- a/lib/HTML/Quoted.pm
+++ b/lib/HTML/Quoted.pm
@@ -4,7 +4,7 @@ use warnings;
 
 package HTML::Quoted;
 
-our $VERSION = '0.03';
+our $VERSION = '0.04';
 
 =head1 NAME
 

-----------------------------------------------------------------------



More information about the Bps-public-commit mailing list