Skip to content

Commit f1af5cb

Browse files
mickeynmickeyn
committed
tidy
1 parent e919976 commit f1af5cb

29 files changed

+170
-135
lines changed

‎bin/author.pl

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,15 +57,16 @@
5757
"pauseid=s" => \$pauseid,
5858
"whois_file=s" => \$whois_file,
5959
);
60+
6061
# TODO: find a better way
61-
my @es_mode = ( $mode ? (mode => $mode) : () );
62+
my @es_mode = ( $mode ? ( mode => $mode ) : () );
6263
$mode and $mode eq 'test' and Log::Log4perl::init('log4perl_test.conf');
6364

6465
# setup
6566
my $es = MetaCPAN::ES->new( index => "author", @es_mode );
6667

6768
log_info {'Reading 00whois'};
68-
my $authors_data = read_00whois( $whois_file );
69+
my $authors_data = read_00whois($whois_file);
6970

7071
if ($pauseid) {
7172
log_info {"Indexing 1 author"};

‎bin/backpan.pl

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,15 @@
1616
"mode=s" => \$mode,
1717
"undo" => \$undo,
1818
);
19+
1920
# TODO: find a better way
20-
my @es_mode = ( $mode ? (mode => $mode) : () );
21+
my @es_mode = ( $mode ? ( mode => $mode ) : () );
2122
$mode and $mode eq 'test' and Log::Log4perl::init('log4perl_test.conf');
2223

2324
# setup
2425
my $cpan_file_map = cpan_file_map();
2526
my $es_release = MetaCPAN::ES->new( index => "release", @es_mode );
26-
my $es_file = MetaCPAN::ES->new( index => "file", @es_mode );
27+
my $es_file = MetaCPAN::ES->new( index => "file", @es_mode );
2728

2829
my %bulk;
2930
my %release_status;
@@ -59,7 +60,7 @@ ()
5960
(
6061
$undo
6162
or exists $cpan_file_map->{$author}{$archive}
62-
)
63+
)
6364
? 'cpan'
6465
: 'backpan',
6566
$release->{_id}

‎bin/backup.pl

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,9 @@
3131
"restore=s" => \$restore,
3232
"size=i" => \$size,
3333
);
34+
3435
# TODO: find a better way
35-
my @es_mode = ( $mode ? (mode => $mode) : () );
36+
my @es_mode = ( $mode ? ( mode => $mode ) : () );
3637
$mode and $mode eq 'test' and Log::Log4perl::init('log4perl_test.conf');
3738

3839
# setup
@@ -156,15 +157,14 @@ ()
156157
}
157158

158159
sub run_backup {
159-
my $filename = join( '-',
160-
DateTime->now->strftime('%F'),
161-
grep {defined} $index );
160+
my $filename
161+
= join( '-', DateTime->now->strftime('%F'), grep {defined} $index );
162162

163163
my $file = $home->child( qw< var backup >, "$filename.json.gz" );
164164
$file->parent->mkpath unless ( -e $file->parent );
165165
my $fh = IO::Zlib->new( "$file", 'wb4' );
166166

167-
my $es = MetaCPAN::ES->new( index => $index, @es_mode );
167+
my $es = MetaCPAN::ES->new( index => $index, @es_mode );
168168
my $scroll = $es->scroll(
169169
scroll => '1m',
170170
body => {

‎bin/check.pl

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,21 +9,22 @@
99
use MetaCPAN::Ingest qw< read_02packages_fh >;
1010

1111
# args
12-
my ( $errors_only, $max_errors, $mode, $module );
12+
my ( $errors_only, $max_errors, $mode, $module );
1313
GetOptions(
1414
"errors_only" => \$errors_only,
1515
"max_errors" => \$max_errors,
1616
"mode=s" => \$mode,
1717
"module=s" => \$module,
1818
);
19+
1920
# TODO: find a better way
20-
my @es_mode = ( $mode ? (mode => $mode) : () );
21+
my @es_mode = ( $mode ? ( mode => $mode ) : () );
2122
$mode and $mode eq 'test' and Log::Log4perl::init('log4perl_test.conf');
2223

2324
# setup
2425
my $error_count = 0;
2526
my $packages_fh = read_02packages_fh();
26-
my $es_file = MetaCPAN::ES->new( type => "file", @es_mode );
27+
my $es_file = MetaCPAN::ES->new( type => "file", @es_mode );
2728
my $es_release = MetaCPAN::ES->new( type => "release", @es_mode );
2829

2930
my $modules_start = 0;

‎bin/checksum.pl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,9 @@
1717
"limit=i" => \$limit,
1818
"mode=s" => \$mode,
1919
);
20+
2021
# TODO: find a better way
21-
my @es_mode = ( $mode ? (mode => $mode) : () );
22+
my @es_mode = ( $mode ? ( mode => $mode ) : () );
2223
$mode and $mode eq 'test' and Log::Log4perl::init('log4perl_test.conf');
2324

2425
# setup

‎bin/contributor.pl

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,17 @@
1919
"mode=s" => \$mode,
2020
"release=s" => \$release,
2121
);
22+
2223
# TODO: find a better way
23-
my @es_mode = ( $mode ? (mode => $mode) : () );
24+
my @es_mode = ( $mode ? ( mode => $mode ) : () );
2425
$mode and $mode eq 'test' and Log::Log4perl::init('log4perl_test.conf');
2526

2627
# setup
2728
my $author_mapping = {};
2829
my $email_mapping = {};
2930

30-
my $es_author = MetaCPAN::ES->new( index => 'author', @es_mode );
31-
my $es_release = MetaCPAN::ES->new( index => "release", @es_mode );
31+
my $es_author = MetaCPAN::ES->new( index => 'author', @es_mode );
32+
my $es_release = MetaCPAN::ES->new( index => "release", @es_mode );
3233
my $es_contributor = MetaCPAN::ES->new( index => "contributor", @es_mode );
3334

3435
run();

‎bin/cover.pl

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,9 @@
1717
"json=s" => \$json_file,
1818
"mode=s" => \$mode,
1919
);
20+
2021
# TODO: find a better way
21-
my @es_mode = ( $mode ? (mode => $mode) : () );
22+
my @es_mode = ( $mode ? ( mode => $mode ) : () );
2223
$mode and $mode eq 'test' and Log::Log4perl::init('log4perl_test.conf');
2324

2425
my $cover_url //= 'http://cpancover.com/latest/cpancover.json';
@@ -29,7 +30,7 @@
2930
= map { $_ => 1 } qw< branch condition statement subroutine total >;
3031

3132
my $es_release = MetaCPAN::ES->new( index => "release", @es_mode );
32-
my $es_cover = MetaCPAN::ES->new( index => "cover", @es_mode );
33+
my $es_cover = MetaCPAN::ES->new( index => "cover", @es_mode );
3334
my $bulk_cover = $es_cover->bulk();
3435

3536
my $data = retrieve_cover_data();
@@ -40,8 +41,8 @@
4041
for my $version ( keys %{ $data->{$dist} } ) {
4142
my $release = $dist . '-' . $version;
4243
my $rel_check = $es_release->search(
43-
size => 0,
44-
body => {
44+
size => 0,
45+
body => {
4546
query => { term => { name => $release } },
4647
},
4748
);

‎bin/cpan_testers.pl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,9 @@
2222
"mode=s" => \$mode,
2323
"skip_download" => \$skip_download,
2424
);
25+
2526
# TODO: find a better way
26-
my @es_mode = ( $mode ? (mode => $mode) : () );
27+
my @es_mode = ( $mode ? ( mode => $mode ) : () );
2728
$mode and $mode eq 'test' and Log::Log4perl::init('log4perl_test.conf');
2829

2930
# setup

‎bin/cpan_testers_api.pl

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,11 @@
1414
>;
1515

1616
# args
17-
my ( $mode );
18-
GetOptions(
19-
"mode=s" => \$mode,
20-
);
17+
my ($mode);
18+
GetOptions( "mode=s" => \$mode, );
19+
2120
# TODO: find a better way
22-
my @es_mode = ( $mode ? (mode => $mode) : () );
21+
my @es_mode = ( $mode ? ( mode => $mode ) : () );
2322
$mode and $mode eq 'test' and Log::Log4perl::init('log4perl_test.conf');
2423

2524
# setup

‎bin/cve.pl

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,17 +38,18 @@
3838
"json_file=s" => \$json_file,
3939
"mode=s" => \$mode,
4040
);
41+
4142
# TODO: find a better way
42-
my @es_mode = ( $mode ? (mode => $mode) : () );
43+
my @es_mode = ( $mode ? ( mode => $mode ) : () );
4344
$mode and $mode eq 'test' and Log::Log4perl::init('log4perl_test.conf');
4445

4546
# setup
4647
$cve_url //= 'https://hackeriet.github.io/cpansa-feed/cpansa.json';
4748
$cve_dev_url //= 'https://hackeriet.github.io/cpansa-feed/cpansa_dev.json';
4849

4950
my $es_release = MetaCPAN::ES->new( index => "release", @es_mode );
50-
my $es_cve = MetaCPAN::ES->new( index => "cve", @es_mode );
51-
my $bulk_cve = $es_cve->bulk();
51+
my $es_cve = MetaCPAN::ES->new( index => "cve", @es_mode );
52+
my $bulk_cve = $es_cve->bulk();
5253

5354
my $data = retrieve_cve_data();
5455

@@ -146,7 +147,7 @@
146147
};
147148

148149
my $releases = $es_release->search(
149-
body => {
150+
body => {
150151
query => $query,
151152
_source => [qw< version name author >],
152153
size => 2000,

‎bin/external.pl

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,17 +18,18 @@
1818
"external_source=s" => \$external_source,
1919
"mode=s" => \$mode,
2020
);
21+
2122
# TODO: find a better way
22-
my @es_mode = ( $mode ? (mode => $mode) : () );
23+
my @es_mode = ( $mode ? ( mode => $mode ) : () );
2324
$mode and $mode eq 'test' and Log::Log4perl::init('log4perl_test.conf');
2425

2526
die "wrong external source: $external\n"
2627
unless $external_source
2728
and grep { $_ eq $external_source } qw< cygwin debian >;
2829

2930
# setup
30-
my $es = MetaCPAN::ES->new( index => "distribution", @es_mode );
31-
my $bulk = $es->bulk();
31+
my $es = MetaCPAN::ES->new( index => "distribution", @es_mode );
32+
my $bulk = $es->bulk();
3233
my $scroll = $es->scroll(
3334
scroll => '10m',
3435
body => {
@@ -38,8 +39,6 @@
3839
},
3940
);
4041

41-
42-
4342
my $ret;
4443

4544
$ret = run_cygwin() if $external_source eq 'cygwin';

‎bin/favorite.pl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,9 @@
2020
"mode=s" => \$mode,
2121
"queue" => \$queue,
2222
);
23+
2324
# TODO: find a better way
24-
my @es_mode = ( $mode ? (mode => $mode) : () );
25+
my @es_mode = ( $mode ? ( mode => $mode ) : () );
2526
$mode and $mode eq 'test' and Log::Log4perl::init('log4perl_test.conf');
2627

2728
if ( $count and !$distribution ) {

‎bin/first.pl

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,11 @@
1111
my ( $distribution, $mode );
1212
GetOptions(
1313
"distribution=s" => \$distribution,
14-
"mode=s" => \$mode,
14+
"mode=s" => \$mode,
1515
);
16+
1617
# TODO: find a better way
17-
my @es_mode = ( $mode ? (mode => $mode) : () );
18+
my @es_mode = ( $mode ? ( mode => $mode ) : () );
1819
$mode and $mode eq 'test' and Log::Log4perl::init('log4perl_test.conf');
1920

2021
# setup
@@ -44,7 +45,7 @@
4445
$release
4546
? log_debug {
4647
"@{[ $release->name ]} by @{[ $release->author ]} was first"
47-
}
48+
}
4849
: log_warn {
4950
"no release found for distribution @{[$distribution->name]}"
5051
};

‎bin/latest.pl

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,9 @@
2727
"mode=s" => \$mode,
2828
"queue" => \$queue,
2929
);
30+
3031
# TODO: find a better way
31-
my @es_mode = ( $mode ? (mode => $mode) : () );
32+
my @es_mode = ( $mode ? ( mode => $mode ) : () );
3233
$mode and $mode eq 'test' and Log::Log4perl::init('log4perl_test.conf');
3334

3435
log_info {'Dry run: updates will not be written to ES'} if $dry_run;
@@ -306,7 +307,7 @@ ( $bulk, $source, $status )
306307

307308
log_info {
308309
$status eq 'latest' ? 'Upgrading ' : 'Downgrading ',
309-
'release ', $release->{name}
310+
'release ', $release->{name}
310311
};
311312

312313
# Get all the files for the release.

‎bin/mapping.pl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,5 +22,5 @@
2222

2323
if ( $cmd eq 'create' ) {
2424
$mapper->index_create($index);
25-
$mapper->index_add_mapping($index, $type);
25+
$mapper->index_add_mapping( $index, $type );
2626
}

‎bin/mirrors.pl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,9 @@
1717
"mode=s" => \$mode,
1818
"undo" => \$undo,
1919
);
20+
2021
# TODO: find a better way
21-
my @es_mode = ( $mode ? (mode => $mode) : () );
22+
my @es_mode = ( $mode ? ( mode => $mode ) : () );
2223
$mode and $mode eq 'test' and Log::Log4perl::init('log4perl_test.conf');
2324

2425
# setup

‎bin/package.pl

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,9 @@
1919
"mode=s" => \$mode,
2020
"package_file=s" => \$package_file,
2121
);
22+
2223
# TODO: find a better way
23-
my @es_mode = ( $mode ? (mode => $mode) : () );
24+
my @es_mode = ( $mode ? ( mode => $mode ) : () );
2425
$mode and $mode eq 'test' and Log::Log4perl::init('log4perl_test.conf');
2526

2627
# setup
@@ -34,7 +35,10 @@
3435

3536
# read the rest of the file line-by-line (too big to slurp)
3637

37-
my $fh_packages = read_02packages_fh( log_meta => 1, ( $package_file ? (file => $package_file) : () ) );
38+
my $fh_packages = read_02packages_fh(
39+
log_meta => 1,
40+
( $package_file ? ( file => $package_file ) : () )
41+
);
3842
while ( my $line = <$fh_packages> ) {
3943
next unless $line;
4044
chomp($line);

‎bin/permission.pl

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,9 @@
1818
"mode=s" => \$mode,
1919

2020
);
21+
2122
# TODO: find a better way
22-
my @es_mode = ( $mode ? (mode => $mode) : () );
23+
my @es_mode = ( $mode ? ( mode => $mode ) : () );
2324
$mode and $mode eq 'test' and Log::Log4perl::init('log4perl_test.conf');
2425

2526
# setup
@@ -29,7 +30,7 @@
2930
my %seen;
3031
log_debug {"building permission data to add"};
3132

32-
my $iterator = read_06perms_iter( $perms_file );
33+
my $iterator = read_06perms_iter($perms_file);
3334
while ( my $perms = $iterator->next_module ) {
3435

3536
# This method does a "return sort @foo", so it can't be called in the

‎bin/purge.pl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,9 @@
1919
"mode=s" => \$mode,
2020
"release=s" => \$release,
2121
);
22+
2223
# TODO: find a better way
23-
my @es_mode = ( $mode ? (mode => $mode) : () );
24+
my @es_mode = ( $mode ? ( mode => $mode ) : () );
2425
$mode and $mode eq 'test' and Log::Log4perl::init('log4perl_test.conf');
2526

2627
# setup

0 commit comments

Comments
 (0)