[Bps-public-commit] SD branch, config-gitlike, updated. 82861066066ac51d8c947a5c128b5fbe1982ec9e

[jesse]

The branch, config-gitlike has been updated
       via  82861066066ac51d8c947a5c128b5fbe1982ec9e (commit)
       via  f48aca6dea4f753a89528ed122bfb1abda235fc0 (commit)
       via  42e88417114f719ddceb56b07cdd3b5029a33de9 (commit)
       via  72f08d65d88b800bca837c56f0061890f76d7af3 (commit)
      from  be94243d53c94600b8c334de940979a3b4957fbd (commit)

Summary of changes:
 lib/App/SD/CLI/Command/Ticket/Show.pm  |    8 +++++---
 lib/App/SD/CLI/Dispatcher.pm           |   10 +++++++++-
 lib/App/SD/Replica/trac/PushEncoder.pm |    1 -
 lib/App/SD/Server/View.pm              |    2 +-
 4 files changed, 15 insertions(+), 6 deletions(-)

- Log -----------------------------------------------------------------
commit 72f08d65d88b800bca837c56f0061890f76d7af3
Author: Jesse Vincent <jesse at bestpractical.com>
Date:   Mon Jul 6 17:23:00 2009 -0400

    expose a friendly name for replicas in the web view

diff --git a/lib/App/SD/Server/View.pm b/lib/App/SD/Server/View.pm
index 076f1b7..73bcd54 100644
--- a/lib/App/SD/Server/View.pm
+++ b/lib/App/SD/Server/View.pm
@@ -573,7 +573,7 @@ template ticket_history => sub {
                 };
                 span {
                     { class is 'original_source_uuid' };
-                    $changeset->original_source_uuid;
+                    $self->app_handle->config->display_name_for_uuid($changeset->original_source_uuid);
                 };
                 };
             };

commit 42e88417114f719ddceb56b07cdd3b5029a33de9
Author: Jesse Vincent <jesse at bestpractical.com>
Date:   Mon Jul 6 17:23:30 2009 -0400

    fix a redefinition warning in the trac pushencoder

diff --git a/lib/App/SD/Replica/trac/PushEncoder.pm b/lib/App/SD/Replica/trac/PushEncoder.pm
index dadb540..2e2cf13 100644
--- a/lib/App/SD/Replica/trac/PushEncoder.pm
+++ b/lib/App/SD/Replica/trac/PushEncoder.pm
@@ -79,7 +79,6 @@ sub integrate_attachment {
     my $tempdir = File::Temp::tempdir( CLEANUP => 1 );
     my $file = File::Spec->catfile( $tempdir, ( $props{'name'} || 'unnamed' ) );
     open my $fh, '>', $file or die $!;
-    my $fh = $file->openw;
     print $fh $props{content};
     close $fh;
     my %content = ( message     => '(See attachments)', attachments => ["$file"]);

commit f48aca6dea4f753a89528ed122bfb1abda235fc0
Author: Jesse Vincent <jesse at bestpractical.com>
Date:   Mon Jul 6 17:23:56 2009 -0400

    improve tickt views of friendly replica names

diff --git a/lib/App/SD/CLI/Command/Ticket/Show.pm b/lib/App/SD/CLI/Command/Ticket/Show.pm
index 74e9b84..a2c824b 100644
--- a/lib/App/SD/CLI/Command/Ticket/Show.pm
+++ b/lib/App/SD/CLI/Command/Ticket/Show.pm
@@ -84,8 +84,10 @@ sub show_history_entry {
     $self->history_entry_header(
          $changeset->creator,
         $changeset->created,
-        $self->config->display_name_for_uuid($changeset->original_sequence_no),
-        $changeset->original_source_uuid);
+        $changeset->original_sequence_no,
+        $self->config->display_name_for_uuid($changeset->original_source_uuid),
+    
+    );
 
     print $body;
 }
@@ -119,7 +121,7 @@ sub show_comment {
         $content =~ s|\n\n|\n|gismx;
     }
 
-    $self->history_entry_header($creator, $created,$creation->original_sequence_no, $creation->original_source_uuid);
+    $self->history_entry_header($creator, $created,$creation->original_sequence_no, $self->config->display_name_for_uuid($creation->original_source_uuid));
     print $content;
     print "\n\n";
 }

commit 82861066066ac51d8c947a5c128b5fbe1982ec9e
Author: Jesse Vincent <jesse at bestpractical.com>
Date:   Mon Jul 6 17:43:50 2009 -0400

    Dispatcher cleanups to fix failing tests

diff --git a/lib/App/SD/CLI/Dispatcher.pm b/lib/App/SD/CLI/Dispatcher.pm
index 1175242..c455883 100644
--- a/lib/App/SD/CLI/Dispatcher.pm
+++ b/lib/App/SD/CLI/Dispatcher.pm
@@ -88,7 +88,7 @@ on qr/^(\w+)\s+tickets?(.*)$/ => sub {
 under ticket => sub {
     # all these might possibly have IDs tacked onto the end
     on
-    qr/^((?:comment\s+)?comments?|update|edit|show|display|delete|del|rm|history|claim|take|resolve|close) $Prophet::CLIContext::ID_REGEX$/i => sub {
+    qr/^((?:comment\s+)?(?:comments?|update|edit|show|display|delete|del|rm|history|claim|take|resolve|basics|close)) $Prophet::CLIContext::ID_REGEX$/i => sub {
         my $self = shift;
         $self->context->set_id_from_primary_commands;
         run("ticket $1", $self, @_);
@@ -158,6 +158,14 @@ under ticket => sub {
 };
 
 under attachment => sub {
+    on qr/^(.*)\s+($Prophet::CLIContext::ID_REGEX)$/i => sub {
+        my $self = shift;
+        my $next = $1;
+        my $id = $2;
+        $self->context->set_id($id);
+        run("attachment $next", $self, @_);
+    };
+
     on content => run_command('Attachment::Content');
     on create  => run_command('Attachment::Create');
 };

-----------------------------------------------------------------------