The nopinit options is back in the config.

I've rationalized (to myself) that this is something that you should be able to set just once on the repository. For example, if you create a repository that is strictly for private use and you know that no one else will be messing with the VCS.
thaljef · Aug 25, 2011 · ffba137 · ffba137
1 parent 3466c6a
commit ffba137
Show file tree

Hide file tree

Showing 15 changed files with 90 additions and 22 deletions.
diff --git a/Changes b/Changes
@@ -1,5 +1,11 @@
 {{$NEXT}}
 
+     * Interface changes
+
+     The "noinit" parameter has been removed from the repository's
+     configuration file and is now only available on the command
+     line.
+
 0.019     2011-08-24 04:09:41 America/Los_Angeles
 
      * Bug Fixes:

diff --git a/dist.ini b/dist.ini
@@ -5,7 +5,7 @@ license     = Perl_5
 copyright_holder = Imaginative Software Systems
 copyright_year   = 2011
 
-version = 0.019
+version = 0.020
 
 [GatherDir]         ; everything under top dir
 [PruneCruft]        ; default stuff to skip

diff --git a/lib/App/Pinto/Admin.pm b/lib/App/Pinto/Admin.pm
@@ -16,11 +16,10 @@ use App::Cmd::Setup -app;
 sub global_opt_spec {
 
   return (
-
-      [ "repos|r=s"   => "Path to your repository directory"],
-      [ "nocolor"     => "Do not colorize diagnostic messages" ],
-      [ "quiet|q"     => "Only report fatal errors"],
-      [ "verbose|v+"  => "More diagnostic output (repeatable)" ],
+      [ 'repos|r=s'   => 'Path to your repository directory' ],
+      [ 'nocolor'     => 'Do not colorize diagnostic messages' ],
+      [ 'quiet|q'     => 'Only report fatal errors' ],
+      [ 'verbose|v+'  => 'More diagnostic output (repeatable)' ],
   );
 }
 

diff --git a/lib/App/Pinto/Admin/Command.pm b/lib/App/Pinto/Admin/Command.pm
@@ -15,6 +15,25 @@ use App::Cmd::Setup -command;
 
 #-----------------------------------------------------------------------------
 
+sub opt_spec {
+    my ( $self, $app ) = @_;
+
+    return (
+
+        [ 'man' => 'Show manual for this command' ],
+    );
+}
+
+#-----------------------------------------------------------------------------
+
+sub validate_args {
+    my ($self, $opts, $args) = @_;
+
+    die "RTFM!\n" if $opts->{man};
+}
+
+#-----------------------------------------------------------------------------
+
 =method pinto()
 
 Returns the Pinto object for this command.  Basically an alias for

diff --git a/lib/App/Pinto/Admin/Command/add.pm b/lib/App/Pinto/Admin/Command/add.pm
@@ -18,7 +18,10 @@ use base 'App::Pinto::Admin::Command';
 #-----------------------------------------------------------------------------
 
 sub opt_spec {
-    return (
+    my ($self, $app) = @_;
+
+    return ( $self->SUPER::opt_spec(),
+
         [ 'author=s'  => 'Your (alphanumeric) author ID' ],
         [ 'message=s' => 'Prepend a message to the VCS log' ],
         [ 'nocommit'  => 'Do not commit changes to VCS' ],
@@ -39,6 +42,7 @@ sub execute {
     $self->pinto->new_action_batch( %{$opts} );
     $self->pinto->add_action('Add', %{$opts}, dist => $_) for @args;
     my $result = $self->pinto->run_actions();
+
     return $result->is_success() ? 0 : 1;
 }
 

diff --git a/lib/App/Pinto/Admin/Command/clean.pm b/lib/App/Pinto/Admin/Command/clean.pm
@@ -18,7 +18,10 @@ use base 'App::Pinto::Admin::Command';
 #------------------------------------------------------------------------------
 
 sub opt_spec {
-    return (
+    my ($self, $app) = @_;
+
+    return ( $self->SUPER::opt_spec(),
+
         [ 'noinit'    => 'Do not pull/update from VCS' ],
     );
 }
@@ -27,7 +30,11 @@ sub opt_spec {
 
 sub validate_args {
     my ($self, $opts, $args) = @_;
+
+    $self->SUPER::validate_args($opts, $args);
+
     $self->usage_error('Arguments are not allowed') if @{ $args };
+
     return 1;
 }
 

diff --git a/lib/App/Pinto/Admin/Command/create.pm b/lib/App/Pinto/Admin/Command/create.pm
@@ -19,7 +19,11 @@ use base 'App::Pinto::Admin::Command';
 
 sub validate_args {
     my ($self, $opts, $args) = @_;
+
+    $self->SUPER::validate_args($opts, $args);
+
     $self->usage_error('Arguments are not allowed') if @{ $args };
+
     return 1;
 }
 

diff --git a/lib/App/Pinto/Admin/Command/list.pm b/lib/App/Pinto/Admin/Command/list.pm
@@ -25,8 +25,10 @@ Readonly my $DEFAULT_LIST_TYPE => 'all';
 #------------------------------------------------------------------------------
 
 sub opt_spec {
+    my ($self, $app) = @_;
+
+    return ( $self->SUPER::opt_spec(),
 
-    return (
         [ 'noinit'  => 'Do not pull/update from VCS' ],
         [ 'type=s'  => "One of: ( $LIST_TYPES_STRING )" ],
     );
@@ -37,6 +39,8 @@ sub opt_spec {
 sub validate_args {
     my ($self, $opts, $args) = @_;
 
+    $self->SUPER::validate_args($opts, $args);
+
     $self->usage_error('Arguments are not allowed') if @{ $args };
 
     $opts->{type} ||= $DEFAULT_LIST_TYPE;

diff --git a/lib/App/Pinto/Admin/Command/mirror.pm b/lib/App/Pinto/Admin/Command/mirror.pm
@@ -16,7 +16,10 @@ use base 'App::Pinto::Admin::Command';
 #------------------------------------------------------------------------------
 
 sub opt_spec {
-    return (
+    my ($self, $app) = @_;
+
+    return ( $self->SUPER::opt_spec(),
+
         [ 'force' => 'Force action, even if indexes appear unchanged' ],
         [ 'message=s' => 'Prepend a message to the VCS log' ],
         [ 'nocommit'  => 'Do not commit changes to VCS' ],
@@ -30,7 +33,11 @@ sub opt_spec {
 
 sub validate_args {
     my ($self, $opts, $args) = @_;
+
+    $self->SUPER::validate_args($opts, $args);
+
     $self->usage_error('Arguments are not allowed') if @{ $args };
+
     return 1;
 }
 

diff --git a/lib/App/Pinto/Admin/Command/rebuild.pm b/lib/App/Pinto/Admin/Command/rebuild.pm
@@ -16,8 +16,10 @@ use base 'App::Pinto::Admin::Command';
 #------------------------------------------------------------------------------
 
 sub opt_spec {
+    my ($self, $app) = @_;
+
+    return ( $self->SUPER::opt_spec(),
 
-    return (
         [ 'noinit'  => 'Do not pull/update from VCS' ],
     );
 }
@@ -27,6 +29,8 @@ sub opt_spec {
 sub validate_args {
     my ($self, $opts, $args) = @_;
 
+    $self->SUPER::validate_args($opts, $args);
+
     $self->usage_error('Arguments are not allowed') if @{ $args };
 
     return 1;

diff --git a/lib/App/Pinto/Admin/Command/remove.pm b/lib/App/Pinto/Admin/Command/remove.pm
@@ -18,7 +18,10 @@ use base 'App::Pinto::Admin::Command';
 #------------------------------------------------------------------------------
 
 sub opt_spec {
-    return (
+    my ($self, $app) = @_;
+
+    return ( $self->SUPER::opt_spec(),
+
         [ 'author=s'  => 'Your (alphanumeric) author ID' ],
         [ 'message=s' => 'Prepend a message to the VCS log' ],
         [ 'nocommit'  => 'Do not commit changes to VCS' ],

diff --git a/lib/App/Pinto/Admin/Command/verify.pm b/lib/App/Pinto/Admin/Command/verify.pm
@@ -16,15 +16,21 @@ use base 'App::Pinto::Admin::Command';
 #-----------------------------------------------------------------------------
 
 sub opt_spec {
-    return (
+    my ($self, $app) = @_;
+
+    return ( $self->SUPER::opt_spec(),
+
         [ 'noinit'    => 'Do not pull/update from VCS' ],
     );
 }
 
 #-----------------------------------------------------------------------------
 
 sub validate_args {
-    my ($self, $opt, $args) = @_;
+    my ($self, $opts, $args) = @_;
+
+    $self->SUPER::validate_args($opts, $args);
+
     $self->usage_error("Arguments are not allowed") if @{ $args };
     return 1;
 }

diff --git a/lib/Pinto/ActionBatch.pm b/lib/Pinto/ActionBatch.pm
@@ -55,12 +55,6 @@ has message => (
     default  => '',
 );
 
-has noinit => (
-    is       => 'ro',
-    isa      => Bool,
-    default  => 0,
-);
-
 has nocommit => (
     is       => 'ro',
     isa      => Bool,
@@ -146,7 +140,7 @@ sub run {
 sub _run_actions {
     my ($self) = @_;
 
-    $self->store->initialize() unless $self->noinit();
+    $self->store->initialize() unless $self->config->noinit();
 
     while ( my $action = $self->dequeue() ) {
         $self->_run_one_action($action);

diff --git a/lib/Pinto/Config.pm b/lib/Pinto/Config.pm
@@ -54,6 +54,15 @@ has noclobber => (
 );
 
 
+has noinit => (
+    is       => 'ro',
+    isa      => Bool,
+    key      => 'noinit',
+    default  => 0,
+    documentation => 'If true, then Pinto will not pull/update from VCS before each operation',
+);
+
+
 has store => (
     is        => 'ro',
     isa       => Str,

diff --git a/t/03-config.t b/t/03-config.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More (tests => 9);
+use Test::More (tests => 11);
 use Test::Exception;
 
 use Path::Class;
@@ -21,6 +21,7 @@ use Pinto::Config;
         source    => 'http://cpan.perl.org',
         store     => 'Pinto::Store',
         nocleanup => 0,
+        noinit    => 0,
     );
 
     my $cfg = Pinto::Config->new(repos => 'nowhere');
@@ -34,6 +35,7 @@ use Pinto::Config;
         source    => 'http://cpan.pair.com',
         store     => 'Pinto::Store::VCS::Git',
         nocleanup => 1,
+        noinit    => 1,
     );
 
     $cfg = Pinto::Config->new(%custom_cases);