X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=script%2Fdbicdump;h=80ade35604167cf87f7d24f15a22b4abb6393562;hb=02596b0987d65d196d3b7884163ff4f5ec280f16;hp=cb976380308e804ba09aa720867dc979850ca418;hpb=0322c5b3875e401b1e9bfc207713d5eaff31e4a0;p=dbsrgits%2FDBIx-Class-Schema-Loader.git

diff --git a/script/dbicdump b/script/dbicdump
index cb97638..80ade35 100644
--- a/script/dbicdump
+++ b/script/dbicdump
@@ -1,58 +1,73 @@
 #!/usr/bin/perl
 
+=encoding UTF-8
+
 =head1 NAME
 
 dbicdump - Dump a schema using DBIx::Class::Schema::Loader
 
 =head1 SYNOPSIS
 
-  dbicdump <configuration_file>
-  dbicdump [-o <loader_option>=<value> ] <schema_class> <connect_info>
+    dbicdump <configuration_file>
+    dbicdump [-I <lib-path>] [-o <loader_option>=<value> ] \
+             <schema_class> <connect_info>
 
 Examples:
 
-  $ dbicdump schema.conf
+    $ dbicdump schema.conf
+
+    $ dbicdump -o dump_directory=./lib \
+      -o components='["InflateColumn::DateTime"]' \
+      MyApp::Schema dbi:SQLite:./foo.db
 
-  $ dbicdump -o dump_directory=./lib \
-    -o components='["InflateColumn::DateTime"]' \
-    MyApp::Schema dbi:SQLite:./foo.db '{ quote_char => "\"" }'
+    $ dbicdump -o dump_directory=./lib \
+      -o components='["InflateColumn::DateTime"]' \
+      MyApp::Schema dbi:SQLite:./foo.db '{ quote_char => "\"" }'
 
-  $ dbicdump -o dump_directory=./lib \
-    -o components='["InflateColumn::DateTime"]' \
-    -o preserve_case=1 \
-    MyApp::Schema dbi:mysql:database=foo user pass '{ quote_char => "`" }'
+    $ dbicdump -Ilib -o dump_directory=./lib \
+      -o components='["InflateColumn::DateTime"]' \
+      -o preserve_case=1 \
+      MyApp::Schema dbi:mysql:database=foo user pass \
+      '{ quote_char => "`" }'
 
-  $ dbicdump -o dump_directory=./lib \
-    -o components='["InflateColumn::DateTime"]' \
-    MyApp::Schema 'dbi:mysql:database=foo;host=domain.tld;port=3306' user pass
+    $ dbicdump -o dump_directory=./lib \
+      -o components='["InflateColumn::DateTime"]' \
+      MyApp::Schema 'dbi:mysql:database=foo;host=domain.tld;port=3306' \
+      user pass
 
 On Windows that would be:
 
-  $ dbicdump -o dump_directory=.\lib ^
-    -o components="[q{InflateColumn::DateTime}]" ^
-    -o preserve_case=1 ^
-    MyApp::Schema dbi:mysql:database=foo user pass "{ quote_char => q{`} }"
-    
+    $ dbicdump -o dump_directory=.\lib ^
+      -o components="[q{InflateColumn::DateTime}]" ^
+      -o preserve_case=1 ^
+      MyApp::Schema dbi:mysql:database=foo user pass ^
+      "{ quote_char => q{`} }"
+
 Configuration files must have schema_class and connect_info sections,
 an example of a general config file is as follows:
 
     schema_class MyApp::Schema
-    
+
+    lib /extra/perl/libs
+
     # connection string
     <connect_info>
         dsn     dbi:mysql:example
         user    root
         pass    secret
     </connect_info>
-    
+
     # dbic loader options
     <loader_options>
-        components  InflateColumn::DateTime
-        components  TimeStamp
+        dump_directory ./lib
+        components     InflateColumn::DateTime
+        components     TimeStamp
     </loader_options>
 
 Using a config file requires L<Config::Any> installed.
 
+The optional C<lib> key is equivalent to the C<-I> option.
+
 =head1 DESCRIPTION
 
 Dbicdump generates a L<DBIx::Class> schema using
@@ -70,13 +85,9 @@ specified.
 
 L<DBIx::Class::Schema::Loader>, L<DBIx::Class>.
 
-=head1 AUTHOR
-
-Dagfinn Ilmari Mannsåker C<< <ilmari@ilmari.org> >>
-
-=head1 CONTRIBUTORS
+=head1 AUTHORS
 
-Caelum: Rafael Kitover <rkitover@cpan.org>
+See L<DBIx::Class::Schema::Loader/AUTHORS>.
 
 =head1 LICENSE
 
@@ -90,12 +101,20 @@ use warnings;
 use Getopt::Long;
 use Pod::Usage;
 use DBIx::Class::Schema::Loader 'make_schema_at';
+use namespace::clean;
 use DBIx::Class::Schema::Loader::Base ();
 use DBIx::Class::Schema::Loader::Optional::Dependencies ();
+require lib;
 
 my $loader_options;
 
-GetOptions( 'loader-option|o=s%' => \&handle_option );
+Getopt::Long::Configure('gnu_getopt');
+
+GetOptions(
+    'I=s'                => sub { shift; lib->import(shift) },
+    'loader-option|o=s%' => \&handle_option,
+);
+
 $loader_options->{dump_directory} ||= '.';
 
 if (@ARGV == 1) {
@@ -106,24 +125,36 @@ if (@ARGV == 1) {
 
     my $configuration_file = shift @ARGV;
 
-    my $configurations =
-      Config::Any->load_files( {
-            use_ext => 1,
-            flatten_to_hash => 1,
-            files => [$configuration_file] } );
-    
+    my $configurations = Config::Any->load_files({
+        use_ext => 1,
+        flatten_to_hash => 1,
+        files => [$configuration_file]
+    });
+
     my $c = (values %$configurations)[0];
-    
+
     unless (keys %{$c->{connect_info}} && $c->{schema_class}) {
         pod2usage(1);
     }
-    
+
+    my @libs;
+
+    if ($c->{lib}) {
+        if (ref $c->{lib}) {
+            @libs = @{ $c->{lib} };
+        }
+
+        @libs = ($c->{lib});
+    }
+
+    lib->import($_) for @libs;
+
     my ($dsn, $user, $pass, $options) =
         map { $c->{connect_info}->{$_} } qw/dsn user pass options/;
         $options ||= {};
         $c->{loader_options}->{dump_directory} ||=
             $loader_options->{dump_directory};
-    
+
     make_schema_at(
         $c->{schema_class},
         $c->{loader_options} || {},
@@ -133,14 +164,14 @@ if (@ARGV == 1) {
 else {
     my ($schema_class, @loader_connect_info) = @ARGV
         or pod2usage(1);
-    
+
     my $dsn = shift @loader_connect_info;
-    
+
     my ($user, $pass) = $dsn =~ /sqlite/i ? ('', '')
         : splice @loader_connect_info, 0, 2;
-    
+
     my @extra_connect_info_opts = map parse_value($_), @loader_connect_info;
-    
+
     make_schema_at(
         $schema_class,
         $loader_options,