From eb8c3830bb3b524fe757a1073cd34e781185c982 Mon Sep 17 00:00:00 2001 From: Andrew Ruthven Date: Wed, 27 May 2009 11:27:17 +1200 Subject: [PATCH] Imported Upstream version 0.03_02 --- Changes | 16 + MANIFEST | 21 + META.yml | 19 + Makefile.PL | 20 + README | 26 + bin/rt-merge-users | 40 ++ bin/rt-update-merged-users | 30 ++ .../Admin/Users/Modify.html/RightColumnBottom | 89 ++++ inc/Module/Install.pm | 369 +++++++++++++ inc/Module/Install/Base.pm | 72 +++ inc/Module/Install/Can.pm | 83 +++ inc/Module/Install/Fetch.pm | 93 ++++ inc/Module/Install/Makefile.pm | 253 +++++++++ inc/Module/Install/Metadata.pm | 483 ++++++++++++++++++ inc/Module/Install/RTx.pm | 191 +++++++ inc/Module/Install/Substitute.pm | 131 +++++ inc/Module/Install/Win32.pm | 64 +++ inc/Module/Install/WriteAll.pm | 40 ++ lib/RT/Extension/MergeUsers.pm | 283 ++++++++++ t/01merge_users.t | 89 ++++ t/change_email.t | 43 ++ 21 files changed, 2455 insertions(+) create mode 100644 Changes create mode 100644 MANIFEST create mode 100644 META.yml create mode 100644 Makefile.PL create mode 100644 README create mode 100755 bin/rt-merge-users create mode 100755 bin/rt-update-merged-users create mode 100644 html/Callbacks/RT-Extension-MergeUsers/Admin/Users/Modify.html/RightColumnBottom create mode 100644 inc/Module/Install.pm create mode 100644 inc/Module/Install/Base.pm create mode 100644 inc/Module/Install/Can.pm create mode 100644 inc/Module/Install/Fetch.pm create mode 100644 inc/Module/Install/Makefile.pm create mode 100644 inc/Module/Install/Metadata.pm create mode 100644 inc/Module/Install/RTx.pm create mode 100644 inc/Module/Install/Substitute.pm create mode 100644 inc/Module/Install/Win32.pm create mode 100644 inc/Module/Install/WriteAll.pm create mode 100644 lib/RT/Extension/MergeUsers.pm create mode 100644 t/01merge_users.t create mode 100644 t/change_email.t diff --git a/Changes b/Changes new file mode 100644 index 0000000..3b676c4 --- /dev/null +++ b/Changes @@ -0,0 +1,16 @@ +0.03_02 2009-04-06 Tue 17:08 -0400 falcone + + Track merged users bidirectionally + Allow unmerging users from the main user's modification page + Show errors/results from merging + Add new script for adding bidirectional attributes to old installs + +0.03_01 2008-11-23 Sun 18:51 -0500 falcone + + remove User_Overlay and Users_Overlay to avoid + conflicts with other plugins + + Use callbacks available in 3.6/3.8 rather than + overriding the whole Admin/Users/Modify.html template + + Upgrade Module::Install::RTx to work with 3.8 diff --git a/MANIFEST b/MANIFEST new file mode 100644 index 0000000..4d04fc4 --- /dev/null +++ b/MANIFEST @@ -0,0 +1,21 @@ +bin/rt-merge-users +bin/rt-update-merged-users +Changes +html/Callbacks/RT-Extension-MergeUsers/Admin/Users/Modify.html/RightColumnBottom +inc/Module/Install.pm +inc/Module/Install/Base.pm +inc/Module/Install/Can.pm +inc/Module/Install/Fetch.pm +inc/Module/Install/Makefile.pm +inc/Module/Install/Metadata.pm +inc/Module/Install/RTx.pm +inc/Module/Install/Substitute.pm +inc/Module/Install/Win32.pm +inc/Module/Install/WriteAll.pm +lib/RT/Extension/MergeUsers.pm +Makefile.PL +MANIFEST This list of files +META.yml +README +t/01merge_users.t +t/change_email.t diff --git a/META.yml b/META.yml new file mode 100644 index 0000000..14ba334 --- /dev/null +++ b/META.yml @@ -0,0 +1,19 @@ +--- +abstract: 'Merges two users into the same effective user' +author: + - 'Alex Vandiver ' +distribution_type: module +generated_by: 'Module::Install version 0.78' +license: 'GPL version 2' +meta-spec: + url: http://module-build.sourceforge.net/META-spec-v1.4.html + version: 1.4 +name: RT-Extension-MergeUsers +no_index: + directory: + - html + - inc + - t +requires: + Hook::LexWrap: 0 +version: 0.03_02 diff --git a/Makefile.PL b/Makefile.PL new file mode 100644 index 0000000..ba6960b --- /dev/null +++ b/Makefile.PL @@ -0,0 +1,20 @@ +use inc::Module::Install; + +RTx('RT-Extension-MergeUsers'); + +name ('RT-Extension-MergeUsers'); +abstract ('Merges two users into the same effective user'); +author ('Alex Vandiver '); +version_from ('lib/RT/Extension/MergeUsers.pm'); +license ('GPL version 2'); + +requires ('Hook::LexWrap'); + +my ($lib_path) = $INC{'RT.pm'} =~ /^(.*)[\\\/]/; +my $local_lib_path = "$RT::LocalPath/lib"; +substitute( { RT_LIB_PATH => join( ' ', $local_lib_path, $lib_path ), }, + 'bin/rt-update-merged-users', + 'bin/rt-merge-users', +); + +WriteAll(); diff --git a/README b/README new file mode 100644 index 0000000..294edf5 --- /dev/null +++ b/README @@ -0,0 +1,26 @@ + +This RT extension adds a "Merge Users" box to the User Administration page, +which allows you to merge the user you are currently viewing with another +user on your RT instance. It also adds MergeInto() and Unmerge() functions to +the RT::User class, which allow you to programmatically accomplish the same +thing from your scrips. It also provides a version of CanonicalizeEmailAddress, +which means that all e-mail sent from secondary users is displayed as coming +from the primary user. + +To install: + + perl Makefile.PL + make install + +For 3.8 + + Add RT::Extension::MergeUsers to your /opt/rt3/etc/RT_SiteConfig.pm file + Set(@Plugins, qw(RT::Extension::MergeUsers)); + +UPGRADING + +If you are upgrading from 0.03_01 or earlier, you must run rt-upgrade-merged-users +This script will create MergedUsers Attributes so RT can know when you're looking +at a user that other users have been merged into. If you don't run this script, +you'll have issues unmerging users. It can be safely run multiple times, it will +only create Attributes as needed. diff --git a/bin/rt-merge-users b/bin/rt-merge-users new file mode 100755 index 0000000..65c7067 --- /dev/null +++ b/bin/rt-merge-users @@ -0,0 +1,40 @@ +#!/usr/bin/perl + +use strict; +use warnings; + +my $usage = "usage: perl $0 "; + +my ($from, $into) = @ARGV; +die "\n$usage\n" unless $from && $into; + +### after: use lib qw(@RT_LIB_PATH@); +use lib qw(/opt/rt3/local/lib /opt/rt3/lib); +use RT; +RT::LoadConfig(); +RT::Init(); + +my $merge = RT::User->new( $RT::SystemUser ); +$merge->Load( $from ); +die "Couldn't load user using '$from'" unless $merge->id; + +my $user = RT::User->new( $RT::SystemUser ); +$user->Load( $into ); +die "Couldn't load user using '$into'" unless $user->id; + +print "Going to merge user #". $merge->id ." into user #". $user->id ."\n"; +exit 0 unless prompt_yN("Are you sure you want to do that?"); + +my ($status, $msg) = $merge->MergeInto( $user ); +die "Couldn't merge users: $msg" unless $status; + +print "DONE.\n"; +exit 0; + +sub prompt_yN { + my $msg = shift; + print $msg ." [N]: "; + my $a = ; + return 1 if $a =~ /^(y|yes)$/i; + return 0; +} diff --git a/bin/rt-update-merged-users b/bin/rt-update-merged-users new file mode 100755 index 0000000..cdee73d --- /dev/null +++ b/bin/rt-update-merged-users @@ -0,0 +1,30 @@ +#!/usr/bin/env perl + +use strict; +use warnings; + +### after: use lib qw(@RT_LIB_PATH@); +use lib qw(/opt/rt3/local/lib /opt/rt3/lib); +use RT; +RT::LoadConfig(); +RT::Init(); + +my $Attributes = RT::Attributes->new($RT::SystemUser); +$Attributes->Limit( FIELD => 'Name', VALUE => 'EffectiveId' ); +$Attributes->Limit( FIELD => 'ObjectType', VALUE => 'RT::User' ); + +my $primary_user = RT::User->new($RT::SystemUser); + +while ( my $Attr = $Attributes->Next ) { + $primary_user->LoadById($Attr->Content); + my $merged_users = $primary_user->GetMergedUsers; + if ( grep { $_ == $Attr->ObjectId } @{$merged_users->Content} ) { + print $Attr->Content." already has ".$Attr->ObjectId." in the merge list\n"; + } else { + print "Adding ".$Attr->ObjectId." to the merged user list for ".$Attr->Content."\n"; + $merged_users->SetContent([ $Attr->ObjectId, @{$merged_users->Content} ]); + } +} + +print "DONE.\n"; +exit 0; diff --git a/html/Callbacks/RT-Extension-MergeUsers/Admin/Users/Modify.html/RightColumnBottom b/html/Callbacks/RT-Extension-MergeUsers/Admin/Users/Modify.html/RightColumnBottom new file mode 100644 index 0000000..abb3a50 --- /dev/null +++ b/html/Callbacks/RT-Extension-MergeUsers/Admin/Users/Modify.html/RightColumnBottom @@ -0,0 +1,89 @@ +%# BEGIN BPS TAGGED BLOCK {{{ +%# +%# COPYRIGHT: +%# +%# This software is Copyright (c) 1996-2008 Best Practical Solutions, LLC +%# +%# +%# (Except where explicitly superseded by other copyright notices) +%# +%# +%# LICENSE: +%# +%# This work is made available to you under the terms of Version 2 of +%# the GNU General Public License. A copy of that license should have +%# been provided with this software, but in any event can be snarfed +%# from www.gnu.org. +%# +%# This work is distributed in the hope that it will be useful, but +%# WITHOUT ANY WARRANTY; without even the implied warranty of +%# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +%# General Public License for more details. +%# +%# You should have received a copy of the GNU General Public License +%# along with this program; if not, write to the Free Software +%# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +%# 02110-1301 or visit their web page on the internet at +%# http://www.gnu.org/licenses/old-licenses/gpl-2.0.html. +%# +%# +%# CONTRIBUTION SUBMISSION POLICY: +%# +%# (The following paragraph is not intended to limit the rights granted +%# to you to modify and distribute this software under the terms of +%# the GNU General Public License and is only of importance to you if +%# you choose to contribute your changes and enhancements to the +%# community by submitting them to Best Practical Solutions, LLC.) +%# +%# By intentionally submitting any modifications, corrections or +%# derivatives to this work, or any other work intended for use with +%# Request Tracker, to Best Practical Solutions, LLC, you confirm that +%# you are the copyright holder for those contributions and you grant +%# Best Practical Solutions, LLC a nonexclusive, worldwide, irrevocable, +%# royalty-free, perpetual, license to use, copy, create derivative +%# works based on those contributions, and sublicense and distribute +%# those contributions and any derivatives thereof. +%# +%# END BPS TAGGED BLOCK }}} +
+<&| /Widgets/TitleBox, title => loc('Merge user') &> +

<% $result %>

+% my ($EffectiveId) = $UserObj->Attributes->Named("EffectiveId"); +% my $MergedUsers = $UserObj->FirstAttribute('MergedUsers'); +% if ($EffectiveId) { +This user has been merged with +% my $real = RT::User->new($session{'CurrentUser'}); +% $real->Load($EffectiveId->Content); +<% $real->EmailAddress %>; +% } elsif ($MergedUsers) { +The following users have been merged into this user:
+% foreach my $user_id (@{$MergedUsers->Content}) { +% my $user = RT::User->new($session{'CurrentUser'}); +% $user->LoadOriginal(Id => $user_id); +<% $user->EmailAddress %>
+% } +% } else { +Merge this user into: +% } + +<%init> +my ($id, $result); +if ($MergeUser) { + ($id, $result) = $UserObj->MergeInto($MergeUser); +} elsif ($Unmerge) { + ($id, $result) = $UserObj->UnMerge(); +} + +foreach my $key (keys %ARGS) { + if ($key =~ /Unmerge(\d+)/) { + my $merged_user = RT::User->new($session{'CurrentUser'}); + $merged_user->LoadOriginal( id => $1 ); + ($id, $result) = $merged_user->UnMerge() + } +} + +<%args> +$UserObj => undef +$MergeUser => undef +$Unmerge => undef + diff --git a/inc/Module/Install.pm b/inc/Module/Install.pm new file mode 100644 index 0000000..5121fe4 --- /dev/null +++ b/inc/Module/Install.pm @@ -0,0 +1,369 @@ +#line 1 +package Module::Install; + +# For any maintainers: +# The load order for Module::Install is a bit magic. +# It goes something like this... +# +# IF ( host has Module::Install installed, creating author mode ) { +# 1. Makefile.PL calls "use inc::Module::Install" +# 2. $INC{inc/Module/Install.pm} set to installed version of inc::Module::Install +# 3. The installed version of inc::Module::Install loads +# 4. inc::Module::Install calls "require Module::Install" +# 5. The ./inc/ version of Module::Install loads +# } ELSE { +# 1. Makefile.PL calls "use inc::Module::Install" +# 2. $INC{inc/Module/Install.pm} set to ./inc/ version of Module::Install +# 3. The ./inc/ version of Module::Install loads +# } + +BEGIN { + require 5.004; +} +use strict 'vars'; + +use vars qw{$VERSION}; +BEGIN { + # All Module::Install core packages now require synchronised versions. + # This will be used to ensure we don't accidentally load old or + # different versions of modules. + # 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.78'; + + *inc::Module::Install::VERSION = *VERSION; + @inc::Module::Install::ISA = __PACKAGE__; + +} + + + + + +# Whether or not inc::Module::Install is actually loaded, the +# $INC{inc/Module/Install.pm} is what will still get set as long as +# the caller loaded module this in the documented manner. +# If not set, the caller may NOT have loaded the bundled version, and thus +# they may not have a MI version that works with the Makefile.PL. This would +# result in false errors or unexpected behaviour. And we don't want that. +my $file = join( '/', 'inc', split /::/, __PACKAGE__ ) . '.pm'; +unless ( $INC{$file} ) { die <<"END_DIE" } + +Please invoke ${\__PACKAGE__} with: + + use inc::${\__PACKAGE__}; + +not: + + use ${\__PACKAGE__}; + +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 + + + + + +# Build.PL was formerly supported, but no longer is due to excessive +# difficulty in implementing every single feature twice. +if ( $0 =~ /Build.PL$/i ) { die <<"END_DIE" } + +Module::Install no longer supports Build.PL. + +It was impossible to maintain duel backends, and has been deprecated. + +Please remove all Build.PL files and only use the Makefile.PL installer. + +END_DIE + + + + + +# To save some more typing in Module::Install installers, every... +# use inc::Module::Install +# ...also acts as an implicit use strict. +$^H |= strict::bits(qw(refs subs vars)); + + + + + +use Cwd (); +use File::Find (); +use File::Path (); +use FindBin; + +sub autoload { + my $self = shift; + my $who = $self->_caller; + my $cwd = Cwd::cwd(); + my $sym = "${who}::AUTOLOAD"; + $sym->{$cwd} = sub { + my $pwd = Cwd::cwd(); + if ( my $code = $sym->{$pwd} ) { + # delegate back to parent dirs + goto &$code unless $cwd eq $pwd; + } + $$sym =~ /([^:]+)$/ or die "Cannot autoload $who - $sym"; + unless ( uc($1) eq $1 ) { + unshift @_, ( $self, $1 ); + goto &{$self->can('call')}; + } + }; +} + +sub import { + my $class = shift; + my $self = $class->new(@_); + my $who = $self->_caller; + + unless ( -f $self->{file} ) { + require "$self->{path}/$self->{dispatch}.pm"; + File::Path::mkpath("$self->{prefix}/$self->{author}"); + $self->{admin} = "$self->{name}::$self->{dispatch}"->new( _top => $self ); + $self->{admin}->init; + @_ = ($class, _self => $self); + goto &{"$self->{name}::import"}; + } + + *{"${who}::AUTOLOAD"} = $self->autoload; + $self->preload; + + # Unregister loader and worker packages so subdirs can use them again + delete $INC{"$self->{file}"}; + delete $INC{"$self->{path}.pm"}; + + return 1; +} + +sub preload { + my $self = shift; + unless ( $self->{extensions} ) { + $self->load_extensions( + "$self->{prefix}/$self->{path}", $self + ); + } + + my @exts = @{$self->{extensions}}; + unless ( @exts ) { + my $admin = $self->{admin}; + @exts = $admin->load_all_extensions; + } + + my %seen; + foreach my $obj ( @exts ) { + while (my ($method, $glob) = each %{ref($obj) . '::'}) { + next unless $obj->can($method); + next if $method =~ /^_/; + next if $method eq uc($method); + $seen{$method}++; + } + } + + my $who = $self->_caller; + foreach my $name ( sort keys %seen ) { + *{"${who}::$name"} = sub { + ${"${who}::AUTOLOAD"} = "${who}::$name"; + goto &{"${who}::AUTOLOAD"}; + }; + } +} + +sub new { + my ($class, %args) = @_; + + # 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 ) { + delete $args{prefix}; + } + + return $args{_self} if $args{_self}; + + $args{dispatch} ||= 'Admin'; + $args{prefix} ||= 'inc'; + $args{author} ||= ($^O eq 'VMS' ? '_author' : '.author'); + $args{bundle} ||= 'inc/BUNDLES'; + $args{base} ||= $base_path; + $class =~ s/^\Q$args{prefix}\E:://; + $args{name} ||= $class; + $args{version} ||= $class->VERSION; + unless ( $args{path} ) { + $args{path} = $args{name}; + $args{path} =~ s!::!/!g; + } + $args{file} ||= "$args{base}/$args{prefix}/$args{path}.pm"; + $args{wrote} = 0; + + bless( \%args, $class ); +} + +sub call { + my ($self, $method) = @_; + my $obj = $self->load($method) or return; + splice(@_, 0, 2, $obj); + goto &{$obj->can($method)}; +} + +sub load { + my ($self, $method) = @_; + + $self->load_extensions( + "$self->{prefix}/$self->{path}", $self + ) unless $self->{extensions}; + + foreach my $obj (@{$self->{extensions}}) { + return $obj if $obj->can($method); + } + + my $admin = $self->{admin} or die <<"END_DIE"; +The '$method' method does not exist in the '$self->{prefix}' path! +Please remove the '$self->{prefix}' directory and run $0 again to load it. +END_DIE + + my $obj = $admin->load($method, 1); + push @{$self->{extensions}}, $obj; + + $obj; +} + +sub load_extensions { + my ($self, $path, $top) = @_; + + unless ( grep { !ref $_ and lc $_ eq lc $self->{prefix} } @INC ) { + unshift @INC, $self->{prefix}; + } + + foreach my $rv ( $self->find_extensions($path) ) { + my ($file, $pkg) = @{$rv}; + next if $self->{pathnames}{$pkg}; + + local $@; + my $new = eval { require $file; $pkg->can('new') }; + unless ( $new ) { + warn $@ if $@; + next; + } + $self->{pathnames}{$pkg} = delete $INC{$file}; + push @{$self->{extensions}}, &{$new}($pkg, _top => $top ); + } + + $self->{extensions} ||= []; +} + +sub find_extensions { + my ($self, $path) = @_; + + my @found; + File::Find::find( sub { + my $file = $File::Find::name; + return unless $file =~ m!^\Q$path\E/(.+)\.pm\Z!is; + my $subpath = $1; + return if lc($subpath) eq lc($self->{dispatch}); + + $file = "$self->{path}/$subpath.pm"; + my $pkg = "$self->{name}::$subpath"; + $pkg =~ s!/!::!g; + + # If we have a mixed-case package name, assume case has been preserved + # correctly. Otherwise, root through the file to locate the case-preserved + # version of the package name. + if ( $subpath eq lc($subpath) || $subpath eq uc($subpath) ) { + my $content = Module::Install::_read($subpath . '.pm'); + my $in_pod = 0; + foreach ( split //, $content ) { + $in_pod = 1 if /^=\w/; + $in_pod = 0 if /^=cut/; + next if ($in_pod || /^=cut/); # skip pod text + next if /^\s*#/; # and comments + if ( m/^\s*package\s+($pkg)\s*;/i ) { + $pkg = $1; + last; + } + } + } + + push @found, [ $file, $pkg ]; + }, $path ) if -d $path; + + @found; +} + + + + + +##################################################################### +# Utility Functions + +sub _caller { + my $depth = 0; + my $call = caller($depth); + while ( $call eq __PACKAGE__ ) { + $depth++; + $call = caller($depth); + } + return $call; +} + +sub _read { + local *FH; + open FH, "< $_[0]" or die "open($_[0]): $!"; + my $str = do { local $/; }; + close FH or die "close($_[0]): $!"; + return $str; +} + +sub _write { + local *FH; + open FH, "> $_[0]" or die "open($_[0]): $!"; + foreach ( 1 .. $#_ ) { print FH $_[$_] or die "print($_[0]): $!" } + close FH or die "close($_[0]): $!"; +} + +# _version is for processing module versions (eg, 1.03_05) not +# Perl versions (eg, 5.8.1). + +sub _version ($) { + my $s = shift || 0; + $s =~ s/^(\d+)\.?//; + my $l = $1 || 0; + my @v = map { $_ . '0' x (3 - length $_) } $s =~ /(\d{1,3})\D?/g; + $l = $l . '.' . join '', @v if @v; + return $l + 0; +} + +# Cloned from Params::Util::_CLASS +sub _CLASS ($) { + ( + defined $_[0] + and + ! ref $_[0] + and + $_[0] =~ m/^[^\W\d]\w*(?:::\w+)*$/s + ) ? $_[0] : undef; +} + +1; + +# Copyright 2008 - 2009 Adam Kennedy. diff --git a/inc/Module/Install/Base.pm b/inc/Module/Install/Base.pm new file mode 100644 index 0000000..2056605 --- /dev/null +++ b/inc/Module/Install/Base.pm @@ -0,0 +1,72 @@ +#line 1 +package Module::Install::Base; + +$VERSION = '0.78'; + +# Suspend handler for "redefined" warnings +BEGIN { + my $w = $SIG{__WARN__}; + $SIG{__WARN__} = sub { $w }; +} + +### This is the ONLY module that shouldn't have strict on +# use strict; + +#line 41 + +sub new { + my ($class, %args) = @_; + + foreach my $method ( qw(call load) ) { + *{"$class\::$method"} = sub { + shift()->_top->$method(@_); + } unless defined &{"$class\::$method"}; + } + + bless( \%args, $class ); +} + +#line 61 + +sub AUTOLOAD { + my $self = shift; + local $@; + my $autoload = eval { $self->_top->autoload } or return; + goto &$autoload; +} + +#line 76 + +sub _top { $_[0]->{_top} } + +#line 89 + +sub admin { + $_[0]->_top->{admin} or Module::Install::Base::FakeAdmin->new; +} + +#line 101 + +sub is_admin { + $_[0]->admin->VERSION; +} + +sub DESTROY {} + +package Module::Install::Base::FakeAdmin; + +my $Fake; +sub new { $Fake ||= bless(\@_, $_[0]) } + +sub AUTOLOAD {} + +sub DESTROY {} + +# Restore warning handler +BEGIN { + $SIG{__WARN__} = $SIG{__WARN__}->(); +} + +1; + +#line 146 diff --git a/inc/Module/Install/Can.pm b/inc/Module/Install/Can.pm new file mode 100644 index 0000000..fb6ba28 --- /dev/null +++ b/inc/Module/Install/Can.pm @@ -0,0 +1,83 @@ +#line 1 +package Module::Install::Can; + +use strict; +use Module::Install::Base; +use Config (); +### This adds a 5.005 Perl version dependency. +### This is a bug and will be fixed. +use File::Spec (); +use ExtUtils::MakeMaker (); + +use vars qw{$VERSION $ISCORE @ISA}; +BEGIN { + $VERSION = '0.78'; + $ISCORE = 1; + @ISA = qw{Module::Install::Base}; +} + +# check if we can load some module +### Upgrade this to not have to load the module if possible +sub can_use { + my ($self, $mod, $ver) = @_; + $mod =~ s{::|\\}{/}g; + $mod .= '.pm' unless $mod =~ /\.pm$/i; + + my $pkg = $mod; + $pkg =~ s{/}{::}g; + $pkg =~ s{\.pm$}{}i; + + local $@; + eval { require $mod; $pkg->VERSION($ver || 0); 1 }; +} + +# check if we can run some command +sub can_run { + my ($self, $cmd) = @_; + + my $_cmd = $cmd; + return $_cmd if (-x $_cmd or $_cmd = MM->maybe_command($_cmd)); + + for my $dir ((split /$Config::Config{path_sep}/, $ENV{PATH}), '.') { + next if $dir eq ''; + my $abs = File::Spec->catfile($dir, $_[1]); + return $abs if (-x $abs or $abs = MM->maybe_command($abs)); + } + + return; +} + +# can we locate a (the) C compiler +sub can_cc { + my $self = shift; + my @chunks = split(/ /, $Config::Config{cc}) or return; + + # $Config{cc} may contain args; try to find out the program part + while (@chunks) { + return $self->can_run("@chunks") || (pop(@chunks), next); + } + + return; +} + +# Fix Cygwin bug on maybe_command(); +if ( $^O eq 'cygwin' ) { + require ExtUtils::MM_Cygwin; + require ExtUtils::MM_Win32; + if ( ! defined(&ExtUtils::MM_Cygwin::maybe_command) ) { + *ExtUtils::MM_Cygwin::maybe_command = sub { + my ($self, $file) = @_; + if ($file =~ m{^/cygdrive/}i and ExtUtils::MM_Win32->can('maybe_command')) { + ExtUtils::MM_Win32->maybe_command($file); + } else { + ExtUtils::MM_Unix->maybe_command($file); + } + } + } +} + +1; + +__END__ + +#line 158 diff --git a/inc/Module/Install/Fetch.pm b/inc/Module/Install/Fetch.pm new file mode 100644 index 0000000..266631b --- /dev/null +++ b/inc/Module/Install/Fetch.pm @@ -0,0 +1,93 @@ +#line 1 +package Module::Install::Fetch; + +use strict; +use Module::Install::Base; + +use vars qw{$VERSION $ISCORE @ISA}; +BEGIN { + $VERSION = '0.78'; + $ISCORE = 1; + @ISA = qw{Module::Install::Base}; +} + +sub get_file { + my ($self, %args) = @_; + my ($scheme, $host, $path, $file) = + $args{url} =~ m|^(\w+)://([^/]+)(.+)/(.+)| or return; + + if ( $scheme eq 'http' and ! eval { require LWP::Simple; 1 } ) { + $args{url} = $args{ftp_url} + or (warn("LWP support unavailable!\n"), return); + ($scheme, $host, $path, $file) = + $args{url} =~ m|^(\w+)://([^/]+)(.+)/(.+)| or return; + } + + $|++; + print "Fetching '$file' from $host... "; + + unless (eval { require Socket; Socket::inet_aton($host) }) { + warn "'$host' resolve failed!\n"; + return; + } + + return unless $scheme eq 'ftp' or $scheme eq 'http'; + + require Cwd; + my $dir = Cwd::getcwd(); + chdir $args{local_dir} or return if exists $args{local_dir}; + + if (eval { require LWP::Simple; 1 }) { + LWP::Simple::mirror($args{url}, $file); + } + elsif (eval { require Net::FTP; 1 }) { eval { + # use Net::FTP to get past firewall + my $ftp = Net::FTP->new($host, Passive => 1, Timeout => 600); + $ftp->login("anonymous", 'anonymous@example.com'); + $ftp->cwd($path); + $ftp->binary; + $ftp->get($file) or (warn("$!\n"), return); + $ftp->quit; + } } + elsif (my $ftp = $self->can_run('ftp')) { eval { + # no Net::FTP, fallback to ftp.exe + require FileHandle; + my $fh = FileHandle->new; + + local $SIG{CHLD} = 'IGNORE'; + unless ($fh->open("|$ftp -n")) { + warn "Couldn't open ftp: $!\n"; + chdir $dir; return; + } + + my @dialog = split(/\n/, <<"END_FTP"); +open $host +user anonymous anonymous\@example.com +cd $path +binary +get $file $file +quit +END_FTP + foreach (@dialog) { $fh->print("$_\n") } + $fh->close; + } } + else { + warn "No working 'ftp' program available!\n"; + chdir $dir; return; + } + + unless (-f $file) { + warn "Fetching failed: $@\n"; + chdir $dir; return; + } + + return if exists $args{size} and -s $file != $args{size}; + system($args{run}) if exists $args{run}; + unlink($file) if $args{remove}; + + print(((!exists $args{check_for} or -e $args{check_for}) + ? "done!" : "failed! ($!)"), "\n"); + chdir $dir; return !$?; +} + +1; diff --git a/inc/Module/Install/Makefile.pm b/inc/Module/Install/Makefile.pm new file mode 100644 index 0000000..40483f8 --- /dev/null +++ b/inc/Module/Install/Makefile.pm @@ -0,0 +1,253 @@ +#line 1 +package Module::Install::Makefile; + +use strict 'vars'; +use Module::Install::Base; +use ExtUtils::MakeMaker (); + +use vars qw{$VERSION $ISCORE @ISA}; +BEGIN { + $VERSION = '0.78'; + $ISCORE = 1; + @ISA = qw{Module::Install::Base}; +} + +sub Makefile { $_[0] } + +my %seen = (); + +sub prompt { + shift; + + # Infinite loop protection + my @c = caller(); + if ( ++$seen{"$c[1]|$c[2]|$_[0]"} > 3 ) { + die "Caught an potential prompt infinite loop ($c[1]|$c[2]|$_[0])"; + } + + # In automated testing, always use defaults + if ( $ENV{AUTOMATED_TESTING} and ! $ENV{PERL_MM_USE_DEFAULT} ) { + local $ENV{PERL_MM_USE_DEFAULT} = 1; + goto &ExtUtils::MakeMaker::prompt; + } else { + goto &ExtUtils::MakeMaker::prompt; + } +} + +sub makemaker_args { + my $self = shift; + my $args = ( $self->{makemaker_args} ||= {} ); + %$args = ( %$args, @_ ); + return $args; +} + +# For mm args that take multiple space-seperated args, +# append an argument to the current list. +sub makemaker_append { + my $self = sShift; + my $name = shift; + my $args = $self->makemaker_args; + $args->{name} = defined $args->{$name} + ? join( ' ', $args->{name}, @_ ) + : join( ' ', @_ ); +} + +sub build_subdirs { + my $self = shift; + my $subdirs = $self->makemaker_args->{DIR} ||= []; + for my $subdir (@_) { + push @$subdirs, $subdir; + } +} + +sub clean_files { + my $self = shift; + my $clean = $self->makemaker_args->{clean} ||= {}; + %$clean = ( + %$clean, + FILES => join ' ', grep { length $_ } ($clean->{FILES} || (), @_), + ); +} + +sub realclean_files { + my $self = shift; + my $realclean = $self->makemaker_args->{realclean} ||= {}; + %$realclean = ( + %$realclean, + FILES => join ' ', grep { length $_ } ($realclean->{FILES} || (), @_), + ); +} + +sub libs { + my $self = shift; + my $libs = ref $_[0] ? shift : [ shift ]; + $self->makemaker_args( LIBS => $libs ); +} + +sub inc { + my $self = shift; + $self->makemaker_args( INC => shift ); +} + +my %test_dir = (); + +sub _wanted_t { + /\.t$/ and -f $_ and $test_dir{$File::Find::dir} = 1; +} + +sub tests_recursive { + my $self = shift; + if ( $self->tests ) { + die "tests_recursive will not work if tests are already defined"; + } + my $dir = shift || 't'; + unless ( -d $dir ) { + die "tests_recursive dir '$dir' does not exist"; + } + %test_dir = (); + require File::Find; + File::Find::find( \&_wanted_t, $dir ); + $self->tests( join ' ', map { "$_/*.t" } sort keys %test_dir ); +} + +sub write { + my $self = shift; + die "&Makefile->write() takes no arguments\n" if @_; + + # Make sure we have a new enough + require ExtUtils::MakeMaker; + + # MakeMaker can complain about module versions that include + # an underscore, even though its own version may contain one! + # Hence the funny regexp to get rid of it. See RT #35800 + # for details. + + $self->configure_requires( 'ExtUtils::MakeMaker' => $ExtUtils::MakeMaker::VERSION =~ /^(\d+\.\d+)/ ); + + # Generate the + my $args = $self->makemaker_args; + $args->{DISTNAME} = $self->name; + $args->{NAME} = $self->module_name || $self->name; + $args->{VERSION} = $self->version; + $args->{NAME} =~ s/-/::/g; + if ( $self->tests ) { + $args->{test} = { TESTS => $self->tests }; + } + if ($] >= 5.005) { + $args->{ABSTRACT} = $self->abstract; + $args->{AUTHOR} = $self->author; + } + if ( eval($ExtUtils::MakeMaker::VERSION) >= 6.10 ) { + $args->{NO_META} = 1; + } + if ( eval($ExtUtils::MakeMaker::VERSION) > 6.17 and $self->sign ) { + $args->{SIGN} = 1; + } + unless ( $self->is_admin ) { + delete $args->{SIGN}; + } + + # merge both kinds of requires into prereq_pm + my $prereq = ($args->{PREREQ_PM} ||= {}); + %$prereq = ( %$prereq, + map { @$_ } + map { @$_ } + grep $_, + ($self->configure_requires, $self->build_requires, $self->requires) + ); + + # Remove any reference to perl, PREREQ_PM doesn't support it + delete $args->{PREREQ_PM}->{perl}; + + # merge both kinds of requires into prereq_pm + my $subdirs = ($args->{DIR} ||= []); + if ($self->bundles) { + foreach my $bundle (@{ $self->bundles }) { + my ($file, $dir) = @$bundle; + push @$subdirs, $dir if -d $dir; + delete $prereq->{$file}; + } + } + + if ( my $perl_version = $self->perl_version ) { + eval "use $perl_version; 1" + or die "ERROR: perl: Version $] is installed, " + . "but we need version >= $perl_version"; + } + + $args->{INSTALLDIRS} = $self->installdirs; + + my %args = map { ( $_ => $args->{$_} ) } grep {defined($args->{$_})} keys %$args; + + my $user_preop = delete $args{dist}->{PREOP}; + if (my $preop = $self->admin->preop($user_preop)) { + foreach my $key ( keys %$preop ) { + $args{dist}->{$key} = $preop->{$key}; + } + } + + my $mm = ExtUtils::MakeMaker::WriteMakefile(%args); + $self->fix_up_makefile($mm->{FIRST_MAKEFILE} || 'Makefile'); +} + +sub fix_up_makefile { + my $self = shift; + my $makefile_name = shift; + my $top_class = ref($self->_top) || ''; + my $top_version = $self->_top->VERSION || ''; + + my $preamble = $self->preamble + ? "# Preamble by $top_class $top_version\n" + . $self->preamble + : ''; + my $postamble = "# Postamble by $top_class $top_version\n" + . ($self->postamble || ''); + + local *MAKEFILE; + open MAKEFILE, "< $makefile_name" or die "fix_up_makefile: Couldn't open $makefile_name: $!"; + my $makefile = do { local $/; }; + close MAKEFILE or die $!; + + $makefile =~ s/\b(test_harness\(\$\(TEST_VERBOSE\), )/$1'inc', /; + $makefile =~ s/( -I\$\(INST_ARCHLIB\))/ -Iinc$1/g; + $makefile =~ s/( "-I\$\(INST_LIB\)")/ "-Iinc"$1/g; + $makefile =~ s/^(FULLPERL = .*)/$1 "-Iinc"/m; + $makefile =~ s/^(PERL = .*)/$1 "-Iinc"/m; + + # Module::Install will never be used to build the Core Perl + # Sometimes PERL_LIB and PERL_ARCHLIB get written anyway, which breaks + # PREFIX/PERL5LIB, and thus, install_share. Blank them if they exist + $makefile =~ s/^PERL_LIB = .+/PERL_LIB =/m; + #$makefile =~ s/^PERL_ARCHLIB = .+/PERL_ARCHLIB =/m; + + # Perl 5.005 mentions PERL_LIB explicitly, so we have to remove that as well. + $makefile =~ s/(\"?)-I\$\(PERL_LIB\)\1//g; + + # 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: $!"; + print MAKEFILE "$preamble$makefile$postamble" or die $!; + close MAKEFILE or die $!; + + 1; +} + +sub preamble { + my ($self, $text) = @_; + $self->{preamble} = $text . $self->{preamble} if defined $text; + $self->{preamble}; +} + +sub postamble { + my ($self, $text) = @_; + $self->{postamble} ||= $self->admin->postamble; + $self->{postamble} .= $text if defined $text; + $self->{postamble} +} + +1; + +__END__ + +#line 379 diff --git a/inc/Module/Install/Metadata.pm b/inc/Module/Install/Metadata.pm new file mode 100644 index 0000000..ef1acd1 --- /dev/null +++ b/inc/Module/Install/Metadata.pm @@ -0,0 +1,483 @@ +#line 1 +package Module::Install::Metadata; + +use strict 'vars'; +use Module::Install::Base; + +use vars qw{$VERSION $ISCORE @ISA}; +BEGIN { + $VERSION = '0.78'; + $ISCORE = 1; + @ISA = qw{Module::Install::Base}; +} + +my @scalar_keys = qw{ + name + module_name + abstract + author + version + distribution_type + tests + installdirs +}; + +my @tuple_keys = qw{ + configure_requires + build_requires + requires + recommends + bundles + resources +}; + +my @resource_keys = qw{ + homepage + bugtracker + repository +}; + +sub Meta { shift } +sub Meta_ScalarKeys { @scalar_keys } +sub Meta_TupleKeys { @tuple_keys } +sub Meta_ResourceKeys { @resource_keys } + +foreach my $key ( @scalar_keys ) { + *$key = sub { + my $self = shift; + return $self->{values}{$key} if defined wantarray and !@_; + $self->{values}{$key} = shift; + return $self; + }; +} + +foreach my $key ( @resource_keys ) { + *$key = sub { + my $self = shift; + unless ( @_ ) { + return () unless $self->{values}{resources}; + return map { $_->[1] } + grep { $_->[0] eq $key } + @{ $self->{values}{resources} }; + } + return $self->{values}{resources}{$key} unless @_; + my $uri = shift or die( + "Did not provide a value to $key()" + ); + $self->resources( $key => $uri ); + return 1; + }; +} + +sub requires { + my $self = shift; + while ( @_ ) { + my $module = shift or last; + my $version = shift || 0; + push @{ $self->{values}{requires} }, [ $module, $version ]; + } + $self->{values}{requires}; +} + +sub build_requires { + my $self = shift; + while ( @_ ) { + my $module = shift or last; + my $version = shift || 0; + push @{ $self->{values}{build_requires} }, [ $module, $version ]; + } + $self->{values}{build_requires}; +} + +sub configure_requires { + my $self = shift; + while ( @_ ) { + my $module = shift or last; + my $version = shift || 0; + push @{ $self->{values}{configure_requires} }, [ $module, $version ]; + } + $self->{values}{configure_requires}; +} + +sub recommends { + my $self = shift; + while ( @_ ) { + my $module = shift or last; + my $version = shift || 0; + push @{ $self->{values}{recommends} }, [ $module, $version ]; + } + $self->{values}{recommends}; +} + +sub bundles { + my $self = shift; + while ( @_ ) { + my $module = shift or last; + my $version = shift || 0; + push @{ $self->{values}{bundles} }, [ $module, $version ]; + } + $self->{values}{bundles}; +} + +# Resource handling +my %lc_resource = map { $_ => 1 } qw{ + homepage + license + bugtracker + repository +}; + +sub resources { + my $self = shift; + while ( @_ ) { + my $name = shift or last; + my $value = shift or next; + if ( $name eq lc $name and ! $lc_resource{$name} ) { + die("Unsupported reserved lowercase resource '$name'"); + } + $self->{values}{resources} ||= []; + push @{ $self->{values}{resources} }, [ $name, $value ]; + } + $self->{values}{resources}; +} + +# Aliases for build_requires that will have alternative +# meanings in some future version of META.yml. +sub test_requires { shift->build_requires(@_) } +sub install_requires { shift->build_requires(@_) } + +# Aliases for installdirs options +sub install_as_core { $_[0]->installdirs('perl') } +sub install_as_cpan { $_[0]->installdirs('site') } +sub install_as_site { $_[0]->installdirs('site') } +sub install_as_vendor { $_[0]->installdirs('vendor') } + +sub sign { + my $self = shift; + return $self->{values}{sign} if defined wantarray and ! @_; + $self->{values}{sign} = ( @_ ? $_[0] : 1 ); + return $self; +} + +sub dynamic_config { + my $self = shift; + unless ( @_ ) { + warn "You MUST provide an explicit true/false value to dynamic_config\n"; + return $self; + } + $self->{values}{dynamic_config} = $_[0] ? 1 : 0; + return 1; +} + +sub perl_version { + my $self = shift; + return $self->{values}{perl_version} unless @_; + my $version = shift or die( + "Did not provide a value to perl_version()" + ); + + # Convert triple-part versions (eg, 5.6.1 or 5.8.9) to + # numbers (eg, 5.006001 or 5.008009). + # Also, convert double-part versions (eg, 5.8) + + $version =~ s/^(\d+)\.(\d+)(?:\.(\d+))?$/sprintf("%d.%03d%03d",$1,$2,$3 || 0)/e; + + $version =~ s/_.+$//; + $version = $version + 0; # Numify + unless ( $version >= 5.005 ) { + die "Module::Install only supports 5.005 or newer (use ExtUtils::MakeMaker)\n"; + } + $self->{values}{perl_version} = $version; + return 1; +} + +sub license { + my $self = shift; + return $self->{values}{license} unless @_; + my $license = shift or die( + 'Did not provide a value to license()' + ); + $self->{values}{license} = $license; + + # Automatically fill in license URLs + if ( $license eq 'perl' ) { + $self->resources( license => 'http://dev.perl.org/licenses/' ); + } + + return 1; +} + +sub all_from { + my ( $self, $file ) = @_; + + unless ( defined($file) ) { + my $name = $self->name or die( + "all_from called with no args without setting name() first" + ); + $file = join('/', 'lib', split(/-/, $name)) . '.pm'; + $file =~ s{.*/}{} unless -e $file; + unless ( -e $file ) { + die("all_from cannot find $file from $name"); + } + } + unless ( -f $file ) { + die("The path '$file' does not exist, or is not a file"); + } + + # Some methods pull from POD instead of code. + # If there is a matching .pod, use that instead + my $pod = $file; + $pod =~ s/\.pm$/.pod/i; + $pod = $file unless -e $pod; + + # Pull the different values + $self->name_from($file) unless $self->name; + $self->version_from($file) unless $self->version; + $self->perl_version_from($file) unless $self->perl_version; + $self->author_from($pod) unless $self->author; + $self->license_from($pod) unless $self->license; + $self->abstract_from($pod) unless $self->abstract; + + return 1; +} + +sub provides { + my $self = shift; + my $provides = ( $self->{values}{provides} ||= {} ); + %$provides = (%$provides, @_) if @_; + return $provides; +} + +sub auto_provides { + my $self = shift; + return $self unless $self->is_admin; + unless (-e 'MANIFEST') { + warn "Cannot deduce auto_provides without a MANIFEST, skipping\n"; + return $self; + } + # Avoid spurious warnings as we are not checking manifest here. + local $SIG{__WARN__} = sub {1}; + require ExtUtils::Manifest; + local *ExtUtils::Manifest::manicheck = sub { return }; + + require Module::Build; + my $build = Module::Build->new( + dist_name => $self->name, + dist_version => $self->version, + license => $self->license, + ); + $self->provides( %{ $build->find_dist_packages || {} } ); +} + +sub feature { + my $self = shift; + my $name = shift; + my $features = ( $self->{values}{features} ||= [] ); + my $mods; + + if ( @_ == 1 and ref( $_[0] ) ) { + # The user used ->feature like ->features by passing in the second + # argument as a reference. Accomodate for that. + $mods = $_[0]; + } else { + $mods = \@_; + } + + my $count = 0; + push @$features, ( + $name => [ + map { + ref($_) ? ( ref($_) eq 'HASH' ) ? %$_ : @$_ : $_ + } @$mods + ] + ); + + return @$features; +} + +sub features { + my $self = shift; + while ( my ( $name, $mods ) = splice( @_, 0, 2 ) ) { + $self->feature( $name, @$mods ); + } + return $self->{values}{features} + ? @{ $self->{values}{features} } + : (); +} + +sub no_index { + my $self = shift; + my $type = shift; + push @{ $self->{values}{no_index}{$type} }, @_ if $type; + return $self->{values}{no_index}; +} + +sub read { + my $self = shift; + $self->include_deps( 'YAML::Tiny', 0 ); + + require YAML::Tiny; + my $data = YAML::Tiny::LoadFile('META.yml'); + + # Call methods explicitly in case user has already set some values. + while ( my ( $key, $value ) = each %$data ) { + next unless $self->can($key); + if ( ref $value eq 'HASH' ) { + while ( my ( $module, $version ) = each %$value ) { + $self->can($key)->($self, $module => $version ); + } + } else { + $self->can($key)->($self, $value); + } + } + return $self; +} + +sub write { + my $self = shift; + return $self unless $self->is_admin; + $self->admin->write_meta; + return $self; +} + +sub version_from { + require ExtUtils::MM_Unix; + my ( $self, $file ) = @_; + $self->version( ExtUtils::MM_Unix->parse_version($file) ); +} + +sub abstract_from { + require ExtUtils::MM_Unix; + my ( $self, $file ) = @_; + $self->abstract( + bless( + { DISTNAME => $self->name }, + 'ExtUtils::MM_Unix' + )->parse_abstract($file) + ); +} + +# Add both distribution and module name +sub name_from { + my ($self, $file) = @_; + if ( + Module::Install::_read($file) =~ m/ + ^ \s* + package \s* + ([\w:]+) + \s* ; + /ixms + ) { + my ($name, $module_name) = ($1, $1); + $name =~ s{::}{-}g; + $self->name($name); + unless ( $self->module_name ) { + $self->module_name($module_name); + } + } else { + die("Cannot determine name from $file\n"); + } +} + +sub perl_version_from { + my $self = shift; + if ( + Module::Install::_read($_[0]) =~ m/ + ^ + (?:use|require) \s* + v? + ([\d_\.]+) + \s* ; + /ixms + ) { + my $perl_version = $1; + $perl_version =~ s{_}{}g; + $self->perl_version($perl_version); + } else { + warn "Cannot determine perl version info from $_[0]\n"; + return; + } +} + +sub author_from { + my $self = shift; + my $content = Module::Install::_read($_[0]); + if ($content =~ m/ + =head \d \s+ (?:authors?)\b \s* + ([^\n]*) + | + =head \d \s+ (?:licen[cs]e|licensing|copyright|legal)\b \s* + .*? copyright .*? \d\d\d[\d.]+ \s* (?:\bby\b)? \s* + ([^\n]*) + /ixms) { + my $author = $1 || $2; + $author =~ s{E}{<}g; + $author =~ s{E}{>}g; + $self->author($author); + } else { + warn "Cannot determine author info from $_[0]\n"; + } +} + +sub license_from { + my $self = shift; + if ( + Module::Install::_read($_[0]) =~ m/ + ( + =head \d \s+ + (?:licen[cs]e|licensing|copyright|legal)\b + .*? + ) + (=head\\d.*|=cut.*|) + \z + /ixms ) { + my $license_text = $1; + my @phrases = ( + 'under the same (?:terms|license) as perl itself' => 'perl', 1, + 'GNU general public license' => 'gpl', 1, + 'GNU public license' => 'gpl', 1, + 'GNU lesser general public license' => 'lgpl', 1, + 'GNU lesser public license' => 'lgpl', 1, + 'GNU library general public license' => 'lgpl', 1, + 'GNU library public license' => 'lgpl', 1, + 'BSD license' => 'bsd', 1, + 'Artistic license' => 'artistic', 1, + 'GPL' => 'gpl', 1, + 'LGPL' => 'lgpl', 1, + 'BSD' => 'bsd', 1, + 'Artistic' => 'artistic', 1, + 'MIT' => 'mit', 1, + 'proprietary' => 'proprietary', 0, + ); + while ( my ($pattern, $license, $osi) = splice(@phrases, 0, 3) ) { + $pattern =~ s{\s+}{\\s+}g; + if ( $license_text =~ /\b$pattern\b/i ) { + $self->license($license); + return 1; + } + } + } + + warn "Cannot determine license info from $_[0]\n"; + return 'unknown'; +} + +sub bugtracker_from { + my $self = shift; + my $content = Module::Install::_read($_[0]); + my @links = $content =~ m/L\<(http\:\/\/rt\.cpan\.org\/[^>]+)\>/g; + unless ( @links ) { + warn "Cannot determine bugtracker info from $_[0]\n"; + return 0; + } + if ( @links > 1 ) { + warn "Found more than on rt.cpan.org link in $_[0]\n"; + return 0; + } + + # Set the bugtracker + bugtracker( $links[0] ); + return 1; +} + +1; diff --git a/inc/Module/Install/RTx.pm b/inc/Module/Install/RTx.pm new file mode 100644 index 0000000..20a354b --- /dev/null +++ b/inc/Module/Install/RTx.pm @@ -0,0 +1,191 @@ +#line 1 +package Module::Install::RTx; + +use 5.008; +use strict; +use warnings; +no warnings 'once'; + +use Module::Install::Base; +use base 'Module::Install::Base'; +our $VERSION = '0.24'; + +use FindBin; +use File::Glob (); +use File::Basename (); + +my @DIRS = qw(etc lib html bin sbin po var); +my @INDEX_DIRS = qw(lib bin sbin); + +sub RTx { + my ( $self, $name ) = @_; + + my $original_name = $name; + my $RTx = 'RTx'; + $RTx = $1 if $name =~ s/^(\w+)-//; + my $fname = $name; + $fname =~ s!-!/!g; + + $self->name("$RTx-$name") + unless $self->name; + $self->all_from( -e "$name.pm" ? "$name.pm" : "lib/$RTx/$fname.pm" ) + unless $self->version; + $self->abstract("RT $name Extension") + unless $self->abstract; + + my @prefixes = (qw(/opt /usr/local /home /usr /sw )); + my $prefix = $ENV{PREFIX}; + @ARGV = grep { /PREFIX=(.*)/ ? ( ( $prefix = $1 ), 0 ) : 1 } @ARGV; + + if ($prefix) { + $RT::LocalPath = $prefix; + $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 + ); + until ( eval { require RT; $RT::LocalPath } ) { + warn + "Cannot find the location of RT.pm that defines \$RT::LocalPath in: @INC\n"; + $_ = $self->prompt("Path to your RT.pm:") or exit; + push @INC, $_, "$_/rt3/lib", "$_/lib/rt3", "$_/lib"; + } + } + + my $lib_path = File::Basename::dirname( $INC{'RT.pm'} ); + my $local_lib_path = "$RT::LocalPath/lib"; + print "Using RT configuration from $INC{'RT.pm'}:\n"; + unshift @INC, "$RT::LocalPath/lib" if $RT::LocalPath; + + $RT::LocalVarPath ||= $RT::VarPath; + $RT::LocalPoPath ||= $RT::LocalLexiconPath; + $RT::LocalHtmlPath ||= $RT::MasonComponentRoot; + $RT::LocalLibPath ||= "$RT::LocalPath/lib"; + + my $with_subdirs = $ENV{WITH_SUBDIRS}; + @ARGV = grep { /WITH_SUBDIRS=(.*)/ ? ( ( $with_subdirs = $1 ), 0 ) : 1 } + @ARGV; + + my %subdirs; + %subdirs = map { $_ => 1 } split( /\s*,\s*/, $with_subdirs ) + if defined $with_subdirs; + unless ( keys %subdirs ) { + $subdirs{$_} = 1 foreach grep -d "$FindBin::Bin/$_", @DIRS; + } + + # If we're running on RT 3.8 with plugin support, we really wany + # to install libs, mason templates and po files into plugin specific + # directories + my %path; + if ( $RT::LocalPluginPath ) { + die "Because of bugs in RT 3.8.0 this extension can not be installed.\n" + ."Upgrade to RT 3.8.1 or newer.\n" if $RT::VERSION =~ /^3\.8\.0/; + $path{$_} = $RT::LocalPluginPath . "/$original_name/$_" + foreach @DIRS; + } else { + foreach ( @DIRS ) { + no strict 'refs'; + my $varname = "RT::Local" . ucfirst($_) . "Path"; + $path{$_} = ${$varname} || "$RT::LocalPath/$_"; + } + + $path{$_} .= "/$name" for grep $path{$_}, qw(etc po var); + } + + my %index = map { $_ => 1 } @INDEX_DIRS; + $self->no_index( directory => $_ ) foreach grep !$index{$_}, @DIRS; + + my $args = join ', ', map "q($_)", map { ($_, $path{$_}) } + grep $subdirs{$_}, keys %path; + + print "./$_\t=> $path{$_}\n" for sort keys %subdirs; + + if ( my @dirs = map { ( -D => $_ ) } grep $subdirs{$_}, qw(bin html sbin) ) { + my @po = map { ( -o => $_ ) } + grep -f, + File::Glob::bsd_glob("po/*.po"); + $self->postamble(<< ".") if @po; +lexicons :: +\t\$(NOECHO) \$(PERL) -MLocale::Maketext::Extract::Run=xgettext -e \"xgettext(qw(@dirs @po))\" +. + } + + my $postamble = << "."; +install :: +\t\$(NOECHO) \$(PERL) -MExtUtils::Install -e \"install({$args})\" +. + + if ( $subdirs{var} and -d $RT::MasonDataDir ) { + my ( $uid, $gid ) = ( stat($RT::MasonDataDir) )[ 4, 5 ]; + $postamble .= << "."; +\t\$(NOECHO) chown -R $uid:$gid $path{var} +. + } + + my %has_etc; + if ( File::Glob::bsd_glob("$FindBin::Bin/etc/schema.*") ) { + + # got schema, load factory module + $has_etc{schema}++; + $self->load('RTxFactory'); + $self->postamble(<< "."); +factory :: +\t\$(NOECHO) \$(PERL) -Ilib -I"$local_lib_path" -I"$lib_path" -Minc::Module::Install -e"RTxFactory(qw($RTx $name))" + +dropdb :: +\t\$(NOECHO) \$(PERL) -Ilib -I"$local_lib_path" -I"$lib_path" -Minc::Module::Install -e"RTxFactory(qw($RTx $name drop))" + +. + } + if ( File::Glob::bsd_glob("$FindBin::Bin/etc/acl.*") ) { + $has_etc{acl}++; + } + if ( -e 'etc/initialdata' ) { $has_etc{initialdata}++; } + + $self->postamble("$postamble\n"); + unless ( $subdirs{'lib'} ) { + $self->makemaker_args( PM => { "" => "" }, ); + } else { + $self->makemaker_args( INSTALLSITELIB => $path{'lib'} ); + $self->makemaker_args( INSTALLARCHLIB => $path{'lib'} ); + } + + $self->makemaker_args( INSTALLSITEMAN1DIR => "$RT::LocalPath/man/man1" ); + $self->makemaker_args( INSTALLSITEMAN3DIR => "$RT::LocalPath/man/man3" ); + $self->makemaker_args( INSTALLSITEARCH => "$RT::LocalPath/man" ); + + if (%has_etc) { + $self->load('RTxInitDB'); + print "For first-time installation, type 'make initdb'.\n"; + my $initdb = ''; + $initdb .= <<"." if $has_etc{schema}; +\t\$(NOECHO) \$(PERL) -Ilib -I"$local_lib_path" -I"$lib_path" -Minc::Module::Install -e"RTxInitDB(qw(schema))" +. + $initdb .= <<"." if $has_etc{acl}; +\t\$(NOECHO) \$(PERL) -Ilib -I"$local_lib_path" -I"$lib_path" -Minc::Module::Install -e"RTxInitDB(qw(acl))" +. + $initdb .= <<"." if $has_etc{initialdata}; +\t\$(NOECHO) \$(PERL) -Ilib -I"$local_lib_path" -I"$lib_path" -Minc::Module::Install -e"RTxInitDB(qw(insert))" +. + $self->postamble("initdb ::\n$initdb\n"); + $self->postamble("initialize-database ::\n$initdb\n"); + } +} + +sub RTxInit { + unshift @INC, substr( delete( $INC{'RT.pm'} ), 0, -5 ) if $INC{'RT.pm'}; + require RT; + RT::LoadConfig(); + RT::ConnectToDatabase(); + + die "Cannot load RT" unless $RT::Handle and $RT::DatabaseType; +} + +1; + +__END__ + +#line 302 diff --git a/inc/Module/Install/Substitute.pm b/inc/Module/Install/Substitute.pm new file mode 100644 index 0000000..56af7fe --- /dev/null +++ b/inc/Module/Install/Substitute.pm @@ -0,0 +1,131 @@ +#line 1 +package Module::Install::Substitute; + +use strict; +use warnings; +use 5.008; # I don't care much about earlier versions + +use Module::Install::Base; +our @ISA = qw(Module::Install::Base); + +our $VERSION = '0.03'; + +require File::Temp; +require File::Spec; +require Cwd; + +#line 89 + +sub substitute +{ + my $self = shift; + $self->{__subst} = shift; + $self->{__option} = {}; + if( UNIVERSAL::isa( $_[0], 'HASH' ) ) { + my $opts = shift; + while( my ($k,$v) = each( %$opts ) ) { + $self->{__option}->{ lc( $k ) } = $v || ''; + } + } + $self->_parse_options; + + my @file = @_; + foreach my $f (@file) { + $self->_rewrite_file( $f ); + } + + return; +} + +sub _parse_options +{ + my $self = shift; + my $cwd = Cwd::getcwd(); + foreach my $t ( qw(from to) ) { + $self->{__option}->{$t} = $cwd unless $self->{__option}->{$t}; + my $d = $self->{__option}->{$t}; + die "Couldn't read directory '$d'" unless -d $d && -r _; + } +} + +sub _rewrite_file +{ + my ($self, $file) = @_; + my $source = File::Spec->catfile( $self->{__option}{from}, $file ); + $source .= $self->{__option}{sufix} if $self->{__option}{sufix}; + unless( -f $source && -r _ ) { + print STDERR "Couldn't find file '$source'\n"; + return; + } + my $dest = File::Spec->catfile( $self->{__option}{to}, $file ); + return $self->__rewrite_file( $source, $dest ); +} + +sub __rewrite_file +{ + my ($self, $source, $dest) = @_; + + my $mode = (stat($source))[2]; + + open my $sfh, "<$source" or die "Couldn't open '$source' for read"; + print "Open input '$source' file for substitution\n"; + + my ($tmpfh, $tmpfname) = File::Temp::tempfile('mi-subst-XXXX', UNLINK => 1); + $self->__process_streams( $sfh, $tmpfh, ($source eq $dest)? 1: 0 ); + close $sfh; + + seek $tmpfh, 0, 0 or die "Couldn't seek in tmp file"; + + open my $dfh, ">$dest" or die "Couldn't open '$dest' for write"; + print "Open output '$dest' file for substitution\n"; + + while( <$tmpfh> ) { + print $dfh $_; + } + close $dfh; + chmod $mode, $dest or "Couldn't change mode on '$dest'"; +} + +sub __process_streams +{ + my ($self, $in, $out, $replace) = @_; + + my @queue = (); + my $subst = $self->{'__subst'}; + my $re_subst = join('|', map {"\Q$_"} keys %{ $subst } ); + + while( my $str = <$in> ) { + if( $str =~ /^###\s*(before|replace|after)\:\s?(.*)$/s ) { + my ($action, $nstr) = ($1,$2); + $nstr =~ s/\@($re_subst)\@/$subst->{$1}/ge; + + die "Replace action is bad idea for situations when dest is equal to source" + if $replace && $action eq 'replace'; + if( $action eq 'before' ) { + die "no line before 'before' action" unless @queue; + # overwrite prev line; + pop @queue; + push @queue, $nstr; + push @queue, $str; + } elsif( $action eq 'replace' ) { + push @queue, $nstr; + } elsif( $action eq 'after' ) { + push @queue, $str; + push @queue, $nstr; + # skip one line; + <$in>; + } + } else { + push @queue, $str; + } + while( @queue > 3 ) { + print $out shift(@queue); + } + } + while( scalar @queue ) { + print $out shift(@queue); + } +} + +1; + diff --git a/inc/Module/Install/Win32.pm b/inc/Module/Install/Win32.pm new file mode 100644 index 0000000..9617b35 --- /dev/null +++ b/inc/Module/Install/Win32.pm @@ -0,0 +1,64 @@ +#line 1 +package Module::Install::Win32; + +use strict; +use Module::Install::Base; + +use vars qw{$VERSION @ISA $ISCORE}; +BEGIN { + $VERSION = '0.78'; + @ISA = qw{Module::Install::Base}; + $ISCORE = 1; +} + +# determine if the user needs nmake, and download it if needed +sub check_nmake { + my $self = shift; + $self->load('can_run'); + $self->load('get_file'); + + require Config; + return unless ( + $^O eq 'MSWin32' and + $Config::Config{make} and + $Config::Config{make} =~ /^nmake\b/i and + ! $self->can_run('nmake') + ); + + print "The required 'nmake' executable not found, fetching it...\n"; + + require File::Basename; + my $rv = $self->get_file( + url => 'http://download.microsoft.com/download/vc15/Patch/1.52/W95/EN-US/Nmake15.exe', + ftp_url => 'ftp://ftp.microsoft.com/Softlib/MSLFILES/Nmake15.exe', + local_dir => File::Basename::dirname($^X), + size => 51928, + run => 'Nmake15.exe /o > nul', + check_for => 'Nmake.exe', + remove => 1, + ); + + die <<'END_MESSAGE' unless $rv; + +------------------------------------------------------------------------------- + +Since you are using Microsoft Windows, you will need the 'nmake' utility +before installation. It's available at: + + http://download.microsoft.com/download/vc15/Patch/1.52/W95/EN-US/Nmake15.exe + or + ftp://ftp.microsoft.com/Softlib/MSLFILES/Nmake15.exe + +Please download the file manually, save it to a directory in %PATH% (e.g. +C:\WINDOWS\COMMAND\), then launch the MS-DOS command line shell, "cd" to +that directory, and run "Nmake15.exe" from there; that will create the +'nmake.exe' file needed by this module. + +You may then resume the installation process described in README. + +------------------------------------------------------------------------------- +END_MESSAGE + +} + +1; diff --git a/inc/Module/Install/WriteAll.pm b/inc/Module/Install/WriteAll.pm new file mode 100644 index 0000000..b7a591f --- /dev/null +++ b/inc/Module/Install/WriteAll.pm @@ -0,0 +1,40 @@ +#line 1 +package Module::Install::WriteAll; + +use strict; +use Module::Install::Base; + +use vars qw{$VERSION @ISA $ISCORE}; +BEGIN { + $VERSION = '0.78'; + @ISA = qw{Module::Install::Base}; + $ISCORE = 1; +} + +sub WriteAll { + my $self = shift; + my %args = ( + meta => 1, + sign => 0, + inline => 0, + check_nmake => 1, + @_, + ); + + $self->sign(1) if $args{sign}; + $self->Meta->write if $args{meta}; + $self->admin->WriteAll(%args) if $self->is_admin; + + $self->check_nmake if $args{check_nmake}; + unless ( $self->makemaker_args->{PL_FILES} ) { + $self->makemaker_args( PL_FILES => {} ); + } + + if ( $args{inline} ) { + $self->Inline->write; + } else { + $self->Makefile->write; + } +} + +1; diff --git a/lib/RT/Extension/MergeUsers.pm b/lib/RT/Extension/MergeUsers.pm new file mode 100644 index 0000000..e0720c0 --- /dev/null +++ b/lib/RT/Extension/MergeUsers.pm @@ -0,0 +1,283 @@ +# BEGIN BPS TAGGED BLOCK {{{ +# +# COPYRIGHT: +# +# This software is Copyright (c) 1996-2008 Best Practical Solutions, LLC +# +# +# (Except where explicitly superseded by other copyright notices) +# +# +# LICENSE: +# +# This work is made available to you under the terms of Version 2 of +# the GNU General Public License. A copy of that license should have +# been provided with this software, but in any event can be snarfed +# from www.gnu.org. +# +# This work is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +# +# +# CONTRIBUTION SUBMISSION POLICY: +# +# (The following paragraph is not intended to limit the rights granted +# to you to modify and distribute this software under the terms of +# the GNU General Public License and is only of importance to you if +# you choose to contribute your changes and enhancements to the +# community by submitting them to Best Practical Solutions, LLC.) +# +# By intentionally submitting any modifications, corrections or +# derivatives to this work, or any other work intended for use with +# Request Tracker, to Best Practical Solutions, LLC, you confirm that +# you are the copyright holder for those contributions and you grant +# Best Practical Solutions, LLC a nonexclusive, worldwide, irrevocable, +# royalty-free, perpetual, license to use, copy, create derivative +# works based on those contributions, and sublicense and distribute +# those contributions and any derivatives thereof. +# +# END BPS TAGGED BLOCK }}} +use strict; +use warnings; no warnings qw(redefine); + +package RT::Extension::MergeUsers; + +our $VERSION = '0.03_02'; + +package RT::User; + +our %EFFECTIVE_ID_CACHE; + +use RT::Interface::Web::Handler; +use Hook::LexWrap; + +{ my $i = 0; +wrap 'RT::Interface::Web::Handler::CleanupRequest' => sub { + return if ++$i%100; # flush cache every N requests + %EFFECTIVE_ID_CACHE = (); +}; } + +sub CanonicalizeEmailAddress { + my $self = shift; + my $address = shift; + + if ($RT::CanonicalizeEmailAddressMatch && $RT::CanonicalizeEmailAddressReplace ) { + $address =~ s/$RT::CanonicalizeEmailAddressMatch/$RT::CanonicalizeEmailAddressReplace/gi; + } + + # get the user whose email address this is + my $canonical_user = RT::User->new($RT::SystemUser); + $canonical_user->LoadByCols( EmailAddress => $address ); + return $address unless $canonical_user->id; + + # if we got a user, check for a parent + my ($effective_id) = $canonical_user->Attributes->Named("EffectiveId"); + return $address unless $effective_id && $effective_id->id; + + $canonical_user->LoadByCols( id => $effective_id->Content ); + return $address unless $canonical_user->id; + + # is there another parent user above this one? + return $canonical_user->CanonicalizeEmailAddress( + $canonical_user->EmailAddress + ); +} + +sub LoadByCols { + my $self = shift; + $self->SUPER::LoadByCols(@_); + return $self->id unless my $oid = $self->id; + + unless ( exists $EFFECTIVE_ID_CACHE{ $oid } ) { + my $effective_id = RT::Attribute->new( $RT::SystemUser ); + $effective_id->LoadByCols( + Name => 'EffectiveId', + ObjectType => ref($self) || $self, + ObjectId => $oid, + ); + if ( $effective_id->id && $effective_id->Content && $effective_id->Content != $oid ) { + $self->LoadByCols( id => $effective_id->Content ); + $EFFECTIVE_ID_CACHE{ $oid } = $self->id; + } else { + $EFFECTIVE_ID_CACHE{ $oid } = undef; + } + } + elsif ( defined $EFFECTIVE_ID_CACHE{ $oid } ) { + $self->LoadByCols( id => $EFFECTIVE_ID_CACHE{ $oid } ); + } + + return $self->id; +} + +sub LoadOriginal { + my $self = shift; + return $self->SUPER::LoadByCols( @_ ); +} + +sub GetMergedUsers { + my $self = shift; + + my $merged_users = $self->FirstAttribute('MergedUsers'); + unless ($merged_users) { + $self->SetAttribute( + Name => 'MergedUsers', + Description => 'Users that have been merged into this user', + Content => [] ); + $merged_users = $self->FirstAttribute('MergedUsers'); + }; + return $merged_users; +} + +sub MergeInto { + my $self = shift; + my $user = shift; + + # Load the user objects we were called with + my $merge; + if (ref $user) { + return (0, "User is not loaded") unless $user->id; + + $merge = RT::User->new($RT::SystemUser); + $merge->Load($user->id); + return (0, "Could not reload user #". $user->id) + unless $merge->id; + } else { + $merge = RT::User->new($RT::SystemUser); + $merge->Load($user); + return (0, "Could not load user '$user'") unless $merge->id; + } + + # Get copies of the canonicalized users + my $email; + if (defined $merge->Attributes->Named('EffectiveId')) { + $email = $merge->CanonicalizeEmailAddress($merge->EmailAddress); + $merge->LoadByEmail($email); + } + return (0, "Could not load user to be merged") unless $merge->id; + + my $canonical_self = RT::User->new($RT::SystemUser); + $canonical_self->Load($self->id); + if (defined $canonical_self->Attributes->Named('EffectiveId')) { + $email = $canonical_self->CanonicalizeEmailAddress($canonical_self->EmailAddress); + $canonical_self->LoadByEmail($email); + } + return (0, "Could not load user to merge into") unless $canonical_self->id; + + # No merging into yourself! + return (0, "Could not merge @{[$merge->Name]} into itself") + if $merge->id == $canonical_self->id; + + # No merging if the user you're merging into was merged into you + # (ie. you're the primary address for this user) + my ($new) = $merge->Attributes->Named("EffectiveId"); + return (0, "User @{[$canonical_self->Name]} has already been merged") + if defined $new and $new->Content == $canonical_self->id; + + # do the merge + $canonical_self->SetAttribute( + Name => "EffectiveId", + Description => "Primary ID of this email address", + Content => $merge->id, + ); + + my $merged_users = $merge->GetMergedUsers; + $merged_users->SetContent( [$canonical_self->Id, @{$merged_users->Content}] ); + + $canonical_self->SetComments( join "\n", grep /\S/, + $canonical_self->Comments, + "Merged into ". $merge->EmailAddress ." (". $merge->id .")", + ); + $merge->SetComments(join "\n", grep /\S/, + $merge->Comments, + $canonical_self->EmailAddress." (".$canonical_self->id.") merged into this user", + ); + return (1, "Merged users successfuly"); +} + +sub UnMerge { + my $self = shift; + + my ($current) = $self->Attributes->Named("EffectiveId"); + return (0, "Not a merged user") unless $current; + + my $merge = RT::User->new($RT::SystemUser); + $merge->Load( $current->Content ); + + $current->Delete; + $self->SetComments( join "\n", grep /\S/, + $self->Comments, + "Unmerged from ". $merge->EmailAddress ." (".$merge->id.")", + ); + + $merge->SetComments(join "\n", grep /\S/, + $merge->Comments, + $self->EmailAddress ." (". $self->id .") unmerged from this user", + ); + my $merged_users = $merge->GetMergedUsers; + my @remaining_users = grep { $_ != $self->Id } @{$merged_users->Content}; + if (@remaining_users) { + $merged_users->SetContent(\@remaining_users); + } else { + $merged_users->Delete; + } + + return ($merge->id, "Unmerged from @{[$merge->EmailAddress]}"); +} + +sub SetEmailAddress { + my $self = shift; + my $value = shift; + + return ( 0, $self->loc('Email address in use') ) + unless $self->ValidateEmailAddress( $value ); + + # if value is valid then either there is no user or + # user is merged into this one + my $tmp = RT::User->new($RT::SystemUser); + $tmp->LoadOriginal( EmailAddress => $value ); + if ( $tmp->id && $tmp->id != $self->id ) { + # there is a different user record + $tmp->_Set( Field => 'EmailAddress', Value => undef ); + } + + return $self->_Set( Field => 'EmailAddress', Value => $value ); +} + +package RT::Users; +use RT::Users; + +=head2 Next + +This custom iterator makes sure that duplicate users are never shown in search results. + +=cut + +sub Next { + my $self = shift; + + my $user = $self->SUPER::Next(@_); + return unless ($user && $user->id); + unless ($user) { + $self->{seen_users} = undef; + return undef; + } + + + + my ($effective_id) = $user->Attributes->Named("EffectiveId"); + if ($effective_id && $effective_id->Content && $effective_id->Content != $user->id) { + $user->LoadByCols(id =>$effective_id->Content); + } + return $self->Next() if ($self->{seen_users}->{$user->id}++); + + return $user; + +} + +1; diff --git a/t/01merge_users.t b/t/01merge_users.t new file mode 100644 index 0000000..bc079b8 --- /dev/null +++ b/t/01merge_users.t @@ -0,0 +1,89 @@ +#!/sw/bin/perl5.8.6 + +use strict; +use Test::More tests => 16; +use RT::Test; + +RT->Config->Set('Plugins',qw(RT::Extension::MergeUsers)); + +my ($id, $message); + +# make sure the extension is installed +use_ok('RT::Extension::MergeUsers'); + +# create N unique users ($$ == our pid) +my $primary_user = RT::User->new($RT::SystemUser); +($id, $message) = $primary_user->Create( EmailAddress => "primary-$$\@example.com" ); +ok($id, "Created 'primary' user? $message"); + +my $secondary_user = RT::User->new($RT::SystemUser); +($id, $message) = $secondary_user->Create( EmailAddress => "secondary-$$\@example.com" ); +ok($id, "Created 'secondary' user? $message"); + +my $tertiary_user = RT::User->new($RT::SystemUser); +($id, $message) = $tertiary_user->Create( EmailAddress => "tertiary-$$\@example.com" ); +ok($id, "Created 'tertiary' user? $message"); + +my $quaternary_user = RT::User->new($RT::SystemUser); +($id, $message) = $quaternary_user->Create( EmailAddress => "quaternary-$$\@example.com" ); +ok($id, "Created 'quaternary' user? $message"); + +# load a nonexistent user +my $nonexistent_user = RT::User->new($RT::SystemUser); +#or, rather, don't load anything at all + +# module should error if there isn't a valid user +($id, $message) = $primary_user->MergeInto($nonexistent_user); +ok(!$id, "Doesn't merge into non-existent users? $message"); + +# a user should not be able to be merged into itself +($id, $message) = $primary_user->MergeInto($primary_user); +ok(!$id, "Doesn't merge a user into itself? $message"); + +# successfully merges users +($id, $message) = $secondary_user->MergeInto($primary_user); +ok($id, "Successfully merges users? $message"); + +# recognizes already-merged users +($id, $message) = $secondary_user->MergeInto($primary_user); +ok(!$id, "Recognizes secondary as child? $message"); +($id, $message) = $primary_user->MergeInto($secondary_user); +ok(!$id, "Recognizes primary as parent? $message"); + +# DTRT with multiple inheritance +$quaternary_user->MergeInto($tertiary_user); +($id, $message) = $tertiary_user->MergeInto($primary_user); +ok($id, "Merges users with children? $message"); + +# recognizes siblings +($id, $message) = $tertiary_user->MergeInto($secondary_user); +ok(!$id, "Recognizes siblings? $message"); + +# recognizes children of children as children of the primary +($id, $message) = $quaternary_user->MergeInto($primary_user); +ok(!$id, "Recognizes children of children? $message"); + +# Associates tickets from a secondary address with the primary address +my $ticket = RT::Ticket->new($RT::SystemUser); +my $transaction_obj; +($id, $transaction_obj, $message) + = $ticket->Create( Requestor => ["secondary-$$\@example.com"], + Queue => 'general', + Subject => 'MergeUsers test', + ); +ok($ticket->RequestorAddresses =~ /primary-$$\@example.com/, "Canonicalizes tickets properly: @{[$ticket->RequestorAddresses]}"); + +# allows unmerging +($id, $message) = $secondary_user->UnMerge; +ok($id, "Unmerges users? $message"); + +# Associates tickets from unmerged address with the secondary address +my $ticket2 = RT::Ticket->new($RT::SystemUser); +($id, $transaction_obj, $message) + = $ticket2->Create( Requestor => ["secondary-$$\@example.com"], + Queue => 'general', + Subject => 'UnMergeUsers test', + ); +ok($ticket2->RequestorAddresses =~ /secondary-$$\@example.com/, "Unmerges tickets properly: @{[$ticket2->RequestorAddresses]}"); + +1; diff --git a/t/change_email.t b/t/change_email.t new file mode 100644 index 0000000..592a714 --- /dev/null +++ b/t/change_email.t @@ -0,0 +1,43 @@ +#!/usr/bin/perl + +use strict; +use warnings; +use Test::More tests => 8; +use RT::Test; + +RT->Config->Set('Plugins',qw(RT::Extension::MergeUsers)); +use_ok('RT::Extension::MergeUsers'); + +my ($id, $message); + +# create N unique users ($$ == our pid) +my $primary_user = RT::User->new($RT::SystemUser); +($id, $message) = $primary_user->Create( EmailAddress => "primary-$$\@example.com" ); +ok($id, "Created 'primary' user? $message"); +my $primary_id = $id; + +my $secondary_user = RT::User->new($RT::SystemUser); +($id, $message) = $secondary_user->Create( EmailAddress => "secondary-$$\@example.com" ); +ok($id, "Created 'secondary' user? $message"); +my $secondary_id = $id; + +# successfully merges users +($id, $message) = $secondary_user->MergeInto($primary_user); +ok($id, "Successfully merges users? $message"); + +{ + my $user = RT::User->new( $RT::SystemUser ); + $user->LoadByEmail( "primary-$$\@example.com" ); + is($user->id, $primary_user->id, "loaded user"); + + my ($status, $msg) = $user->SetEmailAddress( "secondary-$$\@example.com" ); + ok $status, "changed primary address to something we already had" + or diag "error: $msg"; + + $user->LoadOriginal( id => $secondary_id ); + is($user->id, $secondary_id, "loaded original record"); + + ok(!$user->EmailAddress, "secondary record has no email"); +} + +1; -- 2.30.2