[Bps-public-commit] rt-extension-resetpassword branch, master, updated. 0.04-6-g9eddb5f

Kevin Falcone falcone at bestpractical.com
Tue Feb 7 18:41:36 EST 2012


The branch, master has been updated
       via  9eddb5f5fd4bc2ab10dd466084a35c4b53eea61e (commit)
       via  c7a2368d526f8232235ceea689473a1771d478fa (commit)
       via  d3aef2740c5af419c418d9c65b4bd77c50e949d9 (commit)
       via  14c40c1799188682bc8d9120bd59cba4c607b34e (commit)
      from  43f0ee5268ab4805e5d41020ead3c220c813b04f (commit)

Summary of changes:
 .gitignore                        |    1 -
 MANIFEST                          |    1 +
 MANIFEST.SKIP                     |    3 ---
 META.yml                          |    9 +++++----
 README                            |   28 ++++++++++++++++++++++++++++
 README.pod                        |    1 -
 inc/Module/Install.pm             |    4 ++--
 inc/Module/Install/Base.pm        |    2 +-
 inc/Module/Install/Can.pm         |    2 +-
 inc/Module/Install/Fetch.pm       |    2 +-
 inc/Module/Install/Makefile.pm    |   11 +++++------
 inc/Module/Install/Metadata.pm    |   22 ++++++++++++++--------
 inc/Module/Install/Win32.pm       |    2 +-
 inc/Module/Install/WriteAll.pm    |    2 +-
 lib/RT/Extension/ResetPassword.pm |    6 +++---
 15 files changed, 63 insertions(+), 33 deletions(-)
 create mode 100644 README
 delete mode 120000 README.pod

- Log -----------------------------------------------------------------
commit 14c40c1799188682bc8d9120bd59cba4c607b34e
Author: Kevin Falcone <falcone at bestpractical.com>
Date:   Tue Feb 7 18:38:58 2012 -0500

    Indent these commands so that README formats properly

diff --git a/lib/RT/Extension/ResetPassword.pm b/lib/RT/Extension/ResetPassword.pm
index f911d75..0c4e0cc 100644
--- a/lib/RT/Extension/ResetPassword.pm
+++ b/lib/RT/Extension/ResetPassword.pm
@@ -17,8 +17,8 @@ This extension should be compatible with RT 3.4 and later
 
 To install this extension:
 
-perl Makefile.PL
-make install
+    perl Makefile.PL
+    make install
 
 If you are running RT 3.8 or later, you must add RT-Extension-
 ResetPassword to your @Plugins in your RT_SiteConfig

commit d3aef2740c5af419c418d9c65b4bd77c50e949d9
Author: Kevin Falcone <falcone at bestpractical.com>
Date:   Tue Feb 7 18:39:15 2012 -0500

    Upgrade infrastructure for new version

diff --git a/MANIFEST b/MANIFEST
index 370d94c..27017a5 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -6,6 +6,7 @@ inc/Module/Install/Base.pm
 inc/Module/Install/Can.pm
 inc/Module/Install/Fetch.pm
 inc/Module/Install/Makefile.pm
+inc/Module/Install/ManifestSkip.pm
 inc/Module/Install/Metadata.pm
 inc/Module/Install/ReadmeFromPod.pm
 inc/Module/Install/RTx.pm
diff --git a/MANIFEST.SKIP b/MANIFEST.SKIP
index 8cbcdcc..4011cb8 100644
--- a/MANIFEST.SKIP
+++ b/MANIFEST.SKIP
@@ -94,6 +94,3 @@
 ^\w$
 \.ttc$
 \.pmc$
-
-README.pod
-RT-Extension-ResetPassword-*
diff --git a/META.yml b/META.yml
index 728ac1d..8c49c10 100644
--- a/META.yml
+++ b/META.yml
@@ -3,11 +3,12 @@ abstract: 'RT Extension-ResetPassword Extension'
 author:
   - 'Jesse Vincent <jesse at bestpractical.com>'
 build_requires:
-  ExtUtils::MakeMaker: 6.42
+  ExtUtils::MakeMaker: 6.36
 configure_requires:
-  ExtUtils::MakeMaker: 6.42
+  ExtUtils::MakeMaker: 6.36
 distribution_type: module
-generated_by: 'Module::Install version 1.01'
+dynamic_config: 1
+generated_by: 'Module::Install version 1.04'
 license: perl
 meta-spec:
   url: http://module-build.sourceforge.net/META-spec-v1.4.html
diff --git a/inc/Module/Install.pm b/inc/Module/Install.pm
index 74caf9c..c685ca4 100644
--- a/inc/Module/Install.pm
+++ b/inc/Module/Install.pm
@@ -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.01';
+	$VERSION = '1.04';
 
 	# Storage for the pseudo-singleton
 	$MAIN    = undef;
@@ -451,7 +451,7 @@ sub _version ($) {
 }
 
 sub _cmp ($$) {
-	_version($_[0]) <=> _version($_[1]);
+	_version($_[1]) <=> _version($_[2]);
 }
 
 # Cloned from Params::Util::_CLASS
diff --git a/inc/Module/Install/Base.pm b/inc/Module/Install/Base.pm
index d3662c9..b520616 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.01';
+	$VERSION = '1.04';
 }
 
 # Suspend handler for "redefined" warnings
diff --git a/inc/Module/Install/Can.pm b/inc/Module/Install/Can.pm
index 276409a..a162ad4 100644
--- a/inc/Module/Install/Can.pm
+++ b/inc/Module/Install/Can.pm
@@ -9,7 +9,7 @@ use Module::Install::Base ();
 
 use vars qw{$VERSION @ISA $ISCORE};
 BEGIN {
-	$VERSION = '1.01';
+	$VERSION = '1.04';
 	@ISA     = 'Module::Install::Base';
 	$ISCORE  = 1;
 }
diff --git a/inc/Module/Install/Fetch.pm b/inc/Module/Install/Fetch.pm
index 093cb7a..a412576 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.01';
+	$VERSION = '1.04';
 	@ISA     = 'Module::Install::Base';
 	$ISCORE  = 1;
 }
diff --git a/inc/Module/Install/Makefile.pm b/inc/Module/Install/Makefile.pm
index 4c71003..035cef2 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.01';
+	$VERSION = '1.04';
 	@ISA     = 'Module::Install::Base';
 	$ISCORE  = 1;
 }
@@ -219,14 +219,14 @@ sub write {
 		# an underscore, even though its own version may contain one!
 		# Hence the funny regexp to get rid of it.  See RT #35800
 		# for details.
-		my $v = $ExtUtils::MakeMaker::VERSION =~ /^(\d+\.\d+)/;
+		my ($v) = $ExtUtils::MakeMaker::VERSION =~ /^(\d+\.\d+)/;
 		$self->build_requires(     'ExtUtils::MakeMaker' => $v );
 		$self->configure_requires( 'ExtUtils::MakeMaker' => $v );
 	} else {
 		# Allow legacy-compatibility with 5.005 by depending on the
 		# most recent EU:MM that supported 5.005.
-		$self->build_requires(     'ExtUtils::MakeMaker' => 6.42 );
-		$self->configure_requires( 'ExtUtils::MakeMaker' => 6.42 );
+		$self->build_requires(     'ExtUtils::MakeMaker' => 6.36 );
+		$self->configure_requires( 'ExtUtils::MakeMaker' => 6.36 );
 	}
 
 	# Generate the MakeMaker params
@@ -241,7 +241,6 @@ in a module, and provide its file path via 'version_from' (or
 'all_from' if you prefer) in Makefile.PL.
 EOT
 
-	$DB::single = 1;
 	if ( $self->tests ) {
 		my @tests = split ' ', $self->tests;
 		my %seen;
@@ -412,4 +411,4 @@ sub postamble {
 
 __END__
 
-#line 541
+#line 540
diff --git a/inc/Module/Install/Metadata.pm b/inc/Module/Install/Metadata.pm
index 3b01e09..31c953e 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.01';
+	$VERSION = '1.04';
 	@ISA     = 'Module::Install::Base';
 	$ISCORE  = 1;
 }
@@ -151,15 +151,21 @@ sub install_as_site   { $_[0]->installdirs('site')   }
 sub install_as_vendor { $_[0]->installdirs('vendor') }
 
 sub dynamic_config {
-	my $self = shift;
-	unless ( @_ ) {
-		warn "You MUST provide an explicit true/false value to dynamic_config\n";
-		return $self;
+	my $self  = shift;
+	my $value = @_ ? shift : 1;
+	if ( $self->{values}->{dynamic_config} ) {
+		# Once dynamic we never change to static, for safety
+		return 0;
 	}
-	$self->{values}->{dynamic_config} = $_[0] ? 1 : 0;
+	$self->{values}->{dynamic_config} = $value ? 1 : 0;
 	return 1;
 }
 
+# Convenience command
+sub static_config {
+	shift->dynamic_config(0);
+}
+
 sub perl_version {
 	my $self = shift;
 	return $self->{values}->{perl_version} unless @_;
@@ -170,7 +176,7 @@ sub perl_version {
 	# Normalize the version
 	$version = $self->_perl_version($version);
 
-	# We don't support the reall old versions
+	# We don't support the really old versions
 	unless ( $version >= 5.005 ) {
 		die "Module::Install only supports 5.005 or newer (use ExtUtils::MakeMaker)\n";
 	}
@@ -582,7 +588,7 @@ sub bugtracker_from {
 sub requires_from {
 	my $self     = shift;
 	my $content  = Module::Install::_readperl($_[0]);
-	my @requires = $content =~ m/^use\s+([^\W\d]\w*(?:::\w+)*)\s+([\d\.]+)/mg;
+	my @requires = $content =~ m/^use\s+([^\W\d]\w*(?:::\w+)*)\s+(v?[\d\.]+)/mg;
 	while ( @requires ) {
 		my $module  = shift @requires;
 		my $version = shift @requires;
diff --git a/inc/Module/Install/Win32.pm b/inc/Module/Install/Win32.pm
index 3139a63..99d9631 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.01';
+	$VERSION = '1.04';
 	@ISA     = 'Module::Install::Base';
 	$ISCORE  = 1;
 }
diff --git a/inc/Module/Install/WriteAll.pm b/inc/Module/Install/WriteAll.pm
index 1f724a7..86bb25e 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.01';
+	$VERSION = '1.04';
 	@ISA     = qw{Module::Install::Base};
 	$ISCORE  = 1;
 }

commit c7a2368d526f8232235ceea689473a1771d478fa
Author: Kevin Falcone <falcone at bestpractical.com>
Date:   Tue Feb 7 18:40:36 2012 -0500

    switch back to storing the generated readme

diff --git a/.gitignore b/.gitignore
index a1ba2cc..65ee14f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,6 +11,5 @@ pm_to_blib*
 cover_db
 pod2htm*.tmp
 /RT-Extension-ResetPassword*
-README
 /MYMETA.*
 *.swp
diff --git a/README b/README
new file mode 100644
index 0000000..fda607a
--- /dev/null
+++ b/README
@@ -0,0 +1,28 @@
+DESCRIPTION
+    This extension for RT adds a new "Forgot your password?" link to the
+    front of your RT instance. Any user can request that RT send them a
+    password reset token by email. RT will send the user a one-time URL
+    which he or she can use to reset her password. This extension allows
+    _all_ users to reset their passwords by email. There isn't yet an option
+    to only allow staff users or non-staff users to reset their passwords.
+
+INSTALL
+    This extension should be compatible with RT 3.4 and later
+
+    To install this extension:
+
+        perl Makefile.PL
+        make install
+
+    If you are running RT 3.8 or later, you must add RT-Extension-
+    ResetPassword to your @Plugins in your RT_SiteConfig
+
+    Set(@Plugins, qw(RT::Extension::ResetPassword Your::Other::Extensions));
+
+    Make sure you clear your mason cache before restarting apache rm -rf
+    /opt/rt3/var/mason_data/obj/* apachectl restart
+
+    Copyright 2006-2011 Best Practical Solutions, LLC. This software is
+    distributed under the same license as Perl 5.8.8. For commercial
+    support, please contact sales at bestpractical.com
+
diff --git a/README.pod b/README.pod
deleted file mode 120000
index d2f9e56..0000000
--- a/README.pod
+++ /dev/null
@@ -1 +0,0 @@
-lib/RT/Extension/ResetPassword.pm
\ No newline at end of file

commit 9eddb5f5fd4bc2ab10dd466084a35c4b53eea61e
Author: Kevin Falcone <falcone at bestpractical.com>
Date:   Tue Feb 7 18:39:41 2012 -0500

    release 0.05

diff --git a/META.yml b/META.yml
index 8c49c10..a6ebebe 100644
--- a/META.yml
+++ b/META.yml
@@ -20,4 +20,4 @@ no_index:
     - inc
 resources:
   license: http://dev.perl.org/licenses/
-version: 0.04
+version: 0.05
diff --git a/lib/RT/Extension/ResetPassword.pm b/lib/RT/Extension/ResetPassword.pm
index 0c4e0cc..81c7a03 100644
--- a/lib/RT/Extension/ResetPassword.pm
+++ b/lib/RT/Extension/ResetPassword.pm
@@ -1,6 +1,6 @@
 package RT::Extension::ResetPassword;
 
-our $VERSION = '0.04';
+our $VERSION = '0.05';
 
 =head1 DESCRIPTION
 

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



More information about the Bps-public-commit mailing list