Changeset 11152 for lang/perl/Punc

Timestamp:

05/05/08 15:45:50 (7 months ago)

Author:

mizzy

Message:

モジュールオプションは配列リファレンスではなくハッシュリファレンスで渡すようにした

Location:

lang/perl/Punc/trunk

Files:

• bin/punc (modified) (2 diffs)
• lib/Punc/Client.pm (modified) (1 diff)
• lib/Punc/Client/Request.pm (modified) (1 diff)
• lib/Punc/Slave/Module/Service.pm (modified) (1 diff)
• lib/Punc/Slave/Module/Service/Debian.pm (modified) (1 diff)
• lib/Punc/Slave/Module/Service/RedHat.pm (modified) (1 diff)

lang/perl/Punc/trunk/bin/punc

@@ -9 +9 @@
 use JSON;
 
-my ( $target, $call, $module, $method, @args ) = @ARGV;
+my $target  = shift;
+my $call    = shift;
+my $module  = shift;
+my $method  = shift;
+my $options = get_options();
 
 my $punc = Punc::Client->new($target);
 
-my $res = $punc->$module->$method(\@args);
+my $res = $punc->$module->$method($options);
 
 for (@$res) {
@@ -24 +28 @@
 }
 
+exit;
+
+sub get_options {
+    my $options = {};
+    while ($#ARGV >= 0 && $ARGV[0] =~ /^--?([^=-][^=]*)(=?)(.*)/) {
+        my $var = $1;
+        my $value = ($2 eq "") ? 1 : $3;
+        $options->{$var} = $value;
+        shift @ARGV;
+    }
+    return $options;
+}

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

@@ -9 +9 @@
 use UNIVERSAL::require;
 use FindBin;
-use UNIVERSAL::require;
 
 sub new {

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

@@ -61 +61 @@
     $self->{method} = $method;
     $self->{args}   = $args;
+
     return $self->request;
 }

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

@@ -21 +21 @@
 
   # with punc command
-  $ sudo punc "*" call service status httpd
+  $ sudo punc "*" call service status --service=httpd
 
   # with Punc::Client module
   my $punc = Punc::Client->new($target);
-  my $res = $punc->service->status('httpd');
+  my $res  = $punc->service->status({ service => 'httpd' });
 
 =head1 DESCRIPTION

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

@@ -12 +12 @@
     my ( $self, $args ) = @_;
 
-    return $self->_command($args->[0], 'status');
+    return $self->_command($args->{service}, 'status');
 }
 

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

@@ -10 +10 @@
 sub status {
     my ( $self, $args ) = @_;
-    return $self->_command($args->[0], 'status');
+    return $self->_command($args->{service}, 'status');
 }