new option -I to modify @inc

bin/catmandu

@@ -61,8 +61,13 @@ Display the help screen.
 
 =item -L PATH
 
-Search upwards from this path for configuration files and lib directories.
-This option is repeatable.
+Search upwards from this path for configuration files. This option is repeatable.
+
+=item --lib-path PATH
+
+=item -I
+
+Try to load Catmandu modules from this library path. This option is repeatable.
 
 =back
 

lib/Catmandu/CLI.pm

@@ -13,6 +13,7 @@ sub plugin_search_path { 'Catmandu::Cmd' }
 sub global_opt_spec {
     (
         ['load_path|L=s@', ""],
+        ['lib_path|I=s@', ""],
     );
 }
 
@@ -26,7 +27,9 @@ sub run {
     my $load_path = $global_opts->{load_path};
     Catmandu->load(@$load_path);
 
-    my $self = $class->new;
+    unshift @INC, @{ $global_opts->{lib_path} || [ ] };
+
+    my $self = ref $class ? $class : $class->new;
     $self->set_global_options($global_opts);
     my ($cmd, $opts, @args) = $self->prepare_command(@$argv);
     $self->execute_command($cmd, $opts, @args);

t/Catmandu-CLI.t

@@ -4,6 +4,7 @@ use strict;
 use warnings;
 use Test::More;
 use Test::Exception;
+use App::Cmd::Tester;
 
 my $pkg;
 BEGIN {
@@ -12,5 +13,16 @@ BEGIN {
 }
 require_ok $pkg;
 
-done_testing 2;
+use Carp::Always;
+
+# check -I / --lib_path
+if ($^O ne 'MSWin32') { # /dev/null required
+    # FIXME: Catmandu dies if testing with output to STDOUT
+    my $result = test_app( 'Catmandu::CLI' => [qw(
+        -I /dev/null -I t/lib convert Values --values 1;2;8 to JSON -file /dev/null
+    )] );
+    ok !$result->error;
+}
+
+done_testing;
 

t/lib/Catmandu/Importer/Values.pm

@@ -0,0 +1,19 @@
+package Catmandu::Importer::Values;
+
+use namespace::clean;
+use Catmandu::Sane;
+use Moo;
+
+with 'Catmandu::Importer';
+
+has values => (is => 'ro', default => sub { '' });
+
+sub generator {
+    my ($self) = @_;
+    sub {
+        state $values = [ split /;/, $self->values ];
+        return @$values ? { value => shift(@$values) } : undef;
+    };
+}
+
+1;