[Bps-public-commit] RT-Extension-MergeUsers branch, master, updated. 0.06-8-g8b0d037

[Thomas Sibley]

The branch, master has been updated
       via  8b0d037a6bec8d031a644a4cb7838191cfdb6a6a (commit)
       via  3ac0f1c2463d5d4843864263c62456d238397610 (commit)
      from  bd8cc7f047d65649eb028412c4ca6b02f6cc3c9a (commit)

Summary of changes:
 .gitignore                     |  1 +
 Changes                        |  8 ++++++
 MANIFEST                       |  9 +++---
 MANIFEST.SKIP                  | 64 ++++++++++++++++++++++++++++++++++++++++++
 lib/RT/Extension/MergeUsers.pm |  2 +-
 {t => xt}/01merge_users.t      |  0
 {t => xt}/change_email.t       |  0
 7 files changed, 79 insertions(+), 5 deletions(-)
 create mode 100644 MANIFEST.SKIP
 rename {t => xt}/01merge_users.t (100%)
 rename {t => xt}/change_email.t (100%)

- Log -----------------------------------------------------------------
commit 3ac0f1c2463d5d4843864263c62456d238397610
Author: Thomas Sibley <trs at bestpractical.com>
Date:   Mon Feb 25 13:38:09 2013 -0800

    Move tests to author-only; they require having an RT installed somewhere

diff --git a/.gitignore b/.gitignore
index 8eb13a9..cec9ded 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ pm_to_blib
 /RT-Extension-MergeUsers*
 /bin/rt-merge-users
 /bin/rt-update-merged-users
+/xt/tmp
diff --git a/t/01merge_users.t b/xt/01merge_users.t
similarity index 100%
rename from t/01merge_users.t
rename to xt/01merge_users.t
diff --git a/t/change_email.t b/xt/change_email.t
similarity index 100%
rename from t/change_email.t
rename to xt/change_email.t

commit 8b0d037a6bec8d031a644a4cb7838191cfdb6a6a
Author: Thomas Sibley <trs at bestpractical.com>
Date:   Mon Feb 25 13:36:22 2013 -0800

    Version 0.08 releng

diff --git a/Changes b/Changes
index f6a7867..20f74f2 100644
--- a/Changes
+++ b/Changes
@@ -1,3 +1,11 @@
+0.08 Mon Feb 25 13:33:48 PST 2013
+
+    * Move tests to author-only; they require having an RT installed somewhere
+    * Switch to .in files for substitution so as not to trash version-controlled files
+    * Record the merged/mergee's user Name if EmailAddress is empty
+    * Unset EmailAddress by setting the empty string rather than undef
+    * Switch to modern RT::Test infrastructure for testing plugins
+
 0.07 Thu Aug 30 12:09:31 EST 2012
 
     Fix bug of "user email address destroys matching address in other ouser"(#70641)
diff --git a/MANIFEST b/MANIFEST
index a231fbb..5d55637 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1,5 +1,5 @@
-bin/rt-merge-users
-bin/rt-update-merged-users
+bin/rt-merge-users.in
+bin/rt-update-merged-users.in
 Changes
 html/Callbacks/RT-Extension-MergeUsers/Admin/Users/Modify.html/RightColumnBottom
 inc/Module/AutoInstall.pm
@@ -19,7 +19,8 @@ inc/Module/Install/WriteAll.pm
 lib/RT/Extension/MergeUsers.pm
 Makefile.PL
 MANIFEST			This list of files
+MANIFEST.SKIP
 META.yml
 README
-t/01merge_users.t
-t/change_email.t
+xt/01merge_users.t
+xt/change_email.t
diff --git a/MANIFEST.SKIP b/MANIFEST.SKIP
new file mode 100644
index 0000000..bd838f9
--- /dev/null
+++ b/MANIFEST.SKIP
@@ -0,0 +1,64 @@
+
+#!start included /opt/perlbrew/perls/perl-5.16.2/lib/5.16.2/ExtUtils/MANIFEST.SKIP
+# Avoid version control files.
+\bRCS\b
+\bCVS\b
+\bSCCS\b
+,v$
+\B\.svn\b
+\B\.git\b
+\B\.gitignore\b
+\b_darcs\b
+\B\.cvsignore$
+
+# Avoid VMS specific MakeMaker generated files
+\bDescrip.MMS$
+\bDESCRIP.MMS$
+\bdescrip.mms$
+
+# Avoid Makemaker generated and utility files.
+\bMANIFEST\.bak
+\bMakefile$
+\bblib/
+\bMakeMaker-\d
+\bpm_to_blib\.ts$
+\bpm_to_blib$
+\bblibdirs\.ts$         # 6.18 through 6.25 generated this
+
+# Avoid Module::Build generated and utility files.
+\bBuild$
+\b_build/
+\bBuild.bat$
+\bBuild.COM$
+\bBUILD.COM$
+\bbuild.com$
+
+# Avoid temp and backup files.
+~$
+\.old$
+\#$
+\b\.#
+\.bak$
+\.tmp$
+\.#
+\.rej$
+
+# Avoid OS-specific files/dirs
+# Mac OSX metadata
+\B\.DS_Store
+# Mac OSX SMB mount metadata files
+\B\._
+
+# Avoid Devel::Cover and Devel::CoverX::Covered files.
+\bcover_db\b
+\bcovered\b
+
+# Avoid MYMETA files
+^MYMETA\.
+#!end included /opt/perlbrew/perls/perl-5.16.2/lib/5.16.2/ExtUtils/MANIFEST.SKIP
+
+
+^x?t/tmp/
+^bin/rt-merge-users$
+^bin/rt-update-merged-users$
+\.tar\.gz$
diff --git a/lib/RT/Extension/MergeUsers.pm b/lib/RT/Extension/MergeUsers.pm
index ea20cd0..309129c 100644
--- a/lib/RT/Extension/MergeUsers.pm
+++ b/lib/RT/Extension/MergeUsers.pm
@@ -49,7 +49,7 @@ use warnings; no warnings qw(redefine);
 
 package RT::Extension::MergeUsers;
 
-our $VERSION = '0.07';
+our $VERSION = '0.08';
 
 =head1 NAME
 

-----------------------------------------------------------------------