[Bps-public-commit] rt-extension-repeatticket branch, master, updated. b4825c2f1b4966b6a618df1fda271c62e908aa5d

[Jim Brandt]

The branch, master has been updated
       via  b4825c2f1b4966b6a618df1fda271c62e908aa5d (commit)
       via  09e23ba8a450c47496e0395efc9eafeda8110404 (commit)
      from  e4daa2628c401162bcfc8f8cdea7d250fc54ff55 (commit)

Summary of changes:
 Changes                             |  2 ++
 META.yml                            |  2 +-
 inc/Module/Install/RTx.pm           | 11 +++++++++--
 inc/Module/Install/RTx/Factory.pm   |  9 ++++++++-
 inc/Module/Install/ReadmeFromPod.pm |  2 +-
 lib/RT/Extension/RepeatTicket.pm    |  2 +-
 6 files changed, 22 insertions(+), 6 deletions(-)

- Log -----------------------------------------------------------------
commit 09e23ba8a450c47496e0395efc9eafeda8110404
Author: Jim Brandt <jbrandt at bestpractical.com>
Date:   Thu Oct 10 11:08:24 2013 -0400

    Module::Install updates

diff --git a/inc/Module/Install/RTx.pm b/inc/Module/Install/RTx.pm
index abf6aea..ac04c79 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.30';
+our $VERSION = '0.32';
 
 use FindBin;
 use File::Glob     ();
@@ -136,6 +136,7 @@ install ::
         $has_etc{acl}++;
     }
     if ( -e 'etc/initialdata' ) { $has_etc{initialdata}++; }
+    if ( -d 'etc/upgrade/' )    { $has_etc{upgrade}++; }
 
     $self->postamble("$postamble\n");
     unless ( $subdirs{'lib'} ) {
@@ -164,6 +165,12 @@ install ::
 .
         $self->postamble("initdb ::\n$initdb\n");
         $self->postamble("initialize-database ::\n$initdb\n");
+        if ($has_etc{upgrade}) {
+            print "To upgrade from a previous version of this extension, use 'make upgrade-database'\n";
+            my $upgradedb = qq|\t\$(NOECHO) \$(PERL) -Ilib -I"$local_lib_path" -I"$lib_path" -Minc::Module::Install -e"RTxInitDB(qw(upgrade \$(NAME) \$(VERSION)))"\n|;
+            $self->postamble("upgrade-database ::\n$upgradedb\n");
+            $self->postamble("upgradedb ::\n$upgradedb\n");
+        }
     }
 }
 
@@ -209,4 +216,4 @@ sub requires_rt {
 
 __END__
 
-#line 329
+#line 336
diff --git a/inc/Module/Install/RTx/Factory.pm b/inc/Module/Install/RTx/Factory.pm
index 76ab761..6776688 100644
--- a/inc/Module/Install/RTx/Factory.pm
+++ b/inc/Module/Install/RTx/Factory.pm
@@ -32,12 +32,19 @@ sub RTxInitDB {
         "-I$lib_path",
         "$RT::SbinPath/rt-setup-database",
         "--action"      => $action,
-        "--datadir"     => "etc",
+        ($action eq 'upgrade' ? () : ("--datadir"     => "etc")),
         (($action eq 'insert') ? ("--datafile"    => "etc/initialdata") : ()),
         "--dba"         => $RT::DatabaseAdmin || $RT::DatabaseUser,
         "--prompt-for-dba-password" => '',
         (RT::System->can('AddUpgradeHistory') ? ("--package" => $name, "--ext-version" => $version) : ()),
     );
+    # If we're upgrading against an RT which isn't at least 4.2 (has
+    # AddUpgradeHistory) then pass --package.  Upgrades against later RT
+    # releases will pick up --package from AddUpgradeHistory.
+    if ($action eq 'upgrade' and
+        not RT::System->can('AddUpgradeHistory')) {
+        push @args, "--package" => $name;
+    }
 
     print "$^X @args\n";
     (system($^X, @args) == 0) or die "...returned with error: $?\n";
diff --git a/inc/Module/Install/ReadmeFromPod.pm b/inc/Module/Install/ReadmeFromPod.pm
index 6a80818..b5e03c3 100644
--- a/inc/Module/Install/ReadmeFromPod.pm
+++ b/inc/Module/Install/ReadmeFromPod.pm
@@ -7,7 +7,7 @@ use warnings;
 use base qw(Module::Install::Base);
 use vars qw($VERSION);
 
-$VERSION = '0.20';
+$VERSION = '0.22';
 
 sub readme_from {
   my $self = shift;

commit b4825c2f1b4966b6a618df1fda271c62e908aa5d
Author: Jim Brandt <jbrandt at bestpractical.com>
Date:   Thu Oct 10 13:55:29 2013 -0400

    Prep for 0.05 release

diff --git a/Changes b/Changes
index f267b45..b91f0da 100644
--- a/Changes
+++ b/Changes
@@ -1,5 +1,7 @@
 Revision history for RT-Extension-RepeatTicket
         MM/DD/YYY
+0.05    10/10/2013
+        * Updates for RT 4.2
 
 0.04    07/01/2013
         * Fixed bug with CFs on repeated tickets
diff --git a/META.yml b/META.yml
index e4407f9..6033e47 100644
--- a/META.yml
+++ b/META.yml
@@ -24,4 +24,4 @@ requires:
   DateTime::Event::ICal: 0
 resources:
   license: http://opensource.org/licenses/gpl-license.php
-version: 0.04
+version: 0.05
diff --git a/lib/RT/Extension/RepeatTicket.pm b/lib/RT/Extension/RepeatTicket.pm
index a7bc1ce..14244b5 100644
--- a/lib/RT/Extension/RepeatTicket.pm
+++ b/lib/RT/Extension/RepeatTicket.pm
@@ -3,7 +3,7 @@ use strict;
 
 package RT::Extension::RepeatTicket;
 
-our $VERSION = "0.04";
+our $VERSION = "0.05";
 
 use RT::Interface::Web;
 use DateTime;

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