[Bps-public-commit] RT-Extension-rt_cpan_org branch, rt4, updated. 784eb980473a3deba26f34988c0cc808b0d97498
Thomas Sibley
trs at bestpractical.com
Tue Mar 19 15:53:22 EDT 2013
The branch, rt4 has been updated
via 784eb980473a3deba26f34988c0cc808b0d97498 (commit)
via 9125de188580e21684d9daa621e464b9544afb59 (commit)
via 52f4660444f96aae34d14a17efba1aea8d6c2072 (commit)
via ea748d01284b2fff74dbc56d18c5626246292c73 (commit)
via a408808da1f6f812b1b2e65725a310ef636ced2b (commit)
via 3584b5ac5a2e63df882b0490784d920021372111 (commit)
via a9766f3eb2623d6e2e9d5bfdb8593c2730b8b4bf (commit)
via 8bef81ce56f7c36ce635c61bcc3b21a7d6018c2d (commit)
via 4e6e801217e3a18b077cac536900051db94f7665 (commit)
via f948e903e85bcb32385af9538426c041bf54ed4e (commit)
via e69e68c8a7e2cf5230d12892785b6c1f41dae1e7 (commit)
via db7a915cc6ea5bbfb285e967f5737769d2a6fd93 (commit)
from 9958698aab3a7abc5e72614910fd4780bf6ee73d (commit)
Summary of changes:
bin/pull-live | 47 ++++++++++++++++++++++++++++++++++-------------
etc/CPAN_Config.pm | 7 +++++++
2 files changed, 41 insertions(+), 13 deletions(-)
mode change 100644 => 100755 bin/pull-live
- Log -----------------------------------------------------------------
commit db7a915cc6ea5bbfb285e967f5737769d2a6fd93
Author: Thomas Sibley <trs at bestpractical.com>
Date: Mon Mar 18 17:55:36 2013 -0700
Use whatever perl we're running with
This is useful when running this script outside the production
environment. Inside production, the current perl should always be
correct.
diff --git a/bin/pull-live b/bin/pull-live
index 70c0398..958a180 100644
--- a/bin/pull-live
+++ b/bin/pull-live
@@ -1,4 +1,4 @@
-#!/home/rtcpan/perl/bin/perl
+#!/usr/bin/env perl
use Getopt::Long;
@@ -10,7 +10,7 @@ GetOptions(
sub skip($);
-my $perl = $ENV{'PERL'} = '/home/rtcpan/perl/bin/perl';
+my $perl = $ENV{'PERL'} = $^X;
my $root = $ENV{'RTHOME'} = "/home/rtcpan/rt38";
commit e69e68c8a7e2cf5230d12892785b6c1f41dae1e7
Author: Thomas Sibley <trs at bestpractical.com>
Date: Mon Mar 18 18:13:03 2013 -0700
Updates for RT 4
Mostly simple renaming. Also adds the "standalone" web handler since
that is useful for local testing.
diff --git a/bin/pull-live b/bin/pull-live
index 958a180..e72bec8 100644
--- a/bin/pull-live
+++ b/bin/pull-live
@@ -12,16 +12,16 @@ sub skip($);
my $perl = $ENV{'PERL'} = $^X;
-my $root = $ENV{'RTHOME'} = "/home/rtcpan/rt38";
+my $root = $ENV{'RTHOME'} = "/home/rtcpan/rt40";
my $rt_opts =
" --prefix=$root"
." --with-db-type=mysql"
." --with-db-host=''" # connect via socket
." --with-db-port=3307"
- ." --with-db-database=rt_cpan_org_38"
+ ." --with-db-database=rt_cpan_org_40"
." --disable-gpg"
- ." --with-web-handler=fastcgi-server"
+ ." --with-web-handler=fastcgi,standalone"
." --with-web-user=rtcpan"
." --with-web-group=rtcpan";
@@ -65,7 +65,7 @@ unless ( skip 'RT' ) {
my $repo = 'git://github.com/bestpractical/rt.git';
($_ = `git clone $repo`)
or !$? or die "$_\n\nCouldn't export repo";
- ($_ = `cd rt && git checkout origin/3.8-trunk && sh ./configure.ac $rt_opts && sudo make install`)
+ ($_ = `cd rt && git checkout origin/4.0-trunk && sh ./configure.ac $rt_opts && sudo make install`)
or !$? or die "$_\n\nCouldn't upgrade RT";
}
commit f948e903e85bcb32385af9538426c041bf54ed4e
Author: Thomas Sibley <trs at bestpractical.com>
Date: Mon Mar 18 18:34:30 2013 -0700
Ensure .pm, .pl, .t, .diff, .patch attachments all display reasonably
Regardless of whatever content-type the client sent.
diff --git a/bin/pull-live b/bin/pull-live
index e72bec8..c67c617 100644
--- a/bin/pull-live
+++ b/bin/pull-live
@@ -40,6 +40,7 @@ my @UPDATE = qw{
RT-Authen-OpenID
RT-Extension-Utils
CPAN2RT
+ RT-Extension-CustomizeContentType
};
my %REPOS = (
@@ -54,6 +55,7 @@ my %REPOS = (
'RT-Extension-rt_cpan_org' => 'git://github.com/bestpractical/rt-extension-rt_cpan_org.git',
'RT-Extension-ReportSpam' => 'git://github.com/bestpractical/rt-extension-reportspam.git',
'RT-Extension-Utils' => 'git://github.com/bestpractical/rt-extension-utils.git',
+ 'RT-Extension-CustomizeContentType' => 'git://github.com/bestpractical/rt-extension-customizecontenttype.git',
);
my $tmp_dir = tempdir( CLEAN => 1 )
diff --git a/etc/CPAN_Config.pm b/etc/CPAN_Config.pm
index 44a3756..2fd2919 100644
--- a/etc/CPAN_Config.pm
+++ b/etc/CPAN_Config.pm
@@ -143,4 +143,11 @@ my %lifecycles = RT->Config->Get("Lifecycles");
# model is pretty simple.
Set($UseSQLForACLChecks, 1);
+# Useful forced content types based on usage.
+# Requires RT::Extension::CustomizeContentType.
+Set(%ContentTypes,
+ (map { $_ => "text/x-perl" } qw( pm pl t )),
+ (map { $_ => "text/x-diff" } qw( diff patch )),
+);
+
1;
commit 4e6e801217e3a18b077cac536900051db94f7665
Author: Thomas Sibley <trs at bestpractical.com>
Date: Mon Mar 18 18:40:25 2013 -0700
Provide a sanity check of Perl and RT paths unless --batch is specified
diff --git a/bin/pull-live b/bin/pull-live
index c67c617..4c4f36d 100644
--- a/bin/pull-live
+++ b/bin/pull-live
@@ -2,10 +2,11 @@
use Getopt::Long;
-my (@skip, @only);
+my (@skip, @only, $batch);
GetOptions(
"skip=s@" => \@skip,
"only=s@" => \@only,
+ "batch" => \$batch,
);
sub skip($);
@@ -14,6 +15,16 @@ my $perl = $ENV{'PERL'} = $^X;
my $root = $ENV{'RTHOME'} = "/home/rtcpan/rt40";
+unless ($batch) {
+ print <<SANITY_CHECK;
+RT: $root
+Perl: $perl
+
+Press enter to continue or ^C to abort.
+SANITY_CHECK
+ <STDIN>;
+}
+
my $rt_opts =
" --prefix=$root"
." --with-db-type=mysql"
commit 8bef81ce56f7c36ce635c61bcc3b21a7d6018c2d
Author: Thomas Sibley <trs at bestpractical.com>
Date: Mon Mar 18 18:40:45 2013 -0700
Pull the RT root from the environment or passed option
diff --git a/bin/pull-live b/bin/pull-live
index 4c4f36d..ec4541b 100644
--- a/bin/pull-live
+++ b/bin/pull-live
@@ -2,10 +2,12 @@
use Getopt::Long;
+my $rthome = $ENV{'RTHOME'} || "/home/rtcpan/rt40";
my (@skip, @only, $batch);
GetOptions(
"skip=s@" => \@skip,
"only=s@" => \@only,
+ "rt=s" => \$rthome,
"batch" => \$batch,
);
@@ -13,7 +15,7 @@ sub skip($);
my $perl = $ENV{'PERL'} = $^X;
-my $root = $ENV{'RTHOME'} = "/home/rtcpan/rt40";
+my $root = $ENV{'RTHOME'} = $rthome;
unless ($batch) {
print <<SANITY_CHECK;
commit a9766f3eb2623d6e2e9d5bfdb8593c2730b8b4bf
Author: Thomas Sibley <trs at bestpractical.com>
Date: Mon Mar 18 18:41:30 2013 -0700
Save a git checkout step by specifying the branch we want to git clone
diff --git a/bin/pull-live b/bin/pull-live
index ec4541b..519a55a 100644
--- a/bin/pull-live
+++ b/bin/pull-live
@@ -78,9 +78,9 @@ chdir $tmp_dir;
unless ( skip 'RT' ) {
my $repo = 'git://github.com/bestpractical/rt.git';
- ($_ = `git clone $repo`)
+ ($_ = `git clone $repo --branch 4.0-trunk`)
or !$? or die "$_\n\nCouldn't export repo";
- ($_ = `cd rt && git checkout origin/4.0-trunk && sh ./configure.ac $rt_opts && sudo make install`)
+ ($_ = `cd rt && sh ./configure.ac $rt_opts && sudo make install`)
or !$? or die "$_\n\nCouldn't upgrade RT";
}
commit 3584b5ac5a2e63df882b0490784d920021372111
Author: Thomas Sibley <trs at bestpractical.com>
Date: Mon Mar 18 18:44:40 2013 -0700
Mark pull-live executable
diff --git a/bin/pull-live b/bin/pull-live
old mode 100644
new mode 100755
commit a408808da1f6f812b1b2e65725a310ef636ced2b
Author: Thomas Sibley <trs at bestpractical.com>
Date: Tue Mar 19 12:49:20 2013 -0700
CPAN2RT must be used from the deploy branch
The master branch contains a reworking that tries to fix some problems,
but it hasn't been tested.
diff --git a/bin/pull-live b/bin/pull-live
index 519a55a..d8ed946 100755
--- a/bin/pull-live
+++ b/bin/pull-live
@@ -57,7 +57,7 @@ my @UPDATE = qw{
};
my %REPOS = (
- 'CPAN2RT' => 'git://github.com/bestpractical/cpan2rt.git',
+ 'CPAN2RT' => 'git://github.com/bestpractical/cpan2rt.git --branch deploy',
'RT-Authen-Bitcard' => 'git://github.com/bestpractical/rt-authen-bitcard.git',
'RT-Authen-OpenID' => 'git://github.com/bestpractical/rt-authen-openid.git',
'RT-Authen-PAUSE' => 'git://github.com/bestpractical/rt-authen-pause.git',
commit ea748d01284b2fff74dbc56d18c5626246292c73
Author: Thomas Sibley <trs at bestpractical.com>
Date: Tue Mar 19 12:50:03 2013 -0700
Clean up temp directories on exit
The option was misspelled.
diff --git a/bin/pull-live b/bin/pull-live
index d8ed946..b603397 100755
--- a/bin/pull-live
+++ b/bin/pull-live
@@ -71,7 +71,7 @@ my %REPOS = (
'RT-Extension-CustomizeContentType' => 'git://github.com/bestpractical/rt-extension-customizecontenttype.git',
);
-my $tmp_dir = tempdir( CLEAN => 1 )
+my $tmp_dir = tempdir( CLEANUP => 1 )
or die "Couldn't get temp dir";
chdir $tmp_dir;
commit 52f4660444f96aae34d14a17efba1aea8d6c2072
Author: Thomas Sibley <trs at bestpractical.com>
Date: Tue Mar 19 12:51:09 2013 -0700
Install RT from the latest release, not from git
We much prefer to track actual releases. Tracking the stable trunk was
a bad habit.
diff --git a/bin/pull-live b/bin/pull-live
index b603397..eb8cb48 100755
--- a/bin/pull-live
+++ b/bin/pull-live
@@ -77,10 +77,10 @@ my $tmp_dir = tempdir( CLEANUP => 1 )
chdir $tmp_dir;
unless ( skip 'RT' ) {
- my $repo = 'git://github.com/bestpractical/rt.git';
- ($_ = `git clone $repo --branch 4.0-trunk`)
- or !$? or die "$_\n\nCouldn't export repo";
- ($_ = `cd rt && sh ./configure.ac $rt_opts && sudo make install`)
+ my $url = 'http://download.bestpractical.com/pub/rt/release/rt.tar.gz';
+ ($_ = `curl $url | tar xzp`)
+ or !$? or die "$_\n\nCouldn't download and extract RT ($url)";
+ ($_ = `cd rt-4.* && ./configure $rt_opts && sudo make install`)
or !$? or die "$_\n\nCouldn't upgrade RT";
}
commit 9125de188580e21684d9daa621e464b9544afb59
Author: Thomas Sibley <trs at bestpractical.com>
Date: Tue Mar 19 12:51:46 2013 -0700
Tidy up script output while installing plugins
diff --git a/bin/pull-live b/bin/pull-live
index eb8cb48..8a9a782 100755
--- a/bin/pull-live
+++ b/bin/pull-live
@@ -96,7 +96,7 @@ foreach my $module (@UPDATE) {
($_ = `svn export --quiet --non-interactive --force $repo $module`)
or !$? or die "$_\n\nCouldn't export repo";
} else {
- ($_ = `git clone $repo $module`)
+ ($_ = `git clone --quiet $repo $module`)
or !$? or die "$_\n\nCouldn't export repo";
}
@@ -105,6 +105,7 @@ foreach my $module (@UPDATE) {
or !$? or die "$_\n\nCouldn't install module";
rmtree($module);
+ print "\n";
}
# adjust bugs-per-dist.data and queue-addresses
commit 784eb980473a3deba26f34988c0cc808b0d97498
Author: Thomas Sibley <trs at bestpractical.com>
Date: Tue Mar 19 12:52:39 2013 -0700
Pull the rt4 branches for a number of extensions
This should be reverted as soon as those branches hit master in their
respective repos.
diff --git a/bin/pull-live b/bin/pull-live
index 8a9a782..943eee2 100755
--- a/bin/pull-live
+++ b/bin/pull-live
@@ -71,6 +71,11 @@ my %REPOS = (
'RT-Extension-CustomizeContentType' => 'git://github.com/bestpractical/rt-extension-customizecontenttype.git',
);
+# Quick hack, should be removed as soon as the rt4 branches are merged
+$REPOS{$_} .= " --branch rt4"
+ for grep { not (/RT-Extension-/ or $REPOS{$_} =~ /--branch/) }
+ keys %REPOS;
+
my $tmp_dir = tempdir( CLEANUP => 1 )
or die "Couldn't get temp dir";
-----------------------------------------------------------------------
More information about the Bps-public-commit
mailing list