Item12952: finish tools/configure script; move common functionality o…

…ut of the ConfigurePlugin and into the core.
foswiki · Oct 29, 2014 · 652aec2 · 652aec2
1 parent a2559f9
commit 652aec2
Show file tree

Hide file tree

Showing 13 changed files with 1,086 additions and 888 deletions.
diff --git a/ConfigurePlugin/lib/Foswiki/Plugins/ConfigurePlugin.pm b/ConfigurePlugin/lib/Foswiki/Plugins/ConfigurePlugin.pm
diff --git a/ConfigurePlugin/lib/Foswiki/Plugins/ConfigurePlugin/Config.spec b/ConfigurePlugin/lib/Foswiki/Plugins/ConfigurePlugin/Config.spec
@@ -5,7 +5,7 @@
 # and do nothing.
 # **STRING FEEDBACK="label='Test one';wizard='Test';method='test1';auth=1" \
 #          FEEDBACK="label='Test two';wizard='Test';method='test1'" \
-#          CHECK="min:3 max:20" **
+#          CHECK="min:3 max:20"**
 # When you press either of the test buttons, expect the value to change
 # to "ROPE" and there to be one each of the different levels of report.
 $Foswiki::cfg{Plugins}{ConfigurePlugin}{Test}{STRING} = 'STRING';
@@ -15,7 +15,7 @@ $Foswiki::cfg{Plugins}{ConfigurePlugin}{Test}{BOOLEAN} = 1;
 # **COMMAND**
 # Should be COMMAND
 $Foswiki::cfg{Plugins}{ConfigurePlugin}{Test}{COMMAND} = 'COMMAND';
-# **DATE**
+# **DATE CHECK="nullok"**
 # Should be 12 Feb 2012
 $Foswiki::cfg{Plugins}{ConfigurePlugin}{Test}{DATE} = '12 Feb 2012';
 # **EMAILADDRESS**

diff --git a/UnitTestContrib/test/unit/ConfigureSaveTests.pm b/UnitTestContrib/test/unit/ConfigureSaveTests.pm
@@ -2,9 +2,6 @@
 
 # Tests for the core 'Save' wizard.
 
-use strict;
-use warnings;
-
 package ConfigureSaveTests;
 
 use FoswikiTestCase;
@@ -92,6 +89,7 @@ sub test_changecfg {
     my $ms = $reporter->messages();
     $this->assert_matches( qr/^Previous/, $ms->[0]->{text} );
     $this->assert_matches( qr/^New/,      $ms->[1]->{text} );
+    die Data::Dumper->Dump( [$ms] );
     $this->assert_matches(
         qr/AccessibleCFG.*\[.+ \[\]/,
         $ms->[3]->{text},

diff --git a/core/lib/Foswiki.pm b/core/lib/Foswiki.pm
@@ -140,35 +140,6 @@ sub _getLibDir {
     return $foswikiLibDir;
 }
 
-sub _workOutOS {
-    unless ( ( $Foswiki::cfg{DetailedOS} = $^O ) ) {
-        require Config;
-        $Foswiki::cfg{DetailedOS} = $Config::Config{'osname'};
-    }
-    $Foswiki::cfg{OS} = 'UNIX';
-    if ( $Foswiki::cfg{DetailedOS} =~ /darwin/i ) {    # MacOS X
-        $Foswiki::cfg{OS} = 'UNIX';
-    }
-    elsif ( $Foswiki::cfg{DetailedOS} =~ /Win/i ) {
-        $Foswiki::cfg{OS} = 'WINDOWS';
-    }
-    elsif ( $Foswiki::cfg{DetailedOS} =~ /vms/i ) {
-        $Foswiki::cfg{OS} = 'VMS';
-    }
-    elsif ( $Foswiki::cfg{DetailedOS} =~ /bsdos/i ) {
-        $Foswiki::cfg{OS} = 'UNIX';
-    }
-    elsif ( $Foswiki::cfg{DetailedOS} =~ /dos/i ) {
-        $Foswiki::cfg{OS} = 'DOS';
-    }
-    elsif ( $Foswiki::cfg{DetailedOS} =~ /^MacOS$/i ) {    # MacOS 9 or earlier
-        $Foswiki::cfg{OS} = 'MACINTOSH';
-    }
-    elsif ( $Foswiki::cfg{DetailedOS} =~ /os2/i ) {
-        $Foswiki::cfg{OS} = 'OS2';
-    }
-}
-
 BEGIN {
 
     #Monitor::MARK("Start of BEGIN block in Foswiki.pm");
@@ -345,8 +316,6 @@ BEGIN {
     );
     $contextFreeSyntax{IF} = 1;
 
-    _workOutOS();
-
     # Load LocalSite.cfg
     if ( Foswiki::Configure::Load::readConfig( 0, 0, 0 ) ) {
         $Foswiki::cfg{isVALID} = 1;

diff --git a/core/lib/Foswiki/Configure/Checkers/ConfigureFilter.pm b/core/lib/Foswiki/Configure/Checkers/ConfigureFilter.pm
@@ -10,6 +10,11 @@ our @ISA = ('Foswiki::Configure::Checker');
 sub check_current_value {
     my ( $this, $reporter ) = @_;
 
+    # Checkers may be called in a script context, in which case
+    # Foswiki::Func is not available. However in a script context
+    # this option isn't interesting anyway.
+    return unless eval "require Foswiki::Func";
+
     my $it = Foswiki::Func::eachGroupMember( $Foswiki::cfg{SuperAdminGroup} );
     my @admins;
 

diff --git a/core/lib/Foswiki/Configure/Load.pm b/core/lib/Foswiki/Configure/Load.pm
@@ -52,6 +52,35 @@ our %remap = (
     '{RCS}{WorkAreaDir}'    => '{Store}{WorkAreaDir}'
 );
 
+sub _workOutOS {
+    unless ( ( $Foswiki::cfg{DetailedOS} = $^O ) ) {
+        require Config;
+        $Foswiki::cfg{DetailedOS} = $Config::Config{'osname'};
+    }
+    $Foswiki::cfg{OS} = 'UNIX';
+    if ( $Foswiki::cfg{DetailedOS} =~ /darwin/i ) {    # MacOS X
+        $Foswiki::cfg{OS} = 'UNIX';
+    }
+    elsif ( $Foswiki::cfg{DetailedOS} =~ /Win/i ) {
+        $Foswiki::cfg{OS} = 'WINDOWS';
+    }
+    elsif ( $Foswiki::cfg{DetailedOS} =~ /vms/i ) {
+        $Foswiki::cfg{OS} = 'VMS';
+    }
+    elsif ( $Foswiki::cfg{DetailedOS} =~ /bsdos/i ) {
+        $Foswiki::cfg{OS} = 'UNIX';
+    }
+    elsif ( $Foswiki::cfg{DetailedOS} =~ /dos/i ) {
+        $Foswiki::cfg{OS} = 'DOS';
+    }
+    elsif ( $Foswiki::cfg{DetailedOS} =~ /^MacOS$/i ) {    # MacOS 9 or earlier
+        $Foswiki::cfg{OS} = 'MACINTOSH';
+    }
+    elsif ( $Foswiki::cfg{DetailedOS} =~ /os2/i ) {
+        $Foswiki::cfg{OS} = 'OS2';
+    }
+}
+
 =begin TML
 
 ---++ StaticMethod readConfig([$noexpand][,$nospec][,$config_spec])
@@ -91,6 +120,8 @@ sub readConfig {
     # Read Foswiki.spec and LocalSite.cfg
     # (Suppress Foswiki.spec if already read)
 
+    _workOutOS();
+
     my @files = qw( Foswiki.spec LocalSite.cfg );
     if ($nospec) {
         shift @files;
@@ -284,6 +315,7 @@ settings for operation when a LocalSite.cfg could not be found.
 
 sub bootstrapConfig {
     my $noload = shift;
+    Carp::confess "WTF";
 
     # Failed to read LocalSite.cfg
     # Clear out $Foswiki::cfg to allow variable expansion to work
@@ -471,7 +503,7 @@ EPITAPH
     # JQueryPlugin. Without the Config.spec, no plugins get registered)
     Foswiki::Configure::Load::readConfig( 0, 0, 1 ) unless ($noload);
 
-    Foswiki::_workOutOS();
+    _workOutOS();
 
     $Foswiki::cfg{isVALID}         = 1;
     $Foswiki::cfg{isBOOTSTRAPPING} = 1;
@@ -501,6 +533,54 @@ BOOTS
 
 }
 
+=begin TML
+
+---++ StaticMethod findDependencies(\%cfg) -> \%deps
+
+   * =\%cfg= configuration hash to scan; defaults to %Foswiki::cfg 
+
+Recursively locate references to other keys in the values of keys.
+Returns a hash containing two keys:
+   * =forward= => a hash mapping keys to a list of the keys that depend
+     on their value
+   * =reverse= => a hash mapping keys to a list of keys whose value they
+     depend on.
+
+=cut
+
+sub findDependencies {
+    my ( $fwcfg, $deps, $extend_keypath, $keypath ) = @_;
+
+    unless ( defined $fwcfg ) {
+        ( $fwcfg, $extend_keypath, $keypath ) = ( \%Foswiki::cfg, 1, '' );
+    }
+
+    $deps ||= { forward => {}, reverse => {} };
+
+    if ( ref($fwcfg) eq 'HASH' ) {
+        while ( my ( $k, $v ) = each %$fwcfg ) {
+            if ( defined $v ) {
+                my $subkey = $extend_keypath ? "$keypath\{$k\}" : $keypath;
+                findDependencies( $v, $deps, $extend_keypath, $subkey );
+            }
+        }
+    }
+    elsif ( ref($fwcfg) eq 'ARRAY' ) {
+        foreach my $v (@$fwcfg) {
+            if ( defined $v ) {
+                findDependencies( $v, $deps, 0, $keypath );
+            }
+        }
+    }
+    else {
+        while ( $fwcfg =~ /\$Foswiki::cfg(({[^}]*})+)/g ) {
+            push( @{ $deps->{forward}->{$1} },       $keypath );
+            push( @{ $deps->{reverse}->{$keypath} }, $1 );
+        }
+    }
+    return $deps;
+}
+
 1;
 __END__
 Foswiki - The Free and Open Source Wiki, http://foswiki.org/