[Bps-public-commit] RT-Extension-ActivityReports branch, master, updated. 1.04-2-g5a92642

[Kevin Falcone]

The branch, master has been updated
       via  5a9264211729041e4f06f2454c887ce1df3f301c (commit)
       via  858d3514bc21618f41f9d7ff2e67285caa094c9d (commit)
      from  addc3957ac6a271bc66a9db2d6cb5932986052a9 (commit)

Summary of changes:
 Changes                             |  4 ++++
 META.yml                            |  4 ++--
 inc/Module/Install/RTx.pm           | 15 +++++++++------
 lib/RT/Extension/ActivityReports.pm |  2 +-
 4 files changed, 16 insertions(+), 9 deletions(-)

- Log -----------------------------------------------------------------
commit 858d3514bc21618f41f9d7ff2e67285caa094c9d
Author: Kevin Falcone <falcone at bestpractical.com>
Date:   Mon Jul 14 12:13:02 2014 -0400

    Update Module::Install::RTx
    
    Gets default Debian support and better handling of stray /lib/RT.pm or
    /lib/ on user supplied paths.

diff --git a/META.yml b/META.yml
index 167dc21..7c5d7de 100644
--- a/META.yml
+++ b/META.yml
@@ -24,6 +24,6 @@ requires:
 resources:
   license: http://dev.perl.org/licenses/
 version: '1.04'
-x_module_install_rtx_version: 0.34_04
+x_module_install_rtx_version: 0.34_05
 x_requires_rt: 4.0.0
 x_rt_too_new: 4.4.0
diff --git a/inc/Module/Install/RTx.pm b/inc/Module/Install/RTx.pm
index 31db76d..160d13a 100644
--- a/inc/Module/Install/RTx.pm
+++ b/inc/Module/Install/RTx.pm
@@ -8,7 +8,7 @@ no warnings 'once';
 
 use Module::Install::Base;
 use base 'Module::Install::Base';
-our $VERSION = '0.34_04';
+our $VERSION = '0.34_05';
 
 use FindBin;
 use File::Glob     ();
@@ -35,7 +35,9 @@ sub RTx {
     $self->add_metadata("x_module_install_rtx_version", $VERSION );
 
     # Try to find RT.pm
-    my @prefixes = qw( /opt /usr/local /home /usr /sw );
+    my @prefixes = qw( /opt /usr/local /home /usr /sw /usr/share/request-tracker4);
+    $ENV{RTHOME} =~ s{/RT\.pm$}{} if defined $ENV{RTHOME};
+    $ENV{RTHOME} =~ s{/lib/?$}{}  if defined $ENV{RTHOME};
     my @try = $ENV{RTHOME} ? ($ENV{RTHOME}, "$ENV{RTHOME}/lib") : ();
     while (1) {
         my @look = @INC;
@@ -46,9 +48,10 @@ sub RTx {
 
         warn
             "Cannot find the location of RT.pm that defines \$RT::LocalPath in: @look\n";
-        $_ = $self->prompt("Path to directory containing your RT.pm:") or exit;
-        $_ =~ s{(/lib)?/RT\.pm$}{};
-        @try = ("$_/rt4/lib", "$_/lib/rt4", "$_/lib");
+        my $given = $self->prompt("Path to directory containing your RT.pm:") or exit;
+        $given =~ s{/RT\.pm$}{};
+        $given =~ s{/lib/?$}{};
+        @try = ($given, "$given/lib");
     }
 
     print "Using RT configuration from $INC{'RT.pm'}:\n";
@@ -250,4 +253,4 @@ sub _load_rt_handle {
 
 __END__
 
-#line 369
+#line 372

commit 5a9264211729041e4f06f2454c887ce1df3f301c
Author: Kevin Falcone <falcone at bestpractical.com>
Date:   Mon Jul 14 12:13:42 2014 -0400

    Bump version to 1.05

diff --git a/Changes b/Changes
index 2997a91..9275fd1 100644
--- a/Changes
+++ b/Changes
@@ -1,3 +1,7 @@
+1.05 2014-07-14
+ - Updated Module::Install::RTx for better Debian compat and better
+   handling of user supplied paths
+
 1.04 2014-07-09
  - Fix missing WebPath
  - Update for 4.2 compatibility
diff --git a/META.yml b/META.yml
index 7c5d7de..456ed53 100644
--- a/META.yml
+++ b/META.yml
@@ -23,7 +23,7 @@ requires:
   perl: 5.8.3
 resources:
   license: http://dev.perl.org/licenses/
-version: '1.04'
+version: '1.05'
 x_module_install_rtx_version: 0.34_05
 x_requires_rt: 4.0.0
 x_rt_too_new: 4.4.0
diff --git a/lib/RT/Extension/ActivityReports.pm b/lib/RT/Extension/ActivityReports.pm
index 0b13801..d284177 100644
--- a/lib/RT/Extension/ActivityReports.pm
+++ b/lib/RT/Extension/ActivityReports.pm
@@ -3,7 +3,7 @@ package RT::Extension::ActivityReports;
 use Exporter qw( import );
 @EXPORT_OK = qw( RelevantTxns );
 
-our $VERSION = '1.04';
+our $VERSION = '1.05';
 
 =head1 NAME
 

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