Changeset 9022 for lang/perl/App-Starter

Timestamp:

04/06/08 23:31:30 (8 months ago)

Author:

tomyhero

Message:

lang/perl/App-Starter : replace ,ignore の設定がマージされなかったのを修正

Location:

lang/perl/App-Starter/trunk

Files:

• Changes (modified) (1 diff)
• lib/App/Starter.pm (modified) (3 diffs)

lang/perl/App-Starter/trunk/Changes

@@ -1 +1 @@
 Revision history for App-Starter
+
+0.13    2008-04-06/23:26
+        - bug fix. replace and ignore data was not marged between yaml and parameter...
+
 0.12    2008-04-06/17:27
         - forget to Test:Spelling :add prerequired 

lang/perl/App-Starter/trunk/lib/App/Starter.pm

@@ -13 +13 @@
 use base qw/Class::Accessor/;
 
-our $VERSION = '0.12';
+our $VERSION = '0.13';
 
 my $DIR = {};
@@ -25 +25 @@
     # get config
     my $config = {};
+    $config->{replace} = $self->{replace} ? $self->{replace} : {};
+    $config->{ignore}  = $self->{ignore}  ? $self->{ignore}  : [];
     $config->{from}      = $self->{from}      if $self->{from};
-    $config->{replace}   = $self->{replace}   if $self->{replace};
-    $config->{ignore}    = $self->{ignore}    if $self->{ignore};
     $config->{name}      = $self->{name}      if $self->{name};
     $config->{tag_style} = $self->{tag_style} if $self->{tag_style};
@@ -58 +58 @@
 
     if ( $self->{config} ) {
-        $config = { %{ LoadFile( $self->{config} ) }, %{$config}, };
+        my $config_from_file = LoadFile( $self->{config} );
+        %$config = ( %$config_from_file, %$config );
+
+        $config->{replace}
+            = { %{ $config_from_file->{replace} }, %{ $config->{replace} } }
+            if $config_from_file->{replace};
+
+        push @{ $config->{ignore} }, @{ $config_from_file->{ignore} }
+            if $config_from_file->{ignore};
     }