Merge pull request #6398 from perlpunk/tidy-blank-sub

tidy: Enforce blank lines before subs

Author: mergify[bot]

.perltidyrc

@@ -3,7 +3,7 @@
 --character-encoding=none
 --no-valign
 -l=120   # 120 characters per line
--fbl     # don't change blank lines
+--noblanks-before-comments
 -nsfs    # no spaces before semicolons
 -baao    # space after operators
 -bbao    # space before operators
@@ -12,3 +12,6 @@
 -sbt=2   # no spaces around {}
 -sct     # stack closing tokens )}
 --pack-operator-types='->' # allow chained method calls on one line
+--blanks-before-subs
+--keep-old-blank-lines=2 # keep all blank lines
+--noblanks-before-blocks

lib/OpenQA/Jobs/Constants.pm

@@ -168,6 +168,7 @@ my %META_RESULT_MAPPING = (
 );
 sub meta_state ($state) { $META_STATE_MAPPING{$state} // NONE }
 sub meta_result ($result) { $META_RESULT_MAPPING{$result} // NONE }
+
 sub is_ok_result ($result) {
     !!grep { $result eq $_ } OK_RESULTS;
 }

lib/OpenQA/Parser/Format/IPA.pm

@@ -87,8 +87,7 @@ sub parse {
     $self;
 }
 
-{
-    package OpenQA::Parser::Result::IPA::Info;
+package OpenQA::Parser::Result::IPA::Info {
     use Mojo::Base 'OpenQA::Parser::Result';
 
     has [qw(distro platform image instance region results_file log_file timestamp)];

lib/OpenQA/Parser/Format/JUnit.pm

@@ -13,6 +13,7 @@ has include_results => 0;
 
 # Override to use specific OpenQA Result class.
 sub _add_single_result { shift->generated_tests_results->add(OpenQA::Parser::Result::OpenQA->new(@_)) }
+
 sub _add_result {
     my $self = shift;
     my %opts = ref $_[0] eq 'HASH' ? %{$_[0]} : @_;

lib/OpenQA/Parser/Format/LTP.pm

@@ -82,8 +82,7 @@ sub parse {
 }
 
 # Schema
-{
-    package OpenQA::Parser::Result::LTP::Test;
+package OpenQA::Parser::Result::LTP::Test {
     use Mojo::Base 'OpenQA::Parser::Result::OpenQA';
 
     has environment => sub { OpenQA::Parser::Result::LTP::Environment->new() };
@@ -92,15 +91,13 @@ sub parse {
 }
 
 # Additional data structure - they get mapped automatically
-{
-    package OpenQA::Parser::Result::LTP::SubTest;
+package OpenQA::Parser::Result::LTP::SubTest {
     use Mojo::Base 'OpenQA::Parser::Result::Test';
 
     has [qw(log duration result)];
 }
 
-{
-    package OpenQA::Parser::Result::LTP::Environment;
+package OpenQA::Parser::Result::LTP::Environment {
     use Mojo::Base 'OpenQA::Parser::Result';
 
     has [qw(gcc product revision kernel ltp_version harness libc arch)];

lib/OpenQA/Parser/Format/XUnit.pm

@@ -103,16 +103,14 @@ sub parse {
 }
 
 # Schema
-{
-    package OpenQA::Parser::Result::XUnit;
+package OpenQA::Parser::Result::XUnit {
     use Mojo::Base 'OpenQA::Parser::Result::OpenQA';
     has properties => sub { OpenQA::Parser::Results->new };
 
     has [qw(errors tests softfailures failures time)];
 }
 
-{
-    package OpenQA::Parser::Result::XUnit::Property;
+package OpenQA::Parser::Result::XUnit::Property {
     use Mojo::Base 'OpenQA::Parser::Result';
 
     has [qw(name value)];

lib/OpenQA/Resource/Jobs.pm

@@ -28,6 +28,7 @@ Handle job restart by user (using API or WebUI). Job is only restarted when eith
 or done. Scheduled jobs can't be restarted.
 
 =cut
+
 sub job_restart ($jobids, %args) {
     my (@duplicates, @comments, @processed, @errors, @warnings);
     my %res = (

lib/OpenQA/Scheduler/Model/Jobs.pm

@@ -499,6 +499,7 @@ sub _serialize_directly_chained_job_sequence ($first_job_id, $cluster_info, $sor
         $cluster_info, $sort_function // sub { return shift });
     return ($sequence, [keys %visited]);
 }
+
 sub _serialize_directly_chained_job_sub_sequence ($output_array, $visited, $child_job_ids, $cluster_info,
     $sort_function)
 {

lib/OpenQA/Schema/Result/Comments.pm

@@ -104,6 +104,7 @@ sub bugrefs ($self) { find_bugrefs($self->text) }
 
 Returns label value if C<$self> is label, e.g. 'label:my_label' returns 'my_label'
 =cut
+
 sub label ($self) {
     return find_labels($self->text)->[0];
 }
@@ -112,6 +113,7 @@ sub label ($self) {
 
 Returns flag values if C<$self> has flags, e.g. 'flag:carryover flag:foobar' returns a hashref with the keys 'carryover' and 'foobar'
 =cut
+
 sub text_flags ($self) {
     my $flags = find_flags($self->text);
     my %flag_hash;
@@ -143,6 +145,7 @@ comments not on test comments. The description is optional.
 Returns C<build_nr>, C<type> and optionally C<description> if C<$self> is tag,
 e.g. 'tag:0123:important:GM' returns a list of '0123', 'important' and 'GM'.
 =cut
+
 sub tag ($self) {
     $self->text
       =~ /\btag:(((?<version>[-.@\d\w]+)-)?(?<build>[-.@\d\w]+)|"((?<version>[-.@\d\w]+)-)?(?<build>[-.@\d\w\s\+:]+)"):(?<type>[-@\d\w]+)(:(?<description>[-.@\d\w]+))?\b/;

lib/OpenQA/Schema/Result/Jobs.pm

@@ -604,6 +604,7 @@ sub extract_group_args_from_settings ($settings) {
 Internal function, needs to be executed in a transaction to perform
 optimistic locking on clone_id
 =cut
+
 sub _create_clone ($self, $cluster_job_info, $clone, $prio, $skip_ok_result_children, $settings) {
     # Skip cloning 'ok' jobs which are only pulled in as children if that flag is set
     return ()
@@ -903,6 +904,7 @@ for DIRECTLY_CHAINED dependencies:
  + if child is clone, find the latest clone and clone it
 
 =cut
+
 sub duplicate ($self, $args = {}) {
     # If the job already has a clone, none is created
     my ($orig_id, $clone_id) = ($self->id, $self->clone_id);
@@ -966,6 +968,7 @@ Handle individual job restart including dependent jobs and asset dependencies. N
 the caller is responsible to notify the workers about the new job.
 
 =cut
+
 sub auto_duplicate ($self, $args = {}) {
     my $clones = $self->duplicate($args);
     return $clones unless ref $clones eq 'HASH';
@@ -1694,6 +1697,7 @@ sub _failure_reason ($self) {
 Returns the hook script for this job depending on its result and settings and the global configuration.
 
 =cut
+
 sub hook_script ($self) {
     my $trigger_hook = $self->settings_hash->{_TRIGGER_JOB_DONE_HOOK};
     return undef if defined $trigger_hook && !$trigger_hook;
@@ -1753,6 +1757,7 @@ carry over bugrefs (i.e. special comments) from previous jobs to current
 result in the same scenario.
 
 =cut
+
 sub carry_over_bugrefs ($self) {
     try {
         if (my $group = $self->group) { return undef unless $group->carry_over_bugrefs }
@@ -2109,6 +2114,7 @@ if result is not set (expected default situation) result is computed from the re
 test modules
 
 =cut
+
 sub done ($self, %args) {
     # read specified result or calculate result from module results if none specified
     my $result;