Changeset 21029 for lang/perl/Archer

Timestamp:

10/09/08 11:37:38 (3 months ago)

Author:

tokuhirom

Message:

specify assets_path by configuration file =)

Location:

lang/perl/Archer/trunk/lib

Files:

• Archer.pm (modified) (2 diffs)
• Archer/ConfigLoader.pm (modified) (2 diffs)

lang/perl/Archer/trunk/lib/Archer.pm

@@ -23 +23 @@
     if ( !$$opts{ write_config } ) {
         my $config_loader = Archer::ConfigLoader->new;
-        $self->{ config } = $config_loader->load( $opts->{ config_yaml } );
+        $self->{ config } = $config_loader->load( $opts->{ config_yaml }, $self );
     }
     $self->{ config }->{ global }->{ log } ||= { level => 'debug' };
@@ -136 +136 @@
 }
 
-# TODO: use the log4perl?
+# TODO: use the Log::Dispatch?
 sub log {
     my ( $self, $level, $msg, %opt ) = @_;

lang/perl/Archer/trunk/lib/Archer/ConfigLoader.pm

@@ -14 +14 @@
     my ( $self, $stuff, $context ) = @_;
 
-    my $schema_file = file( $FindBin::Bin, 'assets', 'kwalify', 'schema.yaml' );
-
+    # load
     my $config;
     if (   ( !ref($stuff) && $stuff eq '-' )
@@ -33 +32 @@
     }
 
+    # setup default value
+    $config->{global}->{assets_path} ||= file( $FindBin::Bin, 'assets')->stringify;
+    $context->log('debug' => "assets path: $config->{global}->{assets_path}");
+
+    # verify
+    my $schema_file = file( $config->{global}->{assets_path}, 'kwalify', 'schema.yaml' );
     my $res = validate( YAML::LoadFile($schema_file), $config );
     $context->log( error => $res ) unless $res == 1;