commit 5671cfdd6b6cec3373da0a475e9e036a61406c26 Author: Petr Písař <ppisar@xxxxxxxxxx> Date: Mon Aug 5 14:37:24 2013 +0200 0.020 bump .gitignore | 1 + ...Test-Simple-0.98_04-describes-inheritance.patch | 53 ++++++++++++++++++++ ...-Test-Simple-0.98_05-outputs-subtest-name.patch | 31 +++++++++++ perl-Test-Moose-More.spec | 29 +++++++--- sources | 2 +- 5 files changed, 106 insertions(+), 10 deletions(-) --- diff --git a/.gitignore b/.gitignore index 52e523e..efc9a21 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ /Test-Moose-More-0.017.tar.gz /Test-Moose-More-0.018.tar.gz /Test-Moose-More-0.019.tar.gz +/Test-Moose-More-0.020.tar.gz diff --git a/Test-Moose-More-0.020-Test-Simple-0.98_04-describes-inheritance.patch b/Test-Moose-More-0.020-Test-Simple-0.98_04-describes-inheritance.patch new file mode 100644 index 0000000..9689c7e --- /dev/null +++ b/Test-Moose-More-0.020-Test-Simple-0.98_04-describes-inheritance.patch @@ -0,0 +1,53 @@ +From 25f62f6f59688dcbc28ba9fb16c95250cf80a14d Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@xxxxxxxxxx> +Date: Mon, 5 Aug 2013 14:26:51 +0200 +Subject: [PATCH] Test-Simple 0.98_04 describes inheritance +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +https://github.com/RsrchBoy/Test-Moose-More/issues/5 + +Signed-off-by: Petr Písař <ppisar@xxxxxxxxxx> +--- + t/validate_attribute.t | 6 +++++- + t/validate_class.t | 6 +++++- + 2 files changed, 10 insertions(+), 2 deletions(-) + +diff --git a/t/validate_attribute.t b/t/validate_attribute.t +index e06f801..7692c5c 100644 +--- a/t/validate_attribute.t ++++ b/t/validate_attribute.t +@@ -38,7 +38,11 @@ note 'validate attribute validation'; + test_out $_ok->('TestClass has an attribute named foo'); + test_out $_ok->(q{Moose::Meta::Class::__ANON__::SERIAL::1 has a metaclass}); + test_out $_ok->(q{Moose::Meta::Class::__ANON__::SERIAL::1 is a Moose class}); +- test_out $_ok->('The object isa Moose::Meta::Attribute'); ++ if ($Test::More::VERSION < 0.9804) { ++ test_out $_ok->(q{The object isa Moose::Meta::Attribute}); ++ } else { ++ test_out $_ok->(q{An object of class 'Moose::Meta::Class::__ANON__::SERIAL::1' isa 'Moose::Meta::Attribute'}); ++ } + test_out $_ok->('Moose::Meta::Class::__ANON__::SERIAL::1 does TestRole'); + test_out $_ok->('foo is required'); + test_out $_ok->('foo has a builder'); +diff --git a/t/validate_class.t b/t/validate_class.t +index 4b183bf..c9e74e5 100644 +--- a/t/validate_class.t ++++ b/t/validate_class.t +@@ -47,7 +47,11 @@ note 'validate w/valid class'; + my ($_ok, $_nok) = counters(); + test_out $_ok->('TestClass has a metaclass'); + test_out $_ok->('TestClass is a Moose class'); +- test_out $_ok->('The class isa Moose::Object'); ++ if ($Test::More::VERSION < 0.9804) { ++ test_out $_ok->(q{The class isa Moose::Object}); ++ } else { ++ test_out $_ok->(q{The class (or class-like) 'TestClass' isa 'Moose::Object'}); ++ } + test_out $_ok->('TestClass is not anonymous'); + test_out $_ok->('TestClass does TestRole'); + test_out $_ok->('TestClass does not do TestRole::Two'); +-- +1.8.1.4 + diff --git a/Test-Moose-More-0.020-Test-Simple-0.98_05-outputs-subtest-name.patch b/Test-Moose-More-0.020-Test-Simple-0.98_05-outputs-subtest-name.patch new file mode 100644 index 0000000..998d192 --- /dev/null +++ b/Test-Moose-More-0.020-Test-Simple-0.98_05-outputs-subtest-name.patch @@ -0,0 +1,31 @@ +From 52c76a387ca60a7a76f728566f18db24ee4f584e Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@xxxxxxxxxx> +Date: Mon, 5 Aug 2013 13:26:43 +0200 +Subject: [PATCH] Test-Simple 0.98_05 outputs subtest name +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +<https://github.com/RsrchBoy/Test-Moose-More/issues/4> + +Signed-off-by: Petr Písař <ppisar@xxxxxxxxxx> +--- + t/validate_class.t | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/t/validate_class.t b/t/validate_class.t +index 9fbea64..4b183bf 100644 +--- a/t/validate_class.t ++++ b/t/validate_class.t +@@ -154,6 +154,8 @@ note 'validate w/attribute validation'; + test_out $_ok->('TestClass has an attribute named baz'); + do { + my ($_ok, $_nok, $_skip, $_plan) = counters(1); ++ test_out (q{ # Subtest: [subtest] checking TestClass's attribute baz}) ++ if ($Test::More::VERSION >= 0.9805); + test_out $_ok->(q{Moose::Meta::Class::__ANON__::SERIAL::1 has a metaclass}); + test_out $_ok->(q{Moose::Meta::Class::__ANON__::SERIAL::1 is a Moose class}); + test_out $_ok->(q{TestClass's attribute baz does TestRole::Two}); +-- +1.8.1.4 + diff --git a/perl-Test-Moose-More.spec b/perl-Test-Moose-More.spec index 84793a0..94b6b69 100644 --- a/perl-Test-Moose-More.spec +++ b/perl-Test-Moose-More.spec @@ -1,36 +1,42 @@ Name: perl-Test-Moose-More -Version: 0.019 -Release: 2%{?dist} +Version: 0.020 +Release: 1%{?dist} Summary: More tools for testing Moose packages License: LGPLv2+ Group: Development/Libraries URL: http://search.cpan.org/dist/Test-Moose-More/ Source0: http://www.cpan.org/authors/id/R/RS/RSRCHBOY/Test-Moose-More-%{version}.tar.gz +# Adjust to Test-Simple 0.98_05 +# https://github.com/RsrchBoy/Test-Moose-More/issues/4 +Patch0: Test-Moose-More-0.020-Test-Simple-0.98_05-outputs-subtest-name.patch +# Adjust to Test-Simple 0.98_04 +# https://github.com/RsrchBoy/Test-Moose-More/issues/5 +Patch1: Test-Moose-More-0.020-Test-Simple-0.98_04-describes-inheritance.patch BuildArch: noarch +BuildRequires: perl BuildRequires: perl(ExtUtils::MakeMaker) +BuildRequires: perl(strict) +BuildRequires: perl(warnings) # Run-time: BuildRequires: perl(Data::OptList) BuildRequires: perl(Moose::Autobox) BuildRequires: perl(Moose::Util) BuildRequires: perl(Moose::Util::TypeConstraints) -BuildRequires: perl(Perl6::Junction) BuildRequires: perl(Scalar::Util) BuildRequires: perl(Sub::Exporter) +BuildRequires: perl(Syntax::Keyword::Junction) BuildRequires: perl(Test::Builder) BuildRequires: perl(Test::Moose) BuildRequires: perl(Test::More) >= 0.88 # Tests only: -BuildRequires: perl(File::Find) -BuildRequires: perl(File::Temp) +BuildRequires: perl(Capture::Tiny) BuildRequires: perl(Moose) BuildRequires: perl(Moose::Deprecated) BuildRequires: perl(Moose::Role) BuildRequires: perl(namespace::autoclean) BuildRequires: perl(TAP::SimpleOutput) BuildRequires: perl(Test::Builder::Tester) -# Optional tests: -BuildRequires: perl(Test::Script) >= 1.05 -Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +Requires: perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version)) Requires: perl(Test::More) >= 0.88 # Removed under-specified dependencies @@ -42,9 +48,11 @@ against Moose classes/roles. It is intended to replace Test::Moose. %prep %setup -q -n Test-Moose-More-%{version} +%patch0 -p1 +%patch1 -p1 %build -%{__perl} Makefile.PL INSTALLDIRS=vendor +perl Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install @@ -62,6 +70,9 @@ make test %{_mandir}/man3/* %changelog +* Sat Aug 03 2013 Petr Pisar <ppisar@xxxxxxxxxx> - 0.020-1 +- 0.020 bump + * Sat Aug 03 2013 Petr Pisar <ppisar@xxxxxxxxxx> - 0.019-2 - Perl 5.18 rebuild diff --git a/sources b/sources index 212c28c..c8b27a5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f9e16a1777ebddc41e4f4bf2d7172cf0 Test-Moose-More-0.019.tar.gz +a90b37d58f3206e9721a92928bed8098 Test-Moose-More-0.020.tar.gz -- Fedora Extras Perl SIG http://www.fedoraproject.org/wiki/Extras/SIGs/Perl perl-devel mailing list perl-devel@xxxxxxxxxxxxxxxxxxxxxxx https://admin.fedoraproject.org/mailman/listinfo/perl-devel