[Bps-public-commit] RT-Extension-UsernameFormat-Organization branch, master, updated. 1.01
Alex Vandiver
alexmv at bestpractical.com
Thu Dec 18 17:34:28 EST 2014
The branch, master has been updated
via cf56e733b51d47c5ba6925e9a44854faea549030 (commit)
from 1a1158e6772fbef91e4b016443ed2ea7cb187685 (commit)
Summary of changes:
META.yml | 12 +++++-----
Makefile.PL | 4 ++--
README | 19 +++++++++-------
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 | 30 ++++++++++++++++---------
inc/Module/Install/Win32.pm | 2 +-
inc/Module/Install/WriteAll.pm | 2 +-
lib/RT/Extension/UsernameFormat/Organization.pm | 13 ++++++-----
14 files changed, 68 insertions(+), 50 deletions(-)
- Log -----------------------------------------------------------------
commit cf56e733b51d47c5ba6925e9a44854faea549030
Author: Alex Vandiver <alexmv at bestpractical.com>
Date: Thu Dec 18 17:33:42 2014 -0500
Version 1.01 releng
diff --git a/META.yml b/META.yml
index b49c84d..4476535 100644
--- a/META.yml
+++ b/META.yml
@@ -1,15 +1,15 @@
---
abstract: 'RT-Extension-UsernameFormat-Organization Extension'
author:
- - 'Thomas Sibley <trs at bestpractical.com>'
+ - 'Best Practical Solutions, LLC <modules at bestpractical.com>'
build_requires:
ExtUtils::MakeMaker: 6.59
configure_requires:
ExtUtils::MakeMaker: 6.59
distribution_type: module
dynamic_config: 1
-generated_by: 'Module::Install version 1.08'
-license: gplv2
+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
@@ -17,11 +17,13 @@ name: RT-Extension-UsernameFormat-Organization
no_index:
directory:
- inc
+ package:
+ - RT::User
requires:
perl: 5.10.1
resources:
license: http://opensource.org/licenses/gpl-license.php
-version: '1.00'
-x_module_install_rtx_version: 0.34_03
+version: '1.01'
+x_module_install_rtx_version: '0.36'
x_requires_rt: 4.2.0
x_rt_too_new: 4.4.0
diff --git a/Makefile.PL b/Makefile.PL
index 685fc08..3f72e65 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -1,11 +1,11 @@
use inc::Module::Install;
RTx 'RT-Extension-UsernameFormat-Organization';
-readme_from 'lib/RT/Extension/UsernameFormat/Organization.pm';
-license 'gplv2';
requires_rt '4.2.0';
rt_too_new '4.4.0';
+no_index package => 'RT::User';
+
sign;
WriteAll;
diff --git a/README b/README
index 0cae0f6..5f84c62 100644
--- a/README
+++ b/README
@@ -12,9 +12,9 @@ DESCRIPTION
and City.
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
@@ -27,13 +27,16 @@ INSTALLATION
Format
AUTHOR
- Thomas Sibley <trs at bestpractical.com>
+ Best Practical Solutions, LLC <modules at bestpractical.com>
BUGS
- All bugs should be reported via
- <http://rt.cpan.org/Public/Dist/Display.html?Name=RT-Extension-UsernameF
- ormat-Organization> or
- bug-RT-Extension-UsernameFormat-Organization at rt.cpan.org.
+ All bugs should be reported via email to
+
+ L<bug-RT-Extension-UsernameFormat-Organization at rt.cpan.org|mailto:bug-RT-Extension-UsernameFormat-Organization at rt.cpan.org>
+
+ or via the web at
+
+ L<rt.cpan.org|http://rt.cpan.org/Public/Dist/Display.html?Name=RT-Extension-UsernameFormat-Organization>.
LICENSE AND COPYRIGHT
This software is Copyright (c) 2012-2014 by Best Practical Solutions
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 049e854..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_03';
+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,10 +31,16 @@ sub RTx {
unless $self->version;
$self->abstract("$name Extension")
unless $self->abstract;
+ 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;
@@ -44,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";
@@ -57,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;
@@ -113,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}++;
}
@@ -188,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);
}
@@ -248,4 +258,4 @@ sub _load_rt_handle {
__END__
-#line 367
+#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/UsernameFormat/Organization.pm b/lib/RT/Extension/UsernameFormat/Organization.pm
index 745893d..b3e20b6 100644
--- a/lib/RT/Extension/UsernameFormat/Organization.pm
+++ b/lib/RT/Extension/UsernameFormat/Organization.pm
@@ -2,7 +2,7 @@ use strict;
use warnings;
package RT::Extension::UsernameFormat::Organization;
-our $VERSION = '1.00';
+our $VERSION = '1.01';
=head1 NAME
@@ -69,14 +69,17 @@ Add this line:
=head1 AUTHOR
-Thomas Sibley <trs at bestpractical.com>
+Best Practical Solutions, LLC E<lt>modules at bestpractical.comE<gt>
=head1 BUGS
-All bugs should be reported via
-L<http://rt.cpan.org/Public/Dist/Display.html?Name=RT-Extension-UsernameFormat-Organization>
-or L<bug-RT-Extension-UsernameFormat-Organization at rt.cpan.org>.
+All bugs should be reported via email to
+ L<bug-RT-Extension-UsernameFormat-Organization at rt.cpan.org|mailto:bug-RT-Extension-UsernameFormat-Organization at rt.cpan.org>
+
+or via the web at
+
+ L<rt.cpan.org|http://rt.cpan.org/Public/Dist/Display.html?Name=RT-Extension-UsernameFormat-Organization>.
=head1 LICENSE AND COPYRIGHT
-----------------------------------------------------------------------
More information about the Bps-public-commit
mailing list