[Rt-commit] r5885 - in rtir/branches/2.1-EXPERIMENTAL: . inc/Module
ruz at bestpractical.com
ruz at bestpractical.com
Thu Sep 7 18:14:50 EDT 2006
Author: ruz
Date: Thu Sep 7 18:14:49 2006
New Revision: 5885
Added:
rtir/branches/2.1-EXPERIMENTAL/MANIFEST
Modified:
rtir/branches/2.1-EXPERIMENTAL/ (props changed)
rtir/branches/2.1-EXPERIMENTAL/META.yml
rtir/branches/2.1-EXPERIMENTAL/inc/Module/AutoInstall.pm
rtir/branches/2.1-EXPERIMENTAL/inc/Module/Install.pm
rtir/branches/2.1-EXPERIMENTAL/inc/Module/Install/AutoInstall.pm
rtir/branches/2.1-EXPERIMENTAL/inc/Module/Install/Base.pm
rtir/branches/2.1-EXPERIMENTAL/inc/Module/Install/Can.pm
rtir/branches/2.1-EXPERIMENTAL/inc/Module/Install/Fetch.pm
rtir/branches/2.1-EXPERIMENTAL/inc/Module/Install/Include.pm
rtir/branches/2.1-EXPERIMENTAL/inc/Module/Install/Makefile.pm
rtir/branches/2.1-EXPERIMENTAL/inc/Module/Install/Metadata.pm
rtir/branches/2.1-EXPERIMENTAL/inc/Module/Install/Win32.pm
rtir/branches/2.1-EXPERIMENTAL/inc/Module/Install/WriteAll.pm
Log:
r1557 at cubic-pc: cubic | 2006-09-08 02:22:03 +0400
* update M::I
* update META.yml
* add MANIFEST
Added: rtir/branches/2.1-EXPERIMENTAL/MANIFEST
==============================================================================
--- (empty file)
+++ rtir/branches/2.1-EXPERIMENTAL/MANIFEST Thu Sep 7 18:14:49 2006
@@ -0,0 +1,178 @@
+etc/initialdata
+etc/RTIR_Config.pm
+etc/upgrade/1.0.3/content
+etc/upgrade/1.1.2/content
+etc/upgrade/1.1.3/content
+etc/upgrade/1.9.0/content
+etc/upgrade/1.9.0/schema.Informix
+etc/upgrade/1.9.0/schema.mysql
+etc/upgrade/1.9.0/schema.Oracle
+etc/upgrade/1.9.0/schema.Pg
+etc/upgrade/1.9.0/schema.SQLite
+etc/upgrade/1.9.0/schema.Sybase
+etc/upgrade/2.1.0/content
+etc/upgrade/upgrade.pl
+html/Callbacks/RTIR/autohandler/Default
+html/Callbacks/RTIR/Elements/Header/Default
+html/Callbacks/RTIR/Elements/Header/Head
+html/Callbacks/RTIR/Elements/ListActions/ModifyRow
+html/Callbacks/RTIR/Elements/MakeClicky/Default
+html/Callbacks/RTIR/Elements/QueueSummary/Filter
+html/Callbacks/RTIR/Elements/RT__Ticket/ColumnMap/ColumnMap
+html/Callbacks/RTIR/Elements/ShowCustomFields/MassageCustomFields
+html/Callbacks/RTIR/Elements/Tabs/Default
+html/Callbacks/RTIR/RTFM/Elements/Tabs/Default
+html/Callbacks/RTIR/Search/Elements/PickBasics/Default
+html/Callbacks/RTIR/Search/Elements/PickCFs/MassageCustomFields
+html/Callbacks/RTIR/Ticket/Create.html/Default
+html/Callbacks/RTIR/Ticket/Display.html/Initial
+html/Callbacks/RTIR/Ticket/Elements/EditCustomFields/MassageCustomFields
+html/Callbacks/RTIR/Ticket/Elements/ShowHistory/SkipTransaction
+html/Callbacks/RTIR/Ticket/Elements/ShowTransaction/ModifyDisplay
+html/Callbacks/RTIR/User/Elements/Tabs/Default
+html/RTIR/Advanced.html
+html/RTIR/Block/Elements/EditState
+html/RTIR/Block/Elements/Tabs
+html/RTIR/Create.html
+html/RTIR/Display.html
+html/RTIR/Edit.html
+html/RTIR/Elements/AddWatchers
+html/RTIR/Elements/BaseQuery
+html/RTIR/Elements/ChildrenQuery
+html/RTIR/Elements/ChildSummary
+html/RTIR/Elements/DueIncidents
+html/RTIR/Elements/EditDates
+html/RTIR/Elements/EditPeople
+html/RTIR/Elements/EditRTIRField
+html/RTIR/Elements/Header
+html/RTIR/Elements/IncidentSummary
+html/RTIR/Elements/MakeClicky
+html/RTIR/Elements/MergeWith
+html/RTIR/Elements/NewQuery
+html/RTIR/Elements/NewReports
+html/RTIR/Elements/PickRestriction
+html/RTIR/Elements/QueueSummary
+html/RTIR/Elements/QueueTabs
+html/RTIR/Elements/Refresh
+html/RTIR/Elements/SearchRTIRField
+html/RTIR/Elements/SelectCustomFieldOperator
+html/RTIR/Elements/SelectCustomFieldValue
+html/RTIR/Elements/ShowChildren
+html/RTIR/Elements/ShowDates
+html/RTIR/Elements/ShowIncidents
+html/RTIR/Elements/ShowPeople
+html/RTIR/Elements/ShowRTIRField
+html/RTIR/Elements/SimpleSearch
+html/RTIR/Elements/States
+html/RTIR/Elements/Tabs
+html/RTIR/Elements/TransactionData
+html/RTIR/Elements/Type
+html/RTIR/Elements/UpdateData
+html/RTIR/Elements/UserDueIncidents
+html/RTIR/Incident/BulkAbandon.html
+html/RTIR/Incident/Create.html
+html/RTIR/Incident/Display.html
+html/RTIR/Incident/Edit.html
+html/RTIR/Incident/Elements/Create
+html/RTIR/Incident/Elements/ReplyForm
+html/RTIR/Incident/Elements/Tabs
+html/RTIR/Incident/LinkArticles.html
+html/RTIR/Incident/LinkChildren.html
+html/RTIR/Incident/LinkToIncident.html
+html/RTIR/Incident/Reply.html
+html/RTIR/Incident/ShowChildren.html
+html/RTIR/Incident/Split.html
+html/RTIR/index.html
+html/RTIR/Investigation/Elements/Create
+html/RTIR/Investigation/Elements/Tabs
+html/RTIR/Merge.html
+html/RTIR/NoAuth/webrtir.css
+html/RTIR/Prefs/Home.html
+html/RTIR/Report/BulkReject.html
+html/RTIR/Report/Elements/Tabs
+html/RTIR/Reporting/Elements/SLASummary
+html/RTIR/Reporting/index.html
+html/RTIR/Reporting/Report.html
+html/RTIR/Reporting/Report.tsv
+html/RTIR/Reporting/Report.txt
+html/RTIR/Search/Elements/BuildQuery
+html/RTIR/Search/Elements/PickCFs
+html/RTIR/Search/Elements/PickCriteria
+html/RTIR/Search/Elements/ProcessQuery
+html/RTIR/Search/Elements/RefineTabs
+html/RTIR/Search/Elements/ShowResults
+html/RTIR/Search/Refine.html
+html/RTIR/Search/Reporting.html
+html/RTIR/Search/Results.html
+html/RTIR/Split.html
+html/RTIR/Tools/Elements/GetEmailFromIP
+html/RTIR/Tools/Elements/Tabs
+html/RTIR/Tools/Lookup.html
+html/RTIR/Tools/ScriptedAction.html
+html/RTIR/Tools/Traceroute.html
+html/RTIR/Update.html
+inc/Module/AutoInstall.pm
+inc/Module/Install.pm
+inc/Module/Install/AutoInstall.pm
+inc/Module/Install/Base.pm
+inc/Module/Install/Can.pm
+inc/Module/Install/Fetch.pm
+inc/Module/Install/Include.pm
+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/Action/RTIR.pm
+lib/RT/Action/RTIR_ChangeChildOwnership.pm
+lib/RT/Action/RTIR_ChangeParentOwnership.pm
+lib/RT/Action/RTIR_FindIP.pm
+lib/RT/Action/RTIR_OpenParent.pm
+lib/RT/Action/RTIR_ResolveChildren.pm
+lib/RT/Action/RTIR_SetBlockState.pm
+lib/RT/Action/RTIR_SetDueBySLA.pm
+lib/RT/Action/RTIR_SetDueCorrespond.pm
+lib/RT/Action/RTIR_SetDueIncident.pm
+lib/RT/Action/RTIR_SetDueReopen.pm
+lib/RT/Action/RTIR_SetDueToNow.pm
+lib/RT/Action/RTIR_SetHowReported.pm
+lib/RT/Action/RTIR_SetIncidentReportState.pm
+lib/RT/Action/RTIR_SetIncidentResolution.pm
+lib/RT/Action/RTIR_SetIncidentState.pm
+lib/RT/Action/RTIR_SetInvestigationState.pm
+lib/RT/Action/RTIR_SetStartsByBizHours.pm
+lib/RT/Action/RTIR_SetStartsToNow.pm
+lib/RT/Action/RTIR_SetState.pm
+lib/RT/Action/RTIR_UnsetDue.pm
+lib/RT/Condition/RTIR.pm
+lib/RT/Condition/RTIR_CloseTicket.pm
+lib/RT/Condition/RTIR_CustomerResponse.pm
+lib/RT/Condition/RTIR_ReopenTicket.pm
+lib/RT/Condition/RTIR_RequireDueChange.pm
+lib/RT/Condition/RTIR_RequireStateChange.pm
+lib/RT/Condition/RTIR_StaffResponse.pm
+lib/RT/IR.pm
+lib/RT/IR/Config.pm
+lib/RT/IR/Ticket.pm
+Makefile.PL
+MANIFEST This list of files
+META.yml
+README
+reports/report.pl
+t/000-rtir-test-setup.t
+t/001-basic-RTIR.t
+t/002-test-reject.t
+t/003-resolve-IR-when-all-incidents-resolved.t
+t/004-rtfm-in-rtir.t
+t/005-resolve-investigations.t
+t/006-saved-searches.t
+t/008-workflow-blocks.t
+t/009-attachments-processing.t
+t/010-bulk-reject.t
+t/011-merge.t
+t/012-split-incident.t
+t/03firstmilestone.t
+t/rtir-test.pl
+UPGRADING
Modified: rtir/branches/2.1-EXPERIMENTAL/META.yml
==============================================================================
--- rtir/branches/2.1-EXPERIMENTAL/META.yml (original)
+++ rtir/branches/2.1-EXPERIMENTAL/META.yml Thu Sep 7 18:14:49 2006
@@ -1,7 +1,7 @@
abstract: RT IR Extension
author: Best Practical Solutions <sales at bestpractical.com>
distribution_type: module
-generated_by: Module::Install version 0.620
+generated_by: Module::Install version 0.640
license: GPL Version 2
name: RT-IR
no_index:
@@ -16,4 +16,4 @@
DBIx::SearchBuilder: 1.4
Net::Whois::RIPE: 0
RT::FM: 0
-version: 2.0.0
+version: 2.1.HEAD
Modified: rtir/branches/2.1-EXPERIMENTAL/inc/Module/AutoInstall.pm
==============================================================================
--- rtir/branches/2.1-EXPERIMENTAL/inc/Module/AutoInstall.pm (original)
+++ rtir/branches/2.1-EXPERIMENTAL/inc/Module/AutoInstall.pm Thu Sep 7 18:14:49 2006
@@ -7,7 +7,7 @@
use vars qw{$VERSION};
BEGIN {
- $VERSION = '1.02';
+ $VERSION = '1.03';
}
# special map on pre-defined feature sets
@@ -214,7 +214,7 @@
}
}
- _check_lock(); # check for $UnderCPAN
+ $UnderCPAN = _check_lock(); # check for $UnderCPAN
if ( @Missing and not( $CheckOnly or $UnderCPAN ) ) {
require Config;
@@ -234,9 +234,20 @@
*{'main::WriteMakefile'} = \&Write if caller(0) eq 'main';
}
-# CPAN.pm is non-reentrant, so check if we're under it and have no CPANPLUS
+# Check to see if we are currently running under CPAN.pm and/or CPANPLUS;
+# if we are, then we simply let it taking care of our dependencies
sub _check_lock {
return unless @Missing;
+
+ if ($ENV{PERL5_CPANPLUS_IS_RUNNING}) {
+ print <<'END_MESSAGE';
+
+*** Since we're running under CPANPLUS, I'll just let it take care
+ of the dependency's installation later.
+END_MESSAGE
+ return 1;
+ }
+
_load_cpan();
# Find the CPAN lock-file
@@ -256,10 +267,11 @@
*** Since we're running under CPAN, I'll just let it take care
of the dependency's installation later.
END_MESSAGE
- $UnderCPAN = 1;
+ return 1;
}
close LOCK;
+ return;
}
sub install {
@@ -280,7 +292,8 @@
}
}
- return @installed unless @modules; # nothing to do
+ return @installed unless @modules; # nothing to do
+ return @installed if _check_lock(); # defer to the CPAN shell
print "*** Installing dependencies...\n";
@@ -300,7 +313,7 @@
@modules = @newmod;
}
- if ( ! $UnderCPAN and _has_cpanplus() ) {
+ if ( _has_cpanplus() ) {
_install_cpanplus( \@modules, \@config );
} else {
_install_cpan( \@modules, \@config );
@@ -466,9 +479,9 @@
delete $INC{$inc};
}
- $obj->force('install') if $args{force};
-
- my $rv = $obj->install || eval {
+ my $rv = $args{force} ? CPAN::Shell->force( install => $pkg )
+ : CPAN::Shell->install($pkg);
+ $rv ||= eval {
$CPAN::META->instance( 'CPAN::Distribution', $obj->cpan_file, )
->{install}
if $CPAN::META;
@@ -639,7 +652,9 @@
# check for version numbers that are not in decimal format
if ( ref($cur) or ref($min) or $cur =~ /v|\..*\./ or $min =~ /v|\..*\./ ) {
- if ( $version::VERSION or defined( _load('version') ) ) {
+ if ( ( $version::VERSION or defined( _load('version') )) and
+ version->can('new')
+ ) {
# use version.pm if it is installed.
return (
@@ -750,4 +765,4 @@
__END__
-#line 988
+#line 1003
Modified: rtir/branches/2.1-EXPERIMENTAL/inc/Module/Install.pm
==============================================================================
--- rtir/branches/2.1-EXPERIMENTAL/inc/Module/Install.pm (original)
+++ rtir/branches/2.1-EXPERIMENTAL/inc/Module/Install.pm Thu Sep 7 18:14:49 2006
@@ -28,7 +28,7 @@
# 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 = '0.62';
+ $VERSION = '0.64';
}
# Whether or not inc::Module::Install is actually loaded, the
@@ -51,6 +51,22 @@
END_DIE
}
+# If the script that is loading Module::Install is from the future,
+# then make will detect this and cause it to re-run over and over
+# again. This is bad. Rather than taking action to touch it (which
+# is unreliable on some platforms and requires write permissions)
+# for now we should catch this and refuse to run.
+if ( -f $0 and (stat($0))[9] > time ) {
+ die << "END_DIE";
+Your installer $0 has a modification time in the future.
+
+This is known to create infinite loops in make.
+
+Please correct this, then run $0 again.
+
+END_DIE
+}
+
use Cwd ();
use File::Find ();
use File::Path ();
Modified: rtir/branches/2.1-EXPERIMENTAL/inc/Module/Install/AutoInstall.pm
==============================================================================
--- rtir/branches/2.1-EXPERIMENTAL/inc/Module/Install/AutoInstall.pm (original)
+++ rtir/branches/2.1-EXPERIMENTAL/inc/Module/Install/AutoInstall.pm Thu Sep 7 18:14:49 2006
@@ -6,7 +6,7 @@
use vars qw{$VERSION $ISCORE @ISA};
BEGIN {
- $VERSION = '0.62';
+ $VERSION = '0.64';
$ISCORE = 1;
@ISA = qw{Module::Install::Base};
}
Modified: rtir/branches/2.1-EXPERIMENTAL/inc/Module/Install/Base.pm
==============================================================================
--- rtir/branches/2.1-EXPERIMENTAL/inc/Module/Install/Base.pm (original)
+++ rtir/branches/2.1-EXPERIMENTAL/inc/Module/Install/Base.pm Thu Sep 7 18:14:49 2006
@@ -1,7 +1,7 @@
#line 1
package Module::Install::Base;
-$VERSION = '0.62';
+$VERSION = '0.64';
# Suspend handler for "redefined" warnings
BEGIN {
Modified: rtir/branches/2.1-EXPERIMENTAL/inc/Module/Install/Can.pm
==============================================================================
--- rtir/branches/2.1-EXPERIMENTAL/inc/Module/Install/Can.pm (original)
+++ rtir/branches/2.1-EXPERIMENTAL/inc/Module/Install/Can.pm Thu Sep 7 18:14:49 2006
@@ -11,7 +11,7 @@
use vars qw{$VERSION $ISCORE @ISA};
BEGIN {
- $VERSION = '0.62';
+ $VERSION = '0.64';
$ISCORE = 1;
@ISA = qw{Module::Install::Base};
}
Modified: rtir/branches/2.1-EXPERIMENTAL/inc/Module/Install/Fetch.pm
==============================================================================
--- rtir/branches/2.1-EXPERIMENTAL/inc/Module/Install/Fetch.pm (original)
+++ rtir/branches/2.1-EXPERIMENTAL/inc/Module/Install/Fetch.pm Thu Sep 7 18:14:49 2006
@@ -6,7 +6,7 @@
use vars qw{$VERSION $ISCORE @ISA};
BEGIN {
- $VERSION = '0.62';
+ $VERSION = '0.64';
$ISCORE = 1;
@ISA = qw{Module::Install::Base};
}
Modified: rtir/branches/2.1-EXPERIMENTAL/inc/Module/Install/Include.pm
==============================================================================
--- rtir/branches/2.1-EXPERIMENTAL/inc/Module/Install/Include.pm (original)
+++ rtir/branches/2.1-EXPERIMENTAL/inc/Module/Install/Include.pm Thu Sep 7 18:14:49 2006
@@ -6,7 +6,7 @@
use vars qw{$VERSION $ISCORE @ISA};
BEGIN {
- $VERSION = '0.62';
+ $VERSION = '0.64';
$ISCORE = 1;
@ISA = qw{Module::Install::Base};
}
Modified: rtir/branches/2.1-EXPERIMENTAL/inc/Module/Install/Makefile.pm
==============================================================================
--- rtir/branches/2.1-EXPERIMENTAL/inc/Module/Install/Makefile.pm (original)
+++ rtir/branches/2.1-EXPERIMENTAL/inc/Module/Install/Makefile.pm Thu Sep 7 18:14:49 2006
@@ -7,7 +7,7 @@
use vars qw{$VERSION $ISCORE @ISA};
BEGIN {
- $VERSION = '0.62';
+ $VERSION = '0.64';
$ISCORE = 1;
@ISA = qw{Module::Install::Base};
}
Modified: rtir/branches/2.1-EXPERIMENTAL/inc/Module/Install/Metadata.pm
==============================================================================
--- rtir/branches/2.1-EXPERIMENTAL/inc/Module/Install/Metadata.pm (original)
+++ rtir/branches/2.1-EXPERIMENTAL/inc/Module/Install/Metadata.pm Thu Sep 7 18:14:49 2006
@@ -6,7 +6,7 @@
use vars qw{$VERSION $ISCORE @ISA};
BEGIN {
- $VERSION = '0.62';
+ $VERSION = '0.64';
$ISCORE = 1;
@ISA = qw{Module::Install::Base};
}
@@ -123,9 +123,9 @@
require Module::Build;
my $build = Module::Build->new(
- dist_name => $self->{name},
- dist_version => $self->{version},
- license => $self->{license},
+ dist_name => $self->name,
+ dist_version => $self->version,
+ license => $self->license,
);
$self->provides(%{ $build->find_dist_packages || {} });
}
Modified: rtir/branches/2.1-EXPERIMENTAL/inc/Module/Install/Win32.pm
==============================================================================
--- rtir/branches/2.1-EXPERIMENTAL/inc/Module/Install/Win32.pm (original)
+++ rtir/branches/2.1-EXPERIMENTAL/inc/Module/Install/Win32.pm Thu Sep 7 18:14:49 2006
@@ -6,7 +6,7 @@
use vars qw{$VERSION $ISCORE @ISA};
BEGIN {
- $VERSION = '0.62';
+ $VERSION = '0.64';
$ISCORE = 1;
@ISA = qw{Module::Install::Base};
}
Modified: rtir/branches/2.1-EXPERIMENTAL/inc/Module/Install/WriteAll.pm
==============================================================================
--- rtir/branches/2.1-EXPERIMENTAL/inc/Module/Install/WriteAll.pm (original)
+++ rtir/branches/2.1-EXPERIMENTAL/inc/Module/Install/WriteAll.pm Thu Sep 7 18:14:49 2006
@@ -6,7 +6,7 @@
use vars qw{$VERSION $ISCORE @ISA};
BEGIN {
- $VERSION = '0.62';
+ $VERSION = '0.64';
$ISCORE = 1;
@ISA = qw{Module::Install::Base};
}
More information about the Rt-commit
mailing list