[Bps-public-commit] rt-extension-deactiveactionpref branch, master, updated. 0.02

[Alex Vandiver]

The branch, master has been updated
       via  3c550417f35d57a9a6517f2303765b39ab84b73b (commit)
       via  5212a209446b9c8802d7390dd4f7de6f701624a8 (commit)
      from  a10320f2257df0ccd38c62798aa0f783b48149a4 (commit)

Summary of changes:
 Changes                                |  3 +++
 META.yml                               |  4 ++--
 inc/Module/Install/RTx.pm              | 30 +++++++++++++++++++-----------
 lib/RT/Extension/DeactiveActionPref.pm |  3 ++-
 4 files changed, 26 insertions(+), 14 deletions(-)

- Log -----------------------------------------------------------------
commit 5212a209446b9c8802d7390dd4f7de6f701624a8
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Wed Sep 3 19:38:57 2014 -0400

    Give a better label for the default

diff --git a/lib/RT/Extension/DeactiveActionPref.pm b/lib/RT/Extension/DeactiveActionPref.pm
index 416e4a5..23dadf6 100644
--- a/lib/RT/Extension/DeactiveActionPref.pm
+++ b/lib/RT/Extension/DeactiveActionPref.pm
@@ -12,6 +12,7 @@ $RT::Config::META{DeactiveAction} = {
     Widget          => '/Widgets/Form/Select',
     WidgetArguments => {
         Description => 'Action of links to change tickets to inactive status?', #loc
+        DefaultLabel => 'From lifecycle', #loc
         Values      => [qw(Respond Comment)], #loc
     },
 };

commit 3c550417f35d57a9a6517f2303765b39ab84b73b
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Wed Sep 3 19:39:52 2014 -0400

    Version 0.02 releng

diff --git a/Changes b/Changes
index e1c59f4..adc884b 100644
--- a/Changes
+++ b/Changes
@@ -1,4 +1,7 @@
 Revision history for RT-Extension-DeactiveActionPref
 
+0.02 2014-09-02
+ - Display a better label for the "from lifecycle" setting
+
 0.01 2014-07-17
  - Initial version
diff --git a/META.yml b/META.yml
index cadfe9d..c04ba4a 100644
--- a/META.yml
+++ b/META.yml
@@ -22,6 +22,6 @@ requires:
   perl: 5.10.1
 resources:
   license: http://opensource.org/licenses/gpl-license.php
-version: '0.01'
-x_module_install_rtx_version: 0.34_04
+version: '0.02'
+x_module_install_rtx_version: '0.36'
 x_requires_rt: 4.2.0
diff --git a/inc/Module/Install/RTx.pm b/inc/Module/Install/RTx.pm
index 31db76d..1b55bfa 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.36';
 
 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
diff --git a/lib/RT/Extension/DeactiveActionPref.pm b/lib/RT/Extension/DeactiveActionPref.pm
index 23dadf6..2b19c0d 100644
--- a/lib/RT/Extension/DeactiveActionPref.pm
+++ b/lib/RT/Extension/DeactiveActionPref.pm
@@ -2,7 +2,7 @@ use strict;
 use warnings;
 package RT::Extension::DeactiveActionPref;
 
-our $VERSION = '0.01';
+our $VERSION = '0.02';
 
 use RT::Config;
 $RT::Config::META{DeactiveAction} = {

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