Bug 1246528 - Use Makefile.PL and allow Bugzilla use cpanm-compatible local dependencies

r=dkl,a=dylan

Author: Dylan Hardison

.gitignore

@@ -1,5 +1,6 @@
 /**/.htaccess
 /lib/*
+/local/*
 /template/en/custom
 /docs/en/rst/extensions/*
 /docs/en/rst/api/extensions/*
@@ -12,6 +13,10 @@
 /localconfig
 /cpanfile
 /index.html
+/Makefile
+/MYMETA.*
+/pm_to_blib
+/blib
 
 /skins/contrib/Dusk/admin.css
 /skins/contrib/Dusk/bug.css

Bugzilla.pm

@@ -34,7 +34,6 @@ use Bugzilla::Extension;
 use Bugzilla::Field;
 use Bugzilla::Flag;
 use Bugzilla::Install::Localconfig qw(read_localconfig);
-use Bugzilla::Install::Requirements qw(OPTIONAL_MODULES have_vers);
 use Bugzilla::Install::Util qw(init_console include_languages i_am_persistent);
 use Bugzilla::Memcached;
 use Bugzilla::Template;
@@ -47,6 +46,7 @@ use File::Spec::Functions;
 use DateTime::TimeZone;
 use Date::Parse;
 use Safe;
+use List::Util qw(first);
 
 #####################################################################
 # Constants
@@ -245,32 +245,66 @@ sub api_server {
     return $cache->{api_server};
 }
 
+use constant _CAN_HAS_FEATURE => eval {
+        require CPAN::Meta;
+        require Module::Runtime;
+        require CPAN::Meta::Check;
+        Module::Runtime->import(qw(require_module));
+        CPAN::Meta::Check->import(qw(verify_dependencies));
+        1;
+    };
+
 sub feature {
-    my ($class, $feature) = @_;
+    my ($class, $feature_name) = @_;
+    return 0 unless _CAN_HAS_FEATURE;
+    return unless $class->has_feature($feature_name);
+
+    my $cache = $class->request_cache;
+    my $feature = $cache->{feature_map}{$feature_name};
+    # Bugzilla expects this will also load all the modules.. so we have to do that.
+    # Later we should put a deprecation warning here, and favor calling has_feature().
+
+    return 1 if $cache->{feature_loaded}{$feature_name};
+    my @modules = $feature->requirements_for('runtime', 'requires')->required_modules;
+    require_module($_) foreach @modules;
+    $cache->{feature_loaded}{$feature_name} = 1;
+    return 1;
+}
+
+sub has_feature {
+    my ($class, $feature_name) = @_;
+
+    return 0 unless _CAN_HAS_FEATURE;
+
     my $cache = $class->request_cache;
-    return $cache->{feature}->{$feature}
-        if exists $cache->{feature}->{$feature};
-
-    my $feature_map = $cache->{feature_map};
-    if (!$feature_map) {
-        foreach my $package (@{ OPTIONAL_MODULES() }) {
-            foreach my $f (@{ $package->{feature} }) {
-                $feature_map->{$f} ||= [];
-                push(@{ $feature_map->{$f} }, $package);
+    return $cache->{feature}->{$feature_name}
+        if exists $cache->{feature}->{$feature_name};
+
+    my $dir = bz_locations()->{libpath};
+    my $feature_map = $cache->{feature_map} //= do {
+        my @meta_json = map { File::Spec->catfile($dir, $_) } qw( MYMETA.json META.json );
+        my $file = first { -f $_ } @meta_json;
+        my %map;
+        if ($file) {
+            open my $meta_fh, '<', $file or die "unable to open $file: $!";
+            my $str = do { local $/ = undef; scalar <$meta_fh> };
+            trick_taint($str);
+            close $meta_fh;
+
+            my $meta = CPAN::Meta->load_json_string($str);
+
+            foreach my $feature ($meta->features) {
+                $map{$feature->identifier} = $feature->prereqs;
             }
         }
-        $cache->{feature_map} = $feature_map;
-    }
 
-    if (!$feature_map->{$feature}) {
-        ThrowCodeError('invalid_feature', { feature => $feature });
-    }
+        \%map;
+    };
 
-    my $success = 1;
-    foreach my $package (@{ $feature_map->{$feature} }) {
-        have_vers($package) or $success = 0;
-    }
-    $cache->{feature}->{$feature} = $success;
+    ThrowCodeError('invalid_feature', { feature => $feature_name }) if !$feature_map->{$feature_name};
+    my $success = !verify_dependencies($feature_map->{$feature_name}, 'runtime', 'requires');
+
+    $cache->{feature}{$feature_name} = $success;
     return $success;
 }
 
@@ -1015,8 +1049,12 @@ this Bugzilla installation.
 
 =item C<feature>
 
-Tells you whether or not a specific feature is enabled. For names
-of features, see C<OPTIONAL_MODULES> in C<Bugzilla::Install::Requirements>.
+Wrapper around C<has_feature()> that also loads all of required modules into the runtime.
+
+=item C<has_feature>
+
+Consults F<MYMETA.yml> for optional Bugzilla features and returns true if all the requirements
+are installed.
 
 =item C<api_server>
 

Bugzilla/API/1_0/Server.pm

@@ -20,7 +20,7 @@ use Bugzilla::Hook;
 use Bugzilla::Util qw(datetime_from trick_taint);
 
 use File::Basename qw(basename);
-use File::Glob qw(:bsd_glob);
+use File::Glob qw(:glob);
 use List::MoreUtils qw(none uniq);
 use MIME::Base64 qw(decode_base64 encode_base64);
 use Moo;

Bugzilla/Constants.pm

@@ -516,41 +516,11 @@ use constant INSTALLATION_MODE_NON_INTERACTIVE => 1;
 # Data about what we require for different databases.
 use constant DB_MODULE => {
     # MySQL 5.0.15 was the first production 5.0.x release.
-    'mysql' => {db => 'Bugzilla::DB::Mysql', db_version => '5.0.15',
-                dbd => { 
-                    package => 'DBD-mysql',
-                    module  => 'DBD::mysql',
-                    # Disallow development versions
-                    blacklist => ['_'],
-                    # For UTF-8 support. 4.001 makes sure that blobs aren't
-                    # marked as UTF-8.
-                    version => '4.001',
-                },
-                name => 'MySQL'},
-    'pg'    => {db => 'Bugzilla::DB::Pg', db_version => '9.00.0000',
-                dbd => {
-                    package => 'DBD-Pg',
-                    module  => 'DBD::Pg',
-                    # Pg 9.2 requires 2.19.3 as spclocation no longer exists.
-                    version => '2.19.3',
-                },
-                name => 'PostgreSQL'},
-     'oracle'=> {db => 'Bugzilla::DB::Oracle', db_version => '10.02.0',
-                dbd => {
-                     package => 'DBD-Oracle',
-                     module  => 'DBD::Oracle',
-                     version => '1.19',
-                },
-                name => 'Oracle'},
-     # SQLite 3.6.22 fixes a WHERE clause problem that may affect us.
-    sqlite => {db => 'Bugzilla::DB::Sqlite', db_version => '3.6.22',
-               dbd => {
-                   package => 'DBD-SQLite',
-                   module  => 'DBD::SQLite',
-                   # 1.29 is the version that contains 3.6.22.
-                   version => '1.29',
-               },
-               name => 'SQLite'},
+    mysql   => { db => 'Bugzilla::DB::Mysql',  db_version => '5.0.15',    name => 'MySQL'},
+    pg      => { db => 'Bugzilla::DB::Pg',     db_version => '9.00.0000', name => 'PostgreSQL'},
+    oracle  => { db => 'Bugzilla::DB::Oracle', db_version => '10.02.0',   name => 'Oracle'},
+    # SQLite 3.6.22 fixes a WHERE clause problem that may affect us.
+    sqlite  => { db => 'Bugzilla::DB::Sqlite', db_version => '3.6.22',    name => 'SQLite'},
 };
 
 # True if we're on Win32.

Bugzilla/DB.pm

@@ -165,10 +165,6 @@ sub bz_check_requirements {
             . bz_locations()->{'localconfig'};
     }
 
-    # Check the existence and version of the DBD that we need.
-    my $dbd = $db->{dbd};
-    _bz_check_dbd($db, $output);
-
     # We don't try to connect to the actual database if $db_check is
     # disabled.
     unless ($lc->{db_check}) {
@@ -183,27 +179,6 @@ sub bz_check_requirements {
     print "\n" if $output;
 }
 
-sub _bz_check_dbd {
-    my ($db, $output) = @_;
-
-    my $dbd = $db->{dbd};
-    unless (have_vers($dbd, $output)) {
-        my $sql_server = $db->{name};
-        my $command = install_command($dbd);
-        my $root    = ROOT_USER;
-        my $dbd_mod = $dbd->{module};
-        my $dbd_ver = $dbd->{version};
-        die <<EOT;
-
-For $sql_server, Bugzilla requires that perl's $dbd_mod $dbd_ver or later be
-installed. To install this module, run the following command (as $root):
-
-    $command
-
-EOT
-    }
-}
-
 sub bz_check_server_version {
     my ($self, $db, $output) = @_;