Changeset 10615 for trunk/Padre/lib/Padre/Task/HTTPClient.pm

Timestamp:

02/08/10 02:23:11 (2 years ago)

Author:

adamk

Message:

Added support for --reset to flush and reset the configuration to defaults, because the Swarm plugin is instantly segfaulting Padre at startup and I didn't want to have to keep resetting the configuration by hand all the time.

File:

• trunk/Padre/lib/Padre/Task/HTTPClient.pm (modified) (2 diffs)

trunk/Padre/lib/Padre/Task/HTTPClient.pm

@@ -4 +4 @@
 use strict;
 use warnings;
-
-use Padre::Constant;
+use Padre::Constant ();
 
 # Use all modules which may provide services for us:
 
 our $VERSION = '0.56';
+our @DRIVERS = qw{
+    Padre::Task::HTTPClient::LWP
+};
 
 =pod
@@ -41 +43 @@
 
 sub new {
-
     my $class = shift;
-
-    my %args = @_;
-
-    return if ( !defined( $args{URL} ) ) or ( $args{URL} eq '' );
+    my %args  = @_;
+    unless ( defined $args{URL} and length $args{URL} ) {
+        return;
+    }
 
     # Prepare information
-    $args{headers}->{'X-Padre'} ||= 'Padre version ' . $VERSION . ' ' . Padre::Constant::PADRE_REVISION;
-    $args{method} ||= 'GET';
-
-    my $self;
+    require Padre::Util::SVN;
+    my $revision = Padre::Util::SVN::padre_version();
+    $args{method}               ||= 'GET';
+    $args{headers}->{'X-Padre'} ||= "Padre version $VERSION $revision";
 
     # Each module will be tested and the first working one should return
     # a object, all others should return nothing (undef)
-    for ('LWP') {
-
-        #       require 'Padre/Task/HTTPClient/' . $_ . '.pm';
-        eval 'require Padre::Task::HTTPClient::' . $_;
+    foreach my $driver ( @DRIVERS ) {
+        eval "require $driver;";
         next if $@;
-        $self = "Padre::Task::HTTPClient::$_"->new(%args);
-        next unless defined($self);
+        my $self = $driver->new(%args) or next;
         return $self;
     }
 
     return;
-
 }