[Bps-public-commit] RT-Extension-MergeUsers branch, master, updated. 1.02
Alex Vandiver
alexmv at bestpractical.com
Thu Dec 18 16:47:43 EST 2014
The branch, master has been updated
via d96a2afe69e592abd60f04ed8fd641f20853e52b (commit)
via 61cf523d388cbb927bb9e4ef3ec43f482b30c854 (commit)
via acf4074ce7ea36f90a515f24e032e55f1c6df119 (commit)
via b65b49dbeb543b87836570a28ba367e85df0abf6 (commit)
via 4632ee94bf22c35e37dcfa43d1d62747bb2f88c8 (commit)
via c1b7a7f219d88579c75a38350bfea51e626892f2 (commit)
from 97f7af1881da11db4d007006ea31542eb139e2bb (commit)
Summary of changes:
META.yml | 6 +--
Makefile.PL | 4 +-
README | 77 +++++++++++++++++++---------------
lib/RT/Extension/MergeUsers.pm | 93 ++++++++++++++++++++++++------------------
4 files changed, 102 insertions(+), 78 deletions(-)
- Log -----------------------------------------------------------------
commit c1b7a7f219d88579c75a38350bfea51e626892f2
Author: Alex Vandiver <alexmv at bestpractical.com>
Date: Thu Dec 18 16:43:33 2014 -0500
Remove the one piece of developer POD
Its position in the POD implies that "Next" is a UTILITY
diff --git a/README b/README
index 42fd506..78e0546 100644
--- a/README
+++ b/README
@@ -77,9 +77,6 @@ UTILITIES
cleans up attributes if the merged-into user record is now gone. These
users will then be converted back to regular unmerged users.
- Next
- This custom iterator makes sure that duplicate users are never shown in
- search results.
AUTHOR
Alex Vandiver <alexmv at bestpractical.com>
diff --git a/lib/RT/Extension/MergeUsers.pm b/lib/RT/Extension/MergeUsers.pm
index 99d1aad..d5f2c43 100644
--- a/lib/RT/Extension/MergeUsers.pm
+++ b/lib/RT/Extension/MergeUsers.pm
@@ -401,12 +401,6 @@ sub NameAndEmail {
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;
commit 4632ee94bf22c35e37dcfa43d1d62747bb2f88c8
Author: Alex Vandiver <alexmv at bestpractical.com>
Date: Thu Dec 18 16:44:49 2014 -0500
Add mention of rt-merge-users tool
diff --git a/README b/README
index 78e0546..b373f91 100644
--- a/README
+++ b/README
@@ -77,6 +77,9 @@ UTILITIES
cleans up attributes if the merged-into user record is now gone. These
users will then be converted back to regular unmerged users.
+ rt-merge-users
+ A command-line tool to merge one user into another
+
AUTHOR
Alex Vandiver <alexmv at bestpractical.com>
diff --git a/lib/RT/Extension/MergeUsers.pm b/lib/RT/Extension/MergeUsers.pm
index d5f2c43..2317c18 100644
--- a/lib/RT/Extension/MergeUsers.pm
+++ b/lib/RT/Extension/MergeUsers.pm
@@ -157,6 +157,10 @@ to the now missing user id. This script cleans up attributes
if the merged-into user record is now gone. These users will then be
converted back to regular unmerged users.
+=head2 rt-merge-users
+
+A command-line tool to merge one user into another
+
=cut
package RT::User;
commit b65b49dbeb543b87836570a28ba367e85df0abf6
Author: Alex Vandiver <alexmv at bestpractical.com>
Date: Thu Dec 18 16:45:43 2014 -0500
Move Shredder out of DESCRIPTION
diff --git a/README b/README
index b373f91..36b3bca 100644
--- a/README
+++ b/README
@@ -15,28 +15,6 @@ DESCRIPTION
all e-mail sent from secondary users is displayed as coming from the
primary user.
- RT::Shredder and Merged Users
- Merging a user effectively makes it impossible to load the merged user
- directly. Attempting to access the old user resolves to the merged-into
- user. Because of this, MergeUsers has some extra code to help
- RT::Shredder clean up these merged records to avoid leaving merged user
- records in the DB while removing the user they were merged into.
-
- When running RT::Shredder on a user record with other users merged into
- it, the merged users are Unmerged before the initial user record is
- shredded. There are two options to handle these newly unmerged users:
-
- 1. Re-run your shredder command with the same or similar options. The
- unmerged user records will now be accessible and, depending on your
- shredder options, they will likely be shredded on the second run. If
- you have multiple layers of merged users, you may need to run
- shredder multiple times.
-
- 2. MergeUsers will log the unmerged users at the "info" level so you
- can pull the user ids from the log and shred them manually. This is
- most likely to be useful if you are shredding one specific user (and
- all merged accounts).
-
INSTALLATION
Be sure to also read "UPGRADING" if you are upgrading.
@@ -80,6 +58,28 @@ UTILITIES
rt-merge-users
A command-line tool to merge one user into another
+CAVEATS
+ RT::Shredder and Merged Users
+ Merging a user effectively makes it impossible to load the merged user
+ directly. Attempting to access the old user resolves to the merged-into
+ user. Because of this, MergeUsers has some extra code to help
+ RT::Shredder clean up these merged records to avoid leaving merged user
+ records in the DB while removing the user they were merged into.
+
+ When running RT::Shredder on a user record with other users merged into
+ it, the merged users are Unmerged before the initial user record is
+ shredded. There are two options to handle these newly unmerged users:
+
+ 1. Re-run your shredder command with the same or similar options. The
+ unmerged user records will now be accessible and, depending on your
+ shredder options, they will likely be shredded on the second run. If
+ you have multiple layers of merged users, you may need to run
+ shredder multiple times.
+
+ 2. MergeUsers will log the unmerged users at the info level so you can
+ pull the user ids from the log and shred them manually. This is most
+ likely to be useful if you are shredding one specific user (and all
+ merged accounts).
AUTHOR
Alex Vandiver <alexmv at bestpractical.com>
diff --git a/lib/RT/Extension/MergeUsers.pm b/lib/RT/Extension/MergeUsers.pm
index 2317c18..8e239c2 100644
--- a/lib/RT/Extension/MergeUsers.pm
+++ b/lib/RT/Extension/MergeUsers.pm
@@ -74,35 +74,6 @@ It also provides a version of L<CanonicalizeEmailAddress>, which means that
all e-mail sent from secondary users is displayed as coming from the primary
user.
-=head2 RT::Shredder and Merged Users
-
-Merging a user effectively makes it impossible to load the merged user
-directly. Attempting to access the old user resolves to the merged-into user.
-Because of this, MergeUsers has some extra code to help L<RT::Shredder>
-clean up these merged records to avoid leaving merged user records in the DB
-while removing the user they were merged into.
-
-When running L<RT::Shredder> on a user record with other users merged into it,
-the merged users are Unmerged before the initial user record is shredded.
-There are two options to handle these newly unmerged users:
-
-=over
-
-=item 1.
-
-Re-run your shredder command with the same or similar options. The unmerged
-user records will now be accessible and, depending on your shredder options,
-they will likely be shredded on the second run. If you have multiple
-layers of merged users, you may need to run shredder multiple times.
-
-=item 2.
-
-MergeUsers will log the unmerged users at the C<info> level so you can pull
-the user ids from the log and shred them manually. This is most likely to
-be useful if you are shredding one specific user (and all merged accounts).
-
-=back
-
=head1 INSTALLATION
Be sure to also read L</UPGRADING> if you are upgrading.
@@ -161,6 +132,37 @@ converted back to regular unmerged users.
A command-line tool to merge one user into another
+=head1 CAVEATS
+
+=head2 RT::Shredder and Merged Users
+
+Merging a user effectively makes it impossible to load the merged user
+directly. Attempting to access the old user resolves to the merged-into user.
+Because of this, MergeUsers has some extra code to help L<RT::Shredder>
+clean up these merged records to avoid leaving merged user records in the DB
+while removing the user they were merged into.
+
+When running L<RT::Shredder> on a user record with other users merged into it,
+the merged users are Unmerged before the initial user record is shredded.
+There are two options to handle these newly unmerged users:
+
+=over
+
+=item 1.
+
+Re-run your shredder command with the same or similar options. The unmerged
+user records will now be accessible and, depending on your shredder options,
+they will likely be shredded on the second run. If you have multiple
+layers of merged users, you may need to run shredder multiple times.
+
+=item 2.
+
+MergeUsers will log the unmerged users at the C<info> level so you can pull
+the user ids from the log and shred them manually. This is most likely to
+be useful if you are shredding one specific user (and all merged accounts).
+
+=back
+
=cut
package RT::User;
commit acf4074ce7ea36f90a515f24e032e55f1c6df119
Author: Alex Vandiver <alexmv at bestpractical.com>
Date: Thu Dec 18 16:46:23 2014 -0500
Use standard AUTHOR, BUGS, and LICENSE AND COPYRIGHT blocks
diff --git a/META.yml b/META.yml
index d6cee98..3bba58d 100644
--- a/META.yml
+++ b/META.yml
@@ -1,7 +1,7 @@
---
abstract: 'Merges two users into the same effective user'
author:
- - 'Alex Vandiver <alexmv at bestpractical.com>'
+ - 'Best Practical Solutions, LLC <modules at bestpractical.com>'
build_requires:
ExtUtils::MakeMaker: 6.59
configure_requires:
diff --git a/README b/README
index 36b3bca..8995f18 100644
--- a/README
+++ b/README
@@ -82,8 +82,21 @@ CAVEATS
merged accounts).
AUTHOR
- Alex Vandiver <alexmv at bestpractical.com>
+ Best Practical Solutions, LLC <modules at bestpractical.com>
-LICENSE
- GPL version 2.
+BUGS
+ All bugs should be reported via email to
+
+ L<bug-RT-Extension-MergeUsers at rt.cpan.org|mailto:bug-RT-Extension-MergeUsers at rt.cpan.org>
+
+ or via the web at
+
+ L<rt.cpan.org|http://rt.cpan.org/Public/Dist/Display.html?Name=RT-Extension-MergeUsers>.
+
+LICENSE AND COPYRIGHT
+ This software is Copyright (c) 2014 by Best Practical Solutions
+
+ This is free software, licensed under:
+
+ The GNU General Public License, Version 2, June 1991
diff --git a/lib/RT/Extension/MergeUsers.pm b/lib/RT/Extension/MergeUsers.pm
index 8e239c2..2bcdc13 100644
--- a/lib/RT/Extension/MergeUsers.pm
+++ b/lib/RT/Extension/MergeUsers.pm
@@ -460,14 +460,27 @@ sub SetDisabled {
return ($ret, $msg);
}
-
=head1 AUTHOR
-Alex Vandiver E<lt>alexmv at bestpractical.comE<gt>
+Best Practical Solutions, LLC E<lt>modules at bestpractical.comE<gt>
+
+=head1 BUGS
+
+All bugs should be reported via email to
+
+ L<bug-RT-Extension-MergeUsers at rt.cpan.org|mailto:bug-RT-Extension-MergeUsers at rt.cpan.org>
+
+or via the web at
+
+ L<rt.cpan.org|http://rt.cpan.org/Public/Dist/Display.html?Name=RT-Extension-MergeUsers>.
+
+=head1 LICENSE AND COPYRIGHT
+
+This software is Copyright (c) 2014 by Best Practical Solutions
-=head1 LICENSE
+This is free software, licensed under:
-GPL version 2.
+ The GNU General Public License, Version 2, June 1991
=cut
commit 61cf523d388cbb927bb9e4ef3ec43f482b30c854
Author: Alex Vandiver <alexmv at bestpractical.com>
Date: Thu Dec 18 16:46:49 2014 -0500
Packaging updates
diff --git a/META.yml b/META.yml
index 3bba58d..9569080 100644
--- a/META.yml
+++ b/META.yml
@@ -27,7 +27,7 @@ requires:
perl: 5.8.3
resources:
license: http://opensource.org/licenses/gpl-license.php
+ repository: https://github.com/bestpractical/rt-extension-mergeusers
version: '1.01'
x_module_install_rtx_version: '0.36'
x_requires_rt: 4.0.0
-x_rt_too_new: 4.4.0
diff --git a/Makefile.PL b/Makefile.PL
index e16bac3..bdd4465 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -1,10 +1,8 @@
use inc::Module::Install;
RTx 'RT-Extension-MergeUsers';
-readme_from 'lib/RT/Extension/MergeUsers.pm';
-requires_rt('4.0.0');
-rt_too_new('4.4.0');
+repository('https://github.com/bestpractical/rt-extension-mergeusers');
my ($lib_path) = $INC{'RT.pm'} =~ /^(.*)[\\\/]/;
my $local_lib_path = "$RT::LocalPath/lib";
diff --git a/README b/README
index 8995f18..b500b0b 100644
--- a/README
+++ b/README
@@ -18,9 +18,9 @@ DESCRIPTION
INSTALLATION
Be sure to also read "UPGRADING" if you are upgrading.
- "perl Makefile.PL"
- "make"
- "make install"
+ perl Makefile.PL
+ make
+ make install
May need root permissions
Edit your /opt/rt4/etc/RT_SiteConfig.pm
@@ -32,7 +32,7 @@ INSTALLATION
Set(@Plugins, qw(RT::Extension::MergeUsers));
- or add "RT::Extension::MergeUsers" to your existing @Plugins line.
+ or add RT::Extension::MergeUsers to your existing @Plugins line.
Clear your mason cache
rm -rf /opt/rt4/var/mason_data/obj
commit d96a2afe69e592abd60f04ed8fd641f20853e52b
Author: Alex Vandiver <alexmv at bestpractical.com>
Date: Thu Dec 18 16:47:11 2014 -0500
Version 1.02 releng
diff --git a/META.yml b/META.yml
index 9569080..79eb10b 100644
--- a/META.yml
+++ b/META.yml
@@ -28,6 +28,6 @@ requires:
resources:
license: http://opensource.org/licenses/gpl-license.php
repository: https://github.com/bestpractical/rt-extension-mergeusers
-version: '1.01'
+version: '1.02'
x_module_install_rtx_version: '0.36'
x_requires_rt: 4.0.0
diff --git a/lib/RT/Extension/MergeUsers.pm b/lib/RT/Extension/MergeUsers.pm
index 2bcdc13..6855638 100644
--- a/lib/RT/Extension/MergeUsers.pm
+++ b/lib/RT/Extension/MergeUsers.pm
@@ -55,7 +55,7 @@ use RT::Shredder;
package RT::Extension::MergeUsers;
-our $VERSION = '1.01';
+our $VERSION = '1.02';
=head1 NAME
-----------------------------------------------------------------------
More information about the Bps-public-commit
mailing list