Changeset 11786 for lang/perl/Config-Multi

Timestamp:

05/17/08 21:58:55 (5 years ago)

Author:

tomyhero

Message:

lang/perl/Config-Multi: FindBin::libs消し忘れてた。orz.

Location:

lang/perl/Config-Multi

Files:

• tags/0.02 (copied) (copied from lang/perl/Config-Multi/trunk)
• tags/0.02/Changes (copied) (copied from lang/perl/Config-Multi/trunk/Changes) (1 diff)
• tags/0.02/MANIFEST (copied) (copied from lang/perl/Config-Multi/trunk/MANIFEST)
• tags/0.02/Makefile.PL (copied) (copied from lang/perl/Config-Multi/trunk/Makefile.PL)
• tags/0.02/lib/Config/Multi.pm (copied) (copied from lang/perl/Config-Multi/trunk/lib/Config/Multi.pm) (7 diffs)
• tags/0.02/t/01-loadling.t (copied) (copied from lang/perl/Config-Multi/trunk/t/01-loadling.t) (1 diff)
• tags/0.02/t/02-overwrite.t (copied) (copied from lang/perl/Config-Multi/trunk/t/02-overwrite.t) (1 diff)
• tags/0.02/t/03-multi.t (copied) (copied from lang/perl/Config-Multi/trunk/t/03-multi.t) (1 diff)
• tags/0.02/t/04-env.t (copied) (copied from lang/perl/Config-Multi/trunk/t/04-env.t) (1 diff)
• tags/0.02/t/05-no-prefix.t (copied) (copied from lang/perl/Config-Multi/trunk/t/05-no-prefix.t) (1 diff)
• tags/0.02/t/boilerplate.t (copied) (copied from lang/perl/Config-Multi/trunk/t/boilerplate.t)
• tags/0.02/t/conf/env-prefix.yml (copied) (copied from lang/perl/Config-Multi/trunk/t/conf/env-prefix.yml)
• tags/0.02/t/conf/env.yml (copied) (copied from lang/perl/Config-Multi/trunk/t/conf/env.yml)
• tags/0.02/t/spelling.t (copied) (copied from lang/perl/Config-Multi/trunk/t/spelling.t) (1 diff)
• trunk/Changes (modified) (1 diff)
• trunk/lib/Config/Multi.pm (modified) (7 diffs)
• trunk/t/01-loadling.t (modified) (1 diff)
• trunk/t/02-overwrite.t (modified) (1 diff)
• trunk/t/03-multi.t (modified) (1 diff)
• trunk/t/04-env.t (modified) (1 diff)
• trunk/t/05-no-prefix.t (modified) (1 diff)
• trunk/t/spelling.t (modified) (1 diff)

lang/perl/Config-Multi/tags/0.02/Changes

@@ -1 +1 @@
 Revision history for Config::Multi
+
+0.02    2008-05-17/21:53
+        - remove use FindBin::libs;
+        - fix POD indent
 
 0.01    2008-05-17/01:17

lang/perl/Config-Multi/tags/0.02/lib/Config/Multi.pm

@@ -6 +6 @@
 use File::Spec;
 use FindBin;
-use Config::Any ;
+use Config::Any;
 use Carp;
 
 use base qw/Class::Accessor/;
 
-our $VERSION = '0.01';
+our $VERSION = '0.02';
 
 __PACKAGE__->mk_accessors(qw/app_name prefix dir files extension/);
 
 sub load {
-    my $self = shift;
+    my $self  = shift;
     my @files = ();
     $self->{extension} ||= 'yml';
-    croak( 'you must set dir' ) unless $self->{dir};
-    croak( 'you must set app_name' ) unless $self->{app_name};
+    croak('you must set dir')      unless $self->{dir};
+    croak('you must set app_name') unless $self->{app_name};
 
     my $config = {};
 
-    my $app_files    = $self->_find_files( $self->{app_name} ) ;
+    my $app_files = $self->_find_files( $self->{app_name} );
     my $app = Config::Any->load_files( { files => $app_files } );
-    for ( @{$app} ){
-        my ($filename, $data) = %$_;
-        push @files , $filename;
-        $config = { %{$config}, %{$data} } ;
-    }
-
-    if( $self->{prefix} ) {
-        my $prefix_files = $self->_find_files( $self->{prefix} . '_' . $self->{app_name} );
-        my $prefix =  Config::Any->load_files( { files => $prefix_files } );
-        for ( @{$prefix} ){
-            my ($filename, $data) = %$_;
-            push @files , $filename;
-            $config = { %{$config}, %{$data} } ;
+    for ( @{$app} ) {
+        my ( $filename, $data ) = %$_;
+        push @files, $filename;
+        $config = { %{$config}, %{$data} };
+    }
+
+    if ( $self->{prefix} ) {
+        my $prefix_files
+            = $self->_find_files( $self->{prefix} . '_' . $self->{app_name} );
+        my $prefix = Config::Any->load_files( { files => $prefix_files } );
+        for ( @{$prefix} ) {
+            my ( $filename, $data ) = %$_;
+            push @files, $filename;
+            $config = { %{$config}, %{$data} };
         }
     }
 
     my $local_files = $self->_local_files;
-    my $local =  Config::Any->load_files( { files => $local_files } );
-    for ( @{$local} ){
-        my ($filename, $data) = %$_;
-        push @files , $filename;
-        $config = { %{$config}, %{$data} } ;
+    my $local = Config::Any->load_files( { files => $local_files } );
+    for ( @{$local} ) {
+        my ( $filename, $data ) = %$_;
+        push @files, $filename;
+        $config = { %{$config}, %{$data} };
     }
 
@@ -55 +56 @@
 }
 
-
 sub _local_files {
-    my $self = shift;
-    my $env_app_key    = 'CONFIG_MULTI_' .uc($self->{app_name})  ;
-    my $env_prefix_key = 'CONFIG_MULTI_' . uc($self->{prefix}) . '_' . uc($self->{app_name})  ;
-    my @files = ();
-    my $app_lcoal    = $ENV{ $env_app_key } || File::Spec->catfile( $self->dir ,  $self->{app_name} . '_local.' . $self->extension ) ;
-    push @files  , $app_lcoal if -e $app_lcoal;
-
-    if( $self->{prefix}) {
-        my $prefix_local = $ENV{ $env_prefix_key} || File::Spec->catfile( $self->dir ,  $self->{prefix} . '_' . $self->{app_name} . '_local.' . $self->extension );
-        push @files  , $prefix_local if -e $prefix_local;
+    my $self        = shift;
+    my $env_app_key = 'CONFIG_MULTI_' . uc( $self->{app_name} );
+    my $env_prefix_key
+        = 'CONFIG_MULTI_'
+        . uc( $self->{prefix} ) . '_'
+        . uc( $self->{app_name} );
+    my @files     = ();
+    my $app_lcoal = $ENV{$env_app_key}
+        || File::Spec->catfile( $self->dir,
+        $self->{app_name} . '_local.' . $self->extension );
+    push @files, $app_lcoal if -e $app_lcoal;
+
+    if ( $self->{prefix} ) {
+        my $prefix_local = $ENV{$env_prefix_key} || File::Spec->catfile(
+            $self->dir,
+            $self->{prefix} . '_'
+                . $self->{app_name}
+                . '_local.'
+                . $self->extension
+        );
+        push @files, $prefix_local if -e $prefix_local;
     }
 
@@ -73 +84 @@
 
 sub _find_files {
-    my $self = shift;
-    my $path = $self->dir;
-    my $label = shift;
+    my $self      = shift;
+    my $path      = $self->dir;
+    my $label     = shift;
     my $extension = $self->extension;
 
     my @files;
-   my $dh = DirHandle->new( $path ) or croak "Could not Open " . $path ;
+    my $dh = DirHandle->new($path) or croak "Could not Open " . $path;
 
     while ( my $file = $dh->read() ) {
         next if $file =~ /local\.$extension$/;
-        if( $file =~ /^$label\.yml$/ || $file =~ /^$label\_(\w+)\.$extension$/ ) {
-            push @files , "$path/$file";
+        if (   $file =~ /^$label\.yml$/
+            || $file =~ /^$label\_(\w+)\.$extension$/ )
+        {
+            push @files, File::Spec->catfile( $path, $file );
         }
     }
@@ -90 +103 @@
     return \@files;
 }
-
 
 1;
@@ -107 +119 @@
 
  # prefix and extension is optional. 
- my $cm =  Config::Multi->new({dir => $dir , app_name => 'myapp' , prefix => 'web' , extension => 'yml' });
+ my $cm 
+        = Config::Multi->new({
+            dir => $dir , 
+            app_name    => 'myapp' , 
+            prefix      => 'web' , 
+            extension   => 'yml' 
+        });
  my $config = $cm->load();
  my $loaded_config_files = $cm->files;
@@ -121 +139 @@
 =head2 your configuration files
 
-  This is under your ~/myapp/conf/ and have sone yaml configuration in each files. you can specify the directory 
-  using dir option.
+This is under your ~/myapp/conf/ and have yaml configuration in each files.  you can specify the directory using dir option.
 
  .
@@ -184 +201 @@
 
 instead of ${prefix}_${app_name}_local.yml , you can specify the path with $ENV{CONFIG_MULTI_PREFIX_MYAPP}
+
 instead of ${app_name}_local.yml , you can specify the path with $ENV{CONFIG_MULTI_MYAPP}
 

lang/perl/Config-Multi/tags/0.02/t/01-loadling.t

@@ -1 @@
-use FindBin::libs;
 use Test::Base;
 use Config::Multi;

lang/perl/Config-Multi/tags/0.02/t/02-overwrite.t

@@ -1 @@
-use FindBin::libs;
 use Test::Base;
 use Config::Multi;

lang/perl/Config-Multi/tags/0.02/t/03-multi.t

@@ -1 @@
-use FindBin::libs;
 use Test::Base;
 use Config::Multi;

lang/perl/Config-Multi/tags/0.02/t/04-env.t

@@ -1 @@
-use FindBin::libs;
 use Test::Base;
 use Config::Multi;

lang/perl/Config-Multi/tags/0.02/t/05-no-prefix.t

@@ -1 @@
-use FindBin::libs;
 use Test::Base;
 use Config::Multi;

lang/perl/Config-Multi/tags/0.02/t/spelling.t

@@ -27 +27 @@
 jobqueue
 myapp
-#     configration
-#     jobqueue
-#     myapp
-#     overwrited
+yaml

lang/perl/Config-Multi/trunk/Changes

@@ -1 +1 @@
 Revision history for Config::Multi
+
+0.02    2008-05-17/21:53
+        - remove use FindBin::libs;
+        - fix POD indent
 
 0.01    2008-05-17/01:17

lang/perl/Config-Multi/trunk/lib/Config/Multi.pm

@@ -6 +6 @@
 use File::Spec;
 use FindBin;
-use Config::Any ;
+use Config::Any;
 use Carp;
 
 use base qw/Class::Accessor/;
 
-our $VERSION = '0.01';
+our $VERSION = '0.02';
 
 __PACKAGE__->mk_accessors(qw/app_name prefix dir files extension/);
 
 sub load {
-    my $self = shift;
+    my $self  = shift;
     my @files = ();
     $self->{extension} ||= 'yml';
-    croak( 'you must set dir' ) unless $self->{dir};
-    croak( 'you must set app_name' ) unless $self->{app_name};
+    croak('you must set dir')      unless $self->{dir};
+    croak('you must set app_name') unless $self->{app_name};
 
     my $config = {};
 
-    my $app_files    = $self->_find_files( $self->{app_name} ) ;
+    my $app_files = $self->_find_files( $self->{app_name} );
     my $app = Config::Any->load_files( { files => $app_files } );
-    for ( @{$app} ){
-        my ($filename, $data) = %$_;
-        push @files , $filename;
-        $config = { %{$config}, %{$data} } ;
-    }
-
-    if( $self->{prefix} ) {
-        my $prefix_files = $self->_find_files( $self->{prefix} . '_' . $self->{app_name} );
-        my $prefix =  Config::Any->load_files( { files => $prefix_files } );
-        for ( @{$prefix} ){
-            my ($filename, $data) = %$_;
-            push @files , $filename;
-            $config = { %{$config}, %{$data} } ;
+    for ( @{$app} ) {
+        my ( $filename, $data ) = %$_;
+        push @files, $filename;
+        $config = { %{$config}, %{$data} };
+    }
+
+    if ( $self->{prefix} ) {
+        my $prefix_files
+            = $self->_find_files( $self->{prefix} . '_' . $self->{app_name} );
+        my $prefix = Config::Any->load_files( { files => $prefix_files } );
+        for ( @{$prefix} ) {
+            my ( $filename, $data ) = %$_;
+            push @files, $filename;
+            $config = { %{$config}, %{$data} };
         }
     }
 
     my $local_files = $self->_local_files;
-    my $local =  Config::Any->load_files( { files => $local_files } );
-    for ( @{$local} ){
-        my ($filename, $data) = %$_;
-        push @files , $filename;
-        $config = { %{$config}, %{$data} } ;
+    my $local = Config::Any->load_files( { files => $local_files } );
+    for ( @{$local} ) {
+        my ( $filename, $data ) = %$_;
+        push @files, $filename;
+        $config = { %{$config}, %{$data} };
     }
 
@@ -55 +56 @@
 }
 
-
 sub _local_files {
-    my $self = shift;
-    my $env_app_key    = 'CONFIG_MULTI_' .uc($self->{app_name})  ;
-    my $env_prefix_key = 'CONFIG_MULTI_' . uc($self->{prefix}) . '_' . uc($self->{app_name})  ;
-    my @files = ();
-    my $app_lcoal    = $ENV{ $env_app_key } || File::Spec->catfile( $self->dir ,  $self->{app_name} . '_local.' . $self->extension ) ;
-    push @files  , $app_lcoal if -e $app_lcoal;
-
-    if( $self->{prefix}) {
-        my $prefix_local = $ENV{ $env_prefix_key} || File::Spec->catfile( $self->dir ,  $self->{prefix} . '_' . $self->{app_name} . '_local.' . $self->extension );
-        push @files  , $prefix_local if -e $prefix_local;
+    my $self        = shift;
+    my $env_app_key = 'CONFIG_MULTI_' . uc( $self->{app_name} );
+    my $env_prefix_key
+        = 'CONFIG_MULTI_'
+        . uc( $self->{prefix} ) . '_'
+        . uc( $self->{app_name} );
+    my @files     = ();
+    my $app_lcoal = $ENV{$env_app_key}
+        || File::Spec->catfile( $self->dir,
+        $self->{app_name} . '_local.' . $self->extension );
+    push @files, $app_lcoal if -e $app_lcoal;
+
+    if ( $self->{prefix} ) {
+        my $prefix_local = $ENV{$env_prefix_key} || File::Spec->catfile(
+            $self->dir,
+            $self->{prefix} . '_'
+                . $self->{app_name}
+                . '_local.'
+                . $self->extension
+        );
+        push @files, $prefix_local if -e $prefix_local;
     }
 
@@ -73 +84 @@
 
 sub _find_files {
-    my $self = shift;
-    my $path = $self->dir;
-    my $label = shift;
+    my $self      = shift;
+    my $path      = $self->dir;
+    my $label     = shift;
     my $extension = $self->extension;
 
     my @files;
-   my $dh = DirHandle->new( $path ) or croak "Could not Open " . $path ;
+    my $dh = DirHandle->new($path) or croak "Could not Open " . $path;
 
     while ( my $file = $dh->read() ) {
         next if $file =~ /local\.$extension$/;
-        if( $file =~ /^$label\.yml$/ || $file =~ /^$label\_(\w+)\.$extension$/ ) {
-            push @files , "$path/$file";
+        if (   $file =~ /^$label\.yml$/
+            || $file =~ /^$label\_(\w+)\.$extension$/ )
+        {
+            push @files, File::Spec->catfile( $path, $file );
         }
     }
@@ -90 +103 @@
     return \@files;
 }
-
 
 1;
@@ -107 +119 @@
 
  # prefix and extension is optional. 
- my $cm =  Config::Multi->new({dir => $dir , app_name => 'myapp' , prefix => 'web' , extension => 'yml' });
+ my $cm 
+        = Config::Multi->new({
+            dir => $dir , 
+            app_name    => 'myapp' , 
+            prefix      => 'web' , 
+            extension   => 'yml' 
+        });
  my $config = $cm->load();
  my $loaded_config_files = $cm->files;
@@ -121 +139 @@
 =head2 your configuration files
 
-  This is under your ~/myapp/conf/ and have sone yaml configuration in each files. you can specify the directory 
-  using dir option.
+This is under your ~/myapp/conf/ and have yaml configuration in each files.  you can specify the directory using dir option.
 
  .
@@ -184 +201 @@
 
 instead of ${prefix}_${app_name}_local.yml , you can specify the path with $ENV{CONFIG_MULTI_PREFIX_MYAPP}
+
 instead of ${app_name}_local.yml , you can specify the path with $ENV{CONFIG_MULTI_MYAPP}
 

lang/perl/Config-Multi/trunk/t/01-loadling.t

@@ -1 @@
-use FindBin::libs;
 use Test::Base;
 use Config::Multi;

lang/perl/Config-Multi/trunk/t/02-overwrite.t

@@ -1 @@
-use FindBin::libs;
 use Test::Base;
 use Config::Multi;

lang/perl/Config-Multi/trunk/t/03-multi.t

@@ -1 @@
-use FindBin::libs;
 use Test::Base;
 use Config::Multi;

lang/perl/Config-Multi/trunk/t/04-env.t

@@ -1 @@
-use FindBin::libs;
 use Test::Base;
 use Config::Multi;

lang/perl/Config-Multi/trunk/t/05-no-prefix.t

@@ -1 @@
-use FindBin::libs;
 use Test::Base;
 use Config::Multi;

lang/perl/Config-Multi/trunk/t/spelling.t

@@ -27 +27 @@
 jobqueue
 myapp
-#     configration
-#     jobqueue
-#     myapp
-#     overwrited
+yaml