r21662 - in /branches/upstream/libcss-tiny-perl/current: Changes LICENSE MANIFEST META.yml Makefile.PL README inc/ lib/CSS/Tiny.pm t/01_compile.t t/02_main.t t/03_inline_clone.t t/98_pod.t t/99_pmv.t t/99_pod.t
dmn at users.alioth.debian.org
dmn at users.alioth.debian.org
Sun Jun 15 18:08:23 UTC 2008
Author: dmn
Date: Sun Jun 15 18:08:22 2008
New Revision: 21662
URL: http://svn.debian.org/wsvn/?sc=1&rev=21662
Log:
[svn-upgrade] Integrating new upstream version, libcss-tiny-perl (1.15)
Added:
branches/upstream/libcss-tiny-perl/current/t/98_pod.t
branches/upstream/libcss-tiny-perl/current/t/99_pmv.t
Removed:
branches/upstream/libcss-tiny-perl/current/inc/
branches/upstream/libcss-tiny-perl/current/t/99_pod.t
Modified:
branches/upstream/libcss-tiny-perl/current/Changes
branches/upstream/libcss-tiny-perl/current/LICENSE
branches/upstream/libcss-tiny-perl/current/MANIFEST
branches/upstream/libcss-tiny-perl/current/META.yml
branches/upstream/libcss-tiny-perl/current/Makefile.PL
branches/upstream/libcss-tiny-perl/current/README
branches/upstream/libcss-tiny-perl/current/lib/CSS/Tiny.pm
branches/upstream/libcss-tiny-perl/current/t/01_compile.t
branches/upstream/libcss-tiny-perl/current/t/02_main.t
branches/upstream/libcss-tiny-perl/current/t/03_inline_clone.t
Modified: branches/upstream/libcss-tiny-perl/current/Changes
URL: http://svn.debian.org/wsvn/branches/upstream/libcss-tiny-perl/current/Changes?rev=21662&op=diff
==============================================================================
--- branches/upstream/libcss-tiny-perl/current/Changes (original)
+++ branches/upstream/libcss-tiny-perl/current/Changes Sun Jun 15 18:08:22 2008
@@ -1,4 +1,16 @@
Revision history for Perl extension CSS::Tiny
+
+1.15 Thu 1 Nov 2007
+ - Moving from Module::Install to the tinier EU:MM
+ - Changed use 5.005 to BEGIN { require 5.004 }
+
+1.14 Mon 4 Sep 2006
+ - Upgrading to Module::Install 0.64
+
+1.12 Thu 9 Jun 2006
+ - Moved from old CVS to new SVN repository
+ - Removed uses of UNIVERSAL::isa
+ - Upgraded to Module::Install 0.63
1.11 Sat Oct 22 2005
- Fixed a bug in the inline ->clone method that only runs
Modified: branches/upstream/libcss-tiny-perl/current/LICENSE
URL: http://svn.debian.org/wsvn/branches/upstream/libcss-tiny-perl/current/LICENSE?rev=21662&op=diff
==============================================================================
--- branches/upstream/libcss-tiny-perl/current/LICENSE (original)
+++ branches/upstream/libcss-tiny-perl/current/LICENSE Sun Jun 15 18:08:22 2008
@@ -1,3 +1,4 @@
+
Terms of Perl itself
a) the GNU General Public License as published by the Free
Modified: branches/upstream/libcss-tiny-perl/current/MANIFEST
URL: http://svn.debian.org/wsvn/branches/upstream/libcss-tiny-perl/current/MANIFEST?rev=21662&op=diff
==============================================================================
--- branches/upstream/libcss-tiny-perl/current/MANIFEST (original)
+++ branches/upstream/libcss-tiny-perl/current/MANIFEST Sun Jun 15 18:08:22 2008
@@ -1,23 +1,13 @@
Changes
-inc/ExtUtils/AutoInstall.pm
-inc/Module/Install.pm
-inc/Module/Install/AutoInstall.pm
-inc/Module/Install/Base.pm
-inc/Module/Install/Can.pm
-inc/Module/Install/Fetch.pm
-inc/Module/Install/Include.pm
-inc/Module/Install/Makefile.pm
-inc/Module/Install/Metadata.pm
-inc/Module/Install/Win32.pm
-inc/Module/Install/WriteAll.pm
lib/CSS/Tiny.pm
LICENSE
Makefile.PL
MANIFEST This list of files
-META.yml
README
t/01_compile.t
t/02_main.t
t/03_inline_clone.t
-t/99_pod.t
+t/98_pod.t
+t/99_pmv.t
test.css
+META.yml Module meta-data (added by MakeMaker)
Modified: branches/upstream/libcss-tiny-perl/current/META.yml
URL: http://svn.debian.org/wsvn/branches/upstream/libcss-tiny-perl/current/META.yml?rev=21662&op=diff
==============================================================================
--- branches/upstream/libcss-tiny-perl/current/META.yml (original)
+++ branches/upstream/libcss-tiny-perl/current/META.yml Sun Jun 15 18:08:22 2008
@@ -1,17 +1,14 @@
-name: CSS-Tiny
-version: 1.11
-abstract: Read/Write .css stylesheets with as little code as possible
-author: Adam Kennedy<cpan at ali.as>
-license: perl
-distribution_type: module
-build_requires:
- File::Spec: 0.80
- Test::More: 0.47
-requires:
- perl: 5.005
-recommends:
- Clone: 0.13
-no_index:
- directory:
- - inc
-generated_by: Module::Install version 0.37
+--- #YAML:1.0
+name: CSS-Tiny
+version: 1.15
+abstract: Read/Write .css files with as little code as possible
+license: perl
+generated_by: ExtUtils::MakeMaker version 6.32
+distribution_type: module
+requires:
+ Test::More: 0.47
+meta-spec:
+ url: http://module-build.sourceforge.net/META-spec-v1.2.html
+ version: 1.2
+author:
+ - Adam Kennedy <adamk at cpan.org>
Modified: branches/upstream/libcss-tiny-perl/current/Makefile.PL
URL: http://svn.debian.org/wsvn/branches/upstream/libcss-tiny-perl/current/Makefile.PL?rev=21662&op=diff
==============================================================================
--- branches/upstream/libcss-tiny-perl/current/Makefile.PL (original)
+++ branches/upstream/libcss-tiny-perl/current/Makefile.PL Sun Jun 15 18:08:22 2008
@@ -1,14 +1,22 @@
-use inc::Module::Install;
+use strict;
+use vars qw{$VERSION};
+BEGIN {
+ require 5.003_96;
+ $VERSION = '1.15';
+}
+use ExtUtils::MakeMaker;
-name ( 'CSS-Tiny' );
-abstract ( 'Read/Write .css stylesheets with as little code as possible' );
-author ( 'Adam Kennedy<cpan at ali.as>' );
-version_from ( 'lib/CSS/Tiny.pm' );
-license ( 'perl' );
-requires ( 'perl' => '5.005' );
-build_requires( 'File::Spec' => '0.80' );
-build_requires( 'Test::More' => '0.47' );
-recommends ( 'Clone' => '0.13' );
-auto_install ( );
-
-&WriteAll;
+WriteMakefile(
+ NAME => 'CSS::Tiny',
+ ABSTRACT => 'Read/Write .css files with as little code as possible',
+ VERSION => $VERSION,
+ PREREQ_PM => {
+ 'Test::More' => '0.47',
+ },
+ ($] >= 5.005 ? (
+ AUTHOR => 'Adam Kennedy <adamk at cpan.org>',
+ ) : ()),
+ ($ExtUtils::MakeMaker::VERSION ge '6.30_00' ? (
+ LICENSE => 'perl',
+ ) : ()),
+);
Modified: branches/upstream/libcss-tiny-perl/current/README
URL: http://svn.debian.org/wsvn/branches/upstream/libcss-tiny-perl/current/README?rev=21662&op=diff
==============================================================================
--- branches/upstream/libcss-tiny-perl/current/README (original)
+++ branches/upstream/libcss-tiny-perl/current/README Sun Jun 15 18:08:22 2008
@@ -140,15 +140,16 @@
author.
AUTHOR
- Adam Kennedy <cpan at ali.as>, <http://ali.as/>
+ Adam Kennedy <adamk at cpan.org>
SEE ALSO
- CSS, <http://www.w3.org/TR/REC-CSS1>, Config::Tiny
+ CSS, <http://www.w3.org/TR/REC-CSS1>, Config::Tiny, <http://ali.as/>
COPYRIGHT
- Copyright 2002 - 2005 Adam Kennedy. All rights reserved. This program is
- free software; you can redistribute it and/or modify it under the same
- terms as Perl itself.
+ Copyright 2002 - 2007 Adam Kennedy.
+
+ This program is free software; you can redistribute it and/or modify it
+ under the same terms as Perl itself.
The full text of the license can be found in the LICENSE file included
with this module.
Modified: branches/upstream/libcss-tiny-perl/current/lib/CSS/Tiny.pm
URL: http://svn.debian.org/wsvn/branches/upstream/libcss-tiny-perl/current/lib/CSS/Tiny.pm?rev=21662&op=diff
==============================================================================
--- branches/upstream/libcss-tiny-perl/current/lib/CSS/Tiny.pm (original)
+++ branches/upstream/libcss-tiny-perl/current/lib/CSS/Tiny.pm Sun Jun 15 18:08:22 2008
@@ -110,11 +110,10 @@
=cut
use strict;
-
-use vars qw{$VERSION $errstr};
BEGIN {
- $VERSION = '1.11';
- $errstr = '';
+ require 5.004;
+ $CSS::Tiny::VERSION = '1.15';
+ $CSS::Tiny::errstr = '';
}
=pod
@@ -207,9 +206,7 @@
=cut
-BEGIN {
- eval "use Clone 'clone';";
- eval <<'END_METHOD' if $@;
+BEGIN { eval "use Clone 'clone';"; eval <<'END_PERL' if $@; }
sub clone {
my $self = shift;
my $copy = ref($self)->new;
@@ -222,8 +219,7 @@
}
$copy;
}
-END_METHOD
-}
+END_PERL
=pod
@@ -259,7 +255,8 @@
# Iterate over the styles
# Note: We use 'reverse' in the sort to avoid a special case related
- # to A:hover. See http://www.w3.org/TR/CSS2/selector.html#dynamic-pseudo-classes
+ # to A:hover even though the file ends up backwards and looks funny.
+ # See http://www.w3.org/TR/CSS2/selector.html#dynamic-pseudo-classes
my $contents = '';
foreach my $style ( reverse sort keys %$self ) {
$contents .= "$style {\n";
@@ -309,8 +306,8 @@
=cut
-sub errstr { $errstr }
-sub _error { $errstr = $_[1]; undef }
+sub errstr { $CSS::Tiny::errstr }
+sub _error { $CSS::Tiny::errstr = $_[1]; undef }
1;
@@ -326,15 +323,16 @@
=head1 AUTHOR
-Adam Kennedy E<lt>cpan at ali.asE<gt>, L<http://ali.as/>
+Adam Kennedy E<lt>adamk at cpan.orgE<gt>
=head1 SEE ALSO
-L<CSS>, L<http://www.w3.org/TR/REC-CSS1>, L<Config::Tiny>
+L<CSS>, L<http://www.w3.org/TR/REC-CSS1>, L<Config::Tiny>, L<http://ali.as/>
=head1 COPYRIGHT
-Copyright 2002 - 2005 Adam Kennedy. All rights reserved.
+Copyright 2002 - 2007 Adam Kennedy.
+
This program is free software; you can redistribute
it and/or modify it under the same terms as Perl itself.
Modified: branches/upstream/libcss-tiny-perl/current/t/01_compile.t
URL: http://svn.debian.org/wsvn/branches/upstream/libcss-tiny-perl/current/t/01_compile.t?rev=21662&op=diff
==============================================================================
--- branches/upstream/libcss-tiny-perl/current/t/01_compile.t (original)
+++ branches/upstream/libcss-tiny-perl/current/t/01_compile.t Sun Jun 15 18:08:22 2008
@@ -1,30 +1,19 @@
-#!/usr/bin/perl -w
+#!/usr/bin/perl
# Formal testing for CSS::Tiny
# This test only tests that the module compiles.
use strict;
-use lib ();
-use UNIVERSAL 'isa';
-use File::Spec::Functions ':ALL';
BEGIN {
- $| = 1;
- unless ( $ENV{HARNESS_ACTIVE} ) {
- require FindBin;
- chdir ($FindBin::Bin = $FindBin::Bin); # Avoid a warning
- lib->import( catdir( updir(), updir(), 'modules') );
- }
+ $| = 1;
+ $^W = 1;
}
use Test::More tests => 2;
-
-
-# Check their perl version
-ok( $] >= 5.005, "Your perl is new enough" );
+# Check their Perl version
+ok( $] >= 5.004, "Your perl is new enough" );
# Does the module load
use_ok( 'CSS::Tiny' );
-
-exit();
Modified: branches/upstream/libcss-tiny-perl/current/t/02_main.t
URL: http://svn.debian.org/wsvn/branches/upstream/libcss-tiny-perl/current/t/02_main.t?rev=21662&op=diff
==============================================================================
--- branches/upstream/libcss-tiny-perl/current/t/02_main.t (original)
+++ branches/upstream/libcss-tiny-perl/current/t/02_main.t Sun Jun 15 18:08:22 2008
@@ -1,25 +1,14 @@
-#!/usr/bin/perl -w
+#!/usr/bin/perl
# Formal testing for CSS::Tiny
use strict;
-use lib ();
-use UNIVERSAL 'isa';
-use File::Spec ();
BEGIN {
- $| = 1;
- unless ( $ENV{HARNESS_ACTIVE} ) {
- require FindBin;
- chdir ($FindBin::Bin = $FindBin::Bin); # Avoid a warning
- lib->import( File::Spec->catdir(
- File::Spec->updir,
- File::Spec->updir,
- 'modules',
- ) );
- }
+ $| = 1;
+ $^W = 1;
}
-use Test::More tests => 31;
+use Test::More tests => 22;
use CSS::Tiny;
@@ -28,18 +17,12 @@
# Test trivial creation
my $Trivial = CSS::Tiny->new();
-ok( $Trivial, '->new returns true' );
-ok( ref $Trivial, '->new returns a reference' );
-ok( isa( $Trivial, 'HASH' ), '->new returns a hash reference' );
-ok( isa( $Trivial, 'CSS::Tiny' ), '->new returns a CSS::Tiny object' );
-ok( scalar keys %$Trivial == 0, '->new returns an empty object' );
+isa_ok( $Trivial, 'CSS::Tiny' );
+is( scalar(keys %$Trivial), 0, '->new returns an empty object' );
# Try to read in a config
my $Config = CSS::Tiny->read( 'test.css' );
-ok( $Config, '->read returns true' );
-ok( ref $Config, '->read returns a reference' );
-ok( isa( $Config, 'HASH' ), '->read returns a hash reference' );
-ok( isa( $Config, 'CSS::Tiny' ), '->read returns a CSS::Tiny object' );
+isa_ok( $Config, 'CSS::Tiny' );
# Check the structure of the config
my $expected = {
@@ -100,10 +83,7 @@
# Try to read the config back in
$Read = CSS::Tiny->read( 'test2.css' );
-ok( $Read, '->read of what we wrote returns true' );
-ok( ref $Read, '->read of what we wrote returns a reference' );
-ok( isa( $Read, 'HASH' ), '->read of what we wrote returns a hash reference' );
-ok( isa( $Read, 'CSS::Tiny' ), '->read of what we wrote returns a CSS::Tiny object' );
+isa_ok( $Read, 'CSS::Tiny' );
# Check the structure of what we read back in
is_deeply( $Trivial, $Read, 'We get back what we wrote out' );
Modified: branches/upstream/libcss-tiny-perl/current/t/03_inline_clone.t
URL: http://svn.debian.org/wsvn/branches/upstream/libcss-tiny-perl/current/t/03_inline_clone.t?rev=21662&op=diff
==============================================================================
--- branches/upstream/libcss-tiny-perl/current/t/03_inline_clone.t (original)
+++ branches/upstream/libcss-tiny-perl/current/t/03_inline_clone.t Sun Jun 15 18:08:22 2008
@@ -1,25 +1,14 @@
-#!/usr/bin/perl -w
+#!/usr/bin/perl
# Formal testing for CSS::Tiny
use strict;
-use lib ();
-use UNIVERSAL 'isa';
-use File::Spec ();
BEGIN {
- $| = 1;
- unless ( $ENV{HARNESS_ACTIVE} ) {
- require FindBin;
- chdir ($FindBin::Bin = $FindBin::Bin); # Avoid a warning
- lib->import( File::Spec->catdir(
- File::Spec->updir,
- File::Spec->updir,
- 'modules',
- ) );
- }
+ $| = 1;
+ $^W = 1;
}
-use Test::More tests => 13;
+use Test::More tests => 7;
my $new_called = 0;
@@ -51,18 +40,12 @@
# Retry some tests to make sure the fake new works the same
# Test trivial creation
my $Trivial = CSS::Tiny->new();
- ok( $Trivial, '->new returns true' );
- ok( ref $Trivial, '->new returns a reference' );
- ok( isa( $Trivial, 'HASH' ), '->new returns a hash reference' );
- ok( isa( $Trivial, 'CSS::Tiny' ), '->new returns a CSS::Tiny object' );
+ isa_ok( $Trivial, 'CSS::Tiny' );
ok( scalar keys %$Trivial == 0, '->new returns an empty object' );
# Try to read in a config
my $Config = CSS::Tiny->read( 'test.css' );
- ok( $Config, '->read returns true' );
- ok( ref $Config, '->read returns a reference' );
- ok( isa( $Config, 'HASH' ), '->read returns a hash reference' );
- ok( isa( $Config, 'CSS::Tiny' ), '->read returns a CSS::Tiny object' );
+ isa_ok( $Config, 'CSS::Tiny' );
# Repeat the clone tests from 02_main.t
$new_called = 0;
@@ -71,5 +54,3 @@
is_deeply( $copy, $Config, '->clone works as expected' );
is( $new_called, 1, 'The inline ->clone was used as expected' );
}
-
-1;
Added: branches/upstream/libcss-tiny-perl/current/t/98_pod.t
URL: http://svn.debian.org/wsvn/branches/upstream/libcss-tiny-perl/current/t/98_pod.t?rev=21662&op=file
==============================================================================
--- branches/upstream/libcss-tiny-perl/current/t/98_pod.t (added)
+++ branches/upstream/libcss-tiny-perl/current/t/98_pod.t Sun Jun 15 18:08:22 2008
@@ -1,0 +1,67 @@
+#!/usr/bin/perl
+
+use strict;
+BEGIN {
+ $| = 1;
+ $^W = 1;
+}
+use Test::More;
+
+# Skip if doing a regular install
+unless ( $ENV{AUTOMATED_TESTING} ) {
+ plan( skip_all => "Author tests not required for installation" );
+}
+
+# Load the testing modules if we can
+eval "use Test::Pod 1.00";
+if ( $@ ) {
+ plan( skip_all => "Test::Pod not available for testing" );
+}
+
+all_pod_files_ok();
+exit(0);
+
+
+
+
+
+#####################################################################
+# WARNING: INSANE BLACK MAGIC
+#####################################################################
+
+# Hack Pod::Simple::BlackBox to ignore the Test::Inline
+# "Extended Begin" syntax.
+# For example, "=begin has more than one word errors"
+my $begin;
+if ( $Test::Pod::VERSION ) {
+ $begin = \&Pod::Simple::BlackBox::_ponder_begin;
+}
+sub mybegin {
+ my $para = $_[1];
+ my $content = join ' ', splice @$para, 2;
+ $content =~ s/^\s+//s;
+ $content =~ s/\s+$//s;
+ my @words = split /\s+/, $content;
+ if ( $words[0] =~ /^test(?:ing)?\z/s ) {
+ foreach ( 2 .. $#$para ) {
+ $para->[$_] = '';
+ }
+ $para->[2] = $words[0];
+ }
+
+ # Continue as normal
+ push @$para, @words;
+ return &$begin(@_);
+}
+
+SCOPE: {
+ local $^W = 0;
+ if ( $Test::Pod::VERSION ) {
+ *Pod::Simple::BlackBox::_ponder_begin = \&mybegin;
+ }
+}
+
+#####################################################################
+# END BLACK MAGIC
+#####################################################################
+
Added: branches/upstream/libcss-tiny-perl/current/t/99_pmv.t
URL: http://svn.debian.org/wsvn/branches/upstream/libcss-tiny-perl/current/t/99_pmv.t?rev=21662&op=file
==============================================================================
--- branches/upstream/libcss-tiny-perl/current/t/99_pmv.t (added)
+++ branches/upstream/libcss-tiny-perl/current/t/99_pmv.t Sun Jun 15 18:08:22 2008
@@ -1,0 +1,22 @@
+#!/usr/bin/perl
+
+use strict;
+BEGIN {
+ $| = 1;
+ $^W = 1;
+}
+use Test::More;
+
+# Skip if doing a regular install
+unless ( $ENV{AUTOMATED_TESTING} ) {
+ plan( skip_all => "Author tests not required for installation" );
+}
+
+# Can we run the version tests
+eval "use Test::MinimumVersion 0.007;";
+if ( $@ ) {
+ plan( skip_all => "Test::MinimumVersion not available" );
+}
+
+# Test minimum version
+all_minimum_version_from_metayml_ok();
More information about the Pkg-perl-cvs-commits
mailing list