Skip to content

Commit 4c1e3c4

Browse files
authored
Merge pull request #1244 from metacpan/oalders/perlimports-ii
Apply perlimports to ./t
2 parents 70b2432 + c9f5393 commit 4c1e3c4

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

71 files changed

+202
-145
lines changed

cpanfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -170,3 +170,4 @@ requires 'Test::Vars', '0.015';
170170

171171
# author requirements
172172
requires 'Plack::Middleware::Rewrite';
173+
requires 'App::perlimports';

perlimports.toml

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
# Valid log levels are:
2+
# debug, info, notice, warning, error, critical, alert, emergency
3+
# critical, alert and emergency are not currently used.
4+
#
5+
# Please use boolean values in this config file. Negated options (--no-*) are
6+
# not permitted here. Explicitly set options to true or false.
7+
#
8+
# Some of these values deviate from the regular perlimports defaults. In
9+
# particular, you're encouraged to leave preserve_duplicates and
10+
# preserve_unused disabled.
11+
12+
cache = false # setting this to true is currently discouraged
13+
ignore_modules = ["Catalyst::Runtime","Module::Pluggable", "namespace::clean", "Test::More", "Type::Library", "With::Roles"]
14+
ignore_modules_filename = ""
15+
ignore_modules_pattern = "" # regex like "^(Foo|Foo::Bar)"
16+
ignore_modules_pattern_filename = ""
17+
libs = ["lib", "t/lib"]
18+
log_filename = ""
19+
log_level = "warn"
20+
never_export_modules = []
21+
never_export_modules_filename = ""
22+
padding = true
23+
preserve_duplicates = false
24+
preserve_unused = false
25+
tidy_whitespace = true

precious.toml

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
excludes = [
2+
".build/**",
3+
"blib/**",
4+
"root/assets/**",
5+
]
6+
7+
[commands.perlimports]
8+
type = "both"
9+
include = [ "**/*.{pl,pm,t,psgi}" ]
10+
cmd = [ "perlimports" ]
11+
lint-flags = ["--lint" ]
12+
tidy-flags = ["-i" ]
13+
ok-exit-codes = 0
14+
expect-stderr = true
15+
16+
[commands.perlcritic]
17+
type = "lint"
18+
include = [ "**/*.{pl,pm,t,psgi}" ]
19+
cmd = [ "perlcritic", "--profile=$PRECIOUS_ROOT/.perlcriticrc" ]
20+
ok-exit-codes = 0
21+
lint-failure-exit-codes = 2
22+
23+
[commands.perltidy]
24+
type = "both"
25+
include = [ "**/*.{pl,pm,t,psgi}" ]
26+
cmd = [ "perltidy", "--profile=$PRECIOUS_ROOT/.perltidyrc" ]
27+
lint-flags = [ "--assert-tidy", "--no-standard-output", "--outfile=/dev/null" ]
28+
tidy-flags = [ "--backup-and-modify-in-place", "--backup-file-extension=/" ]
29+
ok-exit-codes = 0
30+
lint-failure-exit-codes = 2
31+
ignore-stderr = "Begin Error Output Stream"
32+
33+
[commands.omegasort-gitignore]
34+
type = "both"
35+
include = "**/.gitignore"
36+
cmd = [ "omegasort", "--sort", "path", "--unique" ]
37+
lint-flags = "--check"
38+
tidy-flags = "--in-place"
39+
ok-exit-codes = 0
40+
lint-failure-exit-codes = 1
41+
ignore-stderr = [
42+
"The .+ file is not sorted",
43+
"The .+ file is not unique",
44+
]

t/00_setup.t

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,14 @@ use lib 't/lib';
55
use CPAN::Faker 0.010 ();
66
use Devel::Confess;
77
use MetaCPAN::Script::Tickets ();
8-
use MetaCPAN::Server::Test;
9-
use MetaCPAN::TestHelpers qw(
8+
use MetaCPAN::TestHelpers qw(
109
fakecpan_configs_dir
1110
fakecpan_dir
1211
get_config
1312
tmp_dir
1413
write_find_ls
1514
);
1615
use MetaCPAN::TestServer ();
17-
use Module::Faker 0.015 (); # Generates META.json.
1816
use Test::More 0.96;
1917
use URI::FromHash qw( uri );
2018

t/01_darkpan.t

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ use warnings;
33
use lib 't/lib';
44

55
use Devel::Confess;
6-
use MetaCPAN::DarkPAN ();
7-
use MetaCPAN::TestServer;
8-
use MetaCPAN::Tests::Controller::Search::DownloadURL;
6+
use MetaCPAN::DarkPAN ();
7+
use MetaCPAN::TestServer ();
8+
use MetaCPAN::Tests::Controller::Search::DownloadURL ();
99
use Test::More;
1010
use Test::RequiresInternet ( 'cpan.metacpan.org' => 80 );
1111

t/api/controller/cover.t

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@ use Mojo::Base -strict;
22

33
use lib 't/lib';
44

5-
use MetaCPAN::Model::Search ();
6-
use MetaCPAN::TestServer ();
5+
use MetaCPAN::TestServer ();
76
use Test::More;
87
use Test::Mojo ();
98

t/lib/MetaCPAN/DarkPAN.pm

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,13 @@ package MetaCPAN::DarkPAN;
22

33
use MetaCPAN::Moose;
44

5-
use CPAN::Repository::Perms;
6-
use MetaCPAN::TestHelpers qw( get_config write_find_ls );
5+
use CPAN::Repository::Perms ();
6+
use MetaCPAN::TestHelpers qw( write_find_ls );
77
use MetaCPAN::Types::TypeTiny qw( Path );
88
use MetaCPAN::Util qw( author_dir );
9-
use OrePAN2::Indexer;
10-
use OrePAN2::Injector;
11-
use Path::Tiny qw( path );
12-
use URI::FromHash qw( uri_object );
9+
use OrePAN2::Indexer ();
10+
use OrePAN2::Injector ();
11+
use URI::FromHash qw( uri_object );
1312

1413
has base_dir => (
1514
is => 'ro',

t/lib/MetaCPAN/Server/Test.pm

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ package MetaCPAN::Server::Test;
33
use strict;
44
use warnings;
55

6-
use HTTP::Request::Common qw(POST GET DELETE);
6+
use HTTP::Request::Common qw( DELETE GET POST );
77
use MetaCPAN::Server ();
8-
use Plack::Test;
8+
use Plack::Test qw( test_psgi );
99
use Test::More;
1010

1111
use base 'Exporter';
@@ -37,7 +37,7 @@ sub app {
3737
return $app;
3838
}
3939

40-
require MetaCPAN::Model;
40+
use MetaCPAN::Model ();
4141

4242
sub model {
4343
MetaCPAN::Model->new( es => ( $ENV{ES_TEST} ||= 'localhost:9200' ) );

t/lib/MetaCPAN/TestHelpers.pm

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,16 @@ use warnings;
44
package # no_index
55
MetaCPAN::TestHelpers;
66

7-
use Cpanel::JSON::XS;
8-
use File::Copy qw( copy );
9-
use File::pushd qw( pushd );
10-
use FindBin;
11-
use MetaCPAN::Util qw( checkout_root );
12-
use MetaCPAN::Script::Runner;
13-
use Path::Tiny qw( path );
7+
use Cpanel::JSON::XS qw( decode_json encode_json );
8+
use File::Copy qw( copy );
9+
use File::pushd qw( pushd );
10+
use FindBin ();
11+
use MetaCPAN::Util qw( checkout_root );
12+
use MetaCPAN::Script::Runner ();
13+
use Path::Tiny qw( path );
1414
use Test::More;
15-
use Test::Routine::Util;
16-
use Try::Tiny qw( catch try );
15+
use Test::Routine::Util qw( run_tests );
16+
use Try::Tiny qw( catch finally try );
1717

1818
use base 'Exporter';
1919
our @EXPORT = qw(

t/lib/MetaCPAN/TestServer.pm

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -2,24 +2,23 @@ package MetaCPAN::TestServer;
22

33
use MetaCPAN::Moose;
44

5-
use MetaCPAN::DarkPAN ();
6-
use MetaCPAN::Script::Author ();
7-
use MetaCPAN::Script::Cover ();
8-
use MetaCPAN::Script::CPANTestersAPI ();
9-
use MetaCPAN::Script::Favorite ();
10-
use MetaCPAN::Script::First ();
11-
use MetaCPAN::Script::Latest ();
12-
use MetaCPAN::Script::Mapping ();
13-
use MetaCPAN::Script::Mapping::Cover ();
14-
use MetaCPAN::Script::Mirrors ();
15-
use MetaCPAN::Script::Package ();
16-
use MetaCPAN::Script::Permission ();
17-
use MetaCPAN::Script::Release ();
18-
use MetaCPAN::Server ();
19-
use MetaCPAN::TestHelpers qw( fakecpan_dir );
20-
use MetaCPAN::Types::TypeTiny qw( Path HashRef Str );
21-
use Search::Elasticsearch;
22-
use Search::Elasticsearch::TestServer;
5+
use MetaCPAN::Script::Author ();
6+
use MetaCPAN::Script::Cover ();
7+
use MetaCPAN::Script::CPANTestersAPI ();
8+
use MetaCPAN::Script::Favorite ();
9+
use MetaCPAN::Script::First ();
10+
use MetaCPAN::Script::Latest ();
11+
use MetaCPAN::Script::Mapping ();
12+
use MetaCPAN::Script::Mapping::Cover ();
13+
use MetaCPAN::Script::Mirrors ();
14+
use MetaCPAN::Script::Package ();
15+
use MetaCPAN::Script::Permission ();
16+
use MetaCPAN::Script::Release ();
17+
use MetaCPAN::Server ();
18+
use MetaCPAN::TestHelpers qw( fakecpan_dir );
19+
use MetaCPAN::Types::TypeTiny qw( HashRef Path Str );
20+
use Search::Elasticsearch ();
21+
use Search::Elasticsearch::TestServer ();
2322
use Test::More;
2423
use Try::Tiny qw( catch try );
2524

0 commit comments

Comments
 (0)