[Bps-public-commit] r9947 - in bpsbuilder/BPB/lib/BPB: . Source

[sunnavy at bestpractical.com]

Author: sunnavy
Date: Fri Dec 14 08:09:56 2007
New Revision: 9947

Modified:
   bpsbuilder/BPB/lib/BPB/Script/Import.pm
   bpsbuilder/BPB/lib/BPB/Source.pm
   bpsbuilder/BPB/lib/BPB/Source/Base.pm
   bpsbuilder/BPB/lib/BPB/Source/Compressed.pm
   bpsbuilder/BPB/lib/BPB/Source/Directory.pm

Log:
--no-cpan option is a bad name and needless, use no-follow

Modified: bpsbuilder/BPB/lib/BPB/Script/Import.pm
==============================================================================
--- bpsbuilder/BPB/lib/BPB/Script/Import.pm	(original)
+++ bpsbuilder/BPB/lib/BPB/Script/Import.pm	Fri Dec 14 08:09:56 2007
@@ -5,7 +5,7 @@
 use Carp;
 
 use base qw/App::CLI::Command Class::Accessor::Fast/;
-__PACKAGE__->mk_accessors(qw/config name comment source no_cpan/);
+__PACKAGE__->mk_accessors(qw/config name comment source no_follow/);
 
 use BPB;
 use File::Spec;
@@ -17,7 +17,7 @@
         'n|name=s'    => 'name',
         'm|comment=s' => 'comment',
         's|source=s'  => 'source',
-        'no-cpan'  => 'no_cpan',
+        'no-follow'  => 'no_follow',
     );
 }
 
@@ -32,7 +32,7 @@
         config => $self->config,
         name   => $self->name,
         source => $self->source,
-        with_cpan => ! $self->no_cpan,
+        follow => ! $self->no_follow,
     );
 
     $self->source($bpb->source->run);

Modified: bpsbuilder/BPB/lib/BPB/Source.pm
==============================================================================
--- bpsbuilder/BPB/lib/BPB/Source.pm	(original)
+++ bpsbuilder/BPB/lib/BPB/Source.pm	Fri Dec 14 08:09:56 2007
@@ -12,7 +12,6 @@
 our %DEFAULT = (
     follow            => 1,
     mini_perl_version => 5.008.008,
-    with_cpan          => 1,
 );
 
 $DEFAULT{directory} = tempdir( CLEANUP => 1 );

Modified: bpsbuilder/BPB/lib/BPB/Source/Base.pm
==============================================================================
--- bpsbuilder/BPB/lib/BPB/Source/Base.pm	(original)
+++ bpsbuilder/BPB/lib/BPB/Source/Base.pm	Fri Dec 14 08:09:56 2007
@@ -10,8 +10,7 @@
 
 use base qw/Class::Accessor::Fast/;
 __PACKAGE__->mk_accessors(
-    qw/source directory download_directory follow min_perl_version map_path
-    with_cpan/);
+    qw/source directory download_directory follow min_perl_version map_path/);
 
 =head2 new
 

Modified: bpsbuilder/BPB/lib/BPB/Source/Compressed.pm
==============================================================================
--- bpsbuilder/BPB/lib/BPB/Source/Compressed.pm	(original)
+++ bpsbuilder/BPB/lib/BPB/Source/Compressed.pm	Fri Dec 14 08:09:56 2007
@@ -15,7 +15,7 @@
     my $self = shift;
     my $ret = $self->SUPER::run();
     $self->_copy( @_ );
-    $self->_follow($self->path) if $self->follow && $self->with_cpan;
+    $self->_follow($self->path) if $self->follow;
     return $self->path;
 }
 

Modified: bpsbuilder/BPB/lib/BPB/Source/Directory.pm
==============================================================================
--- bpsbuilder/BPB/lib/BPB/Source/Directory.pm	(original)
+++ bpsbuilder/BPB/lib/BPB/Source/Directory.pm	Fri Dec 14 08:09:56 2007
@@ -25,7 +25,7 @@
 sub run {
     my $self = shift;
     $self->SUPER::run();
-    $self->_follow($self->path) if $self->follow && $self->with_cpan;
+    $self->_follow($self->path) if $self->follow;
     return $self->path;
 }