Merge branch '2.0_merge_t2h' into 2.0

.gitignore

@@ -1,70 +1,60 @@
-*.swp
+!Build/
+*.ERR
 *.bak
-*~
+*.bs
+*.o
 *.old
-*.tar.gz
-*.ERR
 *.orig
+*.pm.tdy
 *.rej
-Makefile
-blib/
-pm_to_blib
-Build
-_build
-cover_db/
-MYMETA.*
-/Test2-*/
+*.swp
+*.tar.gz
+*.test_info.*.json
+*.test_info.json
+*~
+.last_cover_stats
+.testsharedjobslots.yml
+.yath-persist.json
+/*.gz
+/*.jsonl
+/*.zip
 /.build
-TODO
-t2_lib
-POD_TEMPLATE.POD
+/.build/
+/MANIFEST.bak
+/MYMETA.*
+/Makefile
+/Makefile.old
+/Test2-*/
+/Test2-Harness-Renderer-JUnit-*
+/_eumm/
+/blib/
 /old*/
-event-log-*
-.yath-persist.json
-test-logs/
+/pm_to_blib
 /pt/
 /tt/
-/*.jsonl
-t2/non_perl/test.binary
-t/integration/test-broken-symlinks/broken-symlink.tx
-coverage.json
-lastlog.*
-lastlog-1.*
-*.test_info.json
-*.test_info.*.json
-.testsharedjobslots.yml
-xxx
-
-!Build/
-.last_cover_stats
-/MYMETA.*
-*.o
-*.pm.tdy
-*.bs
-*.ERR
-*.bak
-
-# Devel::NYTProf
-nytprof.out
-
-# Dizt::Zilla
-/.build/
-
-# Module::Build
-_build/
 Build
 Build.bat
-
-# Module::Install
+MYMETA.*
+Makefile
+POD_TEMPLATE.POD
+TODO
+_build
+_build/
+blib/
+cover_db/
+coverage.json
+demo/MooseC*
+demo/rando*
+demo/xxx
+event-log-*
+how_it_works
 inc/
-
-# ExtUtils::MakeMaker
-/blib/
-/_eumm/
-/*.gz
-/Makefile
-/Makefile.old
-/MANIFEST.bak
-/pm_to_blib
-/*.zip
-/Test2-Harness-Renderer-JUnit-*
+lastlog-1.*
+lastlog.*
+nytprof.out
+pm_to_blib
+t/integration/test-broken-symlinks/broken-symlink.tx
+t2/non_perl/test.binary
+t2_lib
+test-logs/
+xxx

Makefile.PL

@@ -22,11 +22,17 @@ if ($ENV{AUTOMATED_TESTING}) {
         if $is_njh;
 }
 
+use File::ShareDir::Install;
+$File::ShareDir::Install::INCLUDE_DOTFILES = 1;
+$File::ShareDir::Install::INCLUDE_DOTDIRS = 1;
+install_share dist => "share";
+
 my %WriteMakefileArgs = (
   "ABSTRACT" => "FIXME",
   "AUTHOR" => "Chad Granum <exodist\@cpan.org>",
   "CONFIGURE_REQUIRES" => {
-    "ExtUtils::MakeMaker" => 0
+    "ExtUtils::MakeMaker" => 0,
+    "File::ShareDir::Install" => "0.06"
   },
   "DISTNAME" => "Test2-Harness",
   "EXE_FILES" => [
@@ -39,18 +45,36 @@ my %WriteMakefileArgs = (
     "Atomic::Pipe" => "0.021",
     "Capture::Tiny" => 0,
     "Carp" => 0,
-    "Config" => 0,
+    "Clone" => 0,
     "Cpanel::JSON::XS" => 0,
+    "Crypt::Eksblowfish::Bcrypt" => 0,
     "Cwd" => 0,
+    "DBI" => 0,
+    "DBIx::Class::Helper::ResultSet::RemoveColumns" => 0,
+    "DBIx::Class::InflateColumn::DateTime" => 0,
+    "DBIx::Class::InflateColumn::Serializer" => 0,
+    "DBIx::Class::InflateColumn::Serializer::JSON" => 0,
+    "DBIx::Class::Schema::Loader" => 0,
+    "DBIx::Class::Tree::AdjacencyList" => 0,
+    "DBIx::Class::UUIDColumns" => 0,
+    "DBIx::QuickDB" => "0.000020",
     "Data::Dumper" => 0,
-    "Data::UUID" => 0,
+    "DateTime" => 0,
+    "DateTime::Format::MySQL" => 0,
+    "DateTime::Format::Pg" => 0,
+    "DateTime::Format::SQLite" => 0,
+    "Email::Sender::Simple" => 0,
+    "Email::Simple" => 0,
+    "Email::Simple::Creator" => 0,
     "Exporter" => 0,
     "Fcntl" => 0,
     "File::Find" => 0,
     "File::Path" => "2.11",
+    "File::ShareDir" => 0,
     "File::Spec" => 0,
     "File::Temp" => 0,
     "Filter::Util::Call" => 0,
+    "HTTP::Tiny" => 0,
     "IO::Compress::Bzip2" => 0,
     "IO::Compress::Gzip" => 0,
     "IO::Handle" => "1.27",
@@ -61,37 +85,53 @@ my %WriteMakefileArgs = (
     "IPC::Open3" => 0,
     "Import::Into" => 0,
     "Importer" => "0.025",
+    "JSON::MaybeXS" => 0,
     "JSON::PP" => 0,
     "Linux::Inotify2" => "2.3",
     "List::Util" => "1.56",
+    "MIME::Base64" => 0,
+    "Net::Domain" => 0,
     "POSIX" => 0,
+    "Parallel::Runner" => "0.014",
+    "Plack::App::Directory" => 0,
+    "Plack::App::File" => 0,
+    "Plack::Builder" => 0,
+    "Plack::Handler::Starman" => 0,
+    "Plack::Middleware::DBIx::DisconnectAll" => 0,
+    "Plack::Runner" => 0,
+    "Router::Simple" => 0,
     "Scalar::Util" => 0,
     "Scope::Guard" => 0,
+    "Statistics::Basic" => 0,
     "Storable" => 0,
     "Symbol" => 0,
     "Sys::Hostname" => 0,
     "Term::Table" => "0.015",
     "Test2" => "1.302198",
     "Test2::API" => "1.302198",
-    "Test2::Bundle::Extended" => "0.000159",
     "Test2::Event" => "1.302198",
     "Test2::Event::V2" => "1.302198",
     "Test2::Formatter" => "1.302198",
     "Test2::Plugin::MemUsage" => "0.002003",
-    "Test2::Plugin::UUID" => "0.002001",
+    "Test2::Plugin::UUID" => "0.002008",
     "Test2::Tools::AsyncSubtest" => "0.000159",
     "Test2::Tools::Basic" => 0,
     "Test2::Tools::Compare" => 0,
+    "Test2::Tools::QuickDB" => 0,
     "Test2::Tools::Subtest" => "0.000159",
     "Test2::Util" => "1.302198",
+    "Test2::Util::Facets2Legacy" => 0,
     "Test2::Util::Table" => 0,
     "Test2::Util::Term" => "0.000159",
     "Test2::Util::Times" => 0,
     "Test2::V0" => "0.000159",
     "Test::Builder" => "1.302198",
     "Test::Builder::Formatter" => "1.302198",
+    "Test::Harness" => "3.49",
     "Test::More" => "1.302198",
     "Text::ParseWords" => 0,
+    "Text::Xslate" => 0,
+    "Time::Elapsed" => "0.33",
     "Time::HiRes" => 0,
     "XML::Generator" => 0,
     "YAML::Tiny" => 0,
@@ -105,14 +145,15 @@ my %WriteMakefileArgs = (
     "Data::Dumper" => 0,
     "File::Copy" => 0,
     "File::Temp" => 0,
+    "HTTP::Tiny::UNIX" => 0,
     "Test2::Plugin::NoWarnings" => 0,
     "Test2::Tools::Explain" => 0,
     "Test::More" => "1.302198",
     "XML::Simple" => 0
   },
   "VERSION" => "2.000000",
   "test" => {
-    "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"
+    "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"
   }
 );
 
@@ -121,19 +162,38 @@ my %FallbackPrereqs = (
   "Capture::Tiny" => 0,
   "Carp" => 0,
   "Child" => 0,
-  "Config" => 0,
+  "Clone" => 0,
   "Cpanel::JSON::XS" => 0,
+  "Crypt::Eksblowfish::Bcrypt" => 0,
   "Cwd" => 0,
+  "DBI" => 0,
+  "DBIx::Class::Helper::ResultSet::RemoveColumns" => 0,
+  "DBIx::Class::InflateColumn::DateTime" => 0,
+  "DBIx::Class::InflateColumn::Serializer" => 0,
+  "DBIx::Class::InflateColumn::Serializer::JSON" => 0,
+  "DBIx::Class::Schema::Loader" => 0,
+  "DBIx::Class::Tree::AdjacencyList" => 0,
+  "DBIx::Class::UUIDColumns" => 0,
+  "DBIx::QuickDB" => "0.000020",
   "Data::Dumper" => 0,
-  "Data::UUID" => 0,
+  "DateTime" => 0,
+  "DateTime::Format::MySQL" => 0,
+  "DateTime::Format::Pg" => 0,
+  "DateTime::Format::SQLite" => 0,
+  "Email::Sender::Simple" => 0,
+  "Email::Simple" => 0,
+  "Email::Simple::Creator" => 0,
   "Exporter" => 0,
   "Fcntl" => 0,
   "File::Copy" => 0,
   "File::Find" => 0,
   "File::Path" => "2.11",
+  "File::ShareDir" => 0,
   "File::Spec" => 0,
   "File::Temp" => 0,
   "Filter::Util::Call" => 0,
+  "HTTP::Tiny" => 0,
+  "HTTP::Tiny::UNIX" => 0,
   "IO::Compress::Bzip2" => 0,
   "IO::Compress::Gzip" => 0,
   "IO::Handle" => "1.27",
@@ -144,39 +204,55 @@ my %FallbackPrereqs = (
   "IPC::Open3" => 0,
   "Import::Into" => 0,
   "Importer" => "0.025",
+  "JSON::MaybeXS" => 0,
   "JSON::PP" => 0,
   "Linux::Inotify2" => "2.3",
   "List::Util" => "1.56",
+  "MIME::Base64" => 0,
+  "Net::Domain" => 0,
   "POSIX" => 0,
+  "Parallel::Runner" => "0.014",
+  "Plack::App::Directory" => 0,
+  "Plack::App::File" => 0,
+  "Plack::Builder" => 0,
+  "Plack::Handler::Starman" => 0,
+  "Plack::Middleware::DBIx::DisconnectAll" => 0,
+  "Plack::Runner" => 0,
+  "Router::Simple" => 0,
   "Scalar::Util" => 0,
   "Scope::Guard" => 0,
+  "Statistics::Basic" => 0,
   "Storable" => 0,
   "Symbol" => 0,
   "Sys::Hostname" => 0,
   "Term::Table" => "0.015",
   "Test2" => "1.302198",
   "Test2::API" => "1.302198",
-  "Test2::Bundle::Extended" => "0.000159",
   "Test2::Event" => "1.302198",
   "Test2::Event::V2" => "1.302198",
   "Test2::Formatter" => "1.302198",
   "Test2::Plugin::MemUsage" => "0.002003",
   "Test2::Plugin::NoWarnings" => 0,
-  "Test2::Plugin::UUID" => "0.002001",
+  "Test2::Plugin::UUID" => "0.002008",
   "Test2::Tools::AsyncSubtest" => "0.000159",
   "Test2::Tools::Basic" => 0,
   "Test2::Tools::Compare" => 0,
   "Test2::Tools::Explain" => 0,
+  "Test2::Tools::QuickDB" => 0,
   "Test2::Tools::Subtest" => "0.000159",
   "Test2::Util" => "1.302198",
+  "Test2::Util::Facets2Legacy" => 0,
   "Test2::Util::Table" => 0,
   "Test2::Util::Term" => "0.000159",
   "Test2::Util::Times" => 0,
   "Test2::V0" => "0.000159",
   "Test::Builder" => "1.302198",
   "Test::Builder::Formatter" => "1.302198",
+  "Test::Harness" => "3.49",
   "Test::More" => "1.302198",
   "Text::ParseWords" => 0,
+  "Text::Xslate" => 0,
+  "Time::Elapsed" => "0.33",
   "Time::HiRes" => 0,
   "XML::Generator" => 0,
   "XML::Simple" => 0,
@@ -197,3 +273,9 @@ delete $WriteMakefileArgs{CONFIGURE_REQUIRES}
   unless eval { ExtUtils::MakeMaker->VERSION(6.52) };
 
 WriteMakefile(%WriteMakefileArgs);
+
+{
+package
+MY;
+use File::ShareDir::Install qw(postamble);
+}

author_tools/import_cpan.pl

@@ -0,0 +1,21 @@
+use strict;
+use warnings;
+
+BEGIN {$ENV{T2_HARNESS_UI_ENV} = 'dev'}
+
+use Test2::Harness::UI;
+use Test2::Harness::UI::Config;
+use Test2::Harness::UI::CPANImporter;
+
+my ($dsn, $user, $pass) = @ARGV;
+
+$user ||= '';
+$pass ||= '';
+
+my $config = Test2::Harness::UI::Config->new(
+    dbi_dsn    => $dsn,
+    dbi_user   => $user,
+    dbi_pass   => $pass,
+);
+
+Test2::Harness::UI::CPANImporter->new(config => $config)->run;