Author: dylan
Date: 2005-02-10 16:36:57 -0500 (Thu, 10 Feb 2005)
New Revision: 619
Added:
trunk/main/core/lib/Haver/Object.pm
Removed:
trunk/main/core/lib/Haver/Base.pm
trunk/main/core/lib/Haver/Core.pm
trunk/main/core/lib/Haver/OS.pm
trunk/main/core/lib/Haver/OS/
Modified:
trunk/dev-tools/vim-automod/template.pm
trunk/main/core/Build.PL
trunk/main/core/lib/Haver/Config.pm
trunk/main/core/lib/Haver/Logger.pm
trunk/main/core/lib/Haver/Logger/Functions.pm
trunk/main/core/t/001_config.t
trunk/web/Makefile
Log:
commiting changes before upgrade.
Modified: trunk/dev-tools/vim-automod/template.pm
===================================================================
--- trunk/dev-tools/vim-automod/template.pm 2005-02-05 22:13:13 UTC (rev
618)
+++ trunk/dev-tools/vim-automod/template.pm 2005-02-10 21:36:57 UTC (rev
619)
@@ -4,7 +4,7 @@
use strict;
use warnings;
-use base 'Haver::Base'; # Highly recommended for haver stuff.
+use base 'Haver::Object'; # Highly recommended for haver stuff.
our $VERSION = 0.01;
@@ -14,7 +14,7 @@
# <<CURSOR>>
}
-# use this instead of overriding DESTROY, if you extend Haver::Base.
+# use this instead of overriding DESTROY, if you extend Haver::Object.
# sub finalize {
# my ($me) = @_;
#
@@ -38,7 +38,7 @@
=head1 INHERITENCE
-<<PACKAGE>> extends L<Haver::Base>.
+<<PACKAGE>> extends L<Haver::Object>.
=head1 CONSTRUCTOR
Modified: trunk/main/core/Build.PL
===================================================================
--- trunk/main/core/Build.PL 2005-02-05 22:13:13 UTC (rev 618)
+++ trunk/main/core/Build.PL 2005-02-10 21:36:57 UTC (rev 619)
@@ -2,7 +2,7 @@
use Module::Build;
my $build = Module::Build->new(
module_name => 'Haver::Core',
- dist_version_from => 'lib/Haver/Core.pm',
+ dist_version_from => 'lib/Haver/Base.pm',
dist_author => 'Dylan William Hardison <[EMAIL PROTECTED]>',
license => 'gpl',
requires => {
Deleted: trunk/main/core/lib/Haver/Base.pm
===================================================================
--- trunk/main/core/lib/Haver/Base.pm 2005-02-05 22:13:13 UTC (rev 618)
+++ trunk/main/core/lib/Haver/Base.pm 2005-02-10 21:36:57 UTC (rev 619)
@@ -1,158 +0,0 @@
-# vim: set ts=4 sw=4 expandtab si ai sta tw=104:
-# This module is copyrighted, see end of file for details.
-package Haver::Base;
-use strict;
-use warnings;
-use Carp;
-
-use constant DEBUG => 1;
-
-our $VERSION = 0.08;
-
-
-sub new {
- my $class = shift;
- my $me = bless {}, $class;
- my $args;
-
- if (UNIVERSAL::isa($_[0], 'HASH')) {
- $args = $_[0];
- } elsif ((@_ % 2) == 0) {
- $args = { @_ };
- } else {
- croak "Odd number of parameters to new()";
- }
-
- if (DEBUG) {
- print "New: ", overload::StrVal($me), "\n";
- }
-
- $me->initialize($args);
-
- return $me;
-}
-
-
-
-sub initialize { return }
-sub finalize { return }
-
-sub DESTROY {
- my $me = shift;
-
- if (DEBUG) {
- print "Destroy: ", overload::StrVal($me), "\n";
- }
- $me->finalize();
-}
-
-
-1;
-
-__END__
-
-=head1 NAME
-
-Haver::Base - Useful base class for most objects in Haver server and clients.
-
-=head1 SYNOPSIS
-
- BEGIN {
- package Foobar;
- use base 'Haver::Base';
-
- sub initialize {
- my ($me, $params) = @_;
- print "init args: join(', ', keys %$params), "\n";
- }
-
- sub finalize {
- my ($me) = @_;
- # do stuff here that you would do in DESTROY.
- }
- } # BEGIN
-
-=head1 DESCRIPTION
-
-This is a base class for nearly every class in the Haver server,
-and it is encouraged to be used for any class in the client, too.
-
-The main advantage it brings is not having to write redundant
-constructors, and also it prints debugging messages on object creation and
destruction.
-
-When a new object is instantiated, initialize() is called.
-Don't overload DESTROY in child classes, use finalize() instead.
-
-=head1 METHODS
-
-Haver::Base implements the following methods:
-
-=head2 new(%params || \%params)
-
-This constructor method creates and returns a new I<$class>,
-initialized with the list of key-value pairs in I<%options>.
-Keys that begin with _ are ignored. A special option
--initargs can be specified as an array reference,
-and will be passed to initialize.
-
-Alternatively, new() may be called
-with as C<$class-E<gt>new($option, @initargs)>
-where I<$option> is a hashref used like I<%options>
-and I<@initargs> is a list of arguments to be passed to
-initialize()
-
-=head3 Parameters
-
-As a matter of style, parameters should begin with a single dash (-)
-and be all lower-case.
-
-Further, you should document parameters in a "PARAMETERS"
-section in the POD of the class. Place it right before "METHODS".
-
-=head1 VIRTUAL METHODS
-
-The following methods may be defined by subclasses:
-
-=head2 initialize($params)
-
-This is called by new(), and should be defined instead of new().
-
-The first argument, $params, is a hashref all any parameters passed to new().
-
-The return value is unimportant.
-
-=head2 finalize(Z<>)
-
-This method is called from DESTROY().
-
-You should overload this method instead of DESTROY(),
-so that the useful debugging messages are printed
-when objects are destroyed.
-
-=head1 SEE ALSO
-
-L<https://gna.org/projects/haver/>
-
-=head1 AUTHOR
-
-Dylan William Hardison, E<lt>[EMAIL PROTECTED]<gt>
-
-=head1 COPYRIGHT AND LICENSE
-
-Copyright (C) 2004, 2005 by Dylan William Hardison
-
-This library is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this module; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
-=cut
Modified: trunk/main/core/lib/Haver/Config.pm
===================================================================
--- trunk/main/core/lib/Haver/Config.pm 2005-02-05 22:13:13 UTC (rev 618)
+++ trunk/main/core/lib/Haver/Config.pm 2005-02-10 21:36:57 UTC (rev 619)
@@ -3,9 +3,9 @@
package Haver::Config;
use strict;
use warnings;
-use base 'Haver::Base';
-use Haver::Base;
+use Haver::Object;
+use base 'Haver::Object';
use Scalar::Util 'reftype';
use Carp;
use YAML ();
@@ -13,12 +13,19 @@
our $VERSION = 0.08;
sub initialize {
- my ($me) = @_;
+ my ($me, $p) = @_;
- $me->{default} ||= {};
+ foreach my $field (qw( default file )) {
+ if (exists $p->{$field}) {
+ carp "the parameter $field is DEPRECATED. Use -$field instead!";
+ $p->{"-$field"} = delete $p->{$field};
+ }
+ }
- if ($me->{file}) {
- $me->load($me->{file});
+ $me->{default} = delete $p->{'-default'} || {};
+
+ if ($p->{'-file'}) {
+ $me->load(delete $p->{'-file'});
}
}
@@ -104,7 +111,7 @@
=head1 NAME
-Haver::Config - description
+Haver::Config - Configuration Manager.
=head1 SYNOPSIS
@@ -132,7 +139,7 @@
Haver::Config extends L<Haver::Base>.
-=head1 CONSTRUCTOR
+=head1 PARAMETERS
The constructor new() takes the following parameters:
@@ -164,6 +171,7 @@
Save the config hash to $file. If $file is undefined,
it defaults to the file that the config was loaded from most recently.
+If a file has never been loaded, it will croak.
=head1 BUGS
Deleted: trunk/main/core/lib/Haver/Core.pm
===================================================================
--- trunk/main/core/lib/Haver/Core.pm 2005-02-05 22:13:13 UTC (rev 618)
+++ trunk/main/core/lib/Haver/Core.pm 2005-02-10 21:36:57 UTC (rev 619)
@@ -1,75 +0,0 @@
-# Haver::Core - Main module of Haver-Core
-#
-# Copyright (C) 2004 Dylan William Hardison
-#
-# This module is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This module is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this module; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-package Haver::Core;
-use strict;
-use warnings;
-
-our $VERSION = 0.08;
-
-1;
-__END__
-
-=head1 NAME
-
-Haver::Core - Common modules for Haver::Server and Haver::Client.
-
-=head1 SYNOPSIS
-
-There is none. This module contains no code.
-
-=head1 DESCRIPTION
-
-This collection of modules contains
-modules used by both the Haver server and Haver client.
-
-=head2 EXPORT
-
-None by default.
-
-=head1 SEE ALSO
-
-L<Haver::Protocol>, L<Haver::Protocol::Filter>, L<Haver::Base>.
-
-
-L<https://gna.org/projects/haver/>
-
-
-
-=head1 AUTHOR
-
-Dylan William Hardison, E<lt>[EMAIL PROTECTED]<gt>
-
-=head1 COPYRIGHT AND LICENSE
-
-Copyright (C) 2004 by Dylan William Hardison
-
-This library is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this module; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
-=cut
Modified: trunk/main/core/lib/Haver/Logger/Functions.pm
===================================================================
--- trunk/main/core/lib/Haver/Logger/Functions.pm 2005-02-05 22:13:13 UTC
(rev 618)
+++ trunk/main/core/lib/Haver/Logger/Functions.pm 2005-02-10 21:36:57 UTC
(rev 619)
@@ -7,11 +7,18 @@
use base 'Exporter';
our $VERSION = 0.03;
-our @EXPORT_OK = qw( logger );
+our @EXPORT = qw( logger );
+our @EXPORT_OK = qw( logger
+ debug info
+ notice warning
+ error critical
+ alert emergency
-{
+);
+my $Logger = instance Haver::Logger;
+
+BEGIN {
no strict 'refs';
- my $logger = instance Haver::Logger;
my @functions = qw(
debug info
notice warning
@@ -20,49 +27,36 @@
);
foreach my $func (@functions) {
*$func = sub {
- $logger->log(level => $func, message => $_[0]);
+ $Logger->log(level => $func, message => $_[0]);
};
push @EXPORT_OK, $func;
}
- sub logger {
- $logger->log(level => shift, message => shift);
- }
}
+sub logger {
+ $Logger->log(level => shift, message => shift);
+}
+
1;
__END__
-
=head1 NAME
Haver::Logger::Functions - Functional interface to Haver::Logger.
=head1 SYNOPSIS
- use Haver::Logger::Functions
+ use Haver::Logger::Functions;
# Small code example.
=head1 DESCRIPTION
-FIXME
+This module provides a functional interface to L<Haver::Logger>.
+Each log level is an exportable function, and in addition there is a logger()
+function (described below).
+For details on log levels, see L<Haver::Logger/Log Levels>.
-=head1 INHERITENCE
-
-Haver::Logger::Functions extends L<Haver::Base>.
-
-=head1 CONSTRUCTOR
-
-List required parameters for new().
-
-=head1 METHODS
-
-This class implements the following methods:
-
-=head1 method1(Z<>)
-
-...
-
=head1 BUGS
None known. Bug reports are welcome. Please use our bug tracker at
Modified: trunk/main/core/lib/Haver/Logger.pm
===================================================================
--- trunk/main/core/lib/Haver/Logger.pm 2005-02-05 22:13:13 UTC (rev 618)
+++ trunk/main/core/lib/Haver/Logger.pm 2005-02-10 21:36:57 UTC (rev 619)
@@ -5,26 +5,39 @@
use warnings;
use Carp;
-our $VERSION = 0.02;
-our @ISA;
-my $Self;
+use base 'Haver::Object';
-eval { require Log::Dispatch };
+our $VERSION = 0.03;
-if ($@ or $Haver::Logger::Dummy) {
- require Haver::Logger::Dummy;
- push @ISA, 'Haver::Logger::Dummy';
-} else {
- push @ISA, 'Log::Dispatch';
+sub initialize {
+ my ($me, $p) = @_;
+
+ $me->{outputs} = { };
}
-sub new {
- croak __PACKAGE__ . ": Singleton class, use instance() instead.";
+
+sub add {
+ my ($me, $logger) = @_;
+ my $name;
+
+
+ unless ($logger->can('log') and $logger->can('name')) {
+ croak "Method add() must be passed an object which supports log() and
name() methods";
+ }
+
+ $name = $object->name;
+
+ if (exists $me->{outputs}{$name}) {
+ croak "Haver::Logger output with name $name already defined!";
+ }
+
+ $me->{outputs}{$name} = $object;
}
-sub instance {
- return $Self if $Self;
- return $Self = shift->SUPER::new();
+sub outputs {
+ my ($me) = @_;
+
+ return wantarray ?
}
1;
@@ -46,20 +59,14 @@
=head1 INHERITENCE
-Haver::Logger extends either L<Log::Dispatch> or L<Haver::Logger::Dummy>.
+Haver::Logger extends L<Haver::Base>.
=head1 METHODS
Haver::Logger implements the following methods:
-=head2 new(Z<>)
-Don't call this method, ever. It will throw an exception.
-=head2 instance(Z<>)
-
-Returns the (singleton) Haver::Logger object.
-
=head1 BUGS
None known. Bug reports are welcome. Please use our bug tracker at
Deleted: trunk/main/core/lib/Haver/OS.pm
===================================================================
--- trunk/main/core/lib/Haver/OS.pm 2005-02-05 22:13:13 UTC (rev 618)
+++ trunk/main/core/lib/Haver/OS.pm 2005-02-10 21:36:57 UTC (rev 619)
@@ -1,193 +0,0 @@
-# Haver::OS - Base class for operating-system specific things.
-#
-# Copyright (C) 2004 Dylan William Hardison
-#
-# This module is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This module is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this module; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-package Haver::OS;
-use strict;
-use warnings;
-use File::Spec;
-use File::Path ();
-use File::Basename ();
-use Carp;
-
-our $VERSION = 0.10;
-
-my $module = do {
- if ($^O eq 'linux') {
- 'Linux';
- } elsif ($^O eq 'MSWin32') {
- require Win32;
- if (Win32::IsWinNT()) {
- 'WinNT';
- } elsif (Win32::IsWin95()) {
- 'Win95';
- }
- } elsif (lc($^O) eq /bsd/) {
- 'BSD';
- } else {
- 'Unix';
- }
-};
-
-
-require "Haver/OS/$module.pm";
-our @ISA = ("Haver::OS::$module");
-
-sub make_path {
- my ($this, %arg) = @_;
- my $path;
-
- if ($arg{type} eq 'file') {
- $path = File::Basename::dirname($arg{path});
- } elsif ($arg{type} eq 'dir') {
- $path = $arg{path};
- } else {
- croak "Unknown type: $arg{type}";
- }
-
- File::Path::mkpath($path);
-}
-
-sub type { $module }
-
-sub user_is_root {
- undef;
-}
-
-1;
-
-__END__
-
-=head1 NAME
-
-Haver::OS - Base class for operating-system specific routines.
-
-=head1 SYNOPSIS
-
- use Haver::OS;
-
-=head1 DESCRIPTION
-
-This inherits from one of the Haver::OS::*
-modules, depending on which system it is run on.
-All operating system specific things that are not handled
-by a standard perl module are handled in the Haver::OS::* modules.
-
-=head1 METHODS
-
-This an object oriented module.
-All methods are called as C<Haver::OS-E<gt>methodname>.
-
-
-=head2 type(Z<>)
-
-Returns the type of operating system,
-such as Linux, WinNT, Win95, BSD, or Unix.
-
-
-=head2 family(Z<>)
-
-Returns the family of the operating system,
-this is either Unix or Windows currently.
-
-=head2 user_is_root(Z<>)
-
-Returns 1 if the operating system user
-running this process is the root or admin user,
-zero if not.
-
-Returns undef if the OS doesn't have a concept of a root user.
-
-=head2 current_user(Z<>)
-
-Returns the login name of the user that is controling
-this process or '' if the OS doesn't have the concept
-of multiple users.
-
-=head2 home(Z<>)
-
-Returns the home directory
-of the user that is controlling this process.
-
-On Windows this will be the user's "My Documents" folder.
-
-=head2 config_find(%Z<>args)
-
-Finds a config file based on options given in %args.
-
-Description of options follows.
-
-=over 8
-
-=item C<name>
-
-This is the name of the application, such as 'haver-tk'.
-This option is required.
-
-=item C<type>
-
-The type of config thing we want, either 'file' or 'dir'.
-Defaults to 'file'.
-
-
-=item C<scope>
-
-The scope of the config file/dir. Can be
-one of: global, user, local, or data.
-
-On Unix and Linux, global is stored in /etc/, while on BSD it is stored
-in /etc/local/. In Windows, it is stored under program files.
-
-user and local mean the same thing on all Unix systems (BSD, Linux, etc),
-and that is $HOME. On Windows XPish, user config files/dirs will be part
-of the user's roaming profile, while local will not be.
-
-data is /var/lib on most Unix systems, while on Windows
-it is mostly the same as global.
-
-=back
-
-
-=head1 SEE ALSO
-
-L<File::Spec>, L<File::Path>, L<File::Basename>.
-
-L<https://gna.org/projects/haver/>
-
-
-=head1 AUTHOR
-
-Dylan William Hardison, E<lt>[EMAIL PROTECTED]<gt>
-
-=head1 COPYRIGHT AND LICENSE
-
-Copyright (C) 2004 by Dylan William Hardison
-
-This library is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this module; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
-=cut
Copied: trunk/main/core/lib/Haver/Object.pm (from rev 618,
trunk/main/core/lib/Haver/Base.pm)
===================================================================
--- trunk/main/core/lib/Haver/Base.pm 2005-02-05 22:13:13 UTC (rev 618)
+++ trunk/main/core/lib/Haver/Object.pm 2005-02-10 21:36:57 UTC (rev 619)
@@ -0,0 +1,149 @@
+# vim: set ts=4 sw=4 expandtab si ai sta tw=104:
+# This module is copyrighted, see end of file for details.
+package Haver::Object;
+use strict;
+use warnings;
+use Carp;
+
+use constant DEBUG => 1;
+
+our $VERSION = 0.08;
+
+
+sub new {
+ my $class = shift;
+ my $me = bless {}, $class;
+ my $args;
+
+ if (UNIVERSAL::isa($_[0], 'HASH')) {
+ $args = $_[0];
+ } elsif ((@_ % 2) == 0) {
+ $args = { @_ };
+ } else {
+ croak "Odd number of parameters to new()";
+ }
+
+ if (DEBUG) {
+ print "New: ", overload::StrVal($me), "\n";
+ }
+
+ $me->initialize($args);
+
+ return $me;
+}
+
+
+
+sub initialize { return }
+sub finalize { return }
+
+sub DESTROY {
+ my $me = shift;
+
+ if (DEBUG) {
+ print "Destroy: ", overload::StrVal($me), "\n";
+ }
+ $me->finalize();
+}
+
+
+1;
+
+__END__
+
+=head1 NAME
+
+Haver::Object - Useful base class for most objects in Haver server and clients.
+
+=head1 SYNOPSIS
+
+ BEGIN {
+ package Foobar;
+ use base 'Haver::Object';
+
+ sub initialize {
+ my ($me, $params) = @_;
+ print "init args: join(', ', keys %$params), "\n";
+ }
+
+ sub finalize {
+ my ($me) = @_;
+ # do stuff here that you would do in DESTROY.
+ }
+ } # BEGIN
+
+=head1 DESCRIPTION
+
+This is a base class for nearly every class in the Haver server,
+and it is encouraged to be used for any class in the client, too.
+
+The main advantage it brings is not having to write redundant
+constructors, and also it prints debugging messages on object creation and
destruction.
+
+When a new object is instantiated, initialize() is called.
+Don't overload DESTROY in child classes, use finalize() instead.
+
+=head1 METHODS
+
+Haver::Object implements the following methods:
+
+=head2 new(%params || \%params)
+
+This constructor method creates and returns a new I<$class>,
+and passes %params to initialize().
+
+=head3 Parameters
+
+As a matter of style, parameters should begin with a single dash (-)
+and be all lower-case.
+
+Further, you should document parameters in a "PARAMETERS"
+section in the POD of the class. Place it right before "METHODS".
+
+=head1 VIRTUAL METHODS
+
+The following methods may be defined by subclasses:
+
+=head2 initialize($params)
+
+This is called by new(), and should be defined instead of new().
+
+The first argument, $params, is a hashref all any parameters passed to new().
+
+The return value is unimportant.
+
+=head2 finalize(Z<>)
+
+This method is called from DESTROY().
+
+You should overload this method instead of DESTROY(),
+so that the useful debugging messages are printed
+when objects are destroyed.
+
+=head1 SEE ALSO
+
+L<https://gna.org/projects/haver/>
+
+=head1 AUTHOR
+
+Dylan William Hardison, E<lt>[EMAIL PROTECTED]<gt>
+
+=head1 COPYRIGHT AND LICENSE
+
+Copyright (C) 2004, 2005 by Dylan William Hardison
+
+This library is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this module; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+=cut
Modified: trunk/main/core/t/001_config.t
===================================================================
--- trunk/main/core/t/001_config.t 2005-02-05 22:13:13 UTC (rev 618)
+++ trunk/main/core/t/001_config.t 2005-02-10 21:36:57 UTC (rev 619)
@@ -14,8 +14,8 @@
my $d =
my $ch = new Haver::Config (
- file => 'foobar',
- default => {
+ -file => 'foobar',
+ -default => {
stuff => {
monkeys => 2,
},
Modified: trunk/web/Makefile
===================================================================
--- trunk/web/Makefile 2005-02-05 22:13:13 UTC (rev 618)
+++ trunk/web/Makefile 2005-02-10 21:36:57 UTC (rev 619)
@@ -72,11 +72,8 @@
validate: test
@echo "use make test from now on"
-test: $(html)
- @$(VALIDATE) $(html)
-
%.html: %.thtml $(DEPENDS)
@echo "TT $<"
@$(TT) $(TTFLAGS) $< > $@
