Move to Moo for fast bootstrapping.

[p5sagit/Devel-REPL.git] / lib / Devel / REPL / Plugin / Packages.pm

diff --git a/lib/Devel/REPL/Plugin/Packages.pm b/lib/Devel/REPL/Plugin/Packages.pm
index e0b797b..060ce65 100644 (file)
--- a/lib/Devel/REPL/Plugin/Packages.pm
+++ b/lib/Devel/REPL/Plugin/Packages.pm
@@ -1,14 +1,15 @@
 package Devel::REPL::Plugin::Packages;
 use Devel::REPL::Plugin;
 
-use namespace::clean -except => [ "meta" ];
+use namespace::sweep;
+use MooX::Types::MooseLike::Base qw(Str);
 
 use vars qw($PKG_SAVE);
 
 has 'current_package' => (
-  isa      => 'Str',
+  isa      => Str,
   is       => 'rw',
-  default  => 'Devel::REPL::Plugin::Packages::DefaultScratchpad',
+  default  => sub { 'Devel::REPL::Plugin::Packages::DefaultScratchpad' },
   lazy     => 1
 );
 
@@ -26,14 +27,15 @@ around 'mangle_line' => sub {
   my $line = $self->$orig(@args);
   # add a BEGIN block to set the package around at the end of the sub
   # without mangling the return value (we save it off into a global)
-  $line .= '; BEGIN { $Devel::REPL::Plugin::Packages::PKG_SAVE = __PACKAGE__; }';
+  $line .= '
+; BEGIN { $Devel::REPL::Plugin::Packages::PKG_SAVE = __PACKAGE__; }';
   return $line;
 };
 
 after 'execute' => sub {
   my ($self) = @_;
   # if we survived execution successfully, save the new package out the global
-  $self->current_package($PKG_SAVE);
+  $self->current_package($PKG_SAVE) if defined $PKG_SAVE;
 };
 
 around 'eval' => sub {
@@ -49,3 +51,12 @@ package Devel::REPL::Plugin::Packages::DefaultScratchpad;
 # declare empty scratchpad package for cleanliness
 
 1;
+
+__END__
+
+=head1 NAME
+
+Devel::REPL::Plugin::Packages - Keep track of which package the user is in
+
+=cut
+