Changeset 163

Timestamp:

07/19/10 14:41:27 (7 weeks ago)

Author:

oz

Message:

Finish cleanup

Files:

• trunk/lib/whatbot.pm (modified) (5 diffs)

trunk/lib/whatbot.pm

@@ -28 +28 @@
     has 'last_message'      => ( is => 'rw', isa => 'whatbot::Message' );
 
-    method config ( Str $basedir, Str $config_path ) {
+    method config ( Str $basedir, Str $config_path? ) {
     
         # Find configuration file
         unless ($config_path and -e $config_path) {
                 my @try_config = (
-                        $basedir . '/conf/whatbot.conf',
+                        '~/.whatbot/whatbot.conf',
+                        '/usr/local/etc/whatbot/whatbot.conf',
+                        '/usr/local/etc/whatbot.conf',
                         '/etc/whatbot/whatbot.conf',
                         '/etc/whatbot.conf',
-                        '/usr/local/etc/whatbot/whatbot.conf',
-                        '/usr/local/etc/whatbot.conf'
+                        $basedir . '/conf/whatbot.conf',
                 );
                 foreach (@try_config) {
-                        $config_path = $_ if (-e $_);
+                        if (-e $_) {
+                                $config_path = $_;
+                                last;
+                        }
                 }
                 unless ($config_path and -e $config_path) {
@@ -135 +139 @@
         $store->connect();
         $self->report_error('Configured store failed to load properly')
-            unless ( defined $store and defined $store->handle );
+            unless ( $store and defined $store->handle );
         $base_component->store($store);
         
@@ -149 +153 @@
         foreach my $io_module ( @{$self->initial_config->io} ) {
                 $log->error('No interface designated for one or more IO modules')
-                    unless ( defined $io_module->{'interface'} );
+                    unless ( $io_module->{'interface'} );
                 
                 my $io_class = 'whatbot::IO::' . $io_module->{'interface'};
@@ -159 +163 @@
                 );
                 $self->report_error('IO interface "' . $io_module->{'interface'} . '" failed to load properly') 
-                unless ( defined $io_object );
+                unless ($io_object);
 
                 $ios{ $io_object->name } = $io_object;
-                push(@io, $io_object);
+                push( @io, $io_object );
         }
         $base_component->ios(\%ios);
@@ -178 +182 @@
                 $log->write('Sending connect to ' . ref($io_object));
                 $io_object->controller($controller);
-                $io_object->connect;
+                $io_object->connect();
         }