[Rt-commit] rtir branch, 5.0.0-releng, updated. 5.0.0beta1-21-g301a72ca

? sunnavy sunnavy at bestpractical.com
Wed Jul 15 17:15:12 EDT 2020


The branch, 5.0.0-releng has been updated
       via  301a72ca51a9435e013ada23dfb5f39bb51e7ce8 (commit)
       via  e15b68522aaaeec2602ba820029d0fe2245da3e0 (commit)
       via  e119d7d69c2690d77d9f0b2f2fe4c87208bb0d47 (commit)
       via  113f0c535f6360785b4e7b54b9aa079af4f71894 (commit)
       via  c4f09e81f0363497c6d36701077217cd2eac5409 (commit)
      from  a2c9a4f073f4e2acab7e378a63f670ed65e7c9a4 (commit)

Summary of changes:
 MANIFEST                  |  7 +++++++
 META.yml                  |  7 +++----
 Makefile.PL               |  2 +-
 docs/UPGRADING-5.0        | 29 +++++++++++++++++++++++++----
 inc/Module/Install/RTx.pm | 34 +++++++++++++++++++++++++---------
 lib/RT/IR.pm              |  2 +-
 6 files changed, 62 insertions(+), 19 deletions(-)

- Log -----------------------------------------------------------------
commit c4f09e81f0363497c6d36701077217cd2eac5409
Author: sunnavy <sunnavy at bestpractical.com>
Date:   Thu Jul 16 01:48:16 2020 +0800

    Update M:I:RTx to 0.42

diff --git a/META.yml b/META.yml
index 2b8bd4aa..bdafe3d9 100644
--- a/META.yml
+++ b/META.yml
@@ -35,6 +35,6 @@ requires:
 resources:
   license: http://opensource.org/licenses/gpl-license.php
 version: 5.0.0beta1
-x_module_install_rtx_version: '0.41'
+x_module_install_rtx_version: '0.42'
 x_requires_rt: 4.6.0
 x_rt_too_new: 5.2.0
diff --git a/inc/Module/Install/RTx.pm b/inc/Module/Install/RTx.pm
index d371af9b..2dd94897 100644
--- a/inc/Module/Install/RTx.pm
+++ b/inc/Module/Install/RTx.pm
@@ -6,9 +6,10 @@ use strict;
 use warnings;
 no warnings 'once';
 
+use Term::ANSIColor qw(:constants);
 use Module::Install::Base;
 use base 'Module::Install::Base';
-our $VERSION = '0.41';
+our $VERSION = '0.42';
 
 use FindBin;
 use File::Glob     ();
@@ -76,6 +77,22 @@ sub RTx {
         $self->requires_rt('4.0.0');
     }
 
+    my $package = $name;
+    $package =~ s/-/::/g;
+    if ( $RT::CORED_PLUGINS{$package} ) {
+        my ($base_version) = $RT::VERSION =~ /(\d+\.\d+\.\d+)/;
+        die RED, <<"EOT";
+
+**** Error: Your installed version of RT ($RT::VERSION) already
+            contains this extension in core, so you don't need to
+            install it.
+
+            Check https://docs.bestpractical.com/rt/$base_version/RT_Config.html
+            to configure it.
+
+EOT
+    }
+
     # Installation locations
     my %path;
     my $plugin_path;
@@ -223,7 +240,7 @@ sub requires_rt {
     my @sorted = sort RT::Handle::cmp_version $version,$RT::VERSION;
 
     if ($sorted[-1] eq $version) {
-        die <<"EOT";
+        die RED, <<"EOT";
 
 **** Error: This extension requires RT $version. Your installed version
             of RT ($RT::VERSION) is too old.
@@ -249,12 +266,12 @@ sub requires_rt_plugin {
         unshift @INC, $path;
     } else {
         my $name = $self->name;
-        warn <<"EOT";
+        my $msg = <<"EOT";
 
 **** Warning: $name requires that the $plugin plugin be installed and
               enabled; it does not appear to be installed.
-
 EOT
+        warn RED, $msg, RESET, "\n";
     }
     $self->requires(@_);
 }
@@ -264,9 +281,8 @@ sub rt_too_new {
     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.
-
+**** Warning: Your installed version of RT (%s) is too new; this extension
+              has not been tested on your version of RT and may not work as expected.
 EOT
     $self->add_metadata("x_rt_too_new", $version) if $self->is_admin;
 
@@ -274,7 +290,7 @@ EOT
     my @sorted = sort RT::Handle::cmp_version $version,$RT::VERSION;
 
     if ($sorted[0] eq $version) {
-        die sprintf($msg,$RT::VERSION,$version);
+        warn RED, sprintf($msg,$RT::VERSION), RESET, "\n";
     }
 }
 
@@ -297,4 +313,4 @@ sub _load_rt_handle {
 
 __END__
 
-#line 468
+#line 484

commit 113f0c535f6360785b4e7b54b9aa079af4f71894
Author: sunnavy <sunnavy at bestpractical.com>
Date:   Thu Jul 16 01:49:59 2020 +0800

    Update package files for the revert of Net::Whois::RIPE 2.x updates
    
    See also 9670aaebe3

diff --git a/MANIFEST b/MANIFEST
index 1649447d..33462657 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -170,6 +170,13 @@ inc/Module/Install/Substitute.pm
 inc/Module/Install/Win32.pm
 inc/Module/Install/WriteAll.pm
 inc/YAML/Tiny.pm
+lib/Net/Whois/RIPE.pm
+lib/Net/Whois/RIPE.pod
+lib/Net/Whois/RIPE/Iterator.pm
+lib/Net/Whois/RIPE/Iterator.pod
+lib/Net/Whois/RIPE/Object.pm
+lib/Net/Whois/RIPE/Object.pod
+lib/Net/Whois/RIPE/Object/Template.pm
 lib/RT/Action/RTIR.pm
 lib/RT/Action/RTIR_Activate.pm
 lib/RT/Action/RTIR_ChangeChildConstituencies.pm
diff --git a/META.yml b/META.yml
index bdafe3d9..2e8ea01e 100644
--- a/META.yml
+++ b/META.yml
@@ -28,7 +28,6 @@ no_index:
 requires:
   DBIx::SearchBuilder: 1.61
   Net::Domain::TLD: 0
-  Net::Whois::RIPE: 2.006001
   Parse::BooleanLogic: 0
   Regexp::Common: 0
   perl: 5.10.1

commit e119d7d69c2690d77d9f0b2f2fe4c87208bb0d47
Author: Jim Brandt <jbrandt at bestpractical.com>
Date:   Wed Jul 15 16:41:47 2020 -0400

    Update UPGRADING with additional key changes

diff --git a/docs/UPGRADING-5.0 b/docs/UPGRADING-5.0
index 2d5b6635..78b764c8 100644
--- a/docs/UPGRADING-5.0
+++ b/docs/UPGRADING-5.0
@@ -1,9 +1,12 @@
 =head1 Upgrading to 5.0
 
-The following describes some of the key components of the upgrade
+The following describes some of the more significant changes
 to RTIR 5.0 from earlier versions. The other UPGRADING documents contain
 details for previous versions.
 
+Also read the general L<UPGRADING> document for the steps to upgrade from
+a previous version of RTIR.
+
 =head2 Notable Changes
 
 =over
@@ -17,15 +20,16 @@ to add for each queue. This change made it harder to access the
 default RT menus, so we have reverted to the previous configuration
 with a single RTIR menu item containing relevant links.
 
-To make it easier to access the RTIR menu, we have also moved it
-to the left, directly after the default RT Home menu.
+To make it easier to access the RTIR menu, and to keep it in a
+consistent location, we moved it to the left, directly after
+the default RT Home menu.
 
 =item *
 
 To align with RT's create pages we removed the modal to select queue
 before the create page and now give users the option to select
 queue directly on create. CreateInQueue.html still remains available
-incase users are linking directly to it but now logs a deprecated
+in case users are linking directly to it but now logs a deprecated
 warning when accessed.
 
 CreateInQueue.html will be removed in a future version of RTIR.
@@ -97,6 +101,23 @@ C<%RTIR_CustomFieldsDefaults> now sets default values only for "Resolution"
 because the Resolution values are set based on the status of the
 Incident when closed.
 
+=item *
+
+On Incidents, the linked tickets for Incident Reports, Investigations, and
+Countermeasures are now controlled via the new
+L<LinkedQueuePortlets|https://docs.bestpractical.com/rt/5.0.0/RT_Config.html#LinkedQueuePortlets>
+feature in RT. If you previously modified the format of the link display
+on the Incidents page using C<%RTIRSearchResultFormats> for C<ChildReport>,
+C<ChildInvestigation>, or C<ChildCountermeasure>, you can copy that configuration
+to the new C<%LinkedQueuePortletFormats> option.
+
+=item *
+
+Before RTIR 4.0 you could launch an incident and investigation on a single page.
+This feature was removed in RTIR 4.0, but has been restored in RTIR 5.0.0. It
+has also been updated to allow the queue for each section to be selected on
+the create page.
+
 =back
 
 =cut

commit e15b68522aaaeec2602ba820029d0fe2245da3e0
Merge: 113f0c53 e119d7d6
Author: sunnavy <sunnavy at bestpractical.com>
Date:   Thu Jul 16 05:04:35 2020 +0800

    Merge branch '5.0/upgrading-doc-updates' into 5.0.0-releng


commit 301a72ca51a9435e013ada23dfb5f39bb51e7ce8
Author: sunnavy <sunnavy at bestpractical.com>
Date:   Thu Jul 16 01:51:34 2020 +0800

    Prep 5.0.0

diff --git a/META.yml b/META.yml
index 2e8ea01e..13e64b25 100644
--- a/META.yml
+++ b/META.yml
@@ -33,7 +33,7 @@ requires:
   perl: 5.10.1
 resources:
   license: http://opensource.org/licenses/gpl-license.php
-version: 5.0.0beta1
+version: 5.0.0
 x_module_install_rtx_version: '0.42'
-x_requires_rt: 4.6.0
+x_requires_rt: 5.0.0
 x_rt_too_new: 5.2.0
diff --git a/Makefile.PL b/Makefile.PL
index fd381ba0..264fdad3 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -7,7 +7,7 @@ author('Best Practical Solutions <sales at bestpractical.com>');
 all_from('lib/RT/IR.pm');
 
 # update README and docs/UPGRADING
-requires_rt('4.6.0');  # NOTE: we’ll update this to 5.0.0 once an official 5.0.0 is available. fails for alpha tags otherwise.
+requires_rt('5.0.0');
 rt_too_new('5.2.0',"\nThis version of RTIR is only compatible with RT 5.0.x and you are using RT %s\n");
 
 # XXX: This should be reported by M::I::RTx
diff --git a/lib/RT/IR.pm b/lib/RT/IR.pm
index 1d4c03f4..897f5abb 100644
--- a/lib/RT/IR.pm
+++ b/lib/RT/IR.pm
@@ -51,7 +51,7 @@ use 5.008003;
 use strict;
 use warnings;
 
-our $VERSION = '5.0.0beta1';
+our $VERSION = '5.0.0';
 
 use Scalar::Util qw(blessed);
 

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


More information about the rt-commit mailing list