Changeset 431 for wiki-toolkit/trunk/Makefile.PL

Timestamp:

05/11/08 17:04:41 (4 years ago)

Author:

dom

Message:

fix much tab/whitespace damage; no functional changes.

Files:

• wiki-toolkit/trunk/Makefile.PL (modified) (10 diffs)

wiki-toolkit/trunk/Makefile.PL

@@ -15 +15 @@
 if ($Wiki::Toolkit::TestConfig::configured
     and not (@ARGV and $ARGV[0] eq '-s')
-    and not $ENV{WIKI_TOOLKIT_RERUN_CONFIG}
-   ) {
+    and not $ENV{WIKI_TOOLKIT_RERUN_CONFIG}) {
     print "\nFor the test suite, we use the database and user info\n"
         . "specified during the previous run.  If you want to change\n"
@@ -32 +31 @@
         . "preferably relevant to the backend(s) you intend to use live.\n"
         . "Running the tests under every possible backend combination is\n"
-        . "recommended.  To enter an undefined value, accept the empty\n"
+        . "recommended.  To enter an undefined value, accept the empty\n"
         . "string or explicitly enter 'undef'.\n\n"
         . "****        THESE TESTS ARE DESTRUCTIVE.         ****\n"
@@ -53 +52 @@
     foreach my $store (qw(MySQL Pg)) {
         my $dbname = $ENV{"WIKI_TOOLKIT_".uc($store)."_DBNAME"};
-        if ($dbname and $dbname ne "undef") {
-            $config{$store}{dbname} = $dbname;
+        if ($dbname and $dbname ne "undef") {
+            $config{$store}{dbname} = $dbname;
             foreach my $var (qw(dbuser dbpass dbhost)) {
                 my $value = $ENV{"WIKI_TOOLKIT_".uc($store)."_".uc($var)};
-                if ($value and $value ne "undef") {                 $config{$store}{$var} = $value;
-                } elsif ($value eq "undef") {
-                    $config{$store}{$var} = undef;
-                }
-            }
-        } elsif ($dbname eq "undef") {
-            $config{$store}{dbname} = undef;
-        }
+                if ($value and $value ne "undef") {
+                    $config{$store}{$var} = $value;
+                } elsif ($value eq "undef") {
+                    $config{$store}{$var} = undef;
+                }
+            }
+        } elsif ($dbname eq "undef") {
+            $config{$store}{dbname} = undef;
+        }
     }
 
@@ -76 +76 @@
     # Finally ask questions; then check the settings work.
     my %driver = ( MySQL => "DBD::mysql",
-                   Pg    => "DBD::Pg" );
+                   Pg    => "DBD::Pg" );
     foreach my $store_type (qw(MySQL Pg)) {
         # See whether we have the driver installed.
@@ -82 +82 @@
         if ($@) {
             print "\n$driver{$store_type} not installed... skipping...\n";
-            $config{$store_type}{dbname} = undef;
-            next;
-        }
+            $config{$store_type}{dbname} = undef;
+            next;
+        }
 
         # Prompt for the options.
@@ -90 +90 @@
         my $pad = ' ' x (7-length $store_type);
         $dbname = prompt "\n${pad}Database name for $store_type: ",
-                         $config{$store_type}{dbname};
+                         $config{$store_type}{dbname};
         undef $dbname unless ($dbname and $dbname ne "undef");
         if ($dbname and $dbname ne "undef") {
-            $dbuser = prompt "            Database user: ",
-                             $config{$store_type}{dbuser};
+            $dbuser = prompt "            Database user: ",
+                             $config{$store_type}{dbuser};
             undef $dbuser unless ($dbuser and $dbuser ne "undef");
-            $dbpass = prompt "        Database password: ",
-                             $config{$store_type}{dbpass};
+            $dbpass = prompt "        Database password: ",
+                             $config{$store_type}{dbpass};
             undef $dbpass unless ($dbpass and $dbpass ne "undef");
-            $dbhost = prompt "Database host (if needed): ",
-                             $config{$store_type}{dbhost};
+            $dbhost = prompt "Database host (if needed): ",
+                             $config{$store_type}{dbhost};
             undef $dbhost unless ($dbhost and $dbhost ne "undef");
 
@@ -107 +107 @@
             $config{$store_type}{dbpass} = $dbpass;
             $config{$store_type}{dbhost} = $dbhost;
-        } else {
+        } else {
             print "\nNo database name supplied... skipping...\n";
-            $config{$store_type}{dbname} = undef;
-        }
+            $config{$store_type}{dbname} = undef;
+        }
     }
 
@@ -121 +121 @@
 # If we have a MySQL store configured, we can test the DBIx::FullTextSearch
 # search backend.
-eval { require DBIx::FullTextSearch;
-       require Lingua::Stem;
+eval {
+    require DBIx::FullTextSearch;
+    require Lingua::Stem;
 };
 my $fts_inst = $@ ? 0 : 1;
@@ -172 +173 @@
 # Write out the config for next run.
 open OUT, ">lib/Wiki/Toolkit/TestConfig.pm"
-  or die "Couldn't open lib/Wiki/Toolkit/TestConfig.pm for writing: $!";
+    or die "Couldn't open lib/Wiki/Toolkit/TestConfig.pm for writing: $!";
 # warning - blind copy and paste follows.  FIXME.
 print OUT Data::Dumper->new([ \%Wiki::Toolkit::TestConfig::config ],
-                            [ '*Wiki::Toolkit::TestConfig::config' ]
-                           )->Dump,
-  "\$Wiki::Toolkit::TestConfig::configured = 1;\n1;\n";
+                            [ '*Wiki::Toolkit::TestConfig::config' ]
+                           )->Dump,
+          "\$Wiki::Toolkit::TestConfig::configured = 1;\n1;\n";
 close OUT;
 
@@ -202 +203 @@
 # Write the Makefile.
 WriteMakefile( NAME         => "Wiki::Toolkit",
-               VERSION_FROM => "lib/Wiki/Toolkit.pm",
-               PREREQ_PM    => { 'Text::WikiFormat' => '0.78', #earlier's buggy
-                                 'HTML::PullParser' => 0,
-                                 'Digest::MD5' => 0,
-                                 'Test::More' => 0,
-                                 'Time::Piece' => 0,
-                                 %extras },
+               VERSION_FROM => "lib/Wiki/Toolkit.pm",
+               PREREQ_PM    => { 'Text::WikiFormat' => '0.78', #earlier's buggy
+                                 'HTML::PullParser' => 0,
+                                 'Digest::MD5' => 0,
+                                 'Test::More' => 0,
+                                 'Time::Piece' => 0,
+                                 %extras
+                               },
                EXE_FILES => [ "bin/wiki-toolkit-setupdb",
                               "bin/wiki-toolkit-rename-node",
                               "bin/wiki-toolkit-delete-node",
-                              "bin/wiki-toolkit-revert-to-date" ],
-               clean => { FILES => "Config lib/Wiki/Toolkit/TestConfig.pm "
-                                 . "t/sqlite-test.db t/sii-db-file-test.db "
+                              "bin/wiki-toolkit-revert-to-date"
+                            ],
+               clean => { FILES => "Config lib/Wiki/Toolkit/TestConfig.pm "
+                                 . "t/sqlite-test.db t/sii-db-file-test.db "
                                  . "t/node.db t/plucene"
                         }
-             );
+             );