WIP

Author: oalders

etc/metacpan_testing.pl

@@ -14,10 +14,16 @@ sub config {
     require_module('Git::Helpers');
     $config = _zomg( Git::Helpers::checkout_root() );
 
-    return $config if $config;
+    if ( !$config ) {
+        die "Couldn't find config file in $FindBin::RealBin/.. or "
+            . Git::Helpers::checkout_root();
+    }
+
+    if ( defined $config->{logger} && ref $config->{logger} ne 'ARRAY' ) {
+        $config->{logger} = [ $config->{logger} ];
+    }
 
-    die "Couldn't find config file in $FindBin::RealBin/.. or "
-        . Git::Helpers::checkout_root();
+    return $config;
 }
 
 sub _zomg {

lib/MetaCPAN/Config.pm

@@ -2,6 +2,7 @@ package MetaCPAN::Role::Logger;
 
 use v5.10;
 use Moose::Role;
+
 use MetaCPAN::Types::TypeTiny qw( Logger Str );
 use Log::Contextual           qw( set_logger );
 use Log::Log4perl ':easy';
@@ -45,8 +46,6 @@ sub set_logger_once {
     return;
 }
 
-# XXX NOT A MOOSE BUILDER
-# XXX This doesn't belong here.
 sub _build_logger {
     my ($config) = @_;
     my $log = Log::Log4perl->get_logger( $ARGV[0]

lib/MetaCPAN/Role/Logger.pm

@@ -7,6 +7,7 @@ use ElasticSearchX::Model::Document::Types qw( ES );
 use File::Path                             ();
 use Git::Helpers                           qw( checkout_root );
 use IO::Prompt                             qw( prompt );
+use IO::Interactive                        qw( is_interactive );
 use Log::Contextual                        qw( :log :dlog );
 use MetaCPAN::Model                        ();
 use MetaCPAN::Types::TypeTiny              qw( Bool HashRef Int Path Str );
@@ -387,7 +388,7 @@ sub are_you_sure {
     my ( $self, $msg ) = @_;
     my $iconfirmed = 0;
 
-    if ( -t *STDOUT ) {
+    if ( is_interactive() ) {
         my $answer
             = prompt colored( ['bold red'], "*** Warning ***: $msg" ) . "\n"
             . 'Are you sure you want to do this (type "YES" to confirm) ? ';

lib/MetaCPAN/Role/Script.pm

@@ -254,8 +254,6 @@ sub delete_all {
         || $runtime_environment eq 'testing';
 
     if ($is_development) {
-        $self->are_you_sure("ALL Indices will be deleted !!!");
-
         foreach my $name ( keys %{ $self->indices_info } ) {
             $self->_delete_index($name);
         }

lib/MetaCPAN/Script/Mapping.pm

@@ -3,13 +3,13 @@ package MetaCPAN::Script::Runner;
 use strict;
 use warnings;
 
-use Config::ZOMG        ();
-use File::Path          ();
-use Hash::Merge::Simple qw(merge);
-use Module::Pluggable search_path => ['MetaCPAN::Script'];
-use Module::Runtime ();
-use Try::Tiny       qw( catch try );
-use Term::ANSIColor qw( colored );
+use File::Path        ();
+use IO::Interactive   qw(is_interactive);
+use MetaCPAN::Config  ();
+use Module::Pluggable qw( plugins );
+use Module::Runtime   ();
+use Term::ANSIColor   qw( colored );
+use Try::Tiny         qw( catch try );
 
 our $EXIT_CODE = 0;
 
@@ -21,7 +21,8 @@ sub run {
     die "Usage: metacpan [command] [args]" unless ($class);
     Module::Runtime::require_module( $plugins{$class} );
 
-    my $config = build_config();
+    my $config = MetaCPAN::Config::config();
+    $config->{es} = $config->{elasticsearch_servers};
 
     foreach my $logger ( @{ $config->{logger} || [] } ) {
         my $path = $logger->{filename} or next;
@@ -75,21 +76,6 @@ sub run {
     return ( $EXIT_CODE == 0 );
 }
 
-sub build_config {
-    my $config = Config::ZOMG->new(
-        name => 'metacpan',
-        path => 'etc'
-    )->load;
-    if ( $ENV{HARNESS_ACTIVE} ) {
-        my $tconf = Config::ZOMG->new(
-            name => 'metacpan',
-            file => 'etc/metacpan_testing.pl'
-        )->load;
-        $config = merge $config, $tconf;
-    }
-    return $config;
-}
-
 # AnyEvent::Run calls the main method
 *main = \&run;
 

lib/MetaCPAN/Script/Runner.pm

@@ -1,8 +1,15 @@
 git /usr/bin/git
 
+level info
 elasticsearch_servers = :9200
 minion_dsn = postgresql:///minion_queue
 
+<logger>
+    class Log::Log4perl::Appender::File
+    filename ../var/log/metacpan.log
+    syswrite 1
+</logger>
+
 <controller User::Turing>
     # required for server startup -- override this in metacpan_server_local.conf
     private_key 59125ffc09413eed3f2a2c07a37c7a44b95633e2

metacpan_server.conf

@@ -1,7 +1,14 @@
 cpan var/t/tmp/fakecpan
+die_on_error 1
+level warn
 source_base var/t/tmp/source
 
-elasticsearch_servers = http://elasticsearch_test:9200
+elasticsearch_servers = elasticsearch_test:9200
+
+<logger>
+    class Log::Log4perl::Appender::Screen
+    name testing
+</logger>
 
 <model CPAN>
     servers __ENV(ES)__

metacpan_server_testing.conf

@@ -1,19 +1,20 @@
+package MetaCPAN::TestHelpers;
+
 use strict;
 use warnings;
 
 package    # no_index
     MetaCPAN::TestHelpers;
 
-use Cpanel::JSON::XS;
-use File::Copy  qw( copy );
-use File::pushd qw( pushd );
-use FindBin;
-use MetaCPAN::Util qw( checkout_root );
-use MetaCPAN::Script::Runner;
-use Path::Tiny qw( path );
-use Test::More;
-use Test::Routine::Util;
-use Try::Tiny qw( catch try );
+use Cpanel::JSON::XS qw( decode_json encode_json );
+use File::Copy       qw( copy );
+use File::pushd      qw( pushd );
+use MetaCPAN::Config ();
+use MetaCPAN::Util   qw( checkout_root );
+use Path::Tiny       qw( path );
+use Test::More import => [qw( diag is ok )];
+use Test::Routine::Util qw( run_tests );
+use Try::Tiny           qw( catch finally try );
 
 use base 'Exporter';
 our @EXPORT = qw(
@@ -98,13 +99,7 @@ sub test_release {
 }
 
 sub get_config {
-    my $config = do {
-
-        # build_config expects test to be t/*.t
-        local $FindBin::RealBin = path( checkout_root(), 't' );
-        MetaCPAN::Script::Runner->build_config;
-    };
-    return $config;
+    return MetaCPAN::Config::config();
 }
 
 sub tmp_dir {

t/lib/MetaCPAN/TestHelpers.pm

@@ -30,27 +30,13 @@ has es_client => (
     builder => '_build_es_client',
 );
 
-has es_server => (
-    is      => 'ro',
-    isa     => 'Search::Elasticsearch::TestServer',
-    lazy    => 1,
-    builder => '_build_es_server',
-);
-
 has _config => (
     is      => 'ro',
     isa     => HashRef,
     lazy    => 1,
     builder => '_build_config',
 );
 
-has _es_home => (
-    is      => 'ro',
-    isa     => Str,
-    lazy    => 1,
-    builder => '_build_es_home',
-);
-
 has _cpan_dir => (
     is       => 'ro',
     isa      => Path,
@@ -63,8 +49,6 @@ sub setup {
     my $self = shift;
 
     $self->es_client;
-
-    # Deploy project mappings
     $self->put_mappings;
 }
 
@@ -79,69 +63,11 @@ sub _build_config {
     return $config;
 }
 
-sub _build_es_home {
-    my $self = shift;
-
-    my $es_home = MetaCPAN::Config::config()->{elasticsearch_servers};
-
-    if ( !$es_home ) {
-        die <<'USAGE';
-Please set elasticsearch_servers to a running instance of Elasticsearch, eg
-'localhost:9200'
-USAGE
-    }
-
-    return $es_home;
-}
-
-=head2 _build_es_server
-
-This starts an Elastisearch server on the fly.  It should only be called if the
-ES env var contains a path to Elasticsearch.  If the variable contains a port
-number then we'll assume the server has already been started on this port.
-
-=cut
-
-sub _build_es_server {
-    my $self = shift;
-
-    my $server = Search::Elasticsearch::TestServer->new(
-        conf      => [ 'cluster.name' => 'metacpan-test' ],
-        es_home   => $self->_es_home,
-        es_port   => 9700,
-        http_port => 9900,
-        instances => 1,
-    );
-
-    diag 'Connecting to Elasticsearch on ' . $self->_es_home;
-
-    try {
-        $server->start->[0];
-    }
-    catch {
-        diag(<<"EOF");
-Failed to connect to the Elasticsearch test instance on ${\$self->_es_home}.
-Did you start one up? See https://github.com/metacpan/metacpan-api/wiki/Installation
-for more information.
-Error: $_
-EOF
-        BAIL_OUT('Test environment not set up properly');
-    };
-
-    diag( 'Connected to the Elasticsearch test instance on '
-            . $self->_es_home );
-}
-
 sub _build_es_client {
     my $self = shift;
 
-    # Don't try to start a test server if we've been passed the port number of
-    # a running instance.
-
-    $self->es_server unless $self->_es_home =~ m{:};
-
     my $es = Search::Elasticsearch->new(
-        nodes => $self->_es_home,
+        nodes => MetaCPAN::Config::config()->{elasticsearch_servers},
         ( $ENV{ES_TRACE} ? ( trace_to => [ 'File', 'es.log' ] ) : () )
     );
 
@@ -212,7 +138,7 @@ sub check_mappings {
 sub put_mappings {
     my $self = shift;
 
-    local @ARGV = qw(mapping --delete);
+    local @ARGV = qw(mapping --delete --all);
     ok( MetaCPAN::Script::Mapping->new_with_options( $self->_config )->run,
         'put mapping' );
     $self->check_mappings;

t/lib/MetaCPAN/TestServer.pm

@@ -1,14 +1,17 @@
 use strict;
 use warnings;
+
 use lib 't/lib';
 
-use MetaCPAN::Util           qw( checkout_root );
-use MetaCPAN::Script::Cover  ();
-use MetaCPAN::Script::Runner ();
-use Test::More;
-use URI ();
+use MetaCPAN::Config        ();
+use MetaCPAN::Script::Cover ();
+use MetaCPAN::Util          qw( checkout_root );
+use Test::More import => [qw( done_testing ok )];
+use URI                     ();
 
-my $config = MetaCPAN::Script::Runner::build_config;
+my $config = MetaCPAN::Config::config();
+$config->{es} = $config->{elasticsearch_servers};
+$config->{port} = 5000;
 
 my $root = checkout_root();
 my $file = URI->new('t/var/cover.json')->abs("file://$root/");