[Bps-public-commit] rt-extension-spawnlinkedticketinqueue branch, master, updated. 0.01_01-18-g6ad4e82
Ruslan Zakirov
ruz at bestpractical.com
Thu Apr 14 21:56:52 EDT 2011
The branch, master has been updated
via 6ad4e8236ec5985cc7f5a6afbd32d87774f42b54 (commit)
via 3b4da730bc478a5f2b4b890c5881ef3e2f9cc668 (commit)
via 4f9a180fe0eed236016897375e55a8d6249c8e7a (commit)
via e4463c3a20448219d8f6b31a669737db975f8d07 (commit)
via 08b40def16561aaf23306cc31d37a001f8e73aec (commit)
from 66dc402ac0405879ac21034e26876160a1ef1dc4 (commit)
Summary of changes:
Changes | 7 +++-
MANIFEST | 2 +-
META.yml | 4 +-
.../SpawnLinkedTicket/Elements/ShowLinks/Default | 2 +-
html/{Elements => Helpers}/SpawnLinkedTicket | 0
inc/Module/Install.pm | 10 ++++--
inc/Module/Install/AutoInstall.pm | 10 +++++-
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 | 12 ++++---
inc/Module/Install/Metadata.pm | 13 ++++++--
inc/Module/Install/RTx.pm | 11 +++---
inc/Module/Install/ReadmeFromPod.pm | 34 +++++++++++++------
inc/Module/Install/Win32.pm | 2 +-
inc/Module/Install/WriteAll.pm | 2 +-
lib/RT/Extension/SpawnLinkedTicketInQueue.pm | 2 +-
18 files changed, 79 insertions(+), 40 deletions(-)
rename html/{Elements => Helpers}/SpawnLinkedTicket (100%)
- Log -----------------------------------------------------------------
commit 08b40def16561aaf23306cc31d37a001f8e73aec
Author: Ruslan Zakirov <ruz at bestpractical.com>
Date: Fri Apr 15 05:45:09 2011 +0400
move file from Elements to Helpers
we were sending user to /Elements/SpawnLinkedTicket, but since 3.8.10,
3.6.11 and 4.0.0rc8 direct requests to comps in Elements dirs is
illeagal.
diff --git a/html/Elements/SpawnLinkedTicket b/html/Helpers/SpawnLinkedTicket
similarity index 100%
rename from html/Elements/SpawnLinkedTicket
rename to html/Helpers/SpawnLinkedTicket
commit e4463c3a20448219d8f6b31a669737db975f8d07
Author: Ruslan Zakirov <ruz at bestpractical.com>
Date: Fri Apr 15 05:51:37 2011 +0400
use new path
diff --git a/html/Callbacks/SpawnLinkedTicket/Elements/ShowLinks/Default b/html/Callbacks/SpawnLinkedTicket/Elements/ShowLinks/Default
index 65d4d23..684ce36 100644
--- a/html/Callbacks/SpawnLinkedTicket/Elements/ShowLinks/Default
+++ b/html/Callbacks/SpawnLinkedTicket/Elements/ShowLinks/Default
@@ -50,7 +50,7 @@
</table>
<table>
<tr><td>
-<form action="<% RT->Config->Get('WebPath') ."/Elements/SpawnLinkedTicket" %>" name="SpawnLinkedTicket">
+<form action="<% RT->Config->Get('WebPath') ."/Helpers/SpawnLinkedTicket" %>" name="SpawnLinkedTicket">
<input type="hidden" name="CloneTicket" value="<% $Ticket->id %>">
<input type="submit" value="<&|/l&>Create</&>" name="SpawnLinkedTicket">
<select name="LinkType">
commit 4f9a180fe0eed236016897375e55a8d6249c8e7a
Author: Ruslan Zakirov <ruz at bestpractical.com>
Date: Fri Apr 15 05:52:00 2011 +0400
update M::I
diff --git a/inc/Module/Install.pm b/inc/Module/Install.pm
index 5871e1e..8ee839d 100644
--- a/inc/Module/Install.pm
+++ b/inc/Module/Install.pm
@@ -22,7 +22,6 @@ use strict 'vars';
use Cwd ();
use File::Find ();
use File::Path ();
-use FindBin;
use vars qw{$VERSION $MAIN};
BEGIN {
@@ -32,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 = '0.97';
+ $VERSION = '1.00';
# Storage for the pseudo-singleton
$MAIN = undef;
@@ -231,7 +230,12 @@ sub preload {
sub new {
my ($class, %args) = @_;
- FindBin->again;
+ delete $INC{'FindBin.pm'};
+ {
+ # to suppress the redefine warning
+ local $SIG{__WARN__} = sub {};
+ require FindBin;
+ }
# ignore the prefix on extension modules built from top level.
my $base_path = Cwd::abs_path($FindBin::Bin);
diff --git a/inc/Module/Install/AutoInstall.pm b/inc/Module/Install/AutoInstall.pm
index fea975d..f1f5356 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 = '0.97';
+ $VERSION = '1.00';
@ISA = 'Module::Install::Base';
$ISCORE = 1;
}
@@ -48,6 +48,14 @@ sub auto_install {
while (my ($mod, $ver) = splice(@requires, 0, 2)) {
$seen{$mod}{$ver}++;
}
+ my @build_requires = map @$_, map @$_, grep ref, $self->build_requires;
+ while (my ($mod, $ver) = splice(@build_requires, 0, 2)) {
+ $seen{$mod}{$ver}++;
+ }
+ my @configure_requires = map @$_, map @$_, grep ref, $self->configure_requires;
+ while (my ($mod, $ver) = splice(@configure_requires, 0, 2)) {
+ $seen{$mod}{$ver}++;
+ }
my @deduped;
while (my ($mod, $ver) = splice(@features_require, 0, 2)) {
diff --git a/inc/Module/Install/Base.pm b/inc/Module/Install/Base.pm
index 754fb90..b55bda3 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 = '0.97';
+ $VERSION = '1.00';
}
# Suspend handler for "redefined" warnings
diff --git a/inc/Module/Install/Can.pm b/inc/Module/Install/Can.pm
index 5757a67..71ccc27 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 = '0.97';
+ $VERSION = '1.00';
@ISA = 'Module::Install::Base';
$ISCORE = 1;
}
diff --git a/inc/Module/Install/Fetch.pm b/inc/Module/Install/Fetch.pm
index 4f77e2e..ec1f106 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 = '0.97';
+ $VERSION = '1.00';
@ISA = 'Module::Install::Base';
$ISCORE = 1;
}
diff --git a/inc/Module/Install/Include.pm b/inc/Module/Install/Include.pm
index 83223a1..a28cd4c 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 = '0.97';
+ $VERSION = '1.00';
@ISA = 'Module::Install::Base';
$ISCORE = 1;
}
diff --git a/inc/Module/Install/Makefile.pm b/inc/Module/Install/Makefile.pm
index 20955cd..5dfd0e9 100644
--- a/inc/Module/Install/Makefile.pm
+++ b/inc/Module/Install/Makefile.pm
@@ -4,10 +4,11 @@ package Module::Install::Makefile;
use strict 'vars';
use ExtUtils::MakeMaker ();
use Module::Install::Base ();
+use Fcntl qw/:flock :seek/;
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '0.97';
+ $VERSION = '1.00';
@ISA = 'Module::Install::Base';
$ISCORE = 1;
}
@@ -364,9 +365,9 @@ sub fix_up_makefile {
. ($self->postamble || '');
local *MAKEFILE;
- open MAKEFILE, "< $makefile_name" or die "fix_up_makefile: Couldn't open $makefile_name: $!";
+ open MAKEFILE, "+< $makefile_name" or die "fix_up_makefile: Couldn't open $makefile_name: $!";
+ eval { flock MAKEFILE, LOCK_EX };
my $makefile = do { local $/; <MAKEFILE> };
- close MAKEFILE or die $!;
$makefile =~ s/\b(test_harness\(\$\(TEST_VERBOSE\), )/$1'inc', /;
$makefile =~ s/( -I\$\(INST_ARCHLIB\))/ -Iinc$1/g;
@@ -386,7 +387,8 @@ sub fix_up_makefile {
# XXX - This is currently unused; not sure if it breaks other MM-users
# $makefile =~ s/^pm_to_blib\s+:\s+/pm_to_blib :: /mg;
- open MAKEFILE, "> $makefile_name" or die "fix_up_makefile: Couldn't open $makefile_name: $!";
+ seek MAKEFILE, 0, SEEK_SET;
+ truncate MAKEFILE, 0;
print MAKEFILE "$preamble$makefile$postamble" or die $!;
close MAKEFILE or die $!;
@@ -410,4 +412,4 @@ sub postamble {
__END__
-#line 539
+#line 541
diff --git a/inc/Module/Install/Metadata.pm b/inc/Module/Install/Metadata.pm
index bebb73f..cfe45b3 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 = '0.97';
+ $VERSION = '1.00';
@ISA = 'Module::Install::Base';
$ISCORE = 1;
}
@@ -616,8 +616,15 @@ sub _perl_version {
return $v;
}
-
-
+sub add_metadata {
+ my $self = shift;
+ my %hash = @_;
+ for my $key (keys %hash) {
+ warn "add_metadata: $key is not prefixed with 'x_'.\n" .
+ "Use appopriate function to add non-private metadata.\n" unless $key =~ /^x_/;
+ $self->{values}->{$key} = $hash{$key};
+ }
+}
######################################################################
diff --git a/inc/Module/Install/RTx.pm b/inc/Module/Install/RTx.pm
index 5480124..726b3fb 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.25';
+our $VERSION = '0.28';
use FindBin;
use File::Glob ();
@@ -42,10 +42,10 @@ sub RTx {
$INC{'RT.pm'} = "$RT::LocalPath/lib/RT.pm";
} else {
local @INC = (
- @INC,
$ENV{RTHOME} ? ( $ENV{RTHOME}, "$ENV{RTHOME}/lib" ) : (),
- map { ( "$_/rt3/lib", "$_/lib/rt3", "$_/lib" ) } grep $_,
- @prefixes
+ @INC,
+ map { ( "$_/rt4/lib", "$_/lib/rt4", "$_/rt3/lib", "$_/lib/rt3", "$_/lib" )
+ } grep $_, @prefixes
);
until ( eval { require RT; $RT::LocalPath } ) {
warn
@@ -60,6 +60,7 @@ sub RTx {
my $local_lib_path = "$RT::LocalPath/lib";
print "Using RT configuration from $INC{'RT.pm'}:\n";
unshift @INC, "$RT::LocalPath/lib" if $RT::LocalPath;
+ unshift @INC, $lib_path;
$RT::LocalVarPath ||= $RT::VarPath;
$RT::LocalPoPath ||= $RT::LocalLexiconPath;
@@ -189,4 +190,4 @@ sub RTxInit {
__END__
-#line 303
+#line 304
diff --git a/inc/Module/Install/ReadmeFromPod.pm b/inc/Module/Install/ReadmeFromPod.pm
index d5d89f4..348531e 100644
--- a/inc/Module/Install/ReadmeFromPod.pm
+++ b/inc/Module/Install/ReadmeFromPod.pm
@@ -1,36 +1,48 @@
#line 1
package Module::Install::ReadmeFromPod;
+use 5.006;
use strict;
use warnings;
use base qw(Module::Install::Base);
use vars qw($VERSION);
-$VERSION = '0.08';
+$VERSION = '0.12';
sub readme_from {
my $self = shift;
- return unless $Module::Install::AUTHOR;
- my $file = shift || return;
+ return unless $self->is_admin;
+
+ my $file = shift || $self->_all_from
+ or die "Can't determine file to make readme_from";
my $clean = shift;
+
+ print "Writing README from $file\n";
+
require Pod::Text;
my $parser = Pod::Text->new();
open README, '> README' or die "$!\n";
$parser->output_fh( *README );
$parser->parse_file( $file );
- return 1 unless $clean;
- $self->postamble(<<"END");
-distclean :: license_clean
-
-license_clean:
-\t\$(RM_F) README
-END
+ if ($clean) {
+ $self->clean_files('README');
+ }
return 1;
}
+sub _all_from {
+ my $self = shift;
+ return unless $self->admin->{extensions};
+ my ($metadata) = grep {
+ ref($_) eq 'Module::Install::Metadata';
+ } @{$self->admin->{extensions}};
+ return unless $metadata;
+ return $metadata->{values}{all_from} || '';
+}
+
'Readme!';
__END__
-#line 89
+#line 112
diff --git a/inc/Module/Install/Win32.pm b/inc/Module/Install/Win32.pm
index bbfda8d..edc18b4 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 = '0.97';
+ $VERSION = '1.00';
@ISA = 'Module::Install::Base';
$ISCORE = 1;
}
diff --git a/inc/Module/Install/WriteAll.pm b/inc/Module/Install/WriteAll.pm
index e6afa42..d0f6599 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 = '0.97';;
+ $VERSION = '1.00';
@ISA = qw{Module::Install::Base};
$ISCORE = 1;
}
commit 3b4da730bc478a5f2b4b890c5881ef3e2f9cc668
Author: Ruslan Zakirov <ruz at bestpractical.com>
Date: Fri Apr 15 05:53:43 2011 +0400
releng: changelog, manifest and meta
diff --git a/Changes b/Changes
index e2b2767..262a679 100644
--- a/Changes
+++ b/Changes
@@ -1,8 +1,13 @@
-0.04 2010-05-25
+0.05 2011-04-15
+ * fix compatibility with 3.8.10
* fix situation when WebPath config option is not empty
* use better query string generation
+0.04 2009-09-30
+
+ * fix rendering issues in different browsers
+
0.03 2009-09-23
* return back missing Makefile.PL
diff --git a/MANIFEST b/MANIFEST
index a92e953..74c79de 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1,6 +1,6 @@
Changes
html/Callbacks/SpawnLinkedTicket/Elements/ShowLinks/Default
-html/Elements/SpawnLinkedTicket
+html/Helpers/SpawnLinkedTicket
inc/Module/AutoInstall.pm
inc/Module/Install.pm
inc/Module/Install/AutoInstall.pm
diff --git a/META.yml b/META.yml
index c9d6921..1363e87 100644
--- a/META.yml
+++ b/META.yml
@@ -7,7 +7,7 @@ build_requires:
configure_requires:
ExtUtils::MakeMaker: 6.42
distribution_type: module
-generated_by: 'Module::Install version 0.97'
+generated_by: 'Module::Install version 1.00'
license: gpl
meta-spec:
url: http://module-build.sourceforge.net/META-spec-v1.4.html
commit 6ad4e8236ec5985cc7f5a6afbd32d87774f42b54
Author: Ruslan Zakirov <ruz at bestpractical.com>
Date: Fri Apr 15 05:54:50 2011 +0400
bump version, 0.05
diff --git a/META.yml b/META.yml
index 1363e87..0aad740 100644
--- a/META.yml
+++ b/META.yml
@@ -21,4 +21,4 @@ requires:
perl: 5.8.3
resources:
license: http://opensource.org/licenses/gpl-license.php
-version: 0.03
+version: 0.05
diff --git a/lib/RT/Extension/SpawnLinkedTicketInQueue.pm b/lib/RT/Extension/SpawnLinkedTicketInQueue.pm
index a9a51e3..21e1ca6 100644
--- a/lib/RT/Extension/SpawnLinkedTicketInQueue.pm
+++ b/lib/RT/Extension/SpawnLinkedTicketInQueue.pm
@@ -1,6 +1,6 @@
package RT::Extension::SpawnLinkedTicketInQueue;
-our $VERSION = '0.03';
+our $VERSION = '0.05';
use 5.008003;
use warnings;
-----------------------------------------------------------------------
More information about the Bps-public-commit
mailing list