automator improvements

diff --git a/IkiWiki/Setup/Automator.pm b/IkiWiki/Setup/Automator.pm
index 060a8be56c2872e5b7f9c0620dbd9caffdff067b..af98c9847234f45fa9caf641914a8e65713117df 100644 (file)
--- a/IkiWiki/Setup/Automator.pm
+++ b/IkiWiki/Setup/Automator.pm
@@ -16,95 +16,81 @@ sub ask ($$) { #{{{
        $r->readline($question." ", $default);
 } #}}}
 
        $r->readline($question." ", $default);
 } #}}}
 

+sub prettydir ($) { #{{{
+       my $dir=shift;
+       $dir=~s/^\Q$ENV{HOME}\E\//~\//;
+       return $dir;
+} #}}}
+

 sub import (@) { #{{{
 sub import (@) { #{{{

-       my %setup=@_;
+       my $this=shift;
+       IkiWiki::Setup::merge({@_});

 
        # Sanitize this to avoid problimatic directory names.
 
        # Sanitize this to avoid problimatic directory names.

-       $setup{wikiname}=~s/[^-A-Za-z0-9_] //g;
-       if (! length $setup{wikiname}) {
+       $config{wikiname}=~s/[^-A-Za-z0-9_] //g;
+       if (! length $config{wikiname}) {

                die "you must enter a wikiname\n";
        }
 
        # Avoid overwriting any existing files.
                die "you must enter a wikiname\n";
        }
 
        # Avoid overwriting any existing files.

-       foreach my $key (qw{srcdir destdir repository setupfile}) {
-               next unless exists $setup{$key};
+       foreach my $key (qw{srcdir destdir repository dumpsetup}) {
+               next unless exists $config{$key};

                my $add="";
                my $add="";

-               while (-e $setup{$key}.$add) {
+               while (-e $config{$key}.$add) {

                        $add=1 if ! $add;
                        $add++;
                }
                        $add=1 if ! $add;
                        $add++;
                }

-               $setup{$key}.=$add;
+               $config{$key}.=$add;

        }
 
        }
 

-       print "\n\nSetting up $setup{wikiname} ...\n";
+       IkiWiki::checkconfig();
+
+       print "\n\nSetting up $config{wikiname} ...\n";

 
        # Set up the repository.
 
        # Set up the repository.

-       mkpath($setup{srcdir}) || die "mkdir $setup{srcdir}: $!";
-       delete $setup{repository} if ! $setup{rcs} || $setup{rcs}=~/bzr|mercurial/;
-       if ($setup{rcs}) {
-               my @params=($setup{rcs}, $setup{srcdir});
-               push @params, $setup{repository} if exists $setup{repository};
+       mkpath($config{srcdir}) || die "mkdir $config{srcdir}: $!";
+       delete $config{repository} if ! $config{rcs} || $config{rcs}=~/bzr|mercurial/;
+       if ($config{rcs}) {
+               my @params=($config{rcs}, $config{srcdir});
+               push @params, $config{repository} if exists $config{repository};

                if (system("ikiwiki-makerepo", @params) != 0) {
                        die "failed: ikiwiki-makerepo @params";
                }
        }
 
        # Generate setup file.
                if (system("ikiwiki-makerepo", @params) != 0) {
                        die "failed: ikiwiki-makerepo @params";
                }
        }
 
        # Generate setup file.

-       my @params=(
-               "--dumpsetup", $setup{setupfile},
-               "--wikiname", $setup{wikiname},
-               "--url", $setup{url},
-               "--cgiurl", $setup{cgiurl}
-       );
-       if ($setup{rcs}) {
-               push @params, "--rcs", $setup{rcs};
-               if ($setup{rcs} eq 'git') {
-                       push @params, "--set", "git_wrapper=".
-                               $setup{repository}."/hooks/post-update";
+       require IkiWiki::Setup;
+       if ($config{rcs}) {
+               if ($config{rcs} eq 'git') {
+                       $config{git_wrapper}=$config{repository}."/hooks/post-update";

                }
                }

-               elsif ($setup{rcs} eq 'svn') {
-                       push @params, "--set", "svn_wrapper=".
-                               $setup{repository}."/hooks/post-commit";
+               elsif ($config{rcs} eq 'svn') {
+                       $config{svn_wrapper}=$config{repository}."/hooks/post-commit";

                }
                }

-               elsif ($setup{rcs} eq 'bzr') {
+               elsif ($config{rcs} eq 'bzr') {

                        # TODO
                }
                        # TODO
                }

-               elsif ($setup{rcs} eq 'mercurial') {
+               elsif ($config{rcs} eq 'mercurial') {

                        # TODO
                }
        }
                        # TODO
                }
        }

-       if (exists $setup{add_plugins}) {
-               foreach my $plugin (@{$setup{add_plugins}}) {
-                       push @params, "--plugin", $plugin;
-               }
-       }
-       if (exists $setup{disable_plugins}) {
-               foreach my $plugin (@{$setup{disable_plugins}}) {
-                       push @params, "--disable-plugin", $plugin;
-               }
-       }
-       foreach my $key (keys %setup) {
-               next if $key =~ /^(disable_plugins|add_plugins|setupfile|wikiname|url|cgiurl||srcdir|destdir|repository)$/;
-               push @params, "--set", "$key=$setup{$key}";
-       }
-       if (system("ikiwiki", @params, $setup{srcdir}, $setup{destdir}) != 0) {
-               die "failed: ikiwiki @params";
-       }
+       IkiWiki::Setup::dump($config{dumpsetup});

 
        # Build the wiki.
 
        # Build the wiki.

-       mkpath($setup{destdir}) || die "mkdir $setup{destdir}: $!";
-       if (system("ikiwiki", "--setup", $setup{setupfile}) != 0) {
-               die "ikiwiki --setup $setup{setupfile} failed";
+       mkpath($config{destdir}) || die "mkdir $config{destdir}: $!";
+       if (system("ikiwiki", "--setup", $config{dumpsetup}) != 0) {
+               die "ikiwiki --setup $config{dumpsetup} failed";

        }
 
        # Done!
        }
 
        # Done!

-       print "\n\nSuccessfully set up $setup{wikiname}:\n";
-       foreach my $key (qw{url srcdir destdir repository setupfile}) {
-               next unless exists $setup{$key};
-               my $value=$setup{$key};
-               $value=~s/^\Q$ENV{HOME}\E\//~\//;
-               print "\t$key: ".(" " x (10 - length($key)))." $value\n";
+       print "\n\nSuccessfully set up $config{wikiname}:\n";
+       foreach my $key (qw{url srcdir destdir repository}) {
+               next unless exists $config{$key};
+               print "\t$key: ".(" " x (10 - length($key)))." ".
+                       prettydir($config{$key})."\n";

        }
        }

+       print "To modify settings, edit ".prettydir($config{dumpsetup})." and then run:\n";
+       print " ikiwiki -setup ".prettydir($config{dumpsetup})."\n";

        exit 0;
 } #}}}
 
        exit 0;
 } #}}}
 

diff --git a/simple.setup b/simple.setup
index 7c2e635c88e83e815c9f6dca202d45452edc03a6..60934b5f66677af3bed4a9ff9aee15691ae514be 100644 (file)
--- a/simple.setup
+++ b/simple.setup
@@ -6,7 +6,7 @@
 #
 # Just run: ikiwiki -setup /etc/ikiwiki/simple.setup
 #
 #
 # Just run: ikiwiki -setup /etc/ikiwiki/simple.setup
 #

-# By default, it asks two questions, and confines itself to the user's home
+# By default, it asks a few questions, and confines itself to the user's home

 # directory. You can edit it to change what it asks questions about, or to
 # modify the values to use site-specific settings.
 
 # directory. You can edit it to change what it asks questions about, or to
 # modify the values to use site-specific settings.
 


@@ -16,15 +16,18 @@ our $wikiname=IkiWiki::Setup::Automator::ask(
        "What will the wiki be named?", "wiki");
 our $rcs=IkiWiki::Setup::Automator::ask(
        "What revision control system to use?", "git");
        "What will the wiki be named?", "wiki");
 our $rcs=IkiWiki::Setup::Automator::ask(
        "What revision control system to use?", "git");

+our $admin=IkiWiki::Setup::Automator::ask(
+       "What wiki user (or openid) will be wiki admin?", $ENV{USER});

 our $hostname=`hostname -f`; chomp $hostname;
 
 our $hostname=`hostname -f`; chomp $hostname;
 

-IkiWiki::Setup::Automator::import(
+IkiWiki::Setup::Automator->import(

        wikiname => $wikiname,
        wikiname => $wikiname,

+       adminuser => [$admin],

        rcs => $rcs,
        srcdir => "$ENV{HOME}/$wikiname",
        destdir => "$ENV{HOME}/public_html/$wikiname",
        repository => "$ENV{HOME}/$wikiname.$rcs",
        rcs => $rcs,
        srcdir => "$ENV{HOME}/$wikiname",
        destdir => "$ENV{HOME}/public_html/$wikiname",
        repository => "$ENV{HOME}/$wikiname.$rcs",

-       setupfile => "$ENV{HOME}/$wikiname.setup",
+       dumpsetup => "$ENV{HOME}/$wikiname.setup",

        url => "http://$hostname/~$ENV{USER}/$wikiname",
        cgiurl => "http://$hostname/~$ENV{USER}/$wikiname/ikiwiki.cgi",
        cgi_wrapper => "$ENV{HOME}/public_html/$wikiname/ikiwiki.cgi",
        url => "http://$hostname/~$ENV{USER}/$wikiname",
        cgiurl => "http://$hostname/~$ENV{USER}/$wikiname/ikiwiki.cgi",
        cgi_wrapper => "$ENV{HOME}/public_html/$wikiname/ikiwiki.cgi",