[Bps-public-commit] SD - A distributed issue tracker branch, master, updated. 84c5709e4196be75a063f3431b8a5218f740582f

[jesse]

The branch, master has been updated
       via  84c5709e4196be75a063f3431b8a5218f740582f (commit)
       via  b4b394ec9fc98af486044a9cfa17d49149092a7e (commit)
       via  c9e6027448eeef72a974dd558ddd8873c9599746 (commit)
      from  56b578d26a5bf362dec6b86e3d304e9de57343ee (commit)

Summary of changes:
 bin/sd                     |    2 +-
 t/sd-rt/sd-rt-permission.t |   17 ++++++++---------
 2 files changed, 9 insertions(+), 10 deletions(-)

- Log -----------------------------------------------------------------
commit c9e6027448eeef72a974dd558ddd8873c9599746
Author: Jesse Vincent <jesse at bestpractical.com>
Date:   Fri Jan 16 16:29:07 2009 -0500

    Renamed a variable in sd-rt-permission.t to be more readable

diff --git a/t/sd-rt/sd-rt-permission.t b/t/sd-rt/sd-rt-permission.t
index 8789469..3d74ec9 100644
--- a/t/sd-rt/sd-rt-permission.t
+++ b/t/sd-rt/sd-rt-permission.t
@@ -61,11 +61,11 @@ my $sd_root_url = "rt:$root_url|General|Status!='resolved'";
 
 my $alice_url = $url;
 $alice_url =~ s|http://|http://alice:AlicesPassword@|;
-my $sd_alice_url = "rt:$alice_url|General|Status!='resolved'";
+my $alice_rt_url = "rt:$alice_url|General|Status!='resolved'";
 
 as_alice {
     run_script( 'sd', [ 'init']);
-    ($ret, $out, $err) = run_script('sd', ['pull', '--from',  $sd_alice_url, '--force']);
+    ($ret, $out, $err) = run_script('sd', ['pull', '--from',  $alice_rt_url, '--force']);
     ok($ret);
     like($out, qr/No new changesets/);
 
@@ -74,7 +74,6 @@ as_alice {
         like($err, qr/No tickets found/);
         }
 };
-
 diag("grant read rights, ensure we can pull it");
 
 my $queue = RT::Queue->new($RT::SystemUser);
@@ -85,7 +84,7 @@ $alice->PrincipalObj->GrantRight(Right => 'ShowTicket', Object => $queue);
 
 my $flyman_id;
 as_alice {
-    ($ret, $out, $err) = run_script('sd', ['pull', '--from',  $sd_alice_url]);
+    ($ret, $out, $err) = run_script('sd', ['pull', '--from',  $alice_rt_url]);
     ok($ret);
     like($out, qr/Merged one changeset/);
 
@@ -100,7 +99,7 @@ as_alice {
         [qr/ticket .*$flyman_id.* updated/],
     );
 
-    ($ret, $out, $err) = run_script('sd', ['push', '--to',  $sd_alice_url]);
+    ($ret, $out, $err) = run_script('sd', ['push', '--to',  $alice_rt_url]);
     ok($ret);
     like($err, qr/You are not allowed to modify ticket $ticket_id/);
 
@@ -114,7 +113,7 @@ as_alice {
     }
 
     # try again to make sure we still have pending changesets
-    ($ret, $out, $err) = run_script('sd', ['push', '--to',  $sd_alice_url]);
+    ($ret, $out, $err) = run_script('sd', ['push', '--to',  $alice_rt_url]);
 
     TODO: {
         local $TODO = "we mark all changesets as merged even if some failed";
@@ -134,7 +133,7 @@ diag("give write rights, try to push again");
 $alice->PrincipalObj->GrantRight(Right => 'ModifyTicket', Object => $queue);
 
 as_alice {
-    ($ret, $out, $err) = run_script('sd', ['push', '--to',  $sd_alice_url]);
+    ($ret, $out, $err) = run_script('sd', ['push', '--to',  $alice_rt_url]);
     ok($ret);
     TODO: {
         local $TODO = "Prophet thinks it already merged this changeset!";
@@ -161,7 +160,7 @@ $ticket = RT::Client::REST::Ticket->new(
 )->store;
 
 as_alice {
-    ($ret, $out, $err) = run_script('sd', ['pull', '--from',  $sd_alice_url]);
+    ($ret, $out, $err) = run_script('sd', ['pull', '--from',  $alice_rt_url]);
     ok($ret);
     like($out, qr/No new changesets/);
 
@@ -179,7 +178,7 @@ as_alice {
         [qr/ticket .*$flyman_id.* updated/],
     );
 
-    ($ret, $out, $err) = run_script('sd', ['push', '--to',  $sd_alice_url]);
+    ($ret, $out, $err) = run_script('sd', ['push', '--to',  $alice_rt_url]);
     ok($ret);
     like($out, qr/Merged one changeset/, "pushed the 'resolve' changeset");
 };

commit b4b394ec9fc98af486044a9cfa17d49149092a7e
Author: Jesse Vincent <jesse at bestpractical.com>
Date:   Fri Jan 16 17:19:24 2009 -0500

    Only set PROPHET_REPO to SD_REPO if PROPHET_REPO is empty

diff --git a/bin/sd b/bin/sd
index d48ccec..5dea7ef 100755
--- a/bin/sd
+++ b/bin/sd
@@ -6,7 +6,7 @@ BEGIN { $ENV{'CLASS_MOP_NO_XS'} = 1 if ($^V == 5.0010); }
 
 use App::SD::CLI;
 
-$ENV{'PROPHET_REPO'} = $ENV{'SD_REPO'} || $ENV{'HOME'}.'/.sd';
+$ENV{'PROPHET_REPO'} ||= $ENV{'SD_REPO'} || $ENV{'HOME'}.'/.sd';
 
 # Moose likes generating very noisy backtraces. Most users don't need to see
 # anything more than the root cause of the failure. Developers and the curious

commit 84c5709e4196be75a063f3431b8a5218f740582f
Merge: b4b394e... 56b578d...
Author: Jesse Vincent <jesse at bestpractical.com>
Date:   Fri Jan 16 17:20:01 2009 -0500

    Merge branch 'master' of code.bestpractical.com:/git/sd


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