[Bps-public-commit] RT-Extension-ReportSpam branch, master, updated. 1.00
Alex Vandiver
alexmv at bestpractical.com
Mon Dec 15 18:59:56 EST 2014
The branch, master has been updated
via df339ff9c591a49b3383dcdbe585b7bb0cdbc53f (commit)
from 6f94137d695997913104517d04e66b715cff6293 (commit)
Summary of changes:
Changes | 3 +++
META.yml | 10 +++++-----
Makefile.PL | 4 +---
README | 29 ++++++++++++++---------------
inc/Module/Install.pm | 18 +++++++++---------
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 | 4 ++--
inc/Module/Install/Metadata.pm | 6 +++---
inc/Module/Install/RTx.pm | 32 ++++++++++++++++++++------------
inc/Module/Install/Win32.pm | 2 +-
inc/Module/Install/WriteAll.pm | 2 +-
lib/RT/Extension/ReportSpam.pm | 27 +++++++++++++--------------
15 files changed, 76 insertions(+), 69 deletions(-)
- Log -----------------------------------------------------------------
commit df339ff9c591a49b3383dcdbe585b7bb0cdbc53f
Author: Alex Vandiver <alexmv at bestpractical.com>
Date: Mon Dec 15 18:59:07 2014 -0500
Version 1.00 releng
diff --git a/Changes b/Changes
index f01b53b..4bd0dd4 100644
--- a/Changes
+++ b/Changes
@@ -1,3 +1,6 @@
+1.00 2014-12-15
+ - Packaging and documentation updates
+
0.13 2014-07-10
- 4.2 compatibility fixes
- Hover text when mousing over the S to help explain what it is
diff --git a/META.yml b/META.yml
index 9ec950c..76c6e29 100644
--- a/META.yml
+++ b/META.yml
@@ -8,8 +8,8 @@ configure_requires:
ExtUtils::MakeMaker: 6.59
distribution_type: module
dynamic_config: 1
-generated_by: 'Module::Install version 1.08'
-license: perl
+generated_by: 'Module::Install version 1.12'
+license: gpl
meta-spec:
url: http://module-build.sourceforge.net/META-spec-v1.4.html
version: 1.4
@@ -22,7 +22,7 @@ no_index:
requires:
perl: 5.8.3
resources:
- license: http://dev.perl.org/licenses/
-version: '0.13'
-x_module_install_rtx_version: 0.34_04
+ license: http://opensource.org/licenses/gpl-license.php
+version: '1.00'
+x_module_install_rtx_version: '0.36'
x_requires_rt: 4.0.0
diff --git a/Makefile.PL b/Makefile.PL
index 3036cf7..3d20862 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -1,7 +1,5 @@
use inc::Module::Install;
RTx('RT-Extension-ReportSpam');
-all_from 'lib/RT/Extension/ReportSpam.pm';
-readme_from 'lib/RT/Extension/ReportSpam.pm';
-requires_rt("4.0.0");
+
sign;
WriteAll();
diff --git a/README b/README
index 56b0133..cb9e451 100644
--- a/README
+++ b/README
@@ -6,22 +6,21 @@ DESCRIPTION
report a ticket as a spam message.
INSTALLATION
- "perl Makefile.PL"
- "make"
- "make install"
+ perl Makefile.PL
+ make
+ make install
May need root permissions
Edit your /opt/rt4/etc/RT_SiteConfig.pm
If you are using RT 4.2 or greater, add this line:
- Plugin('{{RT::Extension::ReportSpam}}');
+ Plugin('RT::Extension::ReportSpam');
For RT 4.0, add this line:
- Set(@Plugins, qw({{RT::Extension::ReportSpam}}));
+ Set(@Plugins, qw(RT::Extension::ReportSpam));
- or add "{{RT::Extension::ReportSpam}}" to your existing @Plugins
- line.
+ or add RT::Extension::ReportSpam to your existing @Plugins line.
You may also want to set the $SpamAutoDeleteThreshold config option
to the number of spam reports required before the system will
@@ -35,10 +34,6 @@ INSTALLATION
Restart your webserver
-USING ON RT 3.8
- Users of this extension on RT 3.8 should not upgrade past version 0.03
- of this extension.
-
HOW TO …
Report Spam
On any ticket page, you can report the ticket as spam by clicking "S".
@@ -65,6 +60,9 @@ HOW TO …
reported as spam. If you have rights to delete tickets then they will be
deleted.
+AUTHOR
+ Best Practical Solutions, LLC <modules at bestpractical.com>
+
BUGS
All bugs should be reported via email to
@@ -74,9 +72,10 @@ BUGS
L<rt.cpan.org|http://rt.cpan.org/Public/Dist/Display.html?Name=RT-Extension-ReportSpam>.
-AUTHOR
- Best Practical Solutions, LLC <modules at bestpractical.com>
+LICENSE AND COPYRIGHT
+ This software is Copyright (c) 2014 by Best Practical Solutions
+
+ This is free software, licensed under:
-LICENSE
- Under the same terms as perl itself.
+ The GNU General Public License, Version 2, June 1991
diff --git a/inc/Module/Install.pm b/inc/Module/Install.pm
index 7680c84..5460dd5 100644
--- a/inc/Module/Install.pm
+++ b/inc/Module/Install.pm
@@ -17,7 +17,7 @@ package Module::Install;
# 3. The ./inc/ version of Module::Install loads
# }
-use 5.005;
+use 5.006;
use strict 'vars';
use Cwd ();
use File::Find ();
@@ -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.08';
+ $VERSION = '1.12';
# Storage for the pseudo-singleton
$MAIN = undef;
@@ -156,10 +156,10 @@ END_DIE
sub autoload {
my $self = shift;
my $who = $self->_caller;
- my $cwd = Cwd::cwd();
+ my $cwd = Cwd::getcwd();
my $sym = "${who}::AUTOLOAD";
$sym->{$cwd} = sub {
- my $pwd = Cwd::cwd();
+ my $pwd = Cwd::getcwd();
if ( my $code = $sym->{$pwd} ) {
# Delegate back to parent dirs
goto &$code unless $cwd eq $pwd;
@@ -239,7 +239,7 @@ sub new {
# ignore the prefix on extension modules built from top level.
my $base_path = Cwd::abs_path($FindBin::Bin);
- unless ( Cwd::abs_path(Cwd::cwd()) eq $base_path ) {
+ unless ( Cwd::abs_path(Cwd::getcwd()) eq $base_path ) {
delete $args{prefix};
}
return $args{_self} if $args{_self};
@@ -338,7 +338,7 @@ sub find_extensions {
if ( $subpath eq lc($subpath) || $subpath eq uc($subpath) ) {
my $content = Module::Install::_read($subpath . '.pm');
my $in_pod = 0;
- foreach ( split //, $content ) {
+ foreach ( split /\n/, $content ) {
$in_pod = 1 if /^=\w/;
$in_pod = 0 if /^=cut/;
next if ($in_pod || /^=cut/); # skip pod text
@@ -434,7 +434,7 @@ END_OLD
# _version is for processing module versions (eg, 1.03_05) not
# Perl versions (eg, 5.8.1).
-sub _version ($) {
+sub _version {
my $s = shift || 0;
my $d =()= $s =~ /(\.)/g;
if ( $d >= 2 ) {
@@ -450,12 +450,12 @@ sub _version ($) {
return $l + 0;
}
-sub _cmp ($$) {
+sub _cmp {
_version($_[1]) <=> _version($_[2]);
}
# Cloned from Params::Util::_CLASS
-sub _CLASS ($) {
+sub _CLASS {
(
defined $_[0]
and
diff --git a/inc/Module/Install/Base.pm b/inc/Module/Install/Base.pm
index 3e63345..f9bf5de 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.08';
+ $VERSION = '1.12';
}
# Suspend handler for "redefined" warnings
diff --git a/inc/Module/Install/Can.pm b/inc/Module/Install/Can.pm
index 93f248d..b4e5e3b 100644
--- a/inc/Module/Install/Can.pm
+++ b/inc/Module/Install/Can.pm
@@ -8,7 +8,7 @@ use Module::Install::Base ();
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '1.08';
+ $VERSION = '1.12';
@ISA = 'Module::Install::Base';
$ISCORE = 1;
}
diff --git a/inc/Module/Install/Fetch.pm b/inc/Module/Install/Fetch.pm
index ecc0d53..54f14fb 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.08';
+ $VERSION = '1.12';
@ISA = 'Module::Install::Base';
$ISCORE = 1;
}
diff --git a/inc/Module/Install/Include.pm b/inc/Module/Install/Include.pm
index fc86e23..7224cff 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.08';
+ $VERSION = '1.12';
@ISA = 'Module::Install::Base';
$ISCORE = 1;
}
diff --git a/inc/Module/Install/Makefile.pm b/inc/Module/Install/Makefile.pm
index c0978a4..81cddd5 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.08';
+ $VERSION = '1.12';
@ISA = 'Module::Install::Base';
$ISCORE = 1;
}
@@ -133,7 +133,7 @@ sub makemaker_args {
return $args;
}
-# For mm args that take multiple space-seperated args,
+# For mm args that take multiple space-separated args,
# append an argument to the current list.
sub makemaker_append {
my $self = shift;
diff --git a/inc/Module/Install/Metadata.pm b/inc/Module/Install/Metadata.pm
index e4112f8..2c66b1e 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.08';
+ $VERSION = '1.12';
@ISA = 'Module::Install::Base';
$ISCORE = 1;
}
@@ -347,7 +347,7 @@ sub name_from {
^ \s*
package \s*
([\w:]+)
- \s* ;
+ [\s|;]*
/ixms
) {
my ($name, $module_name) = ($1, $1);
@@ -705,7 +705,7 @@ sub _write_mymeta_data {
my @yaml = Parse::CPAN::Meta::LoadFile('META.yml');
my $meta = $yaml[0];
- # Overwrite the non-configure dependency hashs
+ # Overwrite the non-configure dependency hashes
delete $meta->{requires};
delete $meta->{build_requires};
delete $meta->{recommends};
diff --git a/inc/Module/Install/RTx.pm b/inc/Module/Install/RTx.pm
index 31db76d..73e7245 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.34_04';
+our $VERSION = '0.36';
use FindBin;
use File::Glob ();
@@ -18,7 +18,8 @@ my @DIRS = qw(etc lib html static bin sbin po var);
my @INDEX_DIRS = qw(lib bin sbin);
sub RTx {
- my ( $self, $name ) = @_;
+ my ( $self, $name, $extra_args ) = @_;
+ $extra_args ||= {};
# Set up names
my $fname = $name;
@@ -30,12 +31,16 @@ sub RTx {
unless $self->version;
$self->abstract("$name Extension")
unless $self->abstract;
- $self->readme_from( "lib/$fname.pm",
- { options => [ quotes => "none" ] } );
+ unless ( $extra_args->{no_readme_generation} ) {
+ $self->readme_from( "lib/$fname.pm",
+ { options => [ quotes => "none" ] } );
+ }
$self->add_metadata("x_module_install_rtx_version", $VERSION );
# Try to find RT.pm
- my @prefixes = qw( /opt /usr/local /home /usr /sw );
+ my @prefixes = qw( /opt /usr/local /home /usr /sw /usr/share/request-tracker4);
+ $ENV{RTHOME} =~ s{/RT\.pm$}{} if defined $ENV{RTHOME};
+ $ENV{RTHOME} =~ s{/lib/?$}{} if defined $ENV{RTHOME};
my @try = $ENV{RTHOME} ? ($ENV{RTHOME}, "$ENV{RTHOME}/lib") : ();
while (1) {
my @look = @INC;
@@ -46,9 +51,10 @@ sub RTx {
warn
"Cannot find the location of RT.pm that defines \$RT::LocalPath in: @look\n";
- $_ = $self->prompt("Path to directory containing your RT.pm:") or exit;
- $_ =~ s{(/lib)?/RT\.pm$}{};
- @try = ("$_/rt4/lib", "$_/lib/rt4", "$_/lib");
+ my $given = $self->prompt("Path to directory containing your RT.pm:") or exit;
+ $given =~ s{/RT\.pm$}{};
+ $given =~ s{/lib/?$}{};
+ @try = ($given, "$given/lib");
}
print "Using RT configuration from $INC{'RT.pm'}:\n";
@@ -59,7 +65,9 @@ sub RTx {
unshift @INC, $lib_path;
# Set a baseline minimum version
- $self->requires_rt('4.0.0');
+ unless ( $extra_args->{deprecated_rt} ) {
+ $self->requires_rt('4.0.0');
+ }
# Installation locations
my %path;
@@ -115,7 +123,7 @@ install ::
$has_etc{acl}++;
}
if ( -e 'etc/initialdata' ) { $has_etc{initialdata}++; }
- if ( grep { /\d+\.\d+\.\d+.*$/ } glob('etc/upgrade/*.*.*') ) {
+ if ( grep { /\d+\.\d+(\.\d+)?.*$/ } glob('etc/upgrade/*.*') ) {
$has_etc{upgrade}++;
}
@@ -190,7 +198,7 @@ sub requires_rt_plugin {
my ( $plugin ) = @_;
if ($self->is_admin) {
- my $plugins = $self->{values}{"x_requires_rt_plugins"} || [];
+ my $plugins = $self->Meta->{values}{"x_requires_rt_plugins"} || [];
push @{$plugins}, $plugin;
$self->add_metadata("x_requires_rt_plugins", $plugins);
}
@@ -250,4 +258,4 @@ sub _load_rt_handle {
__END__
-#line 369
+#line 390
diff --git a/inc/Module/Install/Win32.pm b/inc/Module/Install/Win32.pm
index e529382..e48c32d 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.08';
+ $VERSION = '1.12';
@ISA = 'Module::Install::Base';
$ISCORE = 1;
}
diff --git a/inc/Module/Install/WriteAll.pm b/inc/Module/Install/WriteAll.pm
index 2c74308..409ef40 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.08';
+ $VERSION = '1.12';
@ISA = qw{Module::Install::Base};
$ISCORE = 1;
}
diff --git a/lib/RT/Extension/ReportSpam.pm b/lib/RT/Extension/ReportSpam.pm
index b555518..5c2465b 100644
--- a/lib/RT/Extension/ReportSpam.pm
+++ b/lib/RT/Extension/ReportSpam.pm
@@ -4,7 +4,7 @@ use 5.008;
use strict;
use warnings;
-our $VERSION = '0.13';
+our $VERSION = '1.00';
=encoding utf-8
@@ -17,7 +17,7 @@ RT::Extension::ReportSpam - mark tickets as spam with one click
A simple extension that works with RT 4.0 and 4.2 which allows users
to report a ticket as a spam message.
-=head1 INSTALLATION
+=head1 INSTALLATION
=over
@@ -33,13 +33,13 @@ May need root permissions
If you are using RT 4.2 or greater, add this line:
- Plugin('{{RT::Extension::ReportSpam}}');
+ Plugin('RT::Extension::ReportSpam');
For RT 4.0, add this line:
- Set(@Plugins, qw({{RT::Extension::ReportSpam}}));
+ Set(@Plugins, qw(RT::Extension::ReportSpam));
-or add C<{{RT::Extension::ReportSpam}}> to your existing C<@Plugins> line.
+or add C<RT::Extension::ReportSpam> to your existing C<@Plugins> line.
You may also want to set the C<$SpamAutoDeleteThreshold> config option to the
number of spam reports required before the system will automatically delete the
@@ -55,11 +55,6 @@ is disabled by leaving C<$SpamAutoDeleteThreshold> unset or setting it to 0.
=back
-=head1 USING ON RT 3.8
-
-Users of this extension on RT 3.8 should not upgrade past version 0.03 of this
-extension.
-
=head1 HOW TO …
=head2 Report Spam
@@ -88,6 +83,10 @@ rights to delete tickets themselves.
You can confirm the reports by clicking "S" after querying all tickets reported
as spam. If you have rights to delete tickets then they will be deleted.
+=head1 AUTHOR
+
+Best Practical Solutions, LLC E<lt>modules at bestpractical.comE<gt>
+
=head1 BUGS
All bugs should be reported via email to
@@ -98,13 +97,13 @@ or via the web at
L<rt.cpan.org|http://rt.cpan.org/Public/Dist/Display.html?Name=RT-Extension-ReportSpam>.
-=head1 AUTHOR
+=head1 LICENSE AND COPYRIGHT
-Best Practical Solutions, LLC E<lt>modules at bestpractical.comE<gt>
+This software is Copyright (c) 2014 by Best Practical Solutions
-=head1 LICENSE
+This is free software, licensed under:
-Under the same terms as perl itself.
+ The GNU General Public License, Version 2, June 1991
=cut
-----------------------------------------------------------------------
More information about the Bps-public-commit
mailing list