summaryrefslogtreecommitdiff
path: root/IkiWiki/Setup
diff options
context:
space:
mode:
authorJoey Hess <joey@gnu.kitenet.net>2010-03-19 15:27:15 -0400
committerJoey Hess <joey@gnu.kitenet.net>2010-03-19 15:27:15 -0400
commit522daa7ea8111482701ce222800096edaf8eb2d2 (patch)
tree92a959a63ce3c061c1451e32e4ba21322c3ebb39 /IkiWiki/Setup
parent8a5084bc62d8f59320efc43fcd5e36bcc668374d (diff)
factored out generic commented line dumping
Diffstat (limited to 'IkiWiki/Setup')
-rw-r--r--IkiWiki/Setup/Standard.pm94
1 files changed, 17 insertions, 77 deletions
diff --git a/IkiWiki/Setup/Standard.pm b/IkiWiki/Setup/Standard.pm
index 4022ff03c..9c177e497 100644
--- a/IkiWiki/Setup/Standard.pm
+++ b/IkiWiki/Setup/Standard.pm
@@ -1,7 +1,6 @@
#!/usr/bin/perl
# Standard ikiwiki setup module.
-# Parameters to import should be all the standard ikiwiki config stuff,
-# plus an array of wrappers to set up.
+# Parameters to import should be all the standard ikiwiki config stuff.
package IkiWiki::Setup::Standard;
@@ -13,6 +12,22 @@ sub import {
IkiWiki::Setup::merge($_[1]);
}
+sub gendump ($$) {
+ my $class=shift;
+ my $description=shift;
+
+ "#!/usr/bin/perl",
+ "# $description",
+ "#",
+ "# Passing this to ikiwiki --setup will make ikiwiki generate",
+ "# wrappers and build the wiki.",
+ "#",
+ "# Remember to re-run ikiwiki --setup any time you edit this file.",
+ "use IkiWiki::Setup::Standard {",
+ IkiWiki::Setup::commented_dump(\&dumpline),
+ "}";
+}
+
sub dumpline ($$$$) {
my $key=shift;
my $value=shift;
@@ -57,79 +72,4 @@ sub dumpline ($$$$) {
return "\t$prefix$key => $dumpedvalue,";
}
-sub dumpvalues ($@) {
- my $setup=shift;
- my @ret;
- while (@_) {
- my $key=shift;
- my %info=%{shift()};
-
- next if $key eq "plugin" || $info{type} eq "internal";
-
- push @ret, "\t# ".$info{description} if exists $info{description};
-
- if (exists $setup->{$key} && defined $setup->{$key}) {
- push @ret, dumpline($key, $setup->{$key}, $info{type}, "");
- delete $setup->{$key};
- }
- elsif (exists $info{example}) {
- push @ret, dumpline($key, $info{example}, $info{type}, "#");
- }
- else {
- push @ret, dumpline($key, "", $info{type}, "#");
- }
- }
- return @ret;
-}
-
-sub gendump ($$) {
- my $class=shift;
- my $description=shift;
-
- my %setup=(%config);
- my @ret;
-
- # disable logging to syslog while dumping
- $config{syslog}=undef;
-
- eval q{use Text::Wrap};
- die $@ if $@;
-
- my %section_plugins;
- push @ret, dumpvalues(\%setup, IkiWiki::getsetup());
- foreach my $pair (IkiWiki::Setup::getsetup()) {
- my $plugin=$pair->[0];
- my $setup=$pair->[1];
- my %s=@{$setup};
- my $section=$s{plugin}->{section};
- push @{$section_plugins{$section}}, $plugin;
- if (@{$section_plugins{$section}} == 1) {
- push @ret, "", "\t".("#" x 70), "\t# $section plugins",
- sub {
- wrap("\t# (", "\t# ",
- join(", ", @{$section_plugins{$section}})).")"
- },
- "\t".("#" x 70);
- }
-
- my @values=dumpvalues(\%setup, @{$setup});
- if (@values) {
- push @ret, "", "\t# $plugin plugin", @values;
- }
- }
-
- unshift @ret,
- "#!/usr/bin/perl",
- "# $description",
- "#",
- "# Passing this to ikiwiki --setup will make ikiwiki generate",
- "# wrappers and build the wiki.",
- "#",
- "# Remember to re-run ikiwiki --setup any time you edit this file.",
- "use IkiWiki::Setup::Standard {";
- push @ret, "}";
-
- return map { ref $_ ? $_->() : $_ } @ret;
-}
-
1