Make perlcritic happy

diff --git a/lib/Gruntmaster/App/Command.pm b/lib/Gruntmaster/App/Command.pm
index b1be168dc43c829b5f666d5e70ecf6373b6a7280..94695ac560cbac194f07e4c24edb12dd46fc4578 100644 (file)
--- a/lib/Gruntmaster/App/Command.pm
+++ b/lib/Gruntmaster/App/Command.pm
@@ -3,6 +3,7 @@ package Gruntmaster::App::Command;
 use 5.014000;
 use strict;
 use warnings;
 use 5.014000;
 use strict;
 use warnings;

+use re '/s';

 
 our $VERSION = '5999.000_004';
 
 
 our $VERSION = '5999.000_004';
 


@@ -13,9 +14,9 @@ sub description {
        my ($self) = @_;
        my ($file) = (ref $self) =~ s,::,/,gr;
        my $usage;
        my ($self) = @_;
        my ($file) = (ref $self) =~ s,::,/,gr;
        my $usage;

-       open my $fh, '>', \$usage;
+       open my $fh, '>', \$usage; ## no critic (RequireCheckedOpen)

        pod2usage(-input => $INC{"$file.pm"}, -output => $fh, -exitval => 'NOEXIT', -verbose => 99, -sections => [qw/SYNOPSIS DESCRIPTION/]);
        pod2usage(-input => $INC{"$file.pm"}, -output => $fh, -exitval => 'NOEXIT', -verbose => 99, -sections => [qw/SYNOPSIS DESCRIPTION/]);

-       close $fh;
+       close $fh; ## no critic (RequireCheckedClose)

        $usage =~ s/Usage:/Usage examples:/;
        1 while chomp $usage;
        $usage
        $usage =~ s/Usage:/Usage examples:/;
        1 while chomp $usage;
        $usage

diff --git a/lib/Gruntmaster/App/Command/Add.pm b/lib/Gruntmaster/App/Command/Add.pm
index 5e8b07a91e8564b4d60602675f4d691cf8350479..b0df358a3c5e7ec115a68eebc3d44bf55f145b64 100644 (file)
--- a/lib/Gruntmaster/App/Command/Add.pm
+++ b/lib/Gruntmaster/App/Command/Add.pm
@@ -48,8 +48,8 @@ sub add_contest {
 
        my $name = prompt 'Contest name';
        my $owner = prompt 'Owner';
 
        my $name = prompt 'Contest name';
        my $owner = prompt 'Owner';

-       my $start = str2time prompt 'Start time' or die 'Cannot parse time';
-       my $stop = str2time prompt 'Stop time' or die 'Cannot parse time';
+       my $start = str2time prompt 'Start time' or die "Cannot parse time\n";
+       my $stop = str2time prompt 'Stop time' or die "Cannot parse time\n";

 
        db->insert(contests => {id => $id, name => $name, owner => $owner, start => $start, stop => $stop});
 }
 
        db->insert(contests => {id => $id, name => $name, owner => $owner, start => $start, stop => $stop});
 }

diff --git a/lib/Gruntmaster/App/Command/Set.pm b/lib/Gruntmaster/App/Command/Set.pm
index 3ae62b0d507f7b81c6fb01c23365ec8dca00e199..406d013cbfb1167a0ae60f4c836885511033c3aa 100644 (file)
--- a/lib/Gruntmaster/App/Command/Set.pm
+++ b/lib/Gruntmaster/App/Command/Set.pm
@@ -11,7 +11,7 @@ use Gruntmaster::Data;
 use File::Slurp qw/read_file/;
 
 sub opt_spec {
 use File::Slurp qw/read_file/;
 
 sub opt_spec {

-       ['file!', 'Use the contents of a file as value'],
+       ['file!', 'Use the contents of a file as value']

 }
 
 sub usage_desc { "%c [-cjpu] set id column value [column value ...]\n%c [-cjpu] set --file id column filename [column filename ...]" }
 }
 
 sub usage_desc { "%c [-cjpu] set id column value [column value ...]\n%c [-cjpu] set --file id column filename [column filename ...]" }

diff --git a/lib/Gruntmaster/App/Command/Show.pm b/lib/Gruntmaster/App/Command/Show.pm
index fbdac50cd9b15f7ac2a4fc7b361842036e7d020c..e21578a6df4e409def2b6534f072b9d522be59fe 100644 (file)
--- a/lib/Gruntmaster/App/Command/Show.pm
+++ b/lib/Gruntmaster/App/Command/Show.pm
@@ -35,7 +35,7 @@ sub show_contest {
        my (%columns) = @_;
        $columns{$_} = strftime '%c', localtime $columns{$_} for qw/start stop/;
 
        my (%columns) = @_;
        $columns{$_} = strftime '%c', localtime $columns{$_} for qw/start stop/;
 

-       print <<END
+       print <<"END"

 Name: $columns{name}
 Owner: $columns{owner}
 Start: $columns{start}
 Name: $columns{name}
 Owner: $columns{owner}
 Start: $columns{start}


@@ -48,7 +48,7 @@ sub show_job {
        $columns{date} = strftime '%c', localtime $columns{date};
 
        no warnings 'uninitialized';
        $columns{date} = strftime '%c', localtime $columns{date};
 
        no warnings 'uninitialized';

-       print <<END
+       print <<"END"

 Problem: $columns{problem}
 Contest: $columns{contest}
 Owner: $columns{owner}
 Problem: $columns{problem}
 Contest: $columns{contest}
 Owner: $columns{owner}


@@ -63,7 +63,7 @@ sub show_problem {
        my (%columns) = @_;
 
        no warnings 'uninitialized';
        my (%columns) = @_;
 
        no warnings 'uninitialized';

-       print <<END
+       print <<"END"

 Name: $columns{name}
 Author: $columns{author}
 Statement written by: $columns{writer}
 Name: $columns{name}
 Author: $columns{author}
 Statement written by: $columns{writer}


@@ -86,7 +86,7 @@ sub show_user {
        $columns{since} = strftime '%c', localtime $columns{since};
 
        no warnings 'uninitialized';
        $columns{since} = strftime '%c', localtime $columns{since};
 
        no warnings 'uninitialized';

-       print <<END
+       print <<"END"

 Email: $columns{name} <$columns{email}>
 Phone: $columns{phone}
 Since: $columns{since}
 Email: $columns{name} <$columns{email}>
 Phone: $columns{phone}
 Since: $columns{since}

diff --git a/lib/Gruntmaster/Data.pm b/lib/Gruntmaster/Data.pm
index 3fed5b3fe360e87d498c69d248a7f67d431616f1..98e62d69b77177fe32e77abf75a264166c162d3a 100644 (file)
--- a/lib/Gruntmaster/Data.pm
+++ b/lib/Gruntmaster/Data.pm
@@ -4,7 +4,7 @@ use warnings;
 
 use parent qw/Exporter/;
 our $VERSION = '5999.000_013';
 
 use parent qw/Exporter/;
 our $VERSION = '5999.000_013';

-our @EXPORT = qw/dbinit purge db user_list user_entry problem_list problem_entry contest_list contest_entry contest_has_problem job_list job_entry create_job standings update_status rerun_job take_job finish_job open_problem/; ## no critic (ProhibitAutomaticExportation)
+our @EXPORT = qw/dbinit purge db user_list user_entry problem_list problem_entry contest_list contest_entry contest_has_problem job_list job_entry create_job standings update_status rerun_job take_job finish_job open_problem/;

 our @EXPORT_OK = @EXPORT;
 
 use JSON::MaybeXS qw/decode_json/;
 our @EXPORT_OK = @EXPORT;
 
 use JSON::MaybeXS qw/decode_json/;


@@ -279,8 +279,8 @@ sub finish_job {
 sub open_problem {
        my ($contest, $problem, $owner, $time) = @_;
        my $ct = contest_entry($contest);
 sub open_problem {
        my ($contest, $problem, $owner, $time) = @_;
        my $ct = contest_entry($contest);

-       return unless $ct->{id} && $time >= $ct->{start} && $time < $ct->{stop};
-       eval { db->insert(opens => {
+       return unless $ct->{id} && $time >= $ct->{start} && $time < $ct->{stop}; ## no critic (ProhibitNegativeExpressionsInUnlessAndUntilConditions)
+       eval { db->insert(opens => { ## no critic (RequireCheckingReturnValueOfEval)

                contest => $contest,
                problem => $problem,
                owner => $owner,
                contest => $contest,
                problem => $problem,
                owner => $owner,

diff --git a/t/perlcriticrc b/t/perlcriticrc
index eea00bdbe1d16cc151dd515ff3a39bdc5c207a8a..766528df49bc409c157c9cff784beee6c075991a 100644 (file)
--- a/t/perlcriticrc
+++ b/t/perlcriticrc
@@ -7,11 +7,12 @@ severity = 1
 [-Documentation::PodSpelling]
 [-Documentation::RequirePodLinksIncludeText]
 [-InputOutput::RequireBracedFileHandleWithPrint]
 [-Documentation::PodSpelling]
 [-Documentation::RequirePodLinksIncludeText]
 [-InputOutput::RequireBracedFileHandleWithPrint]

+[-InputOutput::RequireCheckedSyscalls]

 [-Modules::ProhibitAutomaticExportation]
 [-Modules::ProhibitAutomaticExportation]

-[-Modules::RequireExplicitPackage]

 [-References::ProhibitDoubleSigils]
 [-RegularExpressions::ProhibitEnumeratedClasses]
 [-RegularExpressions::ProhibitUnusualDelimiters]
 [-References::ProhibitDoubleSigils]
 [-RegularExpressions::ProhibitEnumeratedClasses]
 [-RegularExpressions::ProhibitUnusualDelimiters]

+[-RegularExpressions::RequireBracesForMultiline]

 [-RegularExpressions::RequireLineBoundaryMatching]
 [-Subroutines::RequireFinalReturn]
 [-ValuesAndExpressions::ProhibitConstantPragma]
 [-RegularExpressions::RequireLineBoundaryMatching]
 [-Subroutines::RequireFinalReturn]
 [-ValuesAndExpressions::ProhibitConstantPragma]


@@ -36,3 +37,6 @@ script_sections = NAME | SYNOPSIS | DESCRIPTION | AUTHOR | COPYRIGHT AND LICENSE
 [Subroutines::RequireArgUnpacking]
 short_subroutine_statements = 5
 allow_subscripts = 1
 [Subroutines::RequireArgUnpacking]
 short_subroutine_statements = 5
 allow_subscripts = 1

+
+[TestingAndDebugging::ProhibitNoWarnings]
+allow_with_category_restriction = 1