Update to 1.118

- New upstream release 1.118:
  Policy Changes:
  - CodeLayout::RequireTidyCode: revise to work with incompatible changes in
    Perl::Tidy 20120619 (CPAN RT#77977)
  - TestingAndDebugging::ProhibitNoWarnings: correct the parse of the
    'no warnings' statement, so that 'no warnings "qw"' is recognized as
    suppressing just 'qw' warnings (CPAN RT#74647)
  - Miscellanea::RequireRcsKeywords has been moved to the Perl-Critic-More
    distribution (CPAN RT#69546)
  Other Changes:
  - Make all unescaped literal "{" characters in regexps into character
    classes; these are deprecated, and became noisy with Perl 5.17.0
    (CPAN RT#77510)
- Drop now-redundant patch for Perl::Tidy compatibility
- BR: perl(lib) for the build process
- BR: perl(base), perl(PPIx::Utilities::Node) and perl(Test::Builder) ≥ 0.92
  for the module (Test::Builder required by Test::Perl::Critic::Policy)
- BR: perl(Exporter) ≥ 5.58; with older versions we get:
  ":color_severity" is not exported by the Perl::Critic::Utils::Constants module
- BR: perl(File::Spec::Functions) for the test suite
- Drop buildreqs for perl(charnames), perl(File::Basename), perl(File::Find),
  perl(overload), perl(strict) and perl(warnings) - not dual lived
This commit is contained in:
Paul Howarth 2012-07-11 15:47:49 +01:00
parent f1446a8f8b
commit b65d650da0
3 changed files with 33 additions and 55 deletions

View File

@ -1,41 +0,0 @@
See https://rt.cpan.org/Public/Bug/Display.html?id=77977
--- lib/Perl/Critic/Policy/CodeLayout/RequireTidyCode.pm (revision 4123)
+++ lib/Perl/Critic/Policy/CodeLayout/RequireTidyCode.pm (working copy)
@@ -12,6 +12,7 @@
use warnings;
use English qw(-no_match_vars);
+use IO::String qw< >;
use Readonly;
use Perl::Tidy qw< >;
@@ -49,7 +50,8 @@
# Set configuration if defined
if (defined $self->{_perltidyrc} && $self->{_perltidyrc} eq $EMPTY) {
- $self->{_perltidyrc} = \$EMPTY;
+ my $rc = $EMPTY;
+ $self->{_perltidyrc} = \$rc;
}
return $TRUE;
@@ -92,10 +94,16 @@
# Trap Perl::Tidy errors, just in case it dies
my $eval_worked = eval {
+ # Perl::Tidy 20120619 no longer accepts a scalar reference for stdio.
+ my $handle = IO::String->new( $stderr );
+ # Since Perl::Tidy 20120619 modifies $source, we make a copy so
+ # we can get a good comparison. Doing an s/// on $source after the
+ # fact appears not to work with the previous Perl::Tidy.
+ my $source_copy = $source;
Perl::Tidy::perltidy(
- source => \$source,
+ source => \$source_copy,
destination => \$dest,
- stderr => \$stderr,
+ stderr => $handle,
defined $self->{_perltidyrc} ? (perltidyrc => $self->{_perltidyrc}) : (),
);
1;

View File

@ -1,15 +1,15 @@
Name: perl-Perl-Critic
Version: 1.117
Release: 9%{?dist}
Version: 1.118
Release: 1%{?dist}
Summary: Critique Perl source code for best-practices
Group: Development/Libraries
License: GPL+ or Artistic
URL: http://search.cpan.org/dist/Perl-Critic/
Source0: http://search.cpan.org/CPAN/authors/id/T/TH/THALJEF/Perl-Critic-%{version}.tar.gz
Patch2: Perl-Critic-1.117-tidy.patch
BuildArch: noarch
# Build process
BuildRequires: perl(lib)
BuildRequires: perl(Module::Build)
BuildRequires: perl(Task::Weaken)
@ -18,15 +18,13 @@ BuildRequires: perl(Task::Weaken)
BuildRequires: aspell-en
%endif
BuildRequires: perl(B::Keywords) >= 1.05
BuildRequires: perl(base)
BuildRequires: perl(Carp)
BuildRequires: perl(charnames)
BuildRequires: perl(Config::Tiny) >= 2
BuildRequires: perl(Email::Address) >= 1.889
BuildRequires: perl(English)
BuildRequires: perl(Exception::Class) >= 1.23
BuildRequires: perl(Exporter)
BuildRequires: perl(File::Basename)
BuildRequires: perl(File::Find)
BuildRequires: perl(Exporter) >= 5.58
BuildRequires: perl(File::Path)
BuildRequires: perl(File::Spec)
BuildRequires: perl(File::Spec::Unix)
@ -36,7 +34,6 @@ BuildRequires: perl(IO::String)
BuildRequires: perl(List::MoreUtils) >= 0.19
BuildRequires: perl(List::Util)
BuildRequires: perl(Module::Pluggable) >= 3.1
BuildRequires: perl(overload)
BuildRequires: perl(Perl::Tidy)
BuildRequires: perl(Pod::Parser)
BuildRequires: perl(Pod::PlainText)
@ -45,14 +42,14 @@ BuildRequires: perl(Pod::Spell) >= 1
BuildRequires: perl(Pod::Usage)
BuildRequires: perl(PPI) >= 1.215
BuildRequires: perl(PPIx::Regexp) >= 0.010
BuildRequires: perl(PPIx::Utilities::Node)
BuildRequires: perl(PPIx::Utilities::Statement) >= 1.001
BuildRequires: perl(Readonly) >= 1.03
BuildRequires: perl(Scalar::Util)
BuildRequires: perl(strict)
BuildRequires: perl(String::Format) >= 1.13
BuildRequires: perl(Test::Builder) >= 0.92
BuildRequires: perl(Text::ParseWords) >= 3
BuildRequires: perl(version) >= 0.77
BuildRequires: perl(warnings)
# Optional module requirements
BuildRequires: perl(File::HomeDir)
@ -61,6 +58,7 @@ BuildRequires: perl(Readonly::XS)
BuildRequires: perl(Term::ANSIColor) >= 2.02
# Main test suite
BuildRequires: perl(File::Spec::Functions)
BuildRequires: perl(Test::Deep)
BuildRequires: perl(Test::Memory::Cycle)
BuildRequires: perl(Test::More)
@ -118,9 +116,6 @@ of Perl code were mixed directly in the test script. That sucked.
%prep
%setup -q -n Perl-Critic-%{version}
# Fix breakage with Perl::Tidy ≥ 20120619 (CPAN RT#77977)
%patch2
# Drop Test::Kwalitee tests in RHEL ≥ 7
%if 0%{?rhel} >= 7
rm xt/author/95_kwalitee.t
@ -153,6 +148,30 @@ LC_ALL=en_US ./Build %{!?perl_bootstrap:author}test
%{_mandir}/man3/Test::Perl::Critic::Policy.3pm*
%changelog
* Wed Jul 11 2012 Paul Howarth <paul@city-fan.org> - 1.118-1
- update to 1.118
Policy Changes:
- CodeLayout::RequireTidyCode: revise to work with incompatible changes in
Perl::Tidy 20120619 (CPAN RT#77977)
- TestingAndDebugging::ProhibitNoWarnings: correct the parse of the
'no warnings' statement, so that 'no warnings "qw"' is recognized as
suppressing just 'qw' warnings (CPAN RT#74647)
- Miscellanea::RequireRcsKeywords has been moved to the Perl-Critic-More
distribution (CPAN RT#69546)
Other Changes:
- make all unescaped literal "{" characters in regexps into character
classes; these are deprecated, and became noisy with Perl 5.17.0
(CPAN RT#77510)
- drop now-redundant patch for Perl::Tidy compatibility
- BR: perl(lib) for the build process
- BR: perl(base), perl(PPIx::Utilities::Node) and perl(Test::Builder) 0.92
for the module (Test::Builder required by Test::Perl::Critic::Policy)
- BR: perl(Exporter) 5.58; with older versions we get:
":color_severity" is not exported by the Perl::Critic::Utils::Constants module
- BR: perl(File::Spec::Functions) for the test suite
- drop buildreqs for perl(charnames), perl(File::Basename), perl(File::Find),
perl(overload), perl(strict) and perl(warnings) - not dual lived
* Tue Jul 10 2012 Petr Pisar <ppisar@redhat.com> - 1.117-9
- Perl 5.16 re-rebuild of bootstrapped packages

View File

@ -1 +1 @@
85a274c3d08e1c3a5ed9034d5579c0a5 Perl-Critic-1.117.tar.gz
25391a51d57cdf34c535f01d9ff91b83 Perl-Critic-1.118.tar.gz