[Bps-public-commit] rt-extension-ajaxpreviewscrips branch, master, updated. 0.03-2-g568572c

[Kevin Falcone]

The branch, master has been updated
       via  568572c1a25a670a43d65f853c38660f6d8b4e2e (commit)
       via  de5db19b4b7bb3931e789b13aa9077fa76d709aa (commit)
      from  6fcef09672a38cc9b1384d6b5034de859efdad4c (commit)

Summary of changes:
 META.yml                              |  2 +-
 README                                | 11 ++++++-----
 inc/Module/Install/RTx.pm             | 30 +++++++++++++++++++-----------
 lib/RT/Extension/AjaxPreviewScrips.pm |  7 +++++--
 4 files changed, 31 insertions(+), 19 deletions(-)

- Log -----------------------------------------------------------------
commit de5db19b4b7bb3931e789b13aa9077fa76d709aa
Author: Kevin Falcone <falcone at bestpractical.com>
Date:   Mon Sep 15 13:42:08 2014 -0400

    Newer version of Module::Install::RTx

diff --git a/META.yml b/META.yml
index 6082831..9c91f3d 100644
--- a/META.yml
+++ b/META.yml
@@ -24,6 +24,6 @@ requires:
 resources:
   license: http://opensource.org/licenses/gpl-license.php
 version: '0.03'
-x_module_install_rtx_version: 0.34_04
+x_module_install_rtx_version: 0.35_01
 x_requires_rt: 4.2.0
 x_rt_too_new: 4.4.0
diff --git a/inc/Module/Install/RTx.pm b/inc/Module/Install/RTx.pm
index 31db76d..02e645b 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.35_01';
 
 use FindBin;
 use File::Glob     ();
@@ -18,7 +18,8 @@ my @DIRS = qw(etc lib html static bin sbin po var);
 my @INDEX_DIRS = qw(lib bin sbin);
 
 sub RTx {
-    my ( $self, $name ) = @_;
+    my ( $self, $name, $extra_args ) = @_;
+    $extra_args ||= {};
 
     # Set up names
     my $fname = $name;
@@ -30,12 +31,16 @@ sub RTx {
         unless $self->version;
     $self->abstract("$name Extension")
         unless $self->abstract;
-    $self->readme_from( "lib/$fname.pm",
-                        { options => [ quotes => "none" ] } );
+    unless ( $extra_args->{no_readme_generation} ) {
+        $self->readme_from( "lib/$fname.pm",
+                            { options => [ quotes => "none" ] } );
+    }
     $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 +51,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";
@@ -59,7 +65,9 @@ sub RTx {
     unshift @INC, $lib_path;
 
     # Set a baseline minimum version
-    $self->requires_rt('4.0.0');
+    unless ( $extra_args->{deprecated_rt} ) {
+        $self->requires_rt('4.0.0');
+    }
 
     # Installation locations
     my %path;
@@ -190,7 +198,7 @@ sub requires_rt_plugin {
     my ( $plugin ) = @_;
 
     if ($self->is_admin) {
-        my $plugins = $self->{values}{"x_requires_rt_plugins"} || [];
+        my $plugins = $self->Meta->{values}{"x_requires_rt_plugins"} || [];
         push @{$plugins}, $plugin;
         $self->add_metadata("x_requires_rt_plugins", $plugins);
     }
@@ -250,4 +258,4 @@ sub _load_rt_handle {
 
 __END__
 
-#line 369
+#line 390

commit 568572c1a25a670a43d65f853c38660f6d8b4e2e
Author: Kevin Falcone <falcone at bestpractical.com>
Date:   Mon Sep 15 13:42:31 2014 -0400

    Apply some reformatting so that README doesn't have brokenly wrapped URLs

diff --git a/README b/README
index 063c554..13e79ef 100644
--- a/README
+++ b/README
@@ -27,11 +27,12 @@ AUTHOR
 
 BUGS
     All bugs should be reported via email to
-    bug-RT-Extension-AjaxPreviewScrips at rt.cpan.org
-    <mailto:bug-RT-Extension-AjaxPreviewScrips at rt.cpan.org> or via the web
-    at rt.cpan.org
-    <http://rt.cpan.org/Public/Dist/Display.html?Name=RT-Extension-AjaxPrevi
-    ewScrips>.
+
+        bug-RT-Extension-AjaxPreviewScrips at rt.cpan.org
+
+    or via the web at
+
+        http://rt.cpan.org/Public/Dist/Display.html?Name=RT-Extension-AjaxPreviewScrips
 
 LICENSE AND COPYRIGHT
     This software is Copyright (c) 2014 by Best Practical Solutions, LLC.
diff --git a/lib/RT/Extension/AjaxPreviewScrips.pm b/lib/RT/Extension/AjaxPreviewScrips.pm
index 7a6f691..86c1084 100644
--- a/lib/RT/Extension/AjaxPreviewScrips.pm
+++ b/lib/RT/Extension/AjaxPreviewScrips.pm
@@ -369,9 +369,12 @@ sunnavy <sunnavy at bestpractical.com>
 =head1 BUGS
 
 All bugs should be reported via email to
-L<bug-RT-Extension-AjaxPreviewScrips at rt.cpan.org|mailto:bug-RT-Extension-AjaxPreviewScrips at rt.cpan.org>
+
+    bug-RT-Extension-AjaxPreviewScrips at rt.cpan.org
+
 or via the web at
-L<rt.cpan.org|http://rt.cpan.org/Public/Dist/Display.html?Name=RT-Extension-AjaxPreviewScrips>.
+
+    http://rt.cpan.org/Public/Dist/Display.html?Name=RT-Extension-AjaxPreviewScrips
 
 =head1 LICENSE AND COPYRIGHT
 

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