tidy

mickeyn · mickeyn · commit 5bee46b1ef0e · 2025-05-04T12:12:36.000+02:00
diff --git a/bin/author.pl b/bin/author.pl
@@ -61,12 +61,14 @@
 # TODO: find a better way
 $mode eq 'test' and Log::Log4perl::init('log4perl_test.conf');
 
-
 # setup
-my $es = MetaCPAN::ES->new( index => "author", ( $mode ? ( mode => $mode ) : () ) );
+my $es = MetaCPAN::ES->new(
+    index => "author",
+    ( $mode ? ( mode => $mode ) : () )
+);
 
 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/first.pl b/bin/first.pl
@@ -38,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
@@ -310,7 +310,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
@@ -19,11 +19,15 @@
     "mode=s"         => \$mode,
     "package_file=s" => \$package_file,
 );
+
 # TODO: find a better way
 $mode eq 'test' and Log::Log4perl::init('log4perl_test.conf');
 
 # setup
-my $es   = MetaCPAN::ES->new( index => "package", ( $mode ? ( mode => $mode ) : () ) );
+my $es = MetaCPAN::ES->new(
+    index => "package",
+    ( $mode ? ( mode => $mode ) : () )
+);
 my $bulk = $es->bulk();
 
 my %seen;
@@ -33,7 +37,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
@@ -18,17 +18,21 @@
     "mode=s"       => \$mode,
 
 );
+
 # TODO: find a better way
 $mode eq 'test' and Log::Log4perl::init('log4perl_test.conf');
 
 # setup
-my $es   = MetaCPAN::ES->new( index => "permission", ( $mode ? ( mode => $mode ) : () ) );
+my $es = MetaCPAN::ES->new(
+    index => "permission",
+    ( $mode ? ( mode => $mode ) : () )
+);
 my $bulk = $es->bulk();
 
 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
@@ -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/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/ES.pm b/lib/MetaCPAN/ES.pm
@@ -15,12 +15,12 @@ sub new ( $class, %args ) {
     my $index = $args{index} // "cpan";
 
     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,22 +5,22 @@ 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 >;
 
 sub new ( $class, %args ) {
-    my $mode  = $args{mode} // "local";
-    my $node  = $args{node};
+    my $mode = $args{mode} // "local";
+    my $node = $args{node};
 
     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 {
@@ -31,35 +31,35 @@ 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, $index) {
+sub index_create ( $self, $index ) {
     $self->{es}->indices->create( index => $index );
 }
 
-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
@@ -8,7 +8,7 @@ use MetaCPAN::ES;
 use MetaCPAN::Mapper;
 use MetaCPAN::Ingest qw< home >;
 
-my $es = MetaCPAN::ES->new( mode => 'test' );
+my $es     = MetaCPAN::ES->new( mode => 'test' );
 my $mapper = MetaCPAN::Mapper->new( mode => 'test' );
 
 my $home = home();
@@ -31,7 +31,8 @@ my @files = qw<
 
 subtest 'Check Files' => sub {
     ok( $authors->child('00whois.xml'), "Found 00whois.xml" );
-    ok( $modules->child('02packages.details.txt.gz'), "Found 02packages.details.txt.gz" );
+    ok( $modules->child('02packages.details.txt.gz'),
+        "Found 02packages.details.txt.gz" );
     ok( $modules->child('06perms.txt'), "Found 06perms.txt" );
 };
 
@@ -40,7 +41,8 @@ my @packages = qw<
 >;
 
 subtest 'Check Packages' => sub {
-    ok( $authors->child('id/O/OA/OALDERS/HTML-Parser-3.83.tar.gz'), "Found HTML-Parser-3.83.tar.gz" );
+    ok( $authors->child('id/O/OA/OALDERS/HTML-Parser-3.83.tar.gz'),
+        "Found HTML-Parser-3.83.tar.gz" );
 };
 
 # === Mapping
@@ -59,13 +61,13 @@ my @indices = qw<
     release
 >;
 
-for my $i ( @indices ) {
-    $mapper->index_delete($i, 'skip_exists');
+for my $i (@indices) {
+    $mapper->index_delete( $i, 'skip_exists' );
     $mapper->index_create($i);
 }
 
 subtest 'Check Mappings' => sub {
-    for my $i ( @indices ) {
+    for my $i (@indices) {
         ok( $mapper->index_exists($i), "Index '$i' exists" );
     }
 };
@@ -74,35 +76,38 @@ subtest 'Check Mappings' => sub {
 
 # run the author indexing script in test mode
 my $author_script = $bin->child('author.pl');
-my $whois_file = $authors->child('00whois.xml');
+my $whois_file    = $authors->child('00whois.xml');
 `perl $author_script -whois_file $whois_file --mode test`;
 
 subtest 'Author Indexing' => sub {
     my $es_author = MetaCPAN::ES->new( index => 'author', mode => 'test' );
-    ok( $es_author->exists( index => 'author', id => 'OALDERS' ), "Found author OALDERS" );
+    ok( $es_author->exists( index => 'author', id => 'OALDERS' ),
+        "Found author OALDERS" );
 };
 
 # run the package indexing script in test mode
 my $package_script = $bin->child('package.pl');
-my $package_file = $modules->child('02packages.details.txt.gz');
+my $package_file   = $modules->child('02packages.details.txt.gz');
 `perl $package_script -package_file $package_file --mode test`;
 
 subtest 'Package Indexing' => sub {
     my $es_package = MetaCPAN::ES->new( index => 'package', mode => 'test' );
-    ok( $es_package->exists( index => 'package', id => 'LWP' ), "Found package LWP" );
+    ok( $es_package->exists( index => 'package', id => 'LWP' ),
+        "Found package LWP" );
 };
 
 # run the permission indexing script in test mode
 my $perms_script = $bin->child('permission.pl');
-my $perms_file = $modules->child('06perms.txt');
+my $perms_file   = $modules->child('06perms.txt');
 `perl $perms_script -perms_file $perms_file --mode test`;
 
 subtest 'Permissions Indexing' => sub {
-    my $es_permission = MetaCPAN::ES->new( index => 'permission', mode => 'test' );
-    ok( $es_permission->exists( index => 'permission', id => 'LWP' ), "Found permissions for LWP" );
+    my $es_permission
+        = MetaCPAN::ES->new( index => 'permission', mode => 'test' );
+    ok( $es_permission->exists( index => 'permission', id => 'LWP' ),
+        "Found permissions for LWP" );
 };
 
-
 # check test data directory
 #       - check all distros for test are there
 #       - check all other data sources are there to test all indices
@@ -113,5 +118,4 @@ subtest 'Permissions Indexing' => sub {
 # $server->set_first;
 # $server->prepare_user_test_data;
 
-
 done_testing;

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}`
Original file line number	Diff line number	Diff line change
`@@ -22,5 +22,5 @@`
`22`	`22`
`23`	`23`	`if ( $cmd eq 'create' ) {`
`24`	`24`	`$mapper->index_create($index);`
`25`		`- $mapper->index_add_mapping($index, $type);`
	`25`	`+ $mapper->index_add_mapping( $index, $type );`
`26`	`26`	`}`