X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=p5sagit%2FDevel-REPL.git;a=blobdiff_plain;f=lib%2FDevel%2FREPL%2FPlugin%2FReadLineHistory.pm;h=3fb9c9db2a50fe9f129b936a870bfe1e0a61bb84;hp=61ad9c09ed365a3a26075d08fd6af73ce3c16915;hb=1d6c2dbc8cd96877b4f8df5698b6ff18d2fddac8;hpb=4906ca4e09303a2703c2d0f93d0ea5c46ec900d5

diff --git a/lib/Devel/REPL/Plugin/ReadLineHistory.pm b/lib/Devel/REPL/Plugin/ReadLineHistory.pm
index 61ad9c0..3fb9c9d 100644
--- a/lib/Devel/REPL/Plugin/ReadLineHistory.pm
+++ b/lib/Devel/REPL/Plugin/ReadLineHistory.pm
@@ -3,11 +3,14 @@
 #
 # epitaph, 22nd April 2007
 
+use strict;
+use warnings;
 package Devel::REPL::Plugin::ReadLineHistory;
 
 use Devel::REPL::Plugin;
 use File::HomeDir;
 use File::Spec;
+use namespace::autoclean;
 
 my $hist_file = $ENV{PERLREPL_HISTFILE} ||
     File::Spec->catfile(File::HomeDir->my_home, '.perlreplhist');
@@ -18,19 +21,50 @@ my $hist_file = $ENV{PERLREPL_HISTFILE} ||
 my $hist_len=$ENV{PERLREPL_HISTLEN} || 100;
 
 around 'run' => sub {
-  my $orig=shift;
-  my ($self, @args)=@_;
-  if ($self->term->ReadLine eq 'Term::ReadLine::Gnu') {
-     $self->term->stifle_history($hist_len);
-  }
-  if ($self->term->ReadLine eq 'Term::ReadLine::Perl') {
-     $self->term->Attribs->{MaxHistorySize} = $hist_len;
-  }
-  -f($hist_file) && $self->term->ReadHistory($hist_file);
-  $self->term->Attribs->{do_expand}=1;
-  $self->$orig(@args);
-  $self->term->WriteHistory($hist_file) ||
-    $self->print("warning: failed to write history file $hist_file");
+   my $orig=shift;
+   my ($self, @args)=@_;
+   if ($self->term->ReadLine eq 'Term::ReadLine::Gnu') {
+      $self->term->stifle_history($hist_len);
+   }
+   if ($self->term->ReadLine eq 'Term::ReadLine::Perl') {
+      $self->term->Attribs->{MaxHistorySize} = $hist_len;
+   }
+   if (-f($hist_file)) {
+      if ($self->term->ReadLine eq 'Term::ReadLine::Gnu') {
+         $self->term->ReadHistory($hist_file);
+      }
+      if ($self->term->ReadLine eq 'Term::ReadLine::Perl') {
+         open HIST, $hist_file or die "ReadLineHistory: could not open $hist_file: $!\n";
+         while (my $line = <HIST>) {
+            chomp $line;
+            $self->term->addhistory($line);
+         }
+         close HIST;
+      }
+   }
+
+   $self->term->Attribs->{do_expand}=1;  # for Term::ReadLine::Gnu
+   $self->term->MinLine(2);              # don't save one letter commands
+
+   # let History plugin know we have Term::ReadLine support
+   $self->have_readline_history(1) if $self->can('have_readline_history');
+
+
+   $self->$orig(@args);
+
+   if ($self->term->ReadLine eq 'Term::ReadLine::Gnu') {
+      $self->term->WriteHistory($hist_file) ||
+      $self->print("warning: failed to write history file $hist_file");
+   }
+   if ($self->term->ReadLine eq 'Term::ReadLine::Perl') {
+      my @lines = $self->term->GetHistory() if $self->term->can('GetHistory');
+      if( open HIST, ">$hist_file" ) {
+         print HIST join("\n",@lines);
+         close HIST;
+      } else {
+         $self->print("warning: unable to WriteHistory to $hist_file");
+      }
+   }
 };
 
 1;
@@ -41,5 +75,39 @@ __END__
 
 Devel::REPL::Plugin::ReadLineHistory - Integrate history with the facilities provided by L<Term::ReadLine>
 
+=head1 DESCRIPTION
+
+This plugin enables loading and saving command line history from
+a file as well has history expansion of previous commands using
+the !-syntax a la bash.
+
+By default, history expansion is enabled with this plugin when
+using L<Term::ReadLine::Gnu|Term::ReadLine::Gnu>. That means that
+"loose" '!' characters will be treated as history events which
+may not be what you wish.
+
+To avoid this, you need to quote the '!' with '\':
+
+  my $var = "foo\!";
+
+or place the arguments in single quotes---but enable the
+C<Term::ReadLine> attribute C<history_quotes_inhibit_expansion>:
+
+  $_REPL->term->Attribs->{history_quotes_inhibit_expansion} = 1;
+  my $var = 'foo!';
+
+and to disable history expansion from GNU readline/history do
+
+  $_REPL->term->Attribs->{do_expand} = 0;
+
+=head1 CONFLICTS
+
+Note that L<Term::ReadLine::Perl> does not support a history
+expansion method.  In that case, you may wish to use the
+L<Devel::REPL History plugin|Devel::REPL::Plugin::History> which provides similar functions.
+Work is underway to make use of either L<History|Devel::REPL::Plugin::History> or
+L<ReadLineHistory|Devel::REPL::Plugin::ReadHistory>> consistent for expansion with either the
+L<Term::ReadLine::Gnu> support or L<Term::ReadLine::Perl>.
+
 =cut