Skip to content

Commit

Permalink
s/Config::JFDK/Config::ZOMG/
Browse files Browse the repository at this point in the history
  • Loading branch information
oalders committed Nov 10, 2017
1 parent 773d3fa commit 098dbb5
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 13 deletions.
2 changes: 1 addition & 1 deletion cpanfile
Expand Up @@ -29,7 +29,7 @@ requires 'CatalystX::InjectComponent';
requires 'CatalystX::RoleApplicator';
requires 'CatalystX::Fastly::Role::Response', '0.06';
requires 'CPAN::Repository::Perms';
requires 'Config::JFDI';
requires 'Config::ZOMG', '>=', '1.000000';
requires 'Cpanel::JSON::XS', '3.0115';
requires 'Cwd';
requires 'Data::Printer', '0.38';
Expand Down
12 changes: 12 additions & 0 deletions cpanfile.snapshot
Expand Up @@ -1267,6 +1267,18 @@ DISTRIBUTIONS
perl v5.8.1
strict 0
utf8 0
Config-ZOMG-1.000000
pathname: F/FR/FREW/Config-ZOMG-1.000000.tar.gz
provides:
Config::ZOMG 1.000000
Config::ZOMG::Source::Loader 1.000000
requirements:
Clone 0
Config::Any 0
ExtUtils::MakeMaker 6.30
Hash::Merge::Simple 0
List::Util 0
Moo 0
Context-Preserve-0.01
pathname: J/JR/JROCKWAY/Context-Preserve-0.01.tar.gz
provides:
Expand Down
8 changes: 4 additions & 4 deletions lib/MetaCPAN/Role/HasConfig.pm
Expand Up @@ -2,9 +2,9 @@ package MetaCPAN::Role::HasConfig;

use Moose::Role;

use MetaCPAN::Types qw(HashRef);

use FindBin;
use Config::ZOMG ();
use MetaCPAN::Types qw(HashRef);

# Done like this so can be required by a roles
sub config {
Expand All @@ -20,10 +20,10 @@ has _config => (

sub _build_config {
my $self = shift;
return Config::JFDI->new(
return Config::ZOMG->new(
name => 'metacpan_server',
path => "$FindBin::RealBin/..",
)->get;
)->load;
}

1;
16 changes: 8 additions & 8 deletions lib/MetaCPAN/Script/Runner.pm
Expand Up @@ -3,8 +3,8 @@ package MetaCPAN::Script::Runner;
use strict;
use warnings;

use Config::JFDI;
use File::Path ();
use Config::ZOMG ();
use File::Path ();
use Hash::Merge::Simple qw(merge);
use IO::Interactive qw(is_interactive);
use Module::Pluggable search_path => ['MetaCPAN::Script'];
Expand Down Expand Up @@ -32,22 +32,22 @@ sub run {
}

sub build_config {
my $config = Config::JFDI->new(
my $config = Config::ZOMG->new(
name => 'metacpan',
path => 'etc'
)->get;
)->load;
if ( $ENV{HARNESS_ACTIVE} ) {
my $tconf = Config::JFDI->new(
my $tconf = Config::ZOMG->new(
name => 'metacpan',
file => 'etc/metacpan_testing.pl'
)->get;
)->load;
$config = merge $config, $tconf;
}
elsif ( is_interactive() ) {
my $iconf = Config::JFDI->new(
my $iconf = Config::ZOMG->new(
name => 'metacpan',
file => 'etc/metacpan_interactive.pl'
)->get;
)->load;
$config = merge $config, $iconf;
}
return $config;
Expand Down

0 comments on commit 098dbb5

Please sign in to comment.