Changeset 21030

Timestamp:

10/09/08 11:44:08 (5 years ago)

Author:

tokuhirom

Message:

use YAML::Syck if can use

Location:

lang/perl/Archer/trunk

Files:

• examples/config.yaml (modified) (1 diff)
• lib/Archer.pm (modified) (1 diff)
• lib/Archer/ConfigLoader.pm (modified) (4 diffs)

lang/perl/Archer/trunk/examples/config.yaml

@@ -2 +2 @@
   work_dir: /tmp/working_archer/
   dest_dir: /path/to/dest/
+  assets_path: /tmp/
 
 tasks:

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

@@ -167 +167 @@
     my ( $self, $level ) = @_;
 
-    $levels{ $level }
-        >= $levels{ $self->{ config }->{ global }->{ log }->{ level } };
+    my $setting_level = $self->{config}->{global}->{log}->{level} || 'debug';
+    $levels{ $level } >= $levels{ $setting_level };
 }
 

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

@@ -2 +2 @@
 use strict;
 use warnings;
-use YAML;
 use Storable;
 use Carp;
@@ -9 +8 @@
 use FindBin;
 
+my $yaml_class;
+if (eval "require YAML::Syck; 1;") {
+    $yaml_class = "YAML::Syck";
+} else {
+    require YAML;
+    $yaml_class = "YAML";
+}
+
 sub new { bless {}, shift }
 
 sub load {
     my ( $self, $stuff, $context ) = @_;
+
+    $context->log('debug' => "yaml class: $yaml_class");
 
     # load
@@ -19 +28 @@
         || ( -e $stuff && -r _ ) )
     {
-        $config = YAML::LoadFile($stuff);
+        $config = $yaml_class->can('LoadFile')->($stuff);
         $context->{config_path} = $stuff if $context;
     }
     elsif ( ref($stuff) && ref($stuff) eq 'SCALAR' ) {
-        $config = YAML::Load( ${$stuff} );
+        $config = $yaml_class->can('Load')->( ${$stuff} );
     }
     elsif ( ref($stuff) && ref($stuff) eq 'HASH' ) {
@@ -38 +47 @@
     # verify
     my $schema_file = file( $config->{global}->{assets_path}, 'kwalify', 'schema.yaml' );
-    my $res = validate( YAML::LoadFile($schema_file), $config );
+    my $res = validate( $yaml_class->can('LoadFile')->($schema_file), $config );
     $context->log( error => $res ) unless $res == 1;