X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=p5sagit%2FDevel-REPL.git;a=blobdiff_plain;f=lib%2FDevel%2FREPL%2FScript.pm;h=c748b95332ea90c02dac8ffacdcbd5b9789172b3;hp=6da9202cdb892b9c6074f86d5cb2c366d7858213;hb=b595a818b1d89dbea55ace1af86d0df91c97ba0c;hpb=fa626608ee63e378ad7f476b24f732b7aa6c9745

diff --git a/lib/Devel/REPL/Script.pm b/lib/Devel/REPL/Script.pm
index 6da9202..c748b95 100644
--- a/lib/Devel/REPL/Script.pm
+++ b/lib/Devel/REPL/Script.pm
@@ -5,24 +5,23 @@ use Devel::REPL;
 use File::HomeDir;
 use File::Spec;
 use vars qw($CURRENT_SCRIPT);
-use namespace::clean -except => [ qw(meta) ];
+use namespace::autoclean;
 
 with 'MooseX::Getopt';
 
 has 'rcfile' => (
-  is => 'ro', isa => 'Str', required => 1, default => sub { 'repl.rc' },
+  is => 'ro', isa => 'Str',
+  default => sub { 'repl.rc' },
 );
 
 has 'profile' => (
-  is => 'ro', isa => 'Str', required => 1, default => sub { 'Default' },
-);
-
-has 'e' => (
-  is => 'ro', isa => 'ArrayRef', default => sub { [] },
+  is       => 'ro',
+  isa      => 'Str',
+  default  => sub { $ENV{DEVEL_REPL_PROFILE} || 'Default' },
 );
 
 has '_repl' => (
-  is => 'ro', isa => 'Devel::REPL', required => 1,
+  is => 'ro', isa => 'Devel::REPL',
   default => sub { Devel::REPL->new() }
 );
 
@@ -30,7 +29,6 @@ sub BUILD {
   my ($self) = @_;
   $self->load_profile($self->profile);
   $self->load_rcfile($self->rcfile);
-  $self->load_scripts($self->e);
 }
 
 sub load_profile {
@@ -50,25 +48,30 @@ sub load_rcfile {
     $rc_file = File::Spec->catfile(File::HomeDir->my_home, '.re.pl', $rc_file);
   }
 
-  if (-r $rc_file) {
-    open RCFILE, '<', $rc_file || die "Couldn't open ${rc_file}: $!";
-    my $rc_data;
-    { local $/; $rc_data = <RCFILE>; }
-    close RCFILE; # Don't care if this fails
-    $self->eval_rcdata($rc_data);
-    warn "Error executing rc file ${rc_file}: $@\n" if $@;
-  }
+  $self->apply_script($rc_file);
 }
 
-sub load_scripts {
-  my ($self, $scripts) = @_;
+sub apply_script {
+  my ($self, $script, $warn_on_unreadable) = @_;
 
-  for (@$scripts) {
-    do $_;
+  if (!-e $script) {
+    warn "File '$script' does not exist" if $warn_on_unreadable;
+    return;
   }
+  elsif (!-r _) {
+    warn "File '$script' is unreadable" if $warn_on_unreadable;
+    return;
+  }
+
+  open RCFILE, '<', $script or die "Couldn't open ${script}: $!";
+  my $rc_data;
+  { local $/; $rc_data = <RCFILE>; }
+  close RCFILE; # Don't care if this fails
+  $self->eval_script($rc_data);
+  warn "Error executing script ${script}: $@\n" if $@;
 }
 
-sub eval_rcdata {
+sub eval_script {
   my ($self, $data) = @_;
   local $CURRENT_SCRIPT = $self;
   $self->_repl->eval($data);