View | Details | Raw Unified | Return to bug 34978
Collapse All | Expand All

(-)a/Koha/Plugins.pm (-6 / +12 lines)
Lines 284-302 sub InstallPlugins { Link Here
284
    my $verbose = $params->{verbose} // $self->_verbose;
284
    my $verbose = $params->{verbose} // $self->_verbose;
285
285
286
    my @plugin_classes = $self->plugins();
286
    my @plugin_classes = $self->plugins();
287
    my (@plugins, @classes_filters);
287
    my ( @plugins, @classes_filters );
288
288
289
    my $has_filters = defined($params->{include}) || defined($params->{exclude});
289
    my $has_filters = defined( $params->{include} ) || defined( $params->{exclude} );
290
290
291
    # Warn user if the specified classes doesn't exist and return nothing
291
    # Warn user if the specified classes doesn't exist and return nothing
292
    if ($has_filters) {
292
    if ($has_filters) {
293
        @classes_filters = defined($params->{include}) ? @{$params->{include}} : @{$params->{exclude}};
293
        @classes_filters = defined( $params->{include} ) ? @{ $params->{include} } : @{ $params->{exclude} };
294
294
295
        foreach my $classes_filter (@classes_filters) {
295
        foreach my $classes_filter (@classes_filters) {
296
            my $is_found = 0;
296
            my $is_found = 0;
297
297
298
            foreach my $plugin_class (@plugin_classes) {
298
            foreach my $plugin_class (@plugin_classes) {
299
                $is_found = 1 if $plugin_class =~ ":$classes_filter\$|^$classes_filter\$" || ($classes_filter =~ "^::" && $plugin_class =~ "$classes_filter\$");
299
                $is_found = 1
300
                    if $plugin_class =~ ":$classes_filter\$|^$classes_filter\$"
301
                    || ( $classes_filter =~ "^::" && $plugin_class =~ "$classes_filter\$" );
300
            }
302
            }
301
            unless ($is_found) {
303
            unless ($is_found) {
302
                warn "$classes_filter have not been found, try a different name";
304
                warn "$classes_filter have not been found, try a different name";
Lines 313-321 sub InstallPlugins { Link Here
313
            if ($has_filters) {
315
            if ($has_filters) {
314
                my $is_found = 0;
316
                my $is_found = 0;
315
                foreach my $classes_filter (@classes_filters) {
317
                foreach my $classes_filter (@classes_filters) {
316
                    $is_found = 1 if $plugin_class =~ ":$classes_filter\$|^$classes_filter\$" || ($classes_filter =~ "^::" && $plugin_class =~ "$classes_filter\$");
318
                    $is_found = 1
319
                        if $plugin_class =~ ":$classes_filter\$|^$classes_filter\$"
320
                        || ( $classes_filter =~ "^::" && $plugin_class =~ "$classes_filter\$" );
317
                }
321
                }
318
                next if (defined($params->{include}) && !$is_found) || (defined($params->{exclude}) && $is_found);
322
                next
323
                    if ( defined( $params->{include} ) && !$is_found )
324
                    || ( defined( $params->{exclude} ) && $is_found );
319
            }
325
            }
320
326
321
            my $plugin;
327
            my $plugin;
(-)a/misc/devel/install_plugins.pl (-2 / +2 lines)
Lines 26-35 use Koha::Script; Link Here
26
use C4::Context;
26
use C4::Context;
27
use Koha::Plugins;
27
use Koha::Plugins;
28
28
29
my ($help, @include, @exclude);
29
my ( $help, @include, @exclude );
30
30
31
GetOptions(
31
GetOptions(
32
    'help|?' => \$help,
32
    'help|?'    => \$help,
33
    'include=s' => \@include,
33
    'include=s' => \@include,
34
    'exclude=s' => \@exclude,
34
    'exclude=s' => \@exclude,
35
) or die "Installation aborted\n";
35
) or die "Installation aborted\n";
(-)a/t/db_dependent/Koha/Plugins/Plugins.t (-20 / +19 lines)
Lines 25-31 use FindBin qw($Bin); Link Here
25
use Module::Load::Conditional qw(can_load);
25
use Module::Load::Conditional qw(can_load);
26
use Test::MockModule;
26
use Test::MockModule;
27
use Test::NoWarnings;
27
use Test::NoWarnings;
28
use Test::More tests => 31;
28
use Test::More tests => 20;
29
use Test::Warn;
29
use Test::Warn;
30
30
31
use C4::Context;
31
use C4::Context;
Lines 201-223 subtest 'InstallPlugins() tests' => sub { Link Here
201
    Koha::Plugins::Methods->delete;
201
    Koha::Plugins::Methods->delete;
202
    $schema->resultset('PluginData')->delete;
202
    $schema->resultset('PluginData')->delete;
203
203
204
    # Tests for the exclude paramater
204
    # Tests for the exclude parameter
205
    # Test the returned plugins of the InstallPlugins subroutine
205
    # Test the returned plugins of the InstallPlugins subroutine
206
    my $plugins = Koha::Plugins->new({ enable_plugins => 1 });
206
    my $plugins           = Koha::Plugins->new( { enable_plugins => 1 } );
207
    my @installed_plugins = $plugins->InstallPlugins({ exclude => ["Test", "Koha::Plugin::MarcFieldValues"] });
207
    my @installed_plugins = $plugins->InstallPlugins( { exclude => [ "Test", "Koha::Plugin::MarcFieldValues" ] } );
208
    my $plugin_classes = join(" ", map{$_->{class}} @installed_plugins);
208
    my $plugin_classes    = join( " ", map { $_->{class} } @installed_plugins );
209
209
210
    my $result = grep { $plugin_classes !~ $_ } [":Test |:Test\$", ":MarcFieldValues |:MarcFieldValues\$"]
210
    my $result = grep { $plugin_classes !~ $_ } [ ":Test |:Test\$", ":MarcFieldValues |:MarcFieldValues\$" ]
211
        && $plugin_classes =~ ":TestItemBarcodeTransform |:TestItemBarcodeTransform\$";
211
        && $plugin_classes =~ ":TestItemBarcodeTransform |:TestItemBarcodeTransform\$";
212
    ok($result, "Excluded plugins are not returned");
212
    ok( $result, "Excluded plugins are not returned" );
213
213
214
    # Test the plugins in the database
214
    # Test the plugins in the database
215
    my @plugins = $plugins->GetPlugins({ all => 1, error => 1 });
215
    my @plugins = $plugins->GetPlugins( { all => 1, error => 1 } );
216
    $plugin_classes = join(" ", map{$_->{class}} @plugins);
216
    $plugin_classes = join( " ", map { $_->{class} } @plugins );
217
217
218
    $result = grep { $plugin_classes !~ $_ } [":Test |:Test\$", ":MarcFieldValues |:MarcFieldValues\$"]
218
    $result = grep { $plugin_classes !~ $_ } [ ":Test |:Test\$", ":MarcFieldValues |:MarcFieldValues\$" ]
219
        && $plugin_classes =~ ":TestItemBarcodeTransform |:TestItemBarcodeTransform\$";
219
        && $plugin_classes =~ ":TestItemBarcodeTransform |:TestItemBarcodeTransform\$";
220
    ok($result, "Excluded plugins are not installed");
220
    ok( $result, "Excluded plugins are not installed" );
221
221
222
    # Remove installed plugins data
222
    # Remove installed plugins data
223
    Koha::Plugins::Methods->delete;
223
    Koha::Plugins::Methods->delete;
Lines 225-246 subtest 'InstallPlugins() tests' => sub { Link Here
225
225
226
    # Tests for the include parameter
226
    # Tests for the include parameter
227
    # Test the returned plugins of the InstallPlugins subroutine
227
    # Test the returned plugins of the InstallPlugins subroutine
228
    @installed_plugins = $plugins->InstallPlugins({ include => ["Test", "Koha::Plugin::MarcFieldValues"]});
228
    @installed_plugins = $plugins->InstallPlugins( { include => [ "Test", "Koha::Plugin::MarcFieldValues" ] } );
229
229
230
    $result = 1;
230
    $result = 1;
231
    foreach my $plugin_class ( map{ $_->{class} } @installed_plugins ) {
231
    foreach my $plugin_class ( map { $_->{class} } @installed_plugins ) {
232
        $result = 0 unless("$plugin_class" =~ ":Test\$" || "$plugin_class" =~ ":MarcFieldValues\$");
232
        $result = 0 unless ( "$plugin_class" =~ ":Test\$" || "$plugin_class" =~ ":MarcFieldValues\$" );
233
    }
233
    }
234
    ok($result, "Only included plugins are returned");
234
    ok( $result, "Only included plugins are returned" );
235
235
236
    # Test the plugins in the database
236
    # Test the plugins in the database
237
    @plugins = $plugins->GetPlugins({ all => 1, error => 1});
237
    @plugins = $plugins->GetPlugins( { all => 1, error => 1 } );
238
238
239
    $result = 1;
239
    $result = 1;
240
    foreach my $plugin_class ( map{ $_->{class} } @plugins ) {
240
    foreach my $plugin_class ( map { $_->{class} } @plugins ) {
241
        $result = 0 unless("$plugin_class" =~ ":Test\$" || "$plugin_class" =~ ":MarcFieldValues\$");
241
        $result = 0 unless ( "$plugin_class" =~ ":Test\$" || "$plugin_class" =~ ":MarcFieldValues\$" );
242
    }
242
    }
243
    ok($result, "Only included plugins are installed");
243
    ok( $result, "Only included plugins are installed" );
244
244
245
    $schema->storage->txn_rollback;
245
    $schema->storage->txn_rollback;
246
};
246
};
247
- 

Return to bug 34978