Move DbBuilder classes inside the ModulesPerl6:: namespace

Raku · Nov 25, 2015 · 5f9443f · 5f9443f
1 parent 727a71e
commit 5f9443f
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 23 deletions.
diff --git a/build-project-list.pl b/build-project-list.pl
@@ -8,7 +8,7 @@
 use Pod::Usage;
 
 use lib qw/lib/;
-use DbBuilder;
+use ModulesPerl6::DbBuilder;
 
 use constant DB_FILE           => 'modulesperl6.db';
 use constant GITHUB_TOKEN_FILE => 'github-token';
@@ -32,7 +32,7 @@
 
 $ENV{MODULES_PERL6_GITHUB_TOKEN_FILE} = $github_token_file;
 
-DbBuilder->new(
+ModulesPerl6::DbBuilder->new(
     app               => APP,
     db_file           => DB_FILE,
     limit             => $limit,

diff --git a/lib/DbBuilder.pm → lib/ModulesPerl6/DbBuilder.pm b/lib/DbBuilder.pm → lib/ModulesPerl6/DbBuilder.pm
@@ -1,4 +1,4 @@
-package DbBuilder;
+package ModulesPerl6::DbBuilder;
 
 use strictures 2;
 
@@ -10,8 +10,8 @@ use Mojo::Util             qw/slurp  trim/;
 use Types::Common::Numeric qw/PositiveNum/;
 use Types::Standard        qw/InstanceOf  Str  Bool  Maybe/;
 
-use DbBuilder::Log;
-use DbBuilder::Dist;
+use ModulesPerl6::DbBuilder::Log;
+use ModulesPerl6::DbBuilder::Dist;
 use ModulesPerl6::Model::BuildStats;
 use ModulesPerl6::Model::Dists;
 
@@ -89,7 +89,7 @@ sub run {
         print "---\n";
         log info => 'Processing dist ' . ($_+1) . ' of ' . @metas;
         $self->_model_dists->add(
-            DbBuilder::Dist->new(
+            ModulesPerl6::DbBuilder::Dist->new(
                 meta_url          => $metas[$_],
                 build_id          => $build_id,
                 logos_dir         => $self->_logos_dir,

diff --git a/lib/DbBuilder/Dist.pm → lib/ModulesPerl6/DbBuilder/Dist.pm b/lib/DbBuilder/Dist.pm → lib/ModulesPerl6/DbBuilder/Dist.pm
@@ -1,11 +1,11 @@
-package DbBuilder::Dist;
+package ModulesPerl6::DbBuilder::Dist;
 
 use strictures 2;
 use Types::Standard qw/InstanceOf  Str/;
-use DbBuilder::Log;
+use ModulesPerl6::DbBuilder::Log;
 use Moo;
 use namespace::clean;
-use Module::Pluggable search_path => ['DbBuilder::Dist::Source'],
+use Module::Pluggable search_path => ['ModulesPerl6::DbBuilder::Dist::Source'],
                       sub_name    => '_sources',
                       require     => 1;
 

diff --git a/lib/DbBuilder/Dist/Source.pm → lib/ModulesPerl6/DbBuilder/Dist/Source.pm b/lib/DbBuilder/Dist/Source.pm → lib/ModulesPerl6/DbBuilder/Dist/Source.pm
@@ -1,4 +1,4 @@
-package DbBuilder::Dist::Source;
+package ModulesPerl6::DbBuilder::Dist::Source;
 
 use strictures 2;
 
@@ -9,7 +9,7 @@ use Mojo::Util qw/spurt/;
 use Try::Tiny;
 use Types::Standard qw/InstanceOf  Maybe  Ref  Str/;
 
-use DbBuilder::Log;
+use ModulesPerl6::DbBuilder::Log;
 
 use Moo;
 use namespace::clean;

diff --git a/lib/DbBuilder/Dist/Source/GitHub.pm → ...ulesPerl6/DbBuilder/Dist/Source/GitHub.pm b/lib/DbBuilder/Dist/Source/GitHub.pm → ...ulesPerl6/DbBuilder/Dist/Source/GitHub.pm
@@ -1,14 +1,14 @@
-package DbBuilder::Dist::Source::GitHub;
+package ModulesPerl6::DbBuilder::Dist::Source::GitHub;
 
 use strictures 2;
-use base 'DbBuilder::Dist::Source';
+use base 'ModulesPerl6::DbBuilder::Dist::Source';
 
 use Carp       qw/croak/;
 use Mojo::Util qw/slurp  decode/;
 use Pithub;
 use Time::Moment;
 
-use DbBuilder::Log;
+use ModulesPerl6::DbBuilder::Log;
 
 use Moo;
 use namespace::clean;

diff --git a/lib/DbBuilder/Log.pm → lib/ModulesPerl6/DbBuilder/Log.pm b/lib/DbBuilder/Log.pm → lib/ModulesPerl6/DbBuilder/Log.pm
@@ -1,4 +1,4 @@
-package DbBuilder::Log;
+package ModulesPerl6::DbBuilder::Log;
 
 use Exporter::Easy EXPORT => [ 'log' ];
 use Mojo::Log;
@@ -21,11 +21,11 @@ __END__
 
 =head1 NAME
 
-DbBuilder::Log - convenient logging
+ModulesPerl6::DbBuilder::Log - convenient logging
 
 =head1 SYNOPSIS
 
-    use DbBuilder::Log;
+    use ModulesPerl6::DbBuilder::Log;
 
     log info  => 'Starting stuff';
     log fatal => 'Oh noes!'; # dies after logging

diff --git a/t/02-db-builder/01-logger.t b/t/02-db-builder/01-logger.t
@@ -6,7 +6,7 @@ use warnings FATAL => 'all';
 use Test::Most;
 use Test::Output qw/combined_from/;
 
-BEGIN { use_ok 'DbBuilder::Log' };
+BEGIN { use_ok 'ModulesPerl6::DbBuilder::Log' };
 
 my ( $out, $ret );
 my $time_stamp_re = qr/\[\w{3} \w{3} \d\d? \d{2}:\d{2}:\d{2} \d{4}\]/;

diff --git a/t/02-db-builder/02-github-source.t b/t/02-db-builder/02-github-source.t
@@ -8,7 +8,7 @@ use Test::Output qw/combined_from/;
 use t::Helper;
 use File::Temp qw/tempdir/;
 use ModulesPerl6::Model::Dists;
-BEGIN { use_ok 'DbBuilder::Dist::Source::GitHub' };
+BEGIN { use_ok 'ModulesPerl6::DbBuilder::Dist::Source::GitHub' };
 
 my $db_file = t::Helper::setup_db_file;
 END { unlink $db_file };
@@ -26,8 +26,9 @@ subtest 'Repo without a README, tests, or logotype' => sub {
     );
 
     my $out = combined_from sub{
-        my $dist = eval { DbBuilder::Dist::Source::GitHub->new(@ar)->load }
-            or do { print "Failed to get a dist! $@"; return; };
+        my $dist = eval {
+            ModulesPerl6::DbBuilder::Dist::Source::GitHub->new(@ar)->load
+        } or do { print "Failed to get a dist! $@"; return; };
         $dist->{build_id} = 42;
         $m->add( $dist );
     };
@@ -42,8 +43,9 @@ subtest 'Repo without a README, tests, or logotype' => sub {
     $}x, 'Output from loader matches';
 
     $out = combined_from sub{
-        my $dist = eval { DbBuilder::Dist::Source::GitHub->new(@ar)->load }
-            or do { print "Failed to get a dist! $@"; return; };
+        my $dist = eval {
+            ModulesPerl6::DbBuilder::Dist::Source::GitHub->new(@ar)->load
+        } or do { print "Failed to get a dist! $@"; return; };
         $dist->{build_id} = 42;
         $m->add( $dist );
     };