Merge pull request metacpan#880 from metacpan/haarg/update-perltidy

ssoriche · web-flow · commit 3b5b61a3d9b6 · 2018-11-26T10:51:17.000-05:00
update perltidy
diff --git a/cpanfile b/cpanfile
@@ -193,7 +193,7 @@ test_requires 'LWP::ConsoleLogger::Easy';
 test_requires 'MetaCPAN::Client', '>=', '2.017000';
 test_requires 'Module::Faker', '0.015';
 test_requires 'Module::Faker::Dist', '0.010';
-test_requires 'Perl::Tidy' => '20180220';
+test_requires 'Perl::Tidy' => '20181120';
 test_requires 'Plack::Test::Agent';
 test_requires 'Test::Code::TidyAll';
 test_requires 'Test::More', '0.99';
diff --git a/cpanfile.snapshot b/cpanfile.snapshot
@@ -7039,27 +7039,27 @@ DISTRIBUTIONS
       strict 0
       version 0.77
       warnings 0
-  Perl-Tidy-20180220
-    pathname: S/SH/SHANCOCK/Perl-Tidy-20180220.tar.gz
-    provides:
-      Perl::Tidy 20180220
-      Perl::Tidy::Debugger 20180220
-      Perl::Tidy::DevNull 20180220
-      Perl::Tidy::Diagnostics 20180220
-      Perl::Tidy::FileWriter 20180220
-      Perl::Tidy::Formatter 20180220
-      Perl::Tidy::HtmlWriter 20180220
-      Perl::Tidy::IOScalar 20180220
-      Perl::Tidy::IOScalarArray 20180220
-      Perl::Tidy::IndentationItem 20180220
-      Perl::Tidy::LineBuffer 20180220
-      Perl::Tidy::LineSink 20180220
-      Perl::Tidy::LineSource 20180220
-      Perl::Tidy::Logger 20180220
-      Perl::Tidy::Tokenizer 20180220
-      Perl::Tidy::VerticalAligner 20180220
-      Perl::Tidy::VerticalAligner::Alignment 20180220
-      Perl::Tidy::VerticalAligner::Line 20180220
+  Perl-Tidy-20181120
+    pathname: S/SH/SHANCOCK/Perl-Tidy-20181120.tar.gz
+    provides:
+      Perl::Tidy 20181120
+      Perl::Tidy::Debugger 20181120
+      Perl::Tidy::DevNull 20181120
+      Perl::Tidy::Diagnostics 20181120
+      Perl::Tidy::FileWriter 20181120
+      Perl::Tidy::Formatter 20181120
+      Perl::Tidy::HtmlWriter 20181120
+      Perl::Tidy::IOScalar 20181120
+      Perl::Tidy::IOScalarArray 20181120
+      Perl::Tidy::IndentationItem 20181120
+      Perl::Tidy::LineBuffer 20181120
+      Perl::Tidy::LineSink 20181120
+      Perl::Tidy::LineSource 20181120
+      Perl::Tidy::Logger 20181120
+      Perl::Tidy::Tokenizer 20181120
+      Perl::Tidy::VerticalAligner 20181120
+      Perl::Tidy::VerticalAligner::Alignment 20181120
+      Perl::Tidy::VerticalAligner::Line 20181120
     requirements:
       ExtUtils::MakeMaker 0
   PerlIO-gzip-0.20
diff --git a/lib/Catalyst/Authentication/Store/Proxy.pm b/lib/Catalyst/Authentication/Store/Proxy.pm
@@ -51,7 +51,7 @@ sub new_object {
 
 sub from_session {
     my ( $self, $c, $frozenuser ) = @_;
-    my $user = $self->new_object( $self->config, $c );
+    my $user     = $self->new_object( $self->config, $c );
     my $delegate = $self->handles->{from_session};
     return $user->$delegate( $c, $frozenuser );
 }
@@ -64,7 +64,7 @@ sub for_session {
 
 sub find_user {
     my ( $self, $authinfo, $c ) = @_;
-    my $user = $self->new_object( $self->config, $c );
+    my $user     = $self->new_object( $self->config, $c );
     my $delegate = $self->handles->{find_user};
     return $user->$delegate( $authinfo, $c );
 
diff --git a/lib/MetaCPAN/API.pm b/lib/MetaCPAN/API.pm
@@ -100,7 +100,7 @@ sub _gen_index_task_sub {
                 }
             );
         };
-        }
+    }
 }
 
 sub _set_up_routes {
diff --git a/lib/MetaCPAN/Document/File.pm b/lib/MetaCPAN/Document/File.pm
@@ -67,7 +67,7 @@ my $RE_SECTION = qr/^\s*(\S+)((\h+-+\h+(.+))|(\r?\n\h*\r?\n\h*(.+)))?/ms;
 sub _build_section {
     my $self = shift;
 
-    my $text = ${ $self->content };
+    my $text    = ${ $self->content };
     my $section = MetaCPAN::Util::extract_section( $text, 'NAME' );
 
     # if it's a POD file without a name section, let's try to generate
@@ -440,7 +440,7 @@ has level => (
 );
 
 sub _build_level {
-    my $self = shift;
+    my $self  = shift;
     my @level = split( /\//, $self->path );
     return @level - 1;
 }
@@ -568,7 +568,7 @@ sub _build_sloc {
     return 0 unless ( $self->is_perl_file );
 
     my @content = split( "\n", ${ $self->content } );
-    my $pods = 0;
+    my $pods    = 0;
 
     # Use pod_lines data to remove pod content from string.
     map {
diff --git a/lib/MetaCPAN/Document/File/Set.pm b/lib/MetaCPAN/Document/File/Set.pm
@@ -372,7 +372,7 @@ sub _version_filters {
                     term => {
                         'module.version_numified' => $self->_numify($_)
                     }
-                    }
+                }
             } @exclusion;
         }
 
diff --git a/lib/MetaCPAN/Model/Release.pm b/lib/MetaCPAN/Model/Release.pm
@@ -186,7 +186,7 @@ sub _build_dependencies {
 sub _build_document {
     my $self = shift;
 
-    my $st = $self->file->stat;
+    my $st   = $self->file->stat;
     my $stat = { map { $_ => $st->$_ } qw(mode size mtime) };
 
     my $meta         = $self->metadata;
diff --git a/lib/MetaCPAN/Model/Search.pm b/lib/MetaCPAN/Model/Search.pm
@@ -37,7 +37,7 @@ sub _not_rogue {
 
 sub search_for_first_result {
     my ( $self, $search_term ) = @_;
-    my $es_query = $self->build_query($search_term);
+    my $es_query   = $self->build_query($search_term);
     my $es_results = $self->run_query( file => $es_query );
     return unless $es_results->{hits}{total};
 
@@ -381,7 +381,7 @@ sub _extract_results {
                 %{ $res->{fields} },
                 %{ $res->{_source} },
                 score => $res->{_score},
-                }
+            }
         } @{ $es_results->{hits}{hits} }
     ];
 }
diff --git a/lib/MetaCPAN/Script/Author.pm b/lib/MetaCPAN/Script/Author.pm
@@ -75,14 +75,14 @@ sub index_authors {
             = ( @$data{qw(fullname email homepage asciiname)} );
         $name = undef if ( ref $name );
         $asciiname = q{} unless defined $asciiname;
-        $email = lc($pauseid) . '@cpan.org'
+        $email     = lc($pauseid) . '@cpan.org'
             unless ( $email && Email::Valid->address($email) );
         log_debug {
             Encode::encode_utf8(
                 sprintf( "Indexing %s: %s <%s>", $pauseid, $name, $email ) );
         };
         my $conf = $self->author_config( $pauseid, $dates ) || next;
-        my $put = {
+        my $put  = {
             pauseid   => $pauseid,
             name      => $name,
             asciiname => ref $asciiname ? undef : $asciiname,
diff --git a/lib/MetaCPAN/Script/CPANTesters.pm b/lib/MetaCPAN/Script/CPANTesters.pm
@@ -130,7 +130,7 @@ sub index_reports {
         $version =~ s{\+}{}g;
         $version =~ s{\A-}{};
 
-        my $release = join( '-', $row_from_db->{dist}, $version );
+        my $release     = join( '-', $row_from_db->{dist}, $version );
         my $release_doc = $releases{$release};
 
         # there's a cpantesters dist we haven't indexed
diff --git a/lib/MetaCPAN/Script/CPANTestersAPI.pm b/lib/MetaCPAN/Script/CPANTestersAPI.pm
@@ -95,7 +95,7 @@ sub index_reports {
         $version =~ s{\+}{}g;
         $version =~ s{\A-}{};
 
-        my $release = join( '-', $row->{dist}, $version );
+        my $release     = join( '-', $row->{dist}, $version );
         my $release_doc = $releases{$release};
 
         # there's a cpantesters dist we haven't indexed
diff --git a/lib/MetaCPAN/Script/Pagerank.pm b/lib/MetaCPAN/Script/Pagerank.pm
@@ -57,7 +57,7 @@ sub run {
     log_info {
         "Calculating PageRankg with taking $i dependencies into account";
     };
-    my $res = $pr->getPagerankOfNodes( listOfEdges => \@edges );
+    my $res  = $pr->getPagerankOfNodes( listOfEdges => \@edges );
     my @sort = sort { $res->{$b} <=> $res->{$a} } keys %$res;
     for ( 1 .. 500 ) {
         my $mod = shift @sort;
diff --git a/lib/MetaCPAN/Script/Release.pm b/lib/MetaCPAN/Script/Release.pm
@@ -222,7 +222,7 @@ sub import_archive {
     my $self         = shift;
     my $archive_path = shift;
 
-    my $bulk = $self->index->bulk( size => $self->_bulk_size );
+    my $bulk  = $self->index->bulk( size => $self->_bulk_size );
     my $model = $self->_get_release_model( $archive_path, $bulk );
 
     log_debug {'Gathering modules'};
diff --git a/lib/MetaCPAN/Script/Role/Contributor.pm b/lib/MetaCPAN/Script/Role/Contributor.pm
@@ -21,7 +21,7 @@ sub get_cpan_author_contributors {
         next unless exists $d->{pauseid};
 
         # skip existing records
-        my $id = digest( $d->{pauseid}, $release );
+        my $id     = digest( $d->{pauseid}, $release );
         my $exists = $es->exists(
             index => 'contributor',
             type  => 'contributor',
diff --git a/lib/MetaCPAN/Script/Snapshot.pm b/lib/MetaCPAN/Script/Snapshot.pm
@@ -16,7 +16,7 @@ use Sys::Hostname qw(hostname);
 with 'MetaCPAN::Role::Script', 'MooseX::Getopt::Dashes';
 
 my $hostname = hostname;
-my $mode = $hostname =~ /dev/ ? 'testing' : 'production';
+my $mode     = $hostname =~ /dev/ ? 'testing' : 'production';
 
 # So we dont' break production
 my $bucket = "mc-${mode}-backups";
@@ -152,7 +152,7 @@ sub run_snapshot {
     my $snap_name = $self->snap_stub . '_' . $date;
 
     my $indices = join ',', @{ $self->indices };
-    my $data = {
+    my $data    = {
         "ignore_unavailable"   => 0,
         "include_global_state" => 1,
         "indices"              => $indices,
@@ -170,7 +170,7 @@ sub run_snapshot {
 sub run_list_snaps {
     my $self = shift;
 
-    my $path = "${repository_name}/_all";
+    my $path     = "${repository_name}/_all";
     my $response = $self->_request( 'get', $path, {} );
 
     my $data = eval { decode_json $response->{content} };
diff --git a/lib/MetaCPAN/Script/Suggest.pm b/lib/MetaCPAN/Script/Suggest.pm
@@ -43,7 +43,7 @@ sub run {
                 log_info {"updating suggest data for month: $gte"};
             }
 
-            my $lt = $dt->strftime("%Y-%m-%d");
+            my $lt    = $dt->strftime("%Y-%m-%d");
             my $range = +{ range => { date => { gte => $gte, lt => $lt } } };
             $self->_update_slice($range);
         }
diff --git a/lib/MetaCPAN/Server/Controller.pm b/lib/MetaCPAN/Server/Controller.pm
@@ -44,7 +44,7 @@ sub apply_request_filter {
 
     if ( my $fields = $c->req->param('fields') ) {
         my $filtered = {};
-        my @fields = split /,/, $fields;
+        my @fields   = split /,/, $fields;
         @$filtered{@fields} = @$data{@fields};
         $data = $filtered;
     }
diff --git a/lib/MetaCPAN/Server/Controller/Login.pm b/lib/MetaCPAN/Server/Controller/Login.pm
@@ -38,7 +38,7 @@ sub index : Path {
 sub update_user {
     my ( $self, $c, $type, $id, $data ) = @_;
     my $model = $c->model('User::Account');
-    my $user = $model->find( { name => $type, key => $id } );
+    my $user  = $model->find( { name => $type, key => $id } );
     unless ($user) {
         $user = $model->get( $c->user->id )
             if ( $c->session->{__user} );
diff --git a/lib/MetaCPAN/Server/Model/Source.pm b/lib/MetaCPAN/Server/Model/Source.pm
@@ -54,7 +54,7 @@ sub path {
     return if -e $source_dir;  # previously extracted, but file does not exist
 
     my $author = MetaCPAN::Util::author_dir($pauseid);
-    my $http = dir( qw(var tmp http authors), $author );
+    my $http   = dir( qw(var tmp http authors), $author );
     $author = $self->cpan . "/authors/$author";
 
     my ($archive_file)
diff --git a/lib/MetaCPAN/Server/View/Pod.pm b/lib/MetaCPAN/Server/View/Pod.pm
@@ -19,7 +19,7 @@ sub process {
     }
 
     my ( $body, $content_type );
-    my $accept = eval { $c->req->preferred_content_type } || 'text/html';
+    my $accept      = eval { $c->req->preferred_content_type } || 'text/html';
     my $show_errors = $c->stash->{show_errors};
 
     my $renderer = $self->_factory(
diff --git a/lib/MetaCPAN/Types/Internal.pm b/lib/MetaCPAN/Types/Internal.pm
@@ -121,7 +121,7 @@ subtype RiverSummary,
 
 subtype Resources,
     as Dict [
-    license => Optional [ ArrayRef [Str] ],
+    license  => Optional [ ArrayRef [Str] ],
     homepage => Optional [Str],
     bugtracker =>
         Optional [ Dict [ web => Optional [Str], mailto => Optional [Str] ] ],
diff --git a/lib/MetaCPAN/Util.pm b/lib/MetaCPAN/Util.pm
@@ -35,7 +35,7 @@ sub numify_version {
     $version =~ s/_//g;
     if ( $version =~ s/^v//i || $version =~ tr/.// > 1 ) {
         my @parts = split /\./, $version;
-        my $n = shift @parts;
+        my $n     = shift @parts;
         return 0 unless defined $n;
         $version
             = sprintf( join( '.', '%s', ( '%03s' x @parts ) ), $n, @parts );
@@ -52,7 +52,7 @@ sub fix_version {
     $version =~ s/\.[._]+/./;
     $version =~ s/[._]*_[._]*/_/g;
     $version =~ s/\.{2,}/./g;
-    $v ||= $version =~ tr/.// > 1;
+    $v       ||= $version =~ tr/.// > 1;
     $version ||= 0;
     return ( ( $v ? 'v' : '' ) . $version );
 }
diff --git a/t/01_darkpan.t b/t/01_darkpan.t
@@ -10,7 +10,7 @@ use Test::More;
 use Test::RequiresInternet ( 'cpan.metacpan.org' => 80 );
 
 my $darkpan = MetaCPAN::DarkPAN->new;
-my $server = MetaCPAN::TestServer->new( cpan_dir => $darkpan->base_dir );
+my $server  = MetaCPAN::TestServer->new( cpan_dir => $darkpan->base_dir );
 
 # create DarkPAN
 $darkpan->run;
diff --git a/t/lib/Module/Faker/Dist/WithPerl.pm b/t/lib/Module/Faker/Dist/WithPerl.pm
@@ -37,7 +37,7 @@ sub _from_perl_file {
     my $data = do($filename);
 
     my $extra = ( delete $data->{X_Module_Faker} ) || {};
-    my $dist = $self->new( { %$data, %$extra } );
+    my $dist  = $self->new( { %$data, %$extra } );
 }
 
 __PACKAGE__->meta->make_immutable;
diff --git a/t/model/archive.t b/t/model/archive.t
@@ -14,7 +14,7 @@ subtest 'missing required arguments' => sub {
 };
 
 subtest 'file does not exist' => sub {
-    my $file = 'hlaglhalghalghj.blah';
+    my $file    = 'hlaglhalghalghj.blah';
     my $archive = $CLASS->new( file => $file );
 
     throws_ok { $archive->files } qr{$file does not exist};
diff --git a/t/server/controller/changes.t b/t/server/controller/changes.t
@@ -95,7 +95,7 @@ test_psgi app, sub {
     for my $test (@tests) {
         my ( $path, $code, $name, $content, $headers ) = @{$test};
 
-        my $res = get_ok( $cb, $path, $code );
+        my $res  = get_ok( $cb, $path, $code );
         my $json = decode_json_ok($res);
 
         test_cache_headers( $res, $headers );
@@ -106,7 +106,7 @@ test_psgi app, sub {
         like $json->{content}, $content, 'file content';
 
         my @fields = qw(release name content);
-        $res = get_ok( $cb, "$path?fields=" . join( q[,], @fields ), 200 );
+        $res  = get_ok( $cb, "$path?fields=" . join( q[,], @fields ), 200 );
         $json = decode_json_ok($res);
 
         is_deeply [ sort keys %$json ], [ sort @fields ],

Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,7 @@ sub _gen_index_task_sub {`
`100`	`100`	`}`
`101`	`101`	`);`
`102`	`102`	`};`
`103`		`- }`
	`103`	`+ }`
`104`	`104`	`}`
`105`	`105`
`106`	`106`	`sub _set_up_routes {`
Original file line number	Diff line number	Diff line change
`@@ -372,7 +372,7 @@ sub _version_filters {`
`372`	`372`	`term => {`
`373`	`373`	`'module.version_numified' => $self->_numify($_)`
`374`	`374`	`}`
`375`		`- }`
	`375`	`+ }`
`376`	`376`	`} @exclusion;`
`377`	`377`	`}`
`378`	`378`