[Rt-commit] rtfm branch, master, updated. 2.4.3-54-g8a8ccc7

Kevin Falcone falcone at bestpractical.com
Fri Sep 9 19:20:56 EDT 2011 

The branch, master has been updated
       via  8a8ccc742c67faa74714cd988ef1f11d0c773354 (commit)
       via  87c5f7f4bd95bee6e488e3937a79e901e851dbf1 (commit)
       via  2a393f9c3dca1b9654f5c19f547c62aea4838547 (commit)
       via  97ceb5d2739d93eeb3010ed31fea356657e799cb (commit)
       via  b215fa0ae1fe35491eb0bf18dee79e10cda6648d (commit)
      from  bb662cfdae61117a25939829fcddf5410d15d059 (commit)

Summary of changes:
 .gitignore                        |    2 +
 MANIFEST                          |   13 ++++++++++
 META.yml                          |    5 +--
 Makefile.PL                       |    2 +-
 inc/Module/Install.pm             |    4 +-
 inc/Module/Install/AutoInstall.pm |    2 +-
 inc/Module/Install/Base.pm        |    2 +-
 inc/Module/Install/Can.pm         |    2 +-
 inc/Module/Install/Fetch.pm       |    2 +-
 inc/Module/Install/Include.pm     |    2 +-
 inc/Module/Install/Makefile.pm    |    2 +-
 inc/Module/Install/Metadata.pm    |    9 ++++---
 inc/Module/Install/RTx.pm         |   46 +++++++++++++++++++++++++++++++++---
 inc/Module/Install/Win32.pm       |    2 +-
 inc/Module/Install/WriteAll.pm    |    2 +-
 lib/RT/FM.pm                      |    2 +-
 16 files changed, 76 insertions(+), 23 deletions(-)

- Log -----------------------------------------------------------------
commit b215fa0ae1fe35491eb0bf18dee79e10cda6648d
Author: Kevin Falcone <falcone at bestpractical.com>
Date:   Fri Sep 9 17:19:04 2011 -0400

    This is the dev branch, give it a dev version

diff --git a/META.yml b/META.yml
index ac8ac7e..2e34ac6 100644
--- a/META.yml
+++ b/META.yml
@@ -28,4 +28,4 @@ requires:
   perl: 5.8.3
 resources:
   license: http://opensource.org/licenses/gpl-license.php
-version: 2.4.3
+version: 2.5.HEAD
diff --git a/lib/RT/FM.pm b/lib/RT/FM.pm
index 4b53476..9c3db4a 100644
--- a/lib/RT/FM.pm
+++ b/lib/RT/FM.pm
@@ -51,7 +51,7 @@ use 5.008003;
 use strict;
 use warnings;
 
-our $VERSION = '2.4.HEAD';
+our $VERSION = '2.5.HEAD';
 
 # Create a system object for RTFM
 use RT::FM::System;

commit 97ceb5d2739d93eeb3010ed31fea356657e799cb
Author: Kevin Falcone <falcone at bestpractical.com>
Date:   Fri Sep 9 17:18:40 2011 -0400

    upgrade MI::RTx

diff --git a/META.yml b/META.yml
index 2e34ac6..5491408 100644
--- a/META.yml
+++ b/META.yml
@@ -5,7 +5,7 @@ build_requires:
 configure_requires:
   ExtUtils::MakeMaker: 6.42
 distribution_type: module
-generated_by: 'Module::Install version 1.00'
+generated_by: 'Module::Install version 1.01'
 license: gpl
 meta-spec:
   url: http://module-build.sourceforge.net/META-spec-v1.4.html
@@ -21,7 +21,6 @@ no_index:
 requires:
   HTML::FormatText: 0
   HTML::TreeBuilder: 0
-  RT: 3.004002
   Text::WikiFormat: 0
   Time::ParseDate: 0
   Tree::Simple: 0
diff --git a/inc/Module/Install.pm b/inc/Module/Install.pm
index 8ee839d..74caf9c 100644
--- a/inc/Module/Install.pm
+++ b/inc/Module/Install.pm
@@ -31,7 +31,7 @@ BEGIN {
 	# This is not enforced yet, but will be some time in the next few
 	# releases once we can make sure it won't clash with custom
 	# Module::Install extensions.
-	$VERSION = '1.00';
+	$VERSION = '1.01';
 
 	# Storage for the pseudo-singleton
 	$MAIN    = undef;
@@ -467,4 +467,4 @@ sub _CLASS ($) {
 
 1;
 
-# Copyright 2008 - 2010 Adam Kennedy.
+# Copyright 2008 - 2011 Adam Kennedy.
diff --git a/inc/Module/Install/AutoInstall.pm b/inc/Module/Install/AutoInstall.pm
index f1f5356..bc3d172 100644
--- a/inc/Module/Install/AutoInstall.pm
+++ b/inc/Module/Install/AutoInstall.pm
@@ -6,7 +6,7 @@ use Module::Install::Base ();
 
 use vars qw{$VERSION @ISA $ISCORE};
 BEGIN {
-	$VERSION = '1.00';
+	$VERSION = '1.01';
 	@ISA     = 'Module::Install::Base';
 	$ISCORE  = 1;
 }
diff --git a/inc/Module/Install/Base.pm b/inc/Module/Install/Base.pm
index b55bda3..d3662c9 100644
--- a/inc/Module/Install/Base.pm
+++ b/inc/Module/Install/Base.pm
@@ -4,7 +4,7 @@ package Module::Install::Base;
 use strict 'vars';
 use vars qw{$VERSION};
 BEGIN {
-	$VERSION = '1.00';
+	$VERSION = '1.01';
 }
 
 # Suspend handler for "redefined" warnings
diff --git a/inc/Module/Install/Can.pm b/inc/Module/Install/Can.pm
index 71ccc27..276409a 100644
--- a/inc/Module/Install/Can.pm
+++ b/inc/Module/Install/Can.pm
@@ -9,7 +9,7 @@ use Module::Install::Base ();
 
 use vars qw{$VERSION @ISA $ISCORE};
 BEGIN {
-	$VERSION = '1.00';
+	$VERSION = '1.01';
 	@ISA     = 'Module::Install::Base';
 	$ISCORE  = 1;
 }
diff --git a/inc/Module/Install/Fetch.pm b/inc/Module/Install/Fetch.pm
index ec1f106..093cb7a 100644
--- a/inc/Module/Install/Fetch.pm
+++ b/inc/Module/Install/Fetch.pm
@@ -6,7 +6,7 @@ use Module::Install::Base ();
 
 use vars qw{$VERSION @ISA $ISCORE};
 BEGIN {
-	$VERSION = '1.00';
+	$VERSION = '1.01';
 	@ISA     = 'Module::Install::Base';
 	$ISCORE  = 1;
 }
diff --git a/inc/Module/Install/Include.pm b/inc/Module/Install/Include.pm
index a28cd4c..90cc979 100644
--- a/inc/Module/Install/Include.pm
+++ b/inc/Module/Install/Include.pm
@@ -6,7 +6,7 @@ use Module::Install::Base ();
 
 use vars qw{$VERSION @ISA $ISCORE};
 BEGIN {
-	$VERSION = '1.00';
+	$VERSION = '1.01';
 	@ISA     = 'Module::Install::Base';
 	$ISCORE  = 1;
 }
diff --git a/inc/Module/Install/Makefile.pm b/inc/Module/Install/Makefile.pm
index 5dfd0e9..4c71003 100644
--- a/inc/Module/Install/Makefile.pm
+++ b/inc/Module/Install/Makefile.pm
@@ -8,7 +8,7 @@ use Fcntl qw/:flock :seek/;
 
 use vars qw{$VERSION @ISA $ISCORE};
 BEGIN {
-	$VERSION = '1.00';
+	$VERSION = '1.01';
 	@ISA     = 'Module::Install::Base';
 	$ISCORE  = 1;
 }
diff --git a/inc/Module/Install/Metadata.pm b/inc/Module/Install/Metadata.pm
index cfe45b3..3b01e09 100644
--- a/inc/Module/Install/Metadata.pm
+++ b/inc/Module/Install/Metadata.pm
@@ -6,7 +6,7 @@ use Module::Install::Base ();
 
 use vars qw{$VERSION @ISA $ISCORE};
 BEGIN {
-	$VERSION = '1.00';
+	$VERSION = '1.01';
 	@ISA     = 'Module::Install::Base';
 	$ISCORE  = 1;
 }
@@ -515,6 +515,7 @@ sub __extract_license {
 		'GNU Free Documentation license'     => 'unrestricted', 1,
 		'GNU Affero General Public License'  => 'open_source',  1,
 		'(?:Free)?BSD license'               => 'bsd',          1,
+		'Artistic license 2\.0'              => 'artistic_2',   1,
 		'Artistic license'                   => 'artistic',     1,
 		'Apache (?:Software )?license'       => 'apache',       1,
 		'GPL'                                => 'gpl',          1,
@@ -550,9 +551,9 @@ sub license_from {
 
 sub _extract_bugtracker {
 	my @links   = $_[0] =~ m#L<(
-	 \Qhttp://rt.cpan.org/\E[^>]+|
-	 \Qhttp://github.com/\E[\w_]+/[\w_]+/issues|
-	 \Qhttp://code.google.com/p/\E[\w_\-]+/issues/list
+	 https?\Q://rt.cpan.org/\E[^>]+|
+	 https?\Q://github.com/\E[\w_]+/[\w_]+/issues|
+	 https?\Q://code.google.com/p/\E[\w_\-]+/issues/list
 	 )>#gx;
 	my %links;
 	@links{@links}=();
diff --git a/inc/Module/Install/RTx.pm b/inc/Module/Install/RTx.pm
index 873e823..73b9cda 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.26';
+our $VERSION = '0.29';
 
 use FindBin;
 use File::Glob     ();
@@ -44,8 +44,8 @@ sub RTx {
         local @INC = (
             $ENV{RTHOME} ? ( $ENV{RTHOME}, "$ENV{RTHOME}/lib" ) : (),
             @INC,
-            map { ( "$_/rt3/lib", "$_/lib/rt3", "$_/lib" ) } grep $_,
-            @prefixes
+            map { ( "$_/rt4/lib", "$_/lib/rt4", "$_/rt3/lib", "$_/lib/rt3", "$_/lib" )
+                } grep $_, @prefixes
         );
         until ( eval { require RT; $RT::LocalPath } ) {
             warn
@@ -186,8 +186,46 @@ sub RTxInit {
     die "Cannot load RT" unless $RT::Handle and $RT::DatabaseType;
 }
 
+# stolen from RT::Handle so we work on 3.6 (cmp_versions came in with 3.8)
+{ my %word = (
+    a     => -4,
+    alpha => -4,
+    b     => -3,
+    beta  => -3,
+    pre   => -2,
+    rc    => -1,
+    head  => 9999,
+);
+sub cmp_version($$) {
+    my ($a, $b) = (@_);
+    my @a = grep defined, map { /^[0-9]+$/? $_ : /^[a-zA-Z]+$/? $word{$_}|| -10 : undef }
+        split /([^0-9]+)/, $a;
+    my @b = grep defined, map { /^[0-9]+$/? $_ : /^[a-zA-Z]+$/? $word{$_}|| -10 : undef }
+        split /([^0-9]+)/, $b;
+    @a > @b
+        ? push @b, (0) x (@a- at b)
+        : push @a, (0) x (@b- at a);
+    for ( my $i = 0; $i < @a; $i++ ) {
+        return $a[$i] <=> $b[$i] if $a[$i] <=> $b[$i];
+    }
+    return 0;
+}}
+sub requires_rt {
+    my ($self,$version) = @_;
+
+    # if we're exactly the same version as what we want, silently return
+    return if ($version eq $RT::VERSION);
+
+    my @sorted = sort cmp_version $version,$RT::VERSION;
+
+    if ($sorted[-1] eq $version) {
+        # should we die?
+        warn "\nWarning: prerequisite RT $version not found. Your installed version of RT ($RT::VERSION) is too old.\n\n";
+    }
+}
+
 1;
 
 __END__
 
-#line 304
+#line 348
diff --git a/inc/Module/Install/Win32.pm b/inc/Module/Install/Win32.pm
index edc18b4..3139a63 100644
--- a/inc/Module/Install/Win32.pm
+++ b/inc/Module/Install/Win32.pm
@@ -6,7 +6,7 @@ use Module::Install::Base ();
 
 use vars qw{$VERSION @ISA $ISCORE};
 BEGIN {
-	$VERSION = '1.00';
+	$VERSION = '1.01';
 	@ISA     = 'Module::Install::Base';
 	$ISCORE  = 1;
 }
diff --git a/inc/Module/Install/WriteAll.pm b/inc/Module/Install/WriteAll.pm
index d0f6599..1f724a7 100644
--- a/inc/Module/Install/WriteAll.pm
+++ b/inc/Module/Install/WriteAll.pm
@@ -6,7 +6,7 @@ use Module::Install::Base ();
 
 use vars qw{$VERSION @ISA $ISCORE};
 BEGIN {
-	$VERSION = '1.00';
+	$VERSION = '1.01';
 	@ISA     = qw{Module::Install::Base};
 	$ISCORE  = 1;
 }

commit 2a393f9c3dca1b9654f5c19f547c62aea4838547
Author: Kevin Falcone <falcone at bestpractical.com>
Date:   Fri Sep 9 17:18:52 2011 -0400

    use the MI::RTx requires instead

diff --git a/Makefile.PL b/Makefile.PL
index 70dcec6..3a9b1d7 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -5,8 +5,8 @@ license('GPL version 2');
 perl_version('5.008003');
 #version_from('lib/RT/FM.pm');
 all_from('lib/RT/FM.pm');
+requires_rt('3.4.2');
 requires(
-    'RT'                => '3.004002',
     'Text::WikiFormat'  => 0,
     'Tree::Simple'      => 0,
     'HTML::TreeBuilder' => 0,

commit 87c5f7f4bd95bee6e488e3937a79e901e851dbf1
Author: Kevin Falcone <falcone at bestpractical.com>
Date:   Fri Sep 9 18:03:21 2011 -0400

    A few of the recent branches had added new files

diff --git a/MANIFEST b/MANIFEST
index c0d93b7..aa7180b 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -9,12 +9,14 @@ etc/acl.Pg
 etc/drop_schema.mysql
 etc/drop_schema.Oracle
 etc/drop_schema.Pg
+etc/drop_schema.SQLite
 etc/initial_data/dyndns
 etc/RTFM_Config.pm
 etc/schema.mysql
 etc/schema.mysql-4.1
 etc/schema.Oracle
 etc/schema.Pg
+etc/schema.SQLite
 etc/upgrade/2.1.0/acl.mysql
 etc/upgrade/2.1.0/acl.Oracle
 etc/upgrade/2.1.0/acl.Pg
@@ -43,6 +45,7 @@ html/Admin/RTFM/Classes/CustomFields.html
 html/Admin/RTFM/Classes/GroupRights.html
 html/Admin/RTFM/Classes/index.html
 html/Admin/RTFM/Classes/Modify.html
+html/Admin/RTFM/Classes/Objects.html
 html/Admin/RTFM/Classes/Topics.html
 html/Admin/RTFM/Classes/UserRights.html
 html/Admin/RTFM/Elements/ClassTabs
@@ -63,6 +66,7 @@ html/Callbacks/RTFM/autohandler/Default
 html/Callbacks/RTFM/Elements/EditLinks/ExtraLinkInstructions
 html/Callbacks/RTFM/Elements/Header/Head
 html/Callbacks/RTFM/Elements/MessageBox/Default
+html/Callbacks/RTFM/Elements/ShowSearch/ModifySearch
 html/Callbacks/RTFM/Elements/Tabs/Default
 html/Callbacks/RTFM/RTIR/Elements/Tabs/Default
 html/Callbacks/RTFM/SelfService/Elements/Tabs/Default
@@ -70,6 +74,7 @@ html/Callbacks/RTFM/Ticket/Create.html/BeforeCreate
 html/Callbacks/RTFM/Ticket/Create.html/BeforeMessageBox
 html/Callbacks/RTFM/Ticket/Elements/Tabs/Default
 html/Callbacks/RTFM/Ticket/Update.html/BeforeMessageBox
+html/Elements/RT__FM__ArticleCollection/ColumnMap
 html/Elements/RT__FM__ClassCollection/ColumnMap
 html/NoAuth/webrtfm.css
 html/RTFM/Article/Delete.html
@@ -110,6 +115,7 @@ html/RTFM/Elements/Tabs
 html/RTFM/Elements/UpdatedArticles
 html/RTFM/index.html
 html/RTFM/Topics.html
+html/Search/Article.html
 html/Search/Elements/Article
 html/SelfService/Article/autohandler
 html/SelfService/Article/Display.html
@@ -126,6 +132,7 @@ inc/Module/Install/Makefile.pm
 inc/Module/Install/Metadata.pm
 inc/Module/Install/RTx.pm
 inc/Module/Install/RTx/Factory.pm
+inc/Module/Install/Substitute.pm
 inc/Module/Install/Win32.pm
 inc/Module/Install/WriteAll.pm
 lib/RT/FM.pm
@@ -138,6 +145,10 @@ lib/RT/FM/Class_Overlay.pm
 lib/RT/FM/ClassCollection.pm
 lib/RT/FM/ClassCollection_Overlay.pm
 lib/RT/FM/Introduction.pod
+lib/RT/FM/ObjectClass.pm
+lib/RT/FM/ObjectClass_Overlay.pm
+lib/RT/FM/ObjectClassCollection.pm
+lib/RT/FM/ObjectClassCollection_Overlay.pm
 lib/RT/FM/ObjectTopic.pm
 lib/RT/FM/ObjectTopicCollection.pm
 lib/RT/FM/ObjectTopicCollection_Overlay.pm
@@ -166,11 +177,13 @@ t/00smoke.t
 t/04interface.t
 t/05cfsearch.t
 t/06search_interface.t
+t/10-queue-specific-class.t
 t/2basic_api.t
 t/3upload-customfields.t
 t/Article_Overlay.pm.t
 t/ArticleCollection_Overlay.pm.t
 t/Class_Overlay.pm.t
+t/lib/RT/FM/Test.pm
 t/lib/RT/FM/Test.pm.in
 t/URI_a.t
 t/URI_fsck_com_rtfm.t

commit 8a8ccc742c67faa74714cd988ef1f11d0c773354
Author: Kevin Falcone <falcone at bestpractical.com>
Date:   Fri Sep 9 18:03:44 2011 -0400

    useful ignores

diff --git a/.gitignore b/.gitignore
index 6bcf617..61a84d5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,5 @@ pm_to_blib
 t/tmp
 t/lib/RT/FM/Test.pm
 *.swp
+/RTFM-*.tar.gz
+/MYMETA.*

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

More information about the Rt-commit mailing list