[Bps-public-commit] Module-Install-RTx branch, master, updated. 0.34_01-3-g09ed813

[Alex Vandiver]

The branch, master has been updated
       via  09ed813cd318ebdc45c2ef9fffb149022c8a0014 (commit)
       via  b7f78acdeeb7fe6f9d231802ce38611ba3430fb1 (commit)
       via  55d7a470d821ade49b8d13d92d2c87c45105043f (commit)
      from  1ba32290e42d208c441ae360d55ed3fa6b56bdde (commit)

Summary of changes:
 Changes                   |  6 +++++-
 META.yml                  |  4 ++--
 lib/Module/Install/RTx.pm | 19 ++++++++++++++-----
 3 files changed, 21 insertions(+), 8 deletions(-)

- Log -----------------------------------------------------------------
commit 55d7a470d821ade49b8d13d92d2c87c45105043f
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Thu Jun 19 16:34:30 2014 -0400

    Dropped a somewhat necessary character

diff --git a/lib/Module/Install/RTx.pm b/lib/Module/Install/RTx.pm
index 9fc7ece..89f2189 100644
--- a/lib/Module/Install/RTx.pm
+++ b/lib/Module/Install/RTx.pm
@@ -191,7 +191,7 @@ sub requires_rt_plugin {
 
     my $path = $plugin;
     $path =~ s{\:\:}{-}g;
-    $path = "RT::LocalPluginPath/$path/lib";
+    $path = "$RT::LocalPluginPath/$path/lib";
     if ( -e $path ) {
         unshift @INC, $path;
     } else {

commit b7f78acdeeb7fe6f9d231802ce38611ba3430fb1
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Thu Jun 19 16:36:21 2014 -0400

    Make the error say "error" now that we die, and stand out more

diff --git a/lib/Module/Install/RTx.pm b/lib/Module/Install/RTx.pm
index 89f2189..e9e5533 100644
--- a/lib/Module/Install/RTx.pm
+++ b/lib/Module/Install/RTx.pm
@@ -174,8 +174,12 @@ sub requires_rt {
     my @sorted = sort RT::Handle::cmp_version $version,$RT::VERSION;
 
     if ($sorted[-1] eq $version) {
-        # should we die?
-        die "\nWarning: prerequisite RT $version not found. Your installed version of RT ($RT::VERSION) is too old.\n\n";
+        die <<"EOT";
+
+**** Error: This extension requires RT $version. Your installed version
+            of RT ($RT::VERSION) is too old.
+
+EOT
     }
 }
 
@@ -208,8 +212,13 @@ EOT
 
 sub rt_too_new {
     my ($self,$version,$msg) = @_;
-    $msg ||= "Your version %s is too new, this extension requires a release of RT older than %s\n";
+    my $name = $self->name;
+    $msg ||= <<EOT;
 
+**** Error: Your installed version of RT (%s) is too new; this extension
+            only works with versions older than %s.
+
+EOT
     $self->add_metadata("x_rt_too_new", $version) if $self->is_admin;
 
     _load_rt_handle();

commit 09ed813cd318ebdc45c2ef9fffb149022c8a0014
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Thu Jun 19 16:41:00 2014 -0400

    Version 0.34_02 releng

diff --git a/Changes b/Changes
index 64fd630..d9a0690 100644
--- a/Changes
+++ b/Changes
@@ -1,4 +1,8 @@
-0.34_01 2014-06-17
+0.34_02 2014-06-19
+ - Fix requires_rt_plugin
+ - Standardize error messages for rt_too_new and requires_rt
+
+0.34_01 2014-06-19
  - Remove RT 3.8-specific code
  - Update documentation to reflect 3.8-era Plugin world order
  - Add requires_rt_plugin helper
diff --git a/META.yml b/META.yml
index 0ebadd8..5615c65 100644
--- a/META.yml
+++ b/META.yml
@@ -21,7 +21,7 @@ no_index:
 provides:
   Module::Install::RTx:
     file: lib/Module/Install/RTx.pm
-    version: 0.34_01
+    version: 0.34_02
   Module::Install::RTx::Runtime:
     file: lib/Module/Install/RTx/Runtime.pm
 requires:
@@ -29,4 +29,4 @@ requires:
   perl: 5.8.0
 resources:
   license: http://opensource.org/licenses/mit-license.php
-version: 0.34_01
+version: 0.34_02
diff --git a/lib/Module/Install/RTx.pm b/lib/Module/Install/RTx.pm
index e9e5533..93702f0 100644
--- a/lib/Module/Install/RTx.pm
+++ b/lib/Module/Install/RTx.pm
@@ -7,7 +7,7 @@ no warnings 'once';
 
 use Module::Install::Base;
 use base 'Module::Install::Base';
-our $VERSION = '0.34_01';
+our $VERSION = '0.34_02';
 
 use FindBin;
 use File::Glob     ();

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