Skip to content

Commit 520ea6a

Browse files
committed
Merge branch '2.0_merge_t2h' into 2.0
2 parents 85f54a8 + b7b7000 commit 520ea6a

File tree

496 files changed

+65952
-354
lines changed

Some content is hidden

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

496 files changed

+65952
-354
lines changed

.gitignore

+49-59
Original file line numberDiff line numberDiff line change
@@ -1,70 +1,60 @@
1-
*.swp
1+
!Build/
2+
*.ERR
23
*.bak
3-
*~
4+
*.bs
5+
*.o
46
*.old
5-
*.tar.gz
6-
*.ERR
77
*.orig
8+
*.pm.tdy
89
*.rej
9-
Makefile
10-
blib/
11-
pm_to_blib
12-
Build
13-
_build
14-
cover_db/
15-
MYMETA.*
16-
/Test2-*/
10+
*.swp
11+
*.tar.gz
12+
*.test_info.*.json
13+
*.test_info.json
14+
*~
15+
.last_cover_stats
16+
.testsharedjobslots.yml
17+
.yath-persist.json
18+
/*.gz
19+
/*.jsonl
20+
/*.zip
1721
/.build
18-
TODO
19-
t2_lib
20-
POD_TEMPLATE.POD
22+
/.build/
23+
/MANIFEST.bak
24+
/MYMETA.*
25+
/Makefile
26+
/Makefile.old
27+
/Test2-*/
28+
/Test2-Harness-Renderer-JUnit-*
29+
/_eumm/
30+
/blib/
2131
/old*/
22-
event-log-*
23-
.yath-persist.json
24-
test-logs/
32+
/pm_to_blib
2533
/pt/
2634
/tt/
27-
/*.jsonl
28-
t2/non_perl/test.binary
29-
t/integration/test-broken-symlinks/broken-symlink.tx
30-
coverage.json
31-
lastlog.*
32-
lastlog-1.*
33-
*.test_info.json
34-
*.test_info.*.json
35-
.testsharedjobslots.yml
36-
xxx
37-
38-
!Build/
39-
.last_cover_stats
40-
/MYMETA.*
41-
*.o
42-
*.pm.tdy
43-
*.bs
44-
*.ERR
45-
*.bak
46-
47-
# Devel::NYTProf
48-
nytprof.out
49-
50-
# Dizt::Zilla
51-
/.build/
52-
53-
# Module::Build
54-
_build/
5535
Build
5636
Build.bat
57-
58-
# Module::Install
37+
MYMETA.*
38+
Makefile
39+
POD_TEMPLATE.POD
40+
TODO
41+
_build
42+
_build/
43+
blib/
44+
cover_db/
45+
coverage.json
46+
demo/MooseC*
47+
demo/rando*
48+
demo/xxx
49+
event-log-*
50+
how_it_works
5951
inc/
60-
61-
# ExtUtils::MakeMaker
62-
/blib/
63-
/_eumm/
64-
/*.gz
65-
/Makefile
66-
/Makefile.old
67-
/MANIFEST.bak
68-
/pm_to_blib
69-
/*.zip
70-
/Test2-Harness-Renderer-JUnit-*
52+
lastlog-1.*
53+
lastlog.*
54+
nytprof.out
55+
pm_to_blib
56+
t/integration/test-broken-symlinks/broken-symlink.tx
57+
t2/non_perl/test.binary
58+
t2_lib
59+
test-logs/
60+
xxx

Makefile.PL

+92-10
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,17 @@ if ($ENV{AUTOMATED_TESTING}) {
2222
if $is_njh;
2323
}
2424

25+
use File::ShareDir::Install;
26+
$File::ShareDir::Install::INCLUDE_DOTFILES = 1;
27+
$File::ShareDir::Install::INCLUDE_DOTDIRS = 1;
28+
install_share dist => "share";
29+
2530
my %WriteMakefileArgs = (
2631
"ABSTRACT" => "FIXME",
2732
"AUTHOR" => "Chad Granum <exodist\@cpan.org>",
2833
"CONFIGURE_REQUIRES" => {
29-
"ExtUtils::MakeMaker" => 0
34+
"ExtUtils::MakeMaker" => 0,
35+
"File::ShareDir::Install" => "0.06"
3036
},
3137
"DISTNAME" => "Test2-Harness",
3238
"EXE_FILES" => [
@@ -39,18 +45,36 @@ my %WriteMakefileArgs = (
3945
"Atomic::Pipe" => "0.021",
4046
"Capture::Tiny" => 0,
4147
"Carp" => 0,
42-
"Config" => 0,
48+
"Clone" => 0,
4349
"Cpanel::JSON::XS" => 0,
50+
"Crypt::Eksblowfish::Bcrypt" => 0,
4451
"Cwd" => 0,
52+
"DBI" => 0,
53+
"DBIx::Class::Helper::ResultSet::RemoveColumns" => 0,
54+
"DBIx::Class::InflateColumn::DateTime" => 0,
55+
"DBIx::Class::InflateColumn::Serializer" => 0,
56+
"DBIx::Class::InflateColumn::Serializer::JSON" => 0,
57+
"DBIx::Class::Schema::Loader" => 0,
58+
"DBIx::Class::Tree::AdjacencyList" => 0,
59+
"DBIx::Class::UUIDColumns" => 0,
60+
"DBIx::QuickDB" => "0.000020",
4561
"Data::Dumper" => 0,
46-
"Data::UUID" => 0,
62+
"DateTime" => 0,
63+
"DateTime::Format::MySQL" => 0,
64+
"DateTime::Format::Pg" => 0,
65+
"DateTime::Format::SQLite" => 0,
66+
"Email::Sender::Simple" => 0,
67+
"Email::Simple" => 0,
68+
"Email::Simple::Creator" => 0,
4769
"Exporter" => 0,
4870
"Fcntl" => 0,
4971
"File::Find" => 0,
5072
"File::Path" => "2.11",
73+
"File::ShareDir" => 0,
5174
"File::Spec" => 0,
5275
"File::Temp" => 0,
5376
"Filter::Util::Call" => 0,
77+
"HTTP::Tiny" => 0,
5478
"IO::Compress::Bzip2" => 0,
5579
"IO::Compress::Gzip" => 0,
5680
"IO::Handle" => "1.27",
@@ -61,37 +85,53 @@ my %WriteMakefileArgs = (
6185
"IPC::Open3" => 0,
6286
"Import::Into" => 0,
6387
"Importer" => "0.025",
88+
"JSON::MaybeXS" => 0,
6489
"JSON::PP" => 0,
6590
"Linux::Inotify2" => "2.3",
6691
"List::Util" => "1.56",
92+
"MIME::Base64" => 0,
93+
"Net::Domain" => 0,
6794
"POSIX" => 0,
95+
"Parallel::Runner" => "0.014",
96+
"Plack::App::Directory" => 0,
97+
"Plack::App::File" => 0,
98+
"Plack::Builder" => 0,
99+
"Plack::Handler::Starman" => 0,
100+
"Plack::Middleware::DBIx::DisconnectAll" => 0,
101+
"Plack::Runner" => 0,
102+
"Router::Simple" => 0,
68103
"Scalar::Util" => 0,
69104
"Scope::Guard" => 0,
105+
"Statistics::Basic" => 0,
70106
"Storable" => 0,
71107
"Symbol" => 0,
72108
"Sys::Hostname" => 0,
73109
"Term::Table" => "0.015",
74110
"Test2" => "1.302198",
75111
"Test2::API" => "1.302198",
76-
"Test2::Bundle::Extended" => "0.000159",
77112
"Test2::Event" => "1.302198",
78113
"Test2::Event::V2" => "1.302198",
79114
"Test2::Formatter" => "1.302198",
80115
"Test2::Plugin::MemUsage" => "0.002003",
81-
"Test2::Plugin::UUID" => "0.002001",
116+
"Test2::Plugin::UUID" => "0.002008",
82117
"Test2::Tools::AsyncSubtest" => "0.000159",
83118
"Test2::Tools::Basic" => 0,
84119
"Test2::Tools::Compare" => 0,
120+
"Test2::Tools::QuickDB" => 0,
85121
"Test2::Tools::Subtest" => "0.000159",
86122
"Test2::Util" => "1.302198",
123+
"Test2::Util::Facets2Legacy" => 0,
87124
"Test2::Util::Table" => 0,
88125
"Test2::Util::Term" => "0.000159",
89126
"Test2::Util::Times" => 0,
90127
"Test2::V0" => "0.000159",
91128
"Test::Builder" => "1.302198",
92129
"Test::Builder::Formatter" => "1.302198",
130+
"Test::Harness" => "3.49",
93131
"Test::More" => "1.302198",
94132
"Text::ParseWords" => 0,
133+
"Text::Xslate" => 0,
134+
"Time::Elapsed" => "0.33",
95135
"Time::HiRes" => 0,
96136
"XML::Generator" => 0,
97137
"YAML::Tiny" => 0,
@@ -105,14 +145,15 @@ my %WriteMakefileArgs = (
105145
"Data::Dumper" => 0,
106146
"File::Copy" => 0,
107147
"File::Temp" => 0,
148+
"HTTP::Tiny::UNIX" => 0,
108149
"Test2::Plugin::NoWarnings" => 0,
109150
"Test2::Tools::Explain" => 0,
110151
"Test::More" => "1.302198",
111152
"XML::Simple" => 0
112153
},
113154
"VERSION" => "2.000000",
114155
"test" => {
115-
"TESTS" => "t/*.t t/JUnit/*.t t/acceptence/*.t t/integration/*.t t/integration/signals/*.t t/unit/App/*.t t/unit/App/Yath/*.t t/unit/App/Yath/Command/*.t t/unit/App/Yath/Options/*.t t/unit/App/Yath/Plugin/*.t t/unit/App/Yath/Renderer/*.t t/unit/App/Yath/Renderer/Default/*.t t/unit/App/Yath/Resource/*.t t/unit/App/Yath/Resource/SharedJobSlots/*.t t/unit/Getopt/*.t t/unit/Getopt/Yath/*.t t/unit/Getopt/Yath/Option/*.t t/unit/Getopt/Yath/Settings/*.t t/unit/Test2/*.t t/unit/Test2/Formatter/*.t t/unit/Test2/Harness/*.t t/unit/Test2/Harness/Auditor/*.t t/unit/Test2/Harness/Collector/*.t t/unit/Test2/Harness/Collector/Auditor/*.t t/unit/Test2/Harness/Collector/IOParser/*.t t/unit/Test2/Harness/IPC/*.t t/unit/Test2/Harness/IPC/Protocol/*.t t/unit/Test2/Harness/IPC/Protocol/AtomicPipe/*.t t/unit/Test2/Harness/Instance/*.t t/unit/Test2/Harness/Log/*.t t/unit/Test2/Harness/Log/CoverageAggregator/*.t t/unit/Test2/Harness/Preload/*.t t/unit/Test2/Harness/Reloader/*.t t/unit/Test2/Harness/Renderer/*.t t/unit/Test2/Harness/Resource/*.t t/unit/Test2/Harness/Run/*.t t/unit/Test2/Harness/Runner/*.t t/unit/Test2/Harness/Runner/Preload/*.t t/unit/Test2/Harness/Runner/Preloader/*.t t/unit/Test2/Harness/Runner/Preloading/*.t t/unit/Test2/Harness/Runner/Resource/*.t t/unit/Test2/Harness/Runner/Resource/SharedJobSlots/*.t t/unit/Test2/Harness/Scheduler/*.t t/unit/Test2/Harness/Settings/*.t t/unit/Test2/Harness/Util/*.t t/unit/Test2/Harness/Util/File/*.t t/unit/Test2/Tools/*.t"
156+
"TESTS" => "t/*.t t/JUnit/*.t t/UI/*.t t/acceptence/*.t t/integration/*.t t/integration/signals/*.t t/unit/App/*.t t/unit/App/Yath/*.t t/unit/App/Yath/Command/*.t t/unit/App/Yath/Options/*.t t/unit/App/Yath/Plugin/*.t t/unit/App/Yath/Renderer/*.t t/unit/App/Yath/Renderer/Default/*.t t/unit/App/Yath/Resource/*.t t/unit/App/Yath/Resource/SharedJobSlots/*.t t/unit/Getopt/*.t t/unit/Getopt/Yath/*.t t/unit/Getopt/Yath/Option/*.t t/unit/Getopt/Yath/Settings/*.t t/unit/Test2/*.t t/unit/Test2/Formatter/*.t t/unit/Test2/Harness/*.t t/unit/Test2/Harness/Auditor/*.t t/unit/Test2/Harness/Collector/*.t t/unit/Test2/Harness/Collector/Auditor/*.t t/unit/Test2/Harness/Collector/IOParser/*.t t/unit/Test2/Harness/IPC/*.t t/unit/Test2/Harness/IPC/Protocol/*.t t/unit/Test2/Harness/IPC/Protocol/AtomicPipe/*.t t/unit/Test2/Harness/Instance/*.t t/unit/Test2/Harness/Log/*.t t/unit/Test2/Harness/Log/CoverageAggregator/*.t t/unit/Test2/Harness/Preload/*.t t/unit/Test2/Harness/Reloader/*.t t/unit/Test2/Harness/Renderer/*.t t/unit/Test2/Harness/Resource/*.t t/unit/Test2/Harness/Run/*.t t/unit/Test2/Harness/Runner/*.t t/unit/Test2/Harness/Runner/Preload/*.t t/unit/Test2/Harness/Runner/Preloader/*.t t/unit/Test2/Harness/Runner/Preloading/*.t t/unit/Test2/Harness/Runner/Resource/*.t t/unit/Test2/Harness/Runner/Resource/SharedJobSlots/*.t t/unit/Test2/Harness/Scheduler/*.t t/unit/Test2/Harness/Settings/*.t t/unit/Test2/Harness/Util/*.t t/unit/Test2/Harness/Util/File/*.t t/unit/Test2/Tools/*.t"
116157
}
117158
);
118159

@@ -121,19 +162,38 @@ my %FallbackPrereqs = (
121162
"Capture::Tiny" => 0,
122163
"Carp" => 0,
123164
"Child" => 0,
124-
"Config" => 0,
165+
"Clone" => 0,
125166
"Cpanel::JSON::XS" => 0,
167+
"Crypt::Eksblowfish::Bcrypt" => 0,
126168
"Cwd" => 0,
169+
"DBI" => 0,
170+
"DBIx::Class::Helper::ResultSet::RemoveColumns" => 0,
171+
"DBIx::Class::InflateColumn::DateTime" => 0,
172+
"DBIx::Class::InflateColumn::Serializer" => 0,
173+
"DBIx::Class::InflateColumn::Serializer::JSON" => 0,
174+
"DBIx::Class::Schema::Loader" => 0,
175+
"DBIx::Class::Tree::AdjacencyList" => 0,
176+
"DBIx::Class::UUIDColumns" => 0,
177+
"DBIx::QuickDB" => "0.000020",
127178
"Data::Dumper" => 0,
128-
"Data::UUID" => 0,
179+
"DateTime" => 0,
180+
"DateTime::Format::MySQL" => 0,
181+
"DateTime::Format::Pg" => 0,
182+
"DateTime::Format::SQLite" => 0,
183+
"Email::Sender::Simple" => 0,
184+
"Email::Simple" => 0,
185+
"Email::Simple::Creator" => 0,
129186
"Exporter" => 0,
130187
"Fcntl" => 0,
131188
"File::Copy" => 0,
132189
"File::Find" => 0,
133190
"File::Path" => "2.11",
191+
"File::ShareDir" => 0,
134192
"File::Spec" => 0,
135193
"File::Temp" => 0,
136194
"Filter::Util::Call" => 0,
195+
"HTTP::Tiny" => 0,
196+
"HTTP::Tiny::UNIX" => 0,
137197
"IO::Compress::Bzip2" => 0,
138198
"IO::Compress::Gzip" => 0,
139199
"IO::Handle" => "1.27",
@@ -144,39 +204,55 @@ my %FallbackPrereqs = (
144204
"IPC::Open3" => 0,
145205
"Import::Into" => 0,
146206
"Importer" => "0.025",
207+
"JSON::MaybeXS" => 0,
147208
"JSON::PP" => 0,
148209
"Linux::Inotify2" => "2.3",
149210
"List::Util" => "1.56",
211+
"MIME::Base64" => 0,
212+
"Net::Domain" => 0,
150213
"POSIX" => 0,
214+
"Parallel::Runner" => "0.014",
215+
"Plack::App::Directory" => 0,
216+
"Plack::App::File" => 0,
217+
"Plack::Builder" => 0,
218+
"Plack::Handler::Starman" => 0,
219+
"Plack::Middleware::DBIx::DisconnectAll" => 0,
220+
"Plack::Runner" => 0,
221+
"Router::Simple" => 0,
151222
"Scalar::Util" => 0,
152223
"Scope::Guard" => 0,
224+
"Statistics::Basic" => 0,
153225
"Storable" => 0,
154226
"Symbol" => 0,
155227
"Sys::Hostname" => 0,
156228
"Term::Table" => "0.015",
157229
"Test2" => "1.302198",
158230
"Test2::API" => "1.302198",
159-
"Test2::Bundle::Extended" => "0.000159",
160231
"Test2::Event" => "1.302198",
161232
"Test2::Event::V2" => "1.302198",
162233
"Test2::Formatter" => "1.302198",
163234
"Test2::Plugin::MemUsage" => "0.002003",
164235
"Test2::Plugin::NoWarnings" => 0,
165-
"Test2::Plugin::UUID" => "0.002001",
236+
"Test2::Plugin::UUID" => "0.002008",
166237
"Test2::Tools::AsyncSubtest" => "0.000159",
167238
"Test2::Tools::Basic" => 0,
168239
"Test2::Tools::Compare" => 0,
169240
"Test2::Tools::Explain" => 0,
241+
"Test2::Tools::QuickDB" => 0,
170242
"Test2::Tools::Subtest" => "0.000159",
171243
"Test2::Util" => "1.302198",
244+
"Test2::Util::Facets2Legacy" => 0,
172245
"Test2::Util::Table" => 0,
173246
"Test2::Util::Term" => "0.000159",
174247
"Test2::Util::Times" => 0,
175248
"Test2::V0" => "0.000159",
176249
"Test::Builder" => "1.302198",
177250
"Test::Builder::Formatter" => "1.302198",
251+
"Test::Harness" => "3.49",
178252
"Test::More" => "1.302198",
179253
"Text::ParseWords" => 0,
254+
"Text::Xslate" => 0,
255+
"Time::Elapsed" => "0.33",
180256
"Time::HiRes" => 0,
181257
"XML::Generator" => 0,
182258
"XML::Simple" => 0,
@@ -197,3 +273,9 @@ delete $WriteMakefileArgs{CONFIGURE_REQUIRES}
197273
unless eval { ExtUtils::MakeMaker->VERSION(6.52) };
198274

199275
WriteMakefile(%WriteMakefileArgs);
276+
277+
{
278+
package
279+
MY;
280+
use File::ShareDir::Install qw(postamble);
281+
}

author_tools/import_cpan.pl

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
use strict;
2+
use warnings;
3+
4+
BEGIN {$ENV{T2_HARNESS_UI_ENV} = 'dev'}
5+
6+
use Test2::Harness::UI;
7+
use Test2::Harness::UI::Config;
8+
use Test2::Harness::UI::CPANImporter;
9+
10+
my ($dsn, $user, $pass) = @ARGV;
11+
12+
$user ||= '';
13+
$pass ||= '';
14+
15+
my $config = Test2::Harness::UI::Config->new(
16+
dbi_dsn => $dsn,
17+
dbi_user => $user,
18+
dbi_pass => $pass,
19+
);
20+
21+
Test2::Harness::UI::CPANImporter->new(config => $config)->run;

0 commit comments

Comments
 (0)