[Bps-public-commit] SD branch, master, updated. 5b7e7c24818fc42c3937df6316934c1de4889558
jesse
jesse at bestpractical.com
Tue Apr 14 03:35:52 EDT 2009
The branch, master has been updated
via 5b7e7c24818fc42c3937df6316934c1de4889558 (commit)
via 397572078a284ccbeec030bf6a7744ed9e6d02ea (commit)
via 40901580c3fed64bb4f5d3177eea389d1943baef (commit)
via a6498dc8e09fefdb57da57fe04f58143eced6f4a (commit)
via 332aa75eaa856c47443cc4ed478d69258978e5ad (commit)
via c7b7b3aa577ca6b3d799255f9ead296219cd0e1e (commit)
from 66c3c8e5de5de0a0ed3da46349a2d5ca4a055e22 (commit)
Summary of changes:
Makefile.PL | 5 +--
lib/App/SD/CLI/Command/Help/Environment.pm | 28 +++++++++++------------
lib/App/SD/CLI/Command/Server.pm | 4 ++-
lib/App/SD/CLI/Dispatcher.pm | 19 +++++++++++++--
lib/App/SD/Model/Ticket.pm | 2 +-
lib/App/SD/Test.pm | 2 +-
t/01-create.t | 4 +-
t/02-create-with-editor.t | 2 +-
t/03-update-ticket-with-editor.t | 16 ++++++------
t/06-ticket-show.t | 14 ++++++------
t/data/sd-ticket-create-verbose.tmpl | 2 +-
t/data/sd-ticket-create.tmpl | 2 +-
t/data/sd-ticket-update-all-props.tmpl | 2 +-
t/data/sd-ticket-update-verbose-all-props.tmpl | 2 +-
t/data/sd-ticket-update-verbose.tmpl | 4 +-
t/data/sd-ticket-update.tmpl | 2 +-
t/scripts/ticket-update-editor.pl | 4 +-
t/sd-dispatcher.t | 26 +++++++++++-----------
t/sd-hm/attachments.t | 2 +-
t/sd-hm/basics.t | 2 +-
t/sd-hm/comments.t | 2 +-
t/sd-hm/comments1.t | 2 +-
t/sd-hm/group.t | 2 +-
t/sd-hm/tag.t | 2 +-
t/sd-hm/update.t | 2 +-
t/sd-log.t | 10 ++++----
26 files changed, 88 insertions(+), 76 deletions(-)
- Log -----------------------------------------------------------------
commit c7b7b3aa577ca6b3d799255f9ead296219cd0e1e
Author: Jesse Vincent <jesse at bestpractical.com>
Date: Mon Apr 13 09:54:20 2009 -0400
Any::Moose for App::SD::CLI::Command::Server
diff --git a/lib/App/SD/CLI/Command/Server.pm b/lib/App/SD/CLI/Command/Server.pm
index 0b904bb..23141b1 100644
--- a/lib/App/SD/CLI/Command/Server.pm
+++ b/lib/App/SD/CLI/Command/Server.pm
@@ -1,5 +1,5 @@
package App::SD::CLI::Command::Server;
-use Moose;
+use Any::Moose;
extends 'Prophet::CLI::Command::Server';
sub run {
commit 332aa75eaa856c47443cc4ed478d69258978e5ad
Author: Jesse Vincent <jesse at bestpractical.com>
Date: Mon Apr 13 09:56:17 2009 -0400
Don't depend on LWP::Simple unless we're using trac sync
diff --git a/Makefile.PL b/Makefile.PL
index cb52710..f37e470 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -32,11 +32,10 @@ recommends 'Email::Address';
feature 'Trac sync' =>
-default => 0,
- 'Net::Trac' => 0.08,
- 'LWP::Simple' => 0;
+ 'LWP::Simple' => 0,
+ 'Net::Trac' => 0.08;
recommends 'Net::Trac';
-recommends 'LWP::Simple';
install_script('bin/sd');
install_script('bin/git-sd');
commit a6498dc8e09fefdb57da57fe04f58143eced6f4a
Author: Jesse Vincent <jesse at bestpractical.com>
Date: Mon Apr 13 10:07:41 2009 -0400
SD commands now complain rather than exploding when you don't have a replica
diff --git a/lib/App/SD/CLI/Dispatcher.pm b/lib/App/SD/CLI/Dispatcher.pm
index 8b9fcb7..5d8923b 100644
--- a/lib/App/SD/CLI/Dispatcher.pm
+++ b/lib/App/SD/CLI/Dispatcher.pm
@@ -46,6 +46,21 @@ under help => sub {
};
on help => run_command('Help');
+
+on qr'.*' => sub {
+ my $self = shift;
+ my $command = $_;
+ next_rule if $command =~ /^(?:shell|clone|init)$/;
+ if ( !$self->cli->app_handle->handle->replica_exists ) {
+ print join("\n","No SD database was found at " . $self->cli->app_handle->handle->url(),
+ qq{Type "$0 help init" or "$0 help environment" for tips on how to sort that out.});
+ }
+
+ next_rule;
+};
+
+
+
on browser => run_command('Browser');
on qr/^(\w+)\s+tickets?(.*)$/ => sub {
commit 40901580c3fed64bb4f5d3177eea389d1943baef
Author: Jesse Vincent <jesse at bestpractical.com>
Date: Mon Apr 13 10:09:50 2009 -0400
Reordered sd help environment a bit
diff --git a/lib/App/SD/CLI/Command/Help/Environment.pm b/lib/App/SD/CLI/Command/Help/Environment.pm
index 772f3eb..80f5caf 100644
--- a/lib/App/SD/CLI/Command/Help/Environment.pm
+++ b/lib/App/SD/CLI/Command/Help/Environment.pm
@@ -12,9 +12,8 @@ print <<EOF
The following environmental variables can be set to affect SD's
configuration. Example syntax is for bash-like shells.
- export PROPHET_DEVEL=1
- Turn on various development mode checks, warnings and autoreloading
- of modules.
+ export SD_REPO=/path/to/sd/replica
+ Specify where the ticket database SD is using should reside.
export PROPHET_USER=name
Use 'name' as the creator of changesets.
@@ -23,13 +22,6 @@ configuration. Example syntax is for bash-like shells.
Use jesse\@example.com as the default email address for reporting
tickets.
- export PROPHET_REPLICA_TYPE=prophet
- Use the prophet native replica type. Other backend replica
- types are: sqlite.
-
- export SD_REPO=/path/to/sd/replica
- Specify where the ticket database SD is using should reside.
-
export SD_CONFIG=/path/to/sd/config/file
Specify where the configuration file SD is using should reside.
@@ -39,6 +31,15 @@ configuration. Example syntax is for bash-like shells.
export PROPHET_HISTLENGTH=100
Specify how much history the interactive shell should store.
+ export PROPHET_DEVEL=1
+ Turn on various development mode checks, warnings and autoreloading
+ of modules.
+
+ export PROPHET_REPLICA_TYPE=prophet
+ Use the prophet native replica type. Other backend replica
+ types are: sqlite.
+
+
For information on SD database configuration files, see '${cmd}help config'.
EOF
commit 397572078a284ccbeec030bf6a7744ed9e6d02ea
Author: Jesse Vincent <jesse at bestpractical.com>
Date: Mon Apr 13 15:44:19 2009 -0400
Close the pager before starting the SD server
diff --git a/lib/App/SD/CLI/Command/Server.pm b/lib/App/SD/CLI/Command/Server.pm
index 23141b1..c4194f1 100644
--- a/lib/App/SD/CLI/Command/Server.pm
+++ b/lib/App/SD/CLI/Command/Server.pm
@@ -6,6 +6,8 @@ sub run {
my $self = shift;
my $server = $self->setup_server();
$server->read_only(1) unless ($self->has_arg('writable'));
+ Prophet::CLI->end_pager();
+
$server->run;
}
commit 5b7e7c24818fc42c3937df6316934c1de4889558
Author: Jesse Vincent <jesse at bestpractical.com>
Date: Tue Apr 14 10:39:20 2009 +0900
Switch from using username as the creator of a changeset to email address
diff --git a/lib/App/SD/CLI/Command/Help/Environment.pm b/lib/App/SD/CLI/Command/Help/Environment.pm
index 80f5caf..48af619 100644
--- a/lib/App/SD/CLI/Command/Help/Environment.pm
+++ b/lib/App/SD/CLI/Command/Help/Environment.pm
@@ -15,13 +15,10 @@ configuration. Example syntax is for bash-like shells.
export SD_REPO=/path/to/sd/replica
Specify where the ticket database SD is using should reside.
- export PROPHET_USER=name
- Use 'name' as the creator of changesets.
-
- export EMAIL=jesse\@example.com
- Use jesse\@example.com as the default email address for reporting
- tickets.
-
+ export PROPHET_EMAIL=jesse at example.com
+ Use 'jesse at example.com' as the creator of changesets. Prophet
+ will use EMAIL if PROPHET_EMAIL isn't defined.
+
export SD_CONFIG=/path/to/sd/config/file
Specify where the configuration file SD is using should reside.
diff --git a/lib/App/SD/CLI/Dispatcher.pm b/lib/App/SD/CLI/Dispatcher.pm
index 5d8923b..3f1a74a 100644
--- a/lib/App/SD/CLI/Dispatcher.pm
+++ b/lib/App/SD/CLI/Dispatcher.pm
@@ -109,9 +109,7 @@ under ticket => sub {
# off to update
on [ [ 'claim', 'take' ] ] => sub {
my $self = shift;
- my $email = $self->context->app_handle->config->get('email_address')
- || $ENV{EMAIL};
-
+ my $email = $self->context->app_handle->current_user_email;
if ($email) {
$self->context->set_prop(owner => $email);
run('ticket update', $self, @_);
diff --git a/lib/App/SD/Model/Ticket.pm b/lib/App/SD/Model/Ticket.pm
index 32a7192..5063c2d 100644
--- a/lib/App/SD/Model/Ticket.pm
+++ b/lib/App/SD/Model/Ticket.pm
@@ -53,7 +53,7 @@ the environmental variable C<EMAIL>.)
=cut
sub default_prop_reporter {
- shift->app_handle->config->get('email_address') or $ENV{EMAIL}
+ shift->app_handle->current_user_email;
}
=head2 canonicalize_prop_status
diff --git a/lib/App/SD/Test.pm b/lib/App/SD/Test.pm
index ef44c6a..3333970 100644
--- a/lib/App/SD/Test.pm
+++ b/lib/App/SD/Test.pm
@@ -22,6 +22,7 @@ BEGIN {
close $tmp_config;
print "setting SD_CONFIG to " . $tmp_config->filename . "\n";
$ENV{'SD_CONFIG'} = $tmp_config->filename;
+ $ENV{'PROPHET_EMAIL'} = 'nobody at example.com';
}
=head2 create_ticket_ok ARGS
@@ -126,7 +127,6 @@ Returns a list of the ticket luid, ticket uuid, comment luid, and comment uuid.
=cut
-
sub create_ticket_with_editor_ok {
my @extra_args = @_;
diff --git a/t/01-create.t b/t/01-create.t
index 265071e..1b95005 100644
--- a/t/01-create.t
+++ b/t/01-create.t
@@ -35,8 +35,8 @@ run_output_matches( 'sd', [ 'ticket', 'basics', '--batch', '--id', $yatta_id ],
'milestone: alpha',
'component: core',
qr/^created: \d{4}-\d{2}-\d{2}.+$/,
- qr/^creator: /,
- 'reporter: ' . $ENV{EMAIL},
+ 'creator: '. $ENV{PROPHET_EMAIL},
+ 'reporter: ' . $ENV{PROPHET_EMAIL},
"original_replica: " . replica_uuid,
]
);
diff --git a/t/02-create-with-editor.t b/t/02-create-with-editor.t
index 243798e..a8eafc2 100644
--- a/t/02-create-with-editor.t
+++ b/t/02-create-with-editor.t
@@ -32,7 +32,7 @@ sub create_ticket_and_check {
'component: core',
qr/^created: \d{4}-\d{2}-\d{2}.+$/,
qr/^creator: /,
- 'reporter: ' . $ENV{EMAIL},
+ 'reporter: ' . $ENV{PROPHET_EMAIL},
"original_replica: $replica_uuid",
]
);
diff --git a/t/03-update-ticket-with-editor.t b/t/03-update-ticket-with-editor.t
index c8136f3..a269236 100644
--- a/t/03-update-ticket-with-editor.t
+++ b/t/03-update-ticket-with-editor.t
@@ -36,7 +36,7 @@ run_output_matches( 'sd', [ 'ticket', 'basics', '--batch', '--id', $ticket_id ],
'owner: foo at bar.com',
qr/^created: \d{4}-\d{2}-\d{2}.+$/,
qr/^creator: /,
- 'reporter: ' . $ENV{EMAIL},
+ 'reporter: ' . $ENV{PROPHET_EMAIL},
"original_replica: $replica_uuid",
]
);
@@ -56,7 +56,7 @@ run_output_matches( 'sd', [ 'ticket', 'basics', '--batch', '--id', $ticket_id ],
qr/^created: \d{4}-\d{2}-\d{2}.+$/,
'due: 2050-01-25 23:11:42',
qr/^creator: /,
- 'reporter: ' . $ENV{EMAIL},
+ 'reporter: ' . $ENV{PROPHET_EMAIL},
"original_replica: $replica_uuid",
]
);
@@ -93,10 +93,10 @@ run_output_matches( 'sd', [ 'ticket', 'basics', '--batch', '--id', $ticket_id ]
'summary: now we are checking --all-props',
'status: new',
'milestone: alpha',
- "owner: $ENV{EMAIL}",
+ "owner: $ENV{PROPHET_EMAIL}",
qr/^created: \d{4}-\d{2}-\d{2}.+$/,
qr/^creator: /,
- 'reporter: ' . $ENV{EMAIL},
+ 'reporter: ' . $ENV{PROPHET_EMAIL},
"original_replica: $replica_uuid",
]
);
@@ -119,7 +119,7 @@ run_output_matches( 'sd', [ 'ticket', 'basics', '--batch', '--id', $ticket_id ],
qr/^created: \d{4}-\d{2}-\d{2}.+$/,
'due: 2050-01-31 19:14:09',
qr/^creator: /,
- 'reporter: ' . $ENV{EMAIL},
+ 'reporter: ' . $ENV{PROPHET_EMAIL},
"original_replica: $replica_uuid",
]
);
@@ -151,13 +151,13 @@ run_output_matches( 'sd', [ 'ticket', 'basics', '--batch', '--id', $ticket_id, '
'summary: now we are checking --verbose --all-props',
'status: new',
'milestone: alpha',
- "owner: $ENV{EMAIL}",
+ "owner: $ENV{PROPHET_EMAIL}",
qr/^created: \d{4}-\d{2}-\d{2}.+$/,
qr/^creator: /,
"original_replica: $replica_uuid",
# no ordering is imposed on props not in common_ticket_props
- qr/(?:reporter: $ENV{EMAIL}|component: core)/,
- qr/(?:reporter: $ENV{EMAIL}|component: core)/,
+ qr/(?:reporter: $ENV{PROPHET_EMAIL}|component: core)/,
+ qr/(?:reporter: $ENV{PROPHET_EMAIL}|component: core)/,
]
);
diff --git a/t/06-ticket-show.t b/t/06-ticket-show.t
index 32cf619..0be82b7 100644
--- a/t/06-ticket-show.t
+++ b/t/06-ticket-show.t
@@ -40,17 +40,17 @@ TODO: {
'milestone: alpha',
'component: core',
qr/^created:\s+\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}$/,
- qr/^creator:\s+$ENV{USER}$/,
- qr/reporter:\s+$ENV{EMAIL}$/,
+ qr/^creator:\s+$ENV{PROPHET_EMAIL}$/,
+ qr/reporter:\s+$ENV{PROPHET_EMAIL}$/,
qr/original_replica:\s+$replica_uuid$/,
'',
'= HISTORY',
'',
- qr/^ $ENV{USER} at \d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\s+\(\d+\@$replica_uuid\)$/,
+ qr/^ $ENV{PROPHET_EMAIL} at \d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\s+\(\d+\@$replica_uuid\)$/,
" + \"original_replica\" set to \"$replica_uuid\"",
- " + \"creator\" set to \"$ENV{USER}\"",
+ " + \"creator\" set to \"$ENV{PROPHET_EMAIL}\"",
' + "status" set to "new"',
- " + \"reporter\" set to \"$ENV{EMAIL}\"",
+ " + \"reporter\" set to \"$ENV{PROPHET_EMAIL}\"",
qr/^ \+ "created" set to "\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}"$/,
' + "component" set to "core"',
' + "summary" set to "YATTA"',
@@ -77,8 +77,8 @@ sub check_output_without_history {
'milestone: alpha',
'component: core',
qr/^created:\s+\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}$/,
- qr/^creator:\s+$ENV{USER}$/,
- qr/reporter:\s+$ENV{EMAIL}$/,
+ qr/^creator:\s+$ENV{PROPHET_EMAIL}$/,
+ qr/reporter:\s+$ENV{PROPHET_EMAIL}$/,
qr/original_replica:\s+$replica_uuid$/,
]
);
diff --git a/t/data/sd-ticket-create-verbose.tmpl b/t/data/sd-ticket-create-verbose.tmpl
index 37378a6..943b957 100644
--- a/t/data/sd-ticket-create-verbose.tmpl
+++ b/t/data/sd-ticket-create-verbose.tmpl
@@ -18,6 +18,6 @@ owner:
# when this ticket must be finished by (ISO 8601 format)
due:
# the email address of the person who reported this ticket
-qr/reporter: $ENV{EMAIL}/
+qr/reporter: $ENV{PROPHET_EMAIL}/
=== add new ticket comment below ===
diff --git a/t/data/sd-ticket-create.tmpl b/t/data/sd-ticket-create.tmpl
index 847bd68..f2d4af4 100644
--- a/t/data/sd-ticket-create.tmpl
+++ b/t/data/sd-ticket-create.tmpl
@@ -11,6 +11,6 @@ milestone: alpha
component: core
owner:
due:
-qr/reporter: $ENV{EMAIL}/
+qr/reporter: $ENV{PROPHET_EMAIL}/
=== add new ticket comment below ===
diff --git a/t/data/sd-ticket-update-all-props.tmpl b/t/data/sd-ticket-update-all-props.tmpl
index 47572e6..2016683 100644
--- a/t/data/sd-ticket-update-all-props.tmpl
+++ b/t/data/sd-ticket-update-all-props.tmpl
@@ -12,7 +12,7 @@ status: new
milestone: alpha
owner:
due: 2050-01-25 23:11:42
-qr/reporter: $ENV{EMAIL}/
+qr/reporter: $ENV{PROPHET_EMAIL}/
component: core
=== add new ticket comment below ===
diff --git a/t/data/sd-ticket-update-verbose-all-props.tmpl b/t/data/sd-ticket-update-verbose-all-props.tmpl
index 0c85af1..899c095 100644
--- a/t/data/sd-ticket-update-verbose-all-props.tmpl
+++ b/t/data/sd-ticket-update-verbose-all-props.tmpl
@@ -18,7 +18,7 @@ owner:
# when this ticket must be finished by \(ISO 8601 format\)
due: 2050-01-31 19:14:09
# the email address of the person who reported this ticket
-qr/reporter: $ENV{EMAIL}/
+qr/reporter: $ENV{PROPHET_EMAIL}/
# valid values for component: core, ui, docs, tests
component: core
diff --git a/t/data/sd-ticket-update-verbose.tmpl b/t/data/sd-ticket-update-verbose.tmpl
index c846abb..a3a81bc 100644
--- a/t/data/sd-ticket-update-verbose.tmpl
+++ b/t/data/sd-ticket-update-verbose.tmpl
@@ -14,10 +14,10 @@ status: new
# valid values for milestone: alpha, beta, 1.0
milestone: alpha
# the email address of the person who is responsible for this ticket
-qr/owner: $ENV{EMAIL}/
+qr/owner: $ENV{PROPHET_EMAIL}/
# when this ticket must be finished by \(ISO 8601 format\)
due:
# the email address of the person who reported this ticket
-qr/reporter: $ENV{EMAIL}/
+qr/reporter: $ENV{PROPHET_EMAIL}/
=== add new ticket comment below ===
diff --git a/t/data/sd-ticket-update.tmpl b/t/data/sd-ticket-update.tmpl
index 721c4e4..db331cc 100644
--- a/t/data/sd-ticket-update.tmpl
+++ b/t/data/sd-ticket-update.tmpl
@@ -12,6 +12,6 @@ status: new
milestone: alpha
owner: foo at bar.com
due:
-qr/reporter: $ENV{EMAIL}/
+qr/reporter: $ENV{PROPHET_EMAIL}/
=== add new ticket comment below ===
diff --git a/t/scripts/ticket-update-editor.pl b/t/scripts/ticket-update-editor.pl
index ee3df1e..2b527db 100755
--- a/t/scripts/ticket-update-editor.pl
+++ b/t/scripts/ticket-update-editor.pl
@@ -23,7 +23,7 @@ SDTestsEditor::edit( tmpl_files => { '--no-args' => 'sd-ticket-update.tmpl',
} elsif ($option eq '--all-props') {
s/(?<=summary: ).*$/now we are checking --all-props/;
s/^due:.*//; # deleting a prop
- s/(?<=^owner: ).*$/$ENV{EMAIL}/; # adding a prop
+ s/(?<=^owner: ).*$/$ENV{PROPHET_EMAIL}/; # adding a prop
} elsif ($option eq '--verbose') {
s/(?<=^summary: ).*$/now we are checking --verbose/;
s/^owner:.*//; # deleting a prop
@@ -31,7 +31,7 @@ SDTestsEditor::edit( tmpl_files => { '--no-args' => 'sd-ticket-update.tmpl',
} elsif ($option eq '--verbose-and-all') {
s/(?<=^summary: ).*$/now we are checking --verbose --all-props/;
s/^due.*//; # deleting a prop
- s/(?<=^owner: ).*$/$ENV{EMAIL}/; # adding a prop
+ s/(?<=^owner: ).*$/$ENV{PROPHET_EMAIL}/; # adding a prop
}
print;
diff --git a/t/sd-dispatcher.t b/t/sd-dispatcher.t
index ffed337..955a959 100644
--- a/t/sd-dispatcher.t
+++ b/t/sd-dispatcher.t
@@ -40,10 +40,10 @@ run_output_matches( 'sd', [ 'ticket', 'basics', '--batch', '--id', $yatta_id ],
'status: new',
'milestone: alpha',
'component: core',
- 'owner: ' . $ENV{EMAIL},
+ 'owner: ' . $ENV{PROPHET_EMAIL},
qr/^created: \d{4}-\d{2}-\d{2}.+$/,
qr/^creator: /,
- 'reporter: ' . $ENV{EMAIL},
+ 'reporter: ' . $ENV{PROPHET_EMAIL},
"original_replica: " . replica_uuid,
]
);
@@ -62,7 +62,7 @@ run_output_matches( 'sd', [ 'ticket', 'basics', '--batch', '--id', $yatta_id ],
'component: core',
qr/^created: \d{4}-\d{2}-\d{2}.+$/,
qr/^creator: /,
- 'reporter: ' . $ENV{EMAIL},
+ 'reporter: ' . $ENV{PROPHET_EMAIL},
"original_replica: " . replica_uuid,
]
);
@@ -79,10 +79,10 @@ run_output_matches( 'sd', [ 'ticket', 'basics', '--batch', '--id', $yatta_id ],
'status: new',
'milestone: alpha',
'component: core',
- 'owner: ' . $ENV{EMAIL},
+ 'owner: ' . $ENV{PROPHET_EMAIL},
qr/^created: \d{4}-\d{2}-\d{2}.+$/,
qr/^creator: /,
- 'reporter: ' . $ENV{EMAIL},
+ 'reporter: ' . $ENV{PROPHET_EMAIL},
"original_replica: " . replica_uuid,
]
);
@@ -99,10 +99,10 @@ run_output_matches( 'sd', [ 'ticket', 'basics', '--batch', '--id', $yatta_id ],
'status: closed',
'milestone: alpha',
'component: core',
- 'owner: ' . $ENV{EMAIL},
+ 'owner: ' . $ENV{PROPHET_EMAIL},
qr/^created: \d{4}-\d{2}-\d{2}.+$/,
qr/^creator: /,
- 'reporter: ' . $ENV{EMAIL},
+ 'reporter: ' . $ENV{PROPHET_EMAIL},
"original_replica: " . replica_uuid,
]
);
@@ -119,10 +119,10 @@ run_output_matches( 'sd', [ 'ticket', 'basics', '--batch', '--id', $yatta_id ],
'status: new',
'milestone: alpha',
'component: core',
- 'owner: ' . $ENV{EMAIL},
+ 'owner: ' . $ENV{PROPHET_EMAIL},
qr/^created: \d{4}-\d{2}-\d{2}.+$/,
qr/^creator: /,
- 'reporter: ' . $ENV{EMAIL},
+ 'reporter: ' . $ENV{PROPHET_EMAIL},
"original_replica: " . replica_uuid,
]
);
@@ -139,10 +139,10 @@ run_output_matches( 'sd', [ 'ticket', 'basics', '--batch', '--id', $yatta_id ],
'status: closed',
'milestone: alpha',
'component: core',
- 'owner: ' . $ENV{EMAIL},
+ 'owner: ' . $ENV{PROPHET_EMAIL},
qr/^created: \d{4}-\d{2}-\d{2}.+$/,
qr/^creator: /,
- 'reporter: ' . $ENV{EMAIL},
+ 'reporter: ' . $ENV{PROPHET_EMAIL},
"original_replica: " . replica_uuid,
]
);
@@ -162,7 +162,7 @@ run_output_matches( 'sd', [ 'ticket', 'basics', '--batch', '--id', $yatta_id ],
'owner: jesse at bestpractical.com',
qr/^created: \d{4}-\d{2}-\d{2}.+$/,
qr/^creator: /,
- 'reporter: ' . $ENV{EMAIL},
+ 'reporter: ' . $ENV{PROPHET_EMAIL},
"original_replica: " . replica_uuid,
]
);
@@ -181,7 +181,7 @@ run_output_matches( 'sd', [ 'ticket', 'basics', '--batch', '--id', $yatta_id ],
'owner: spang at bestpractical.com',
qr/^created: \d{4}-\d{2}-\d{2}.+$/,
qr/^creator: /,
- 'reporter: ' . $ENV{EMAIL},
+ 'reporter: ' . $ENV{PROPHET_EMAIL},
"original_replica: " . replica_uuid,
]
);
diff --git a/t/sd-hm/attachments.t b/t/sd-hm/attachments.t
index 7b5c146..162d91d 100644
--- a/t/sd-hm/attachments.t
+++ b/t/sd-hm/attachments.t
@@ -3,7 +3,7 @@ use warnings;
use strict;
use Prophet::Test;
use App::SD::Test;
-$ENV{'EMAIL'} = 'onlooker at example.com';
+$ENV{'PROPHET_EMAIL'} = 'onlooker at example.com';
BEGIN {
if ( $ENV{'JIFTY_APP_ROOT'} ) {
diff --git a/t/sd-hm/basics.t b/t/sd-hm/basics.t
index f91c26c..e04bb00 100644
--- a/t/sd-hm/basics.t
+++ b/t/sd-hm/basics.t
@@ -3,7 +3,7 @@ use warnings;
use strict;
use Prophet::Test;
use App::SD::Test;
-$ENV{'EMAIL'} = 'onlooker at example.com';
+$ENV{'PROPHET_EMAIL'} = 'onlooker at example.com';
BEGIN {
if ( $ENV{'JIFTY_APP_ROOT'} ) {
diff --git a/t/sd-hm/comments.t b/t/sd-hm/comments.t
index c74f2d8..9d2caa3 100644
--- a/t/sd-hm/comments.t
+++ b/t/sd-hm/comments.t
@@ -3,7 +3,7 @@ use warnings;
use strict;
use Prophet::Test;
use App::SD::Test;
-$ENV{'EMAIL'} = 'onlooker at example.com';
+$ENV{'PROPHET_EMAIL'} = 'onlooker at example.com';
BEGIN {
if ( $ENV{'JIFTY_APP_ROOT'} ) {
diff --git a/t/sd-hm/comments1.t b/t/sd-hm/comments1.t
index 786f40a..26b0e7f 100644
--- a/t/sd-hm/comments1.t
+++ b/t/sd-hm/comments1.t
@@ -3,7 +3,7 @@ use warnings;
use strict;
use Prophet::Test;
use App::SD::Test;
-$ENV{'EMAIL'} = 'onlooker at example.com';
+$ENV{'PROPHET_EMAIL'} = 'onlooker at example.com';
BEGIN {
if ( $ENV{'JIFTY_APP_ROOT'} ) {
diff --git a/t/sd-hm/group.t b/t/sd-hm/group.t
index f6a28f1..c1d6f92 100644
--- a/t/sd-hm/group.t
+++ b/t/sd-hm/group.t
@@ -4,7 +4,7 @@ use strict;
use Prophet::Test;
use App::SD::Test;
use File::Path qw(rmtree);
-$ENV{'EMAIL'} = 'onlooker at example.com';
+$ENV{'PROPHET_EMAIL'} = 'onlooker at example.com';
BEGIN {
if ( $ENV{'JIFTY_APP_ROOT'} ) {
diff --git a/t/sd-hm/tag.t b/t/sd-hm/tag.t
index fb0dee1..27a7789 100644
--- a/t/sd-hm/tag.t
+++ b/t/sd-hm/tag.t
@@ -3,7 +3,7 @@ use warnings;
use strict;
use Prophet::Test;
use App::SD::Test;
-$ENV{'EMAIL'} = 'onlooker at example.com';
+$ENV{'PROPHET_EMAIL'} = 'onlooker at example.com';
BEGIN {
if ( $ENV{'JIFTY_APP_ROOT'} ) {
diff --git a/t/sd-hm/update.t b/t/sd-hm/update.t
index 55badd9..3b06537 100644
--- a/t/sd-hm/update.t
+++ b/t/sd-hm/update.t
@@ -3,7 +3,7 @@ use warnings;
use strict;
use Prophet::Test;
use App::SD::Test;
-$ENV{'EMAIL'} = 'onlooker at example.com';
+$ENV{'PROPHET_EMAIL'} = 'onlooker at example.com';
BEGIN {
if ( $ENV{'JIFTY_APP_ROOT'} ) {
diff --git a/t/sd-log.t b/t/sd-log.t
index 600d8fe..504f10f 100644
--- a/t/sd-log.t
+++ b/t/sd-log.t
@@ -26,12 +26,12 @@ my ($log_id, $log_uuid) = create_ticket_ok( '--', 'summary', 'logs rock!');
run_output_matches_unordered( 'sd', [ 'log', 'LATEST' ],
[
- qr/^\d{4}-\d{2}-\d{2}.+ - \d+ : $ENV{USER} @ $replica_uuid$/,
+ qr/^\d{4}-\d{2}-\d{2}.+ - \d+ : $ENV{PROPHET_EMAIL} @ $replica_uuid$/,
qr/^ # Ticket \d+ \(logs rock!\)$/,
' + "original_replica" set to "'.$replica_uuid.'"',
- ' + "creator" set to "'.$ENV{USER}.'"',
+ ' + "creator" set to "'.$ENV{PROPHET_EMAIL}.'"',
' + "status" set to "new"',
- ' + "reporter" set to "'.$ENV{EMAIL}.'"',
+ ' + "reporter" set to "'.$ENV{PROPHET_EMAIL}.'"',
qr/^ \+ "created" set to "\d{4}-\d{2}-\d{2}.+"$/,
' + "component" set to "core"',
' + "summary" set to "logs rock!"',
@@ -49,9 +49,9 @@ run_output_matches( 'sd', [ 'ticket',
# check the log
run_output_matches( 'sd', [ 'log', 'LATEST' ],
[
- qr/^\d{4}-\d{2}-\d{2}.+ - \d+ : $ENV{USER} @ $replica_uuid$/,
+ qr/^\d{4}-\d{2}-\d{2}.+ - \d+ : $ENV{PROPHET_EMAIL} @ $replica_uuid$/,
qr/^ # Ticket \d+ \(logs rock!\)$/,
- ' > "reporter" changed from "'.$ENV{EMAIL}.'" to "foo at bar.com".',
+ ' > "reporter" changed from "'.$ENV{PROPHET_EMAIL}.'" to "foo at bar.com".',
'',
], [], "log output is correct",
);
-----------------------------------------------------------------------
More information about the Bps-public-commit
mailing list