tidy

mickeyn · mickeyn · commit 54e3174bf583 · 2025-05-11T16:24:15.000+02:00
diff --git a/bin/author.pl b/bin/author.pl
@@ -61,7 +61,7 @@
 my $es = MetaCPAN::ES->new( index => "author" );
 
 log_info {'Reading 00whois'};
-my $authors_data = read_00whois( $whois_file );
+my $authors_data = read_00whois($whois_file);
 
 if ($pauseid) {
     log_info {"Indexing 1 author"};
diff --git a/bin/backpan.pl b/bin/backpan.pl
@@ -55,7 +55,7 @@ ()
             (
                 $undo
                     or exists $cpan_file_map->{$author}{$archive}
-                )
+            )
             ? 'cpan'
             : 'backpan',
             $release->{_id}
diff --git a/bin/backup.pl b/bin/backup.pl
@@ -152,15 +152,14 @@ ()
 }
 
 sub run_backup {
-    my $filename = join( '-',
-        DateTime->now->strftime('%F'),
-        grep {defined} $index );
+    my $filename
+        = join( '-', DateTime->now->strftime('%F'), grep {defined} $index );
 
     my $file = $home->child( qw< var backup >, "$filename.json.gz" );
     $file->parent->mkpath unless ( -e $file->parent );
     my $fh = IO::Zlib->new( "$file", 'wb4' );
 
-    my $es = MetaCPAN::ES->new( index => $index );
+    my $es     = MetaCPAN::ES->new( index => $index );
     my $scroll = $es->scroll(
         scroll => '1m',
         body   => {
diff --git a/bin/check.pl b/bin/check.pl
@@ -9,7 +9,7 @@
 use MetaCPAN::Ingest qw< read_02packages_fh >;
 
 # args
-my (  $errors_only, $max_errors, $module );
+my ( $errors_only, $max_errors, $module );
 GetOptions(
     "errors_only" => \$errors_only,
     "max_errors"  => \$max_errors,
diff --git a/bin/checksum.pl b/bin/checksum.pl
@@ -11,7 +11,7 @@
 
 # args
 my $limit = 1000;
-my ( $dry_run );
+my ($dry_run);
 GetOptions(
     "dry_run" => \$dry_run,
     "limit=i" => \$limit,
diff --git a/bin/cover.pl b/bin/cover.pl
@@ -25,7 +25,7 @@
     = map { $_ => 1 } qw< branch condition statement subroutine total >;
 
 my $es_release = MetaCPAN::ES->new( index => "release" );
-my $es_cover = MetaCPAN::ES->new( index => "cover" );
+my $es_cover   = MetaCPAN::ES->new( index => "cover" );
 my $bulk_cover = $es_cover->bulk();
 
 my $data = retrieve_cover_data();
@@ -36,8 +36,8 @@
     for my $version ( keys %{ $data->{$dist} } ) {
         my $release   = $dist . '-' . $version;
         my $rel_check = $es_release->search(
-            size  => 0,
-            body  => {
+            size => 0,
+            body => {
                 query => { term => { name => $release } },
             },
         );
diff --git a/bin/cve.pl b/bin/cve.pl
@@ -44,8 +44,8 @@
 $cve_dev_url //= 'https://hackeriet.github.io/cpansa-feed/cpansa_dev.json';
 
 my $es_release = MetaCPAN::ES->new( index => "release" );
-my $es_cve   = MetaCPAN::ES->new( index => "cve" );
-my $bulk_cve = $es_cve->bulk();
+my $es_cve     = MetaCPAN::ES->new( index => "cve" );
+my $bulk_cve   = $es_cve->bulk();
 
 my $data = retrieve_cve_data();
 
@@ -143,7 +143,7 @@
             };
 
             my $releases = $es_release->search(
-                body  => {
+                body => {
                     query   => $query,
                     _source => [qw< version name author >],
                     size    => 2000,
diff --git a/bin/external.pl b/bin/external.pl
@@ -23,8 +23,8 @@
     and grep { $_ eq $external_source } qw< cygwin debian >;
 
 # setup
-my $es = MetaCPAN::ES->new( index => "distribution" );
-my $bulk = $es->bulk();
+my $es     = MetaCPAN::ES->new( index => "distribution" );
+my $bulk   = $es->bulk();
 my $scroll = $es->scroll(
     scroll => '10m',
     body   => {
@@ -34,8 +34,6 @@
     },
 );
 
-
-
 my $ret;
 
 $ret = run_cygwin() if $external_source eq 'cygwin';
diff --git a/bin/first.pl b/bin/first.pl
@@ -8,10 +8,8 @@
 use MetaCPAN::ES;
 
 # args
-my ( $distribution );
-GetOptions(
-    "distribution=s" => \$distribution,
-);
+my ($distribution);
+GetOptions( "distribution=s" => \$distribution, );
 
 # setup
 my $es = MetaCPAN::ES->new( index => "distribution" );
@@ -40,7 +38,7 @@
     $release
         ? log_debug {
         "@{[ $release->name ]} by @{[ $release->author ]} was first"
-        }
+    }
         : log_warn {
         "no release found for distribution @{[$distribution->name]}"
         };
diff --git a/bin/latest.pl b/bin/latest.pl
@@ -302,7 +302,7 @@ ( $bulk, $source, $status )
 
     log_info {
         $status eq 'latest' ? 'Upgrading ' : 'Downgrading ',
-        'release ', $release->{name}
+            'release ', $release->{name}
     };
 
     # Get all the files for the release.
diff --git a/bin/mapping.pl b/bin/mapping.pl
@@ -22,5 +22,5 @@
 
 if ( $cmd eq 'create' ) {
     $mapper->index_create($index);
-    $mapper->index_add_mapping($index, $type);
+    $mapper->index_add_mapping( $index, $type );
 }
diff --git a/bin/package.pl b/bin/package.pl
@@ -30,7 +30,10 @@
 
 # read the rest of the file line-by-line (too big to slurp)
 
-my $fh_packages = read_02packages_fh( log_meta => 1, ( $package_file ? (file => $package_file) : () ) );
+my $fh_packages = read_02packages_fh(
+    log_meta => 1,
+    ( $package_file ? ( file => $package_file ) : () )
+);
 while ( my $line = <$fh_packages> ) {
     next unless $line;
     chomp($line);
diff --git a/bin/permission.pl b/bin/permission.pl
@@ -24,7 +24,7 @@
 my %seen;
 log_debug {"building permission data to add"};
 
-my $iterator = read_06perms_iter( $perms_file );
+my $iterator = read_06perms_iter($perms_file);
 while ( my $perms = $iterator->next_module ) {
 
     # This method does a "return sort @foo", so it can't be called in the
diff --git a/bin/release.pl b/bin/release.pl
@@ -88,7 +88,7 @@
 
 # args
 my ( $age, $bulk_size, $detect_backpan, $force_authorized, $latest,
-     $queue, $skip, $status );
+    $queue, $skip, $status );
 GetOptions(
     "age=i"            => \$age,
     "bulk_size=i"      => \$bulk_size,
@@ -121,7 +121,7 @@
         $find = $find->mtime( ">" . ( time - $age * 3600 ) )
             if $age;
         push( @files,
-            map { $_->{file} }
+            map      { $_->{file} }
                 sort { $a->{mtime} <=> $b->{mtime} }
                 map  { +{ file => $_, mtime => File::stat::stat($_)->mtime } }
                 $find->in($_) );
diff --git a/bin/suggest.pl b/bin/suggest.pl
@@ -10,7 +10,7 @@
 
 # args
 my $days = 1;
-my ( $all );
+my ($all);
 GetOptions(
     "all"    => \$all,
     "days=i" => \$days,
diff --git a/bin/tickets.pl b/bin/tickets.pl
@@ -105,7 +105,7 @@ ($tsv)
             source => _rt_dist_url( $row->{dist} ),
             active => $row->{active} + 0,
             closed => $row->{inactive} + 0,
-            map { $_ => $row->{$_} + 0 }
+            map      { $_ => $row->{$_} + 0 }
                 grep { not /^(dist|active|inactive)$/ }
                 keys %$row,
         };
diff --git a/lib/MetaCPAN/Contributor.pm b/lib/MetaCPAN/Contributor.pm
@@ -31,7 +31,7 @@ sub get_cpan_author_contributors ( $author, $release, $distribution ) {
         next unless exists $d->{pauseid};
 
         # skip existing records
-        my $id = digest( $d->{pauseid}, $release );
+        my $id     = digest( $d->{pauseid}, $release );
         my $exists = $es_contributor->exists( id => $id );
         next if $exists;
 
@@ -49,7 +49,7 @@ sub update_release_contirbutors ( $document, $timeout = "5m" ) {
         @{$document}{qw< author name distribution >} );
     return unless $data and is_arrayref($data);
 
-    my $es_contributor = MetaCPAN::ES->new( index => 'contributor' );
+    my $es_contributor   = MetaCPAN::ES->new( index => 'contributor' );
     my $bulk_contributor = $es_contributor->bulk( timeout => $timeout );
 
     for my $d ( @{$data} ) {
@@ -71,7 +71,7 @@ sub update_release_contirbutors ( $document, $timeout = "5m" ) {
 
 sub get_contributors ( $author_name, $release_name ) {
     my $es_release = MetaCPAN::ES->new( index => "release" );
-    my $es_author = MetaCPAN::ES->new( index => "author" );
+    my $es_author  = MetaCPAN::ES->new( index => "author" );
 
     my $query = +{
         query => {
diff --git a/lib/MetaCPAN/ES.pm b/lib/MetaCPAN/ES.pm
@@ -13,16 +13,18 @@ sub new ( $class, %args ) {
     my $node  = $args{node};
     my $index = $args{index} // 'cpan';
 
-    my $mode  = is_dev() ? 'test' : 'local';
-    $mode eq 'test' and Log::Log4perl::init('log4perl_test.conf'); # TODO: find a better place
+    my $mode = is_dev() ? 'test' : 'local';
+    $mode eq 'test'
+        and Log::Log4perl::init('log4perl_test.conf')
+        ;    # TODO: find a better place
 
     my $config = config;
-    my $config_node =
-        $node ? $node :
-        $mode eq 'local' ? $config->{es_node} :
-        $mode eq 'test'  ? $config->{es_test_node} :
-        $mode eq 'prod'  ? $config->{es_production_node} :
-        undef;
+    my $config_node
+        = $node            ? $node
+        : $mode eq 'local' ? $config->{es_node}
+        : $mode eq 'test'  ? $config->{es_test_node}
+        : $mode eq 'prod'  ? $config->{es_production_node}
+        :                    undef;
     $config_node or die "Cannot create an ES instance without a node\n";
 
     return bless {
diff --git a/lib/MetaCPAN/Mapper.pm b/lib/MetaCPAN/Mapper.pm
@@ -5,7 +5,7 @@ use warnings;
 use v5.36;
 
 use Cpanel::JSON::XS qw< decode_json >;
-use Path::Tiny qw< path >;
+use Path::Tiny       qw< path >;
 use MetaCPAN::Logger qw< :log :dlog >;
 use Search::Elasticsearch;
 use MetaCPAN::Ingest qw< config home is_dev >;
@@ -14,15 +14,17 @@ sub new ( $class, %args ) {
     my $node = $args{node};
 
     my $mode = is_dev() ? 'test' : 'local';
-    $mode eq 'test' and Log::Log4perl::init('log4perl_test.conf'); # TODO: find a better place
+    $mode eq 'test'
+        and Log::Log4perl::init('log4perl_test.conf')
+        ;    # TODO: find a better place
 
     my $config = config;
-    my $config_node =
-        $node ? $node :
-        $mode eq 'local' ? $config->{es_node} :
-        $mode eq 'test'  ? $config->{es_test_node} :
-        $mode eq 'prod'  ? $config->{es_production_node} :
-        undef;
+    my $config_node
+        = $node            ? $node
+        : $mode eq 'local' ? $config->{es_node}
+        : $mode eq 'test'  ? $config->{es_test_node}
+        : $mode eq 'prod'  ? $config->{es_production_node}
+        :                    undef;
     $config_node or die "Cannot create an ES instance without a node\n";
 
     return bless {
@@ -33,57 +35,61 @@ sub new ( $class, %args ) {
     }, $class;
 }
 
-sub index_exists ($self, $index) {
+sub index_exists ( $self, $index ) {
     $self->{es}->indices->exists( index => $index );
 }
 
-sub index_create ($self, %args) {
+sub index_create ( $self, %args ) {
     my $index = $args{index};
     $index or die "Need an index name to create an index\n";
 
-    my $add_mapping = $args{add_mapping};
+    my $add_mapping  = $args{add_mapping};
     my $delete_first = $args{delete_first};
 
-    $self->index_delete($index, 1) if ($delete_first);
+    $self->index_delete( $index, 1 ) if ($delete_first);
 
     my @body;
     if ($add_mapping) {
         my $home = home();
-        my $mapping_file = $home->child('conf/es/' . $index . '/mapping.json');
+        my $mapping_file
+            = $home->child( 'conf/es/' . $index . '/mapping.json' );
         my $mapping = decode_json $mapping_file->slurp();
-        my $settings_file = $home->child('conf/es/' . $index . '/settings.json');
+        my $settings_file
+            = $home->child( 'conf/es/' . $index . '/settings.json' );
         my $settings = decode_json $settings_file->slurp();
 
-        @body = ( body => {
-            settings => $settings,
-            mappings => { $index => $mapping },
-        });
+        @body = (
+            body => {
+                settings => $settings,
+                mappings => { $index => $mapping },
+            }
+        );
     }
 
     $self->{es}->indices->create( index => $index, @body );
 }
 
-sub index_delete ($self, $index, $skip_exists) {
+sub index_delete ( $self, $index, $skip_exists ) {
     return if $skip_exists and !$self->index_exists($index);
     $self->{es}->indices->delete( index => $index );
 }
 
-sub index_put_mapping ($self, $index, $mapping) {
+sub index_put_mapping ( $self, $index, $mapping ) {
     $self->{es}->indices->put_mapping(
         index => $index,
         type  => $index,
         body  => $mapping,
     );
 }
 
-sub index_add_mapping ($self, $index, $skip_exists) {
+sub index_add_mapping ( $self, $index, $skip_exists ) {
     return if $skip_exists and !$self->index_exists($index);
 
-    my $home = home();
-    my $map_file = $home->child('conf/es/' . $index . '/mapping.json');
-    my $mapping = decode_json $map_file->slurp();
+    my $home     = home();
+    my $map_file = $home->child( 'conf/es/' . $index . '/mapping.json' );
+    my $mapping  = decode_json $map_file->slurp();
 
-    $self->index_put_mapping($index, $mapping);
+    $self->index_put_mapping( $index, $mapping );
 }
 
 1;
diff --git a/t/00_setup.t b/t/00_setup.t

Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ ()`
`55`	`55`	`(`
`56`	`56`	`$undo`
`57`	`57`	`or exists $cpan_file_map->{$author}{$archive}`
`58`		`- )`
	`58`	`+ )`
`59`	`59`	`? 'cpan'`
`60`	`60`	`: 'backpan',`
`61`	`61`	`$release->{_id}`