Changeset 11102 for lang/perl/Punc/trunk

Timestamp:

05/04/08 20:28:19 (7 months ago)

Author:

mizzy

Message:

モジュールの仕組みをMooseつかって書き直してみた

Location:

lang/perl/Punc/trunk/lib/Punc/Slave

Files:

• Module.pm (modified) (1 diff)
• Module/Service.pm (modified) (1 diff)
• Module/Service/Debian.pm (modified) (1 diff)
• Module/Service/RedHat.pm (modified) (1 diff)

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

@@ -3 +3 @@
 use strict;
 use warnings;
+use Punc::Util;
+use Moose;
+use MooseX::ClassAttribute;
 use Module::Pluggable;
-use Punc::Util;
+
+class_has 'default_for' => ( isa => 'HashRef', is => 'rw', default => sub { {} } );
+
+sub import {
+    my ( $class, $args ) = @_;
+    my $pkg = caller(0);
+    no strict 'refs';
+    unshift @{"$pkg\::ISA"}, $class;
+    $pkg->default_for($args);
+}
 
 sub new {
     my $class = shift;
-    $class->search_path( new => $class );
+    my $self = bless {}, $class;
+    $self->delegate;
+}
 
-    my @modules = $class->plugins;
+sub delegate {
+    my $self = shift;
+
+    $self->search_path( new => ref $self );
+    my @modules = $self->plugins;
+    my $module_to_delegate;
     for my $module ( @modules ) {
+        next if $module =~ /Role$/;
         $module->require or die $@;
         my $default_for = $module->default_for;
         next unless $default_for;
-
         my ( $fact ) = keys %$default_for;
         if ( grep { Punc::Util->fact($fact) =~ /$_/i } @{ $default_for->{$fact} } ) {
-            $class = $module;
+            $module_to_delegate = $module;
         }
     }
 
-    bless {}, $class;
+    bless $self, $module_to_delegate;
 }
-
-sub default_for { }
 
 sub exec {

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

@@ -3 +3 @@
 use strict;
 use warnings;
-use base qw( Punc::Slave::Module );
-use UNIVERSAL::require;
 
-sub status {
-    die;
-}
+use Moose;
 
+extends 'Punc::Slave::Module';
+
+package Punc::Slave::Module::Service::Role;
+use Moose::Role;
+requires 'status';
 
 1;

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

@@ -3 +3 @@
 use strict;
 use warnings;
-use base qw( Punc::Slave::Module::Service );
+use Punc::Slave::Module::Service { operatingsystem => [ qw / debian ubuntu / ] };
+use Moose;
 
-sub default_for {
-    return { 'operatingsystem' => [ 'debian', 'ubuntu' ] }
-}
+with 'Punc::Slave::Module::Service::Role';
+
 
 sub status {

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

@@ -3 +3 @@
 use strict;
 use warnings;
-use base qw( Punc::Slave::Module::Service );
+use Punc::Slave::Module::Service { operatingsystem => [ qw / redhat fedora centos / ] };
+use Moose;
 
-### TODO: もっと簡単に定義できないか考える
-### default_for { operatingsystem => [ qw/ redhat fedora centos / ] } とか
-### use Punc::Slave::Module::Service { operatingsystem => [ qw / fedora / ] } とか
-sub default_for {
-    return { 'operatingsystem' => [ 'redhat', 'fedora', 'centos' ] }
-}
+with 'Punc::Slave::Module::Service::Role';
 
 sub status {
     my ( $self, $args ) = @_;
-
     return $self->_command($args->[0], 'status');
 }