[Bps-public-commit] r15073 - in sd/trunk: . t

[spang at bestpractical.com]

Author: spang
Date: Tue Aug 12 09:27:54 2008
New Revision: 15073

Removed:
   sd/trunk/lib/App/SD/CLI/Command/Merge.pm
Modified:
   sd/trunk/   (props changed)
   sd/trunk/lib/App/SD/CLI/Command/Help.pm
   sd/trunk/lib/App/SD/CLI/Command/Pull.pm
   sd/trunk/lib/App/SD/CLI/Command/Push.pm
   sd/trunk/t/01-create.t
   sd/trunk/t/sd-attachments.t
   sd/trunk/t/sd-comments.t
   sd/trunk/t/sd-hm.t

Log:
 r47466 at loki:  spang | 2008-07-31 12:45:34 +0100
  r47215 at loki (orig r14544):  sartak | 2008-07-27 16:51:54 +0100
   r65242 at onn:  sartak | 2008-07-27 11:34:17 -0400
   Mention the new search shininess
  
  r47221 at loki (orig r14550):  simonw | 2008-07-27 22:26:55 +0100
  Remove unnecessary code (also allows 'pull --all' to work)
  
  r47260 at loki (orig r14577):  sartak | 2008-07-28 17:55:03 +0100
   r65317 at onn:  sartak | 2008-07-28 12:54:12 -0400
   Have push just subclass Prophet's push command
  
  r47261 at loki (orig r14578):  sartak | 2008-07-28 17:55:13 +0100
   r65318 at onn:  sartak | 2008-07-28 12:54:35 -0400
   There's no point in this empty Merge subclass now
  
  r47262 at loki (orig r14579):  sartak | 2008-07-28 17:55:28 +0100
   r65319 at onn:  sartak | 2008-07-28 12:54:50 -0400
   diag instead of warn the location of the test directories, 99% of the time we don't care
  
 


Modified: sd/trunk/lib/App/SD/CLI/Command/Help.pm
==============================================================================
--- sd/trunk/lib/App/SD/CLI/Command/Help.pm	(original)
+++ sd/trunk/lib/App/SD/CLI/Command/Help.pm	Tue Aug 12 09:27:54 2008
@@ -12,6 +12,7 @@
 $0 ticket update --uuid <uuid> --status closed
 $0 ticket resolve --uuid <uuid>
 $0 ticket search --regex .
+$0 ticket search -- status!=closed summary =~ http 
 $0 ticket delete --uuid <uuid>
 $0 ticket show --uuid <uuid>
 $0 pull --from remote-url

Modified: sd/trunk/lib/App/SD/CLI/Command/Pull.pm
==============================================================================
--- sd/trunk/lib/App/SD/CLI/Command/Pull.pm	(original)
+++ sd/trunk/lib/App/SD/CLI/Command/Pull.pm	Tue Aug 12 09:27:54 2008
@@ -1,19 +1,6 @@
 package App::SD::CLI::Command::Pull;
 use Moose;
-extends qw/App::SD::CLI::Command::Merge/;
-
-override run => sub {
-    my $self = shift;
-
-    die "Please specify a --from.\n" if !$self->has_arg('from');
-
-    local $ENV{PROPHET_RESOLVER} = 'Prompt';
-
-    $self->set_arg(to => $self->cli->app_handle->default_replica_type.":file://".$self->cli->app_handle->handle->fs_root);
-    $self->set_arg(db_uuid => $self->app_handle->handle->db_uuid);
-
-    super();
-};
+extends qw/Prophet::CLI::Command::Pull/;
 
 __PACKAGE__->meta->make_immutable;
 no Moose;

Modified: sd/trunk/lib/App/SD/CLI/Command/Push.pm
==============================================================================
--- sd/trunk/lib/App/SD/CLI/Command/Push.pm	(original)
+++ sd/trunk/lib/App/SD/CLI/Command/Push.pm	Tue Aug 12 09:27:54 2008
@@ -1,19 +1,6 @@
 package App::SD::CLI::Command::Push;
 use Moose;
-extends qw/App::SD::CLI::Command::Merge/;
-
-override run => sub {
-    my $self = shift;
-
-    die "Please specify a --to.\n" if !$self->has_arg('to');
-
-    local $ENV{PROPHET_RESOLVER} = 'Prompt';
-
-    $self->set_arg(from => $self->app_handle->default_replica_type.":file://".$self->app_handle->handle->fs_root);
-    $self->set_arg(db_uuid => $self->app_handle->handle->db_uuid);
-
-    super();
-};
+extends qw/Prophet::CLI::Command::Push/;
 
 __PACKAGE__->meta->make_immutable;
 no Moose;

Modified: sd/trunk/t/01-create.t
==============================================================================
--- sd/trunk/t/01-create.t	(original)
+++ sd/trunk/t/01-create.t	Tue Aug 12 09:27:54 2008
@@ -13,7 +13,7 @@
 BEGIN {
     require File::Temp;
     $ENV{'PROPHET_REPO'} = $ENV{'SD_REPO'} = File::Temp::tempdir( CLEANUP => 0 ) . '/_svb';
-    warn "export SD_REPO=".$ENV{'PROPHET_REPO'} ."\n";
+    diag "export SD_REPO=".$ENV{'PROPHET_REPO'} ."\n";
 }
 # create from sd and push
 my ($yatta_id, $yatta_uuid) = create_ticket_ok( '--summary', 'YATTA');

Modified: sd/trunk/t/sd-attachments.t
==============================================================================

Modified: sd/trunk/t/sd-comments.t
==============================================================================

Modified: sd/trunk/t/sd-hm.t
==============================================================================
--- sd/trunk/t/sd-hm.t	(original)
+++ sd/trunk/t/sd-hm.t	Tue Aug 12 09:27:54 2008
@@ -9,7 +9,7 @@
         plan tests => 10;
         require File::Temp;
         $ENV{'PROPHET_REPO'} = $ENV{'SD_REPO'} = File::Temp::tempdir( CLEANUP => 0 ) . '/_svb';
-        warn $ENV{'PROPHET_REPO'};
+        diag $ENV{'PROPHET_REPO'};
         eval "use Jifty";
         push @INC, File::Spec->catdir( Jifty::Util->app_root, "lib" );
     } else {