Perl Tidy

Author: toddr

.perltidyrc

@@ -0,0 +1,11 @@
+-l=400
+-i=4
+-dt=4
+-it=4
+-bar
+-nsfs
+-nolq
+--break-at-old-comma-breakpoints
+--format-skipping
+--format-skipping-begin='#\s*tidyoff'
+--format-skipping-end='#\s*tidyon'

dist.ini

@@ -17,7 +17,7 @@ copyright_holder = cPanel, Inc.
 
 [PruneFiles]
 ; don't include Dist::Zilla build file
-filenames = dist.ini
+filenames = dist.ini .perltidyrc
 
 [AutoPrereqs]
 skip = ^Mock|Fake|^English$

lib/cPanel/TaskQueue.pm

@@ -257,7 +257,7 @@ END { undef %valid_processors }    # case CPANEL-10871 to avoid a SEGV during gl
                 [qw(max_task_timeout      max_timeout)],
                 [qw(max_in_process        max_running)],
                 [qw(default_child_timeout default_child_timeout)],
-              ) {
+            ) {
                 my ( $internal_name, $arg_name ) = @$settings;
                 if ( exists $args_ref->{$arg_name} && $self->{$internal_name} ne $args_ref->{$arg_name} ) {
                     $self->{$internal_name} = $args_ref->{$arg_name};
@@ -335,9 +335,9 @@ END { undef %valid_processors }    # case CPANEL-10871 to avoid a SEGV during gl
             grep {
                 defined $_
                   and eval { $_->isa('cPanel::TaskQueue::Task') }
-              } map {
+            } map {
                 eval { cPanel::TaskQueue::Task->reconstitute($_) }
-              } @{$task_list}
+            } @{$task_list}
         ];
     }
 

lib/cPanel/TaskQueue/Cookbook.pod

@@ -1,3 +1,4 @@
+
 =head1 NAME
 
 cPanel::TaskQueue::Cookbook - some tasty uses of the cPanel::TaskQueue modules.

lib/cPanel/TaskQueue/Ctrl.pm

@@ -33,12 +33,12 @@ my %commands = (
     and each will be queued in turn.',
     },
     pause => {
-        code => sub { $_[2]->pause_processing(); return; },
+        code     => sub { $_[2]->pause_processing(); return; },
         synopsis => 'pause',
         help     => '    Pause the processing of waiting tasks from the TaskQueue.',
     },
     resume => {
-        code => sub { $_[2]->resume_processing(); return; },
+        code     => sub { $_[2]->resume_processing(); return; },
         synopsis => 'resume',
         help     => '    Resume the processing of waiting tasks from the TaskQueue.',
     },

t/00.load.t

@@ -1,7 +1,7 @@
 use Test::More tests => 1;
 
 BEGIN {
-use_ok( 'cPanel::TaskQueue' );
+    use_ok('cPanel::TaskQueue');
 }
 
-diag( "Testing cPanel::TaskQueue $cPanel::TaskQueue::VERSION" );
+diag("Testing cPanel::TaskQueue $cPanel::TaskQueue::VERSION");

t/statefile_bad_call_unlocked.t

@@ -12,13 +12,13 @@ use warnings;
 use cPanel::StateFile;
 use MockCacheable;
 
-my $tmpdir = './tmp';
-my $dir = "$tmpdir/state_test";
-my $file = "$dir/state_dir/state_file";
+my $tmpdir   = './tmp';
+my $dir      = "$tmpdir/state_test";
+my $file     = "$dir/state_dir/state_file";
 my $lockname = "$file.lock";
 
 cleanup();
-File::Path::mkpath( $tmpdir ) or die "Unable to create temporary directory: $!";
+File::Path::mkpath($tmpdir) or die "Unable to create temporary directory: $!";
 
 my $mock_obj = MockCacheable->new;
 my $state = cPanel::StateFile->new( { state_file => $file, data_obj => $mock_obj } );
@@ -28,22 +28,31 @@ my $state = cPanel::StateFile->new( { state_file => $file, data_obj => $mock_obj
     eval { $guard->call_unlocked(); };
     like( $@, qr/Missing coderef/, 'Correctly handle missing arg to call_unlocked' );
 
-    eval { $guard->call_unlocked( 'fred' ); };
+    eval { $guard->call_unlocked('fred'); };
     like( $@, qr/Missing coderef/, 'Correctly handle wrong argument to call_unlocked' );
 
-    $guard->call_unlocked( sub {
-        eval { $guard->call_unlocked( sub {} ) };
-        like( $@, qr/Cannot nest call_unlocked/, 'Correctly identify nested call_unlocked calls.' );
-    });
+    $guard->call_unlocked(
+        sub {
+            eval {
+                $guard->call_unlocked( sub { } );
+            };
+            like( $@, qr/Cannot nest call_unlocked/, 'Correctly identify nested call_unlocked calls.' );
+        }
+    );
 
-    $guard->call_unlocked( sub {
-        eval { $guard->update_file() };
-        like( $@, qr/Cannot update_file/, 'Cannot relock inside unlock call.' );
-    });
+    $guard->call_unlocked(
+        sub {
+            eval { $guard->update_file() };
+            like( $@, qr/Cannot update_file/, 'Cannot relock inside unlock call.' );
+        }
+    );
 
-    eval { $guard->call_unlocked( sub {
+    eval {
+        $guard->call_unlocked(
+            sub {
                 die 'test exception';
-            });
+            }
+        );
     };
     like( $@, qr/test exception/, 'Exceptions are passed out of call correctly.' );
 }
@@ -52,5 +61,5 @@ cleanup();
 
 # Discard temporary files that we don't need any more.
 sub cleanup {
-    File::Path::rmtree( $tmpdir ) if -d $tmpdir;
+    File::Path::rmtree($tmpdir) if -d $tmpdir;
 }

t/statefile_bad_policy.t

@@ -6,33 +6,21 @@ use strict;
 use warnings;
 use cPanel::StateFile ();
 
-eval {
-    cPanel::StateFile->import( '-logger' );
-};
+eval { cPanel::StateFile->import('-logger'); };
 like( $@, qr/even number/, 'Must have argument pairs.' );
 
-eval {
-    cPanel::StateFile->import( '-other' => 'one' );
-};
+eval { cPanel::StateFile->import( '-other' => 'one' ); };
 like( $@, qr/Unrecognized/, 'Unknown policy handled.' );
 
-eval {
-    cPanel::StateFile->import( '-logger' => 'Fred::UnknownLogger' );
-};
+eval { cPanel::StateFile->import( '-logger' => 'Fred::UnknownLogger' ); };
 like( $@, qr/Can't locate/, 'Bad logger module.' );
 
-eval {
-    cPanel::StateFile->import( '-logger' => {} );
-};
+eval { cPanel::StateFile->import( '-logger' => {} ); };
 like( $@, qr/correct interface/, 'Bad logger object.' );
 
-eval {
-    cPanel::StateFile->import( '-filelock' => 'Fred::UnknownLocker' );
-};
+eval { cPanel::StateFile->import( '-filelock' => 'Fred::UnknownLocker' ); };
 like( $@, qr/Can't locate/, 'Bad filelock module.' );
 
-eval {
-    cPanel::StateFile->import( '-filelock' => {} );
-};
+eval { cPanel::StateFile->import( '-filelock' => {} ); };
 like( $@, qr/correct interface/, 'Bad locker object.' );
 

t/statefile_filelocker_abandoned.t

@@ -11,7 +11,7 @@ use lib "$FindBin::Bin/mocks";
 
 use POSIX qw(strftime);
 use File::Path ();
-use Test::More tests=>4;
+use Test::More tests => 4;
 
 use cPanel::FakeLogger;
 use cPanel::StateFile::FileLocker ();
@@ -23,22 +23,22 @@ use cPanel::StateFile::FileLocker ();
 my $tmpdir = './tmp';
 
 # Make sure we are clean to start with.
-File::Path::rmtree( $tmpdir );
+File::Path::rmtree($tmpdir);
 my $filename = "$tmpdir/fake.file";
 my $lockfile = "$filename.lock";
 
 {
-    File::Path::mkpath( $tmpdir ) or die "Unable to create tmpdir: $!";
+    File::Path::mkpath($tmpdir) or die "Unable to create tmpdir: $!";
     my $logger = cPanel::FakeLogger->new;
-    my $locker = cPanel::StateFile::FileLocker->new({logger => $logger, max_age=>120, max_wait=>120});
+    my $locker = cPanel::StateFile::FileLocker->new( { logger => $logger, max_age => 120, max_wait => 120 } );
 
     # create abandoned lockfile
     {
         open( my $fh, '>', $lockfile ) or die "Cannot create lockfile.";
-        print $fh 65537, "\nFred\n", time+5, "\n";
-        close( $fh );
+        print $fh 65537, "\nFred\n", time + 5, "\n";
+        close($fh);
         my $start = time;
-        my $lock = eval { $locker->file_lock( $filename ); };
+        my $lock = eval { $locker->file_lock($filename); };
         ok( $lock, 'Lock returned successfully' );
         my @msgs = $logger->get_msgs();
         $logger->reset_msgs();
@@ -47,7 +47,7 @@ my $lockfile = "$filename.lock";
 
         my $diff = time - $start;
         ok( $diff < 10, "Abandoned: Did not wait too long." );
-        $locker->file_unlock( $lock ) if $lock;
+        $locker->file_unlock($lock) if $lock;
     }
 }
-File::Path::rmtree( $tmpdir );
+File::Path::rmtree($tmpdir);

t/statefile_filelocker_bad_locks.t

@@ -11,7 +11,7 @@ use lib "$FindBin::Bin/mocks";
 
 use POSIX qw(strftime);
 use File::Path ();
-use Test::More tests=>4;
+use Test::More tests => 4;
 
 use cPanel::FakeLogger;
 use cPanel::StateFile::FileLocker ();
@@ -23,39 +23,39 @@ use cPanel::StateFile::FileLocker ();
 my $tmpdir = './tmp';
 
 # Make sure we are clean to start with.
-File::Path::rmtree( $tmpdir );
-File::Path::mkpath( $tmpdir ) or die "Unable to create temporary directory: $!";
+File::Path::rmtree($tmpdir);
+File::Path::mkpath($tmpdir) or die "Unable to create temporary directory: $!";
 my $filename = "$tmpdir/fake.file";
 my $lockfile = "$filename.lock";
 
 my $logger = cPanel::FakeLogger->new;
-my $locker = cPanel::StateFile::FileLocker->new({logger => $logger, max_age=>120, max_wait=>120});
+my $locker = cPanel::StateFile::FileLocker->new( { logger => $logger, max_age => 120, max_wait => 120 } );
 
 # Someone else's lockfile
 {
     open( my $fh, '>', $lockfile ) or die "Cannot create lockfile.";
-    print $fh "1\n$0\n", time+200, "\n";
-    close( $fh );
-    eval { $locker->file_unlock( $lockfile ) };
+    print $fh "1\n$0\n", time + 200, "\n";
+    close($fh);
+    eval { $locker->file_unlock($lockfile) };
     like( $@, qr/locked by another/, 'Did not unlock belonging to someone else' );
     ok( -e $lockfile, 'Empty: lockfile not removed' );
     unlink $lockfile;
 }
 
 # Attempt to double lock a file
 {
-    my $lock = $locker->file_lock( $filename );
-    eval { $locker->file_lock( $filename ); };
+    my $lock = $locker->file_lock($filename);
+    eval { $locker->file_lock($filename); };
     like( $@, qr/relock/, 'Not allowed to double-lock' );
-    $locker->file_unlock( $lock );
+    $locker->file_unlock($lock);
 }
 
 {
     open( my $fh, '>', $lockfile ) or die "Unable to create fake lockfile: $!\n";
     print $fh "This is not actually a lock file\n";
     close $fh;
 
-    eval { $locker->file_lock( $filename ); };
+    eval { $locker->file_lock($filename); };
     like( $@, qr/Invalid lock file/, 'Correctly handle invalid lock file.' );
 }
-File::Path::rmtree( $tmpdir );
+File::Path::rmtree($tmpdir);