Remember to run all the tests before committing!

[git.ikiwiki.info.git] / IkiWiki / Setup / Automator.pm

diff --git a/IkiWiki/Setup/Automator.pm b/IkiWiki/Setup/Automator.pm
index 5111541e48d5865ef056018306a3a23b09d54ba5..671438710e4444de5dd2f1aacef7183659ccadb1 100644 (file)
--- a/IkiWiki/Setup/Automator.pm
+++ b/IkiWiki/Setup/Automator.pm
@@ -15,6 +15,7 @@ sub ask ($$) {
        my ($question, $default)=@_;
 
        my $r=Term::ReadLine->new("ikiwiki");
+       $r->ornaments("md,me");
        $r->readline(encode_utf8($question)." ", $default);
 }
 
@@ -24,27 +25,35 @@ sub prettydir ($) {
        return $dir;
 }
 
-sub import (@) {
-       my $this=shift;
-       IkiWiki::Setup::merge({@_});
+sub sanitize_wikiname ($) {
+       my $wikiname=shift;
 
        # Sanitize this to avoid problimatic directory names.
-       $config{wikiname}=~s/[^-A-Za-z0-9_]//g;
-       if (! length $config{wikiname}) {
+       $wikiname=~s/[^-A-Za-z0-9_]//g;
+       if (! length $wikiname) {
                error gettext("you must enter a wikiname (that contains alphanumerics)");
        }
+       return $wikiname;
+}
 
-       # Avoid overwriting any existing files.
-       foreach my $key (qw{srcdir destdir repository dumpsetup}) {
-               next unless exists $config{$key};
-               my $add="";
-               my $dir=IkiWiki::dirname($config{$key})."/";
-               my $base=IkiWiki::basename($config{$key});
-               while (-e $dir.$add.$base) {
-                       $add=1 if ! $add;
-                       $add++;
+sub import (@) {
+       my $this=shift;
+       $config{setuptype}='Yaml';
+       IkiWiki::Setup::merge({@_});
+
+       if (! $config{force_overwrite}) {
+               # Avoid overwriting any existing files.
+               foreach my $key (qw{srcdir destdir repository dumpsetup}) {
+                       next unless exists $config{$key};
+                       my $add="";
+                       my $dir=IkiWiki::dirname($config{$key})."/";
+                       my $base=IkiWiki::basename($config{$key});
+                       while (-e $dir.$add.$base) {
+                               $add=1 if ! $add;
+                               $add++;
+                       }
+                       $config{$key}=$dir.$add.$base;
                }
-               $config{$key}=$dir.$add.$base;
        }
        
        # Set up wrapper
@@ -63,9 +72,18 @@ sub import (@) {
                }
                elsif ($config{rcs} eq 'bzr') {
                        # TODO
+                       print STDERR "warning: do not know how to set up the bzr_wrapper hook!\n";
                }
                elsif ($config{rcs} eq 'mercurial') {
                        # TODO
+                       print STDERR "warning: do not know how to set up the mercurial_wrapper hook!\n";
+               }
+               elsif ($config{rcs} eq 'tla') {
+                       # TODO
+                       print STDERR "warning: do not know how to set up the tla_wrapper hook!\n";
+               }
+               elsif ($config{rcs} eq 'cvs') {
+                       $config{cvs_wrapper}=$config{repository}."/CVSROOT/post-commit";
                }
                else {
                        error sprintf(gettext("unsupported revision control system %s"),
@@ -98,6 +116,30 @@ sub import (@) {
                }
        }
 
+       # Make sure that all the listed plugins can load
+       # and checkconfig is ok. If a plugin fails to work,
+       # remove it from the configuration and keep on truckin'.
+       my %bakconfig=%config; # checkconfig can modify %config so back up
+       if (! eval { IkiWiki::loadplugins(); IkiWiki::checkconfig() }) {
+               foreach my $plugin (@{$config{default_plugins}}, @{$bakconfig{add_plugins}}) {
+                       eval {
+                               # delete all hooks so that only this plugins's
+                               # checkconfig will be run
+                               %IkiWiki::hooks=();
+                               IkiWiki::loadplugin($plugin);
+                               IkiWiki::run_hooks(checkconfig => sub { shift->() });
+                       };
+                       if ($@) {
+                               my $err=$@;
+                               print STDERR sprintf(gettext("** Disabling plugin %s, since it is failing with this message:"),
+                                       $plugin)."\n";
+                               print STDERR "$err\n";
+                               push @{$bakconfig{disable_plugins}}, $plugin;
+                       }
+               }
+       }
+       %config=%bakconfig;
+
        # Generate setup file.
        require IkiWiki::Setup;
        IkiWiki::Setup::dump($config{dumpsetup});
@@ -110,7 +152,7 @@ sub import (@) {
 
        # Create admin user(s).
        foreach my $admin (@{$config{adminuser}}) {
-               next if $admin=~/^http\?:\/\//; # openid
+               next if defined IkiWiki::openiduser($admin);
                
                # Prompt for password w/o echo.
                my ($password, $password2);