Changeset 12463 for lang/perl/Punc

Timestamp:

05/26/08 22:51:44 (6 months ago)

Author:

mizzy

Message:

Moooooooooooose

Location:

lang/perl/Punc/trunk

Files:

• bin/punc (modified) (1 diff)
• lib/Punc.pm (modified) (1 diff)
• lib/Punc/Client.pm (modified) (2 diffs)
• lib/Punc/Client/Request.pm (modified) (1 diff)
• lib/Punc/Hosts/File.pm (modified) (1 diff)
• lib/Punc/Master/Daemon.pm (modified) (3 diffs)
• lib/Punc/Slave/Module/Service.pm (modified) (1 diff)

lang/perl/Punc/trunk/bin/punc

@@ -15 +15 @@
 my $options = get_options();
 
-my $punc = Punc::Client->new($target);
+my $punc = Punc::Client->new( target => $target );
 
 my $results = $punc->$module->$method($options);

lang/perl/Punc/trunk/lib/Punc.pm

@@ -100 +100 @@
 
   use Punc::Client;
-  my $punc = Punc::Client->new('*');
+  my $punc = Punc::Client->new( target => '*' );
   my $res  = $punc->service->status('httpd');
 

lang/perl/Punc/trunk/lib/Punc/Client.pm

@@ -2 +2 @@
 
 use Moose;
+use Moose::Util::TypeConstraints;
 our $AUTOLOAD;
 use Punc::ConfigLoader;
@@ -8 +9 @@
 use FindBin;
 
-has 'hosts' => ( is => 'rw', isa => 'ArrayRef' );
 has 'conf'  => ( is => 'rw', isa => 'HashRef' );
 
-sub new {
-    my ( $class, $target ) = @_;
+### TODO: confdir のデフォルト値を変更
+has 'conf_dir' => (
+    is      => 'rw',
+    isa     => 'Str',
+    default => "$FindBin::Bin/../etc",
+);
 
-    $target =~ s/\*/\.\*/g;
+has 'conf_file' => (
+    is      => 'rw',
+    isa     => 'Str',
+    default => sub { File::Spec->catfile(shift->conf_dir, 'punc.yaml') },
+    lazy    => 1,
+);
 
-    ### TODO: confdir のデフォルト値を変更
-    my $confdir = "$FindBin::Bin/../etc";
-    my $yaml    = File::Spec->catfile($confdir, 'punc.yaml');
-    my $conf    = -f $yaml ? Punc::ConfigLoader->new->load($yaml) : {};
-    $conf->{confdir} = $confdir;
+has 'conf' => (
+    is      => 'rw',
+    isa     => 'HashRef',
+    default => sub {
+        my $conf_file = shift->conf_file;
+        -f $conf_file ? Punc::ConfigLoader->new->load($conf_file) : {};
+    },
+    lazy    => 1,
+);
 
-    my $hosts_class = ucfirst $conf->{hosts_class} || 'File';
+coerce 'Str'
+    => from 'Str'
+    => via { s/\*/\.\*/g };
+
+has 'target' => (
+    is      => 'rw',
+    isa     => 'Str',
+    default => '.*',
+    coerce  => 1,
+);
+
+sub hosts {
+    my $self = shift;
+
+    $self->conf->{conf_dir} = $self->conf_dir unless $self->conf->{conf_dir};
+
+    my $hosts_class = ucfirst $self->conf->{hosts_class} || 'File';
     $hosts_class = "Punc::Hosts::$hosts_class";
     $hosts_class->require;
-    my $hosts = $hosts_class->get_hosts({ target => $target, conf => $conf });
 
-    bless {
-        hosts => $hosts,
-        conf  => $conf,
-    }, $class;
+    my $hosts = $hosts_class->get_hosts({
+        target => $self->target,
+        conf   => $self->conf,
+    });
+
+    return $hosts;
 }
 

lang/perl/Punc/trunk/lib/Punc/Client/Request.pm

@@ -26 +26 @@
     my ( $self, $args ) = @_;
 
-    my $confdir = $self->conf->{confdir};
+    my $confdir = $self->conf->{conf_dir};
 
     $ENV{HTTPS_VERSION}   = 3;

lang/perl/Punc/trunk/lib/Punc/Hosts/File.pm

@@ -10 +10 @@
     my ( $class, $args ) = @_;
 
-    my $confdir = $args->{conf}->{confdir};
+    my $confdir = $args->{conf}->{conf_dir};
     my $certdir = File::Spec->catdir($confdir, 'ssl', 'certs');
     my @files = glob("$certdir/*");

lang/perl/Punc/trunk/lib/Punc/Master/Daemon.pm

@@ -2 +2 @@
 
 use Moose;
-use base qw( Punc::Daemon );
 use File::Spec;
 use File::Path;
@@ -15 +14 @@
     is      => 'rw',
     isa     => 'Punc::Master::CA',
-    default => sub { Punc::Master::CA->new },
+    default => sub {
+        Punc::Master::CA->new({
+            ssldir => File::Spec->catdir(shift->confdir, 'ssl'),
+        });
+      },
+    lazy    => 1,
 );
 
@@ -34 +38 @@
 before 'run' => sub {
     my $self = shift;
-
-    $self->ca(
-        Punc::Master::CA->new({
-            ssldir => File::Spec->catdir($self->confdir, 'ssl'),
-        })
-      );
-
     $self->_find_or_create_ca_cert($self->context);
 };

lang/perl/Punc/trunk/lib/Punc/Slave/Module/Service.pm

@@ -22 +22 @@
 
   # with Punc::Client module
-  my $punc = Punc::Client->new($target);
+  my $punc = Punc::Client->new( target => $target );
   my $res  = $punc->service->status({ service => 'httpd' });