[libcode-tidyall-perl] 271/374: make it work with tidyall.ini or .tidyallrc

[Jonas Smedegaard]

This is an automated email from the git hooks/post-receive script.

js pushed a commit to branch master
in repository libcode-tidyall-perl.

commit 16559a1129e1e5d4463922eb1fa877afd7382e46
Author: Jonathan Swartz <swartz at pobox.com>
Date:   Wed Sep 26 22:00:35 2012 -0700

    make it work with tidyall.ini or .tidyallrc
---
 lib/Code/TidyAll/Git/Prereceive.pm    |   13 +++++++------
 lib/Code/TidyAll/Plugin/JSBeautify.pm |    2 +-
 lib/Code/TidyAll/SVN/Precommit.pm     |    6 ++++--
 lib/Code/TidyAll/Util.pm              |    2 +-
 lib/Test/Code/TidyAll.pm              |    6 +++---
 5 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/lib/Code/TidyAll/Git/Prereceive.pm b/lib/Code/TidyAll/Git/Prereceive.pm
index 8ef4dc5..1902126 100644
--- a/lib/Code/TidyAll/Git/Prereceive.pm
+++ b/lib/Code/TidyAll/Git/Prereceive.pm
@@ -165,19 +165,20 @@ Key/value parameters:
 
 =over
 
-=item conf_file
+=item conf_name
 
-Name of conf file; default is C<tidyall.ini>.
+Conf file name to search for instead of the defaults.
 
 =item extra_conf_files
 
-A listref of configuration files referred to from C<tidyall.ini>, e.g.
+A listref of extra configuration files referred to from the main configuration
+file, e.g.
 
     extra_conf_files => ['perlcriticrc', 'perltidyrc']
 
-These files will be pulled out of the repo along with C<tidyall.ini>. If you
-don't list them here then you'll get errors like 'cannot find perlcriticrc'
-when the hook runs.
+These files will be pulled out of the repo alongside the main configuration
+file. If you don't list them here then you'll get errors like 'cannot find
+perlcriticrc' when the hook runs.
 
 =item git_path
 
diff --git a/lib/Code/TidyAll/Plugin/JSBeautify.pm b/lib/Code/TidyAll/Plugin/JSBeautify.pm
index 4d6b5c2..f3ff59a 100644
--- a/lib/Code/TidyAll/Plugin/JSBeautify.pm
+++ b/lib/Code/TidyAll/Plugin/JSBeautify.pm
@@ -29,7 +29,7 @@ Code::TidyAll::Plugin::JSBeautify - use js-beautify with tidyall
 
 =head1 SYNOPSIS
 
-   In tidyall.ini:
+   In configuration:
 
    [JSBeautify]
    select = static/**/*.js
diff --git a/lib/Code/TidyAll/SVN/Precommit.pm b/lib/Code/TidyAll/SVN/Precommit.pm
index 30a711e..06fc013 100644
--- a/lib/Code/TidyAll/SVN/Precommit.pm
+++ b/lib/Code/TidyAll/SVN/Precommit.pm
@@ -233,8 +233,7 @@ Key/value parameters:
 
 =item conf_name
 
-Name of configuration file to look for in the repo, instead of the usual
-C<tidyall.ini> or C<.tidyallrc>.
+Conf file name to search for instead of the defaults.
 
 =item emergency_comment_prefix
 
@@ -252,6 +251,9 @@ file, e.g.
 
     extra_conf_files => ['perlcriticrc', 'perltidyrc']
 
+If you don't list them here then you'll get errors like 'cannot find
+perlcriticrc' when the hook runs.
+
 =item reject_on_error
 
 If the configuration file cannot be found for some/all the files, or if a
diff --git a/lib/Code/TidyAll/Util.pm b/lib/Code/TidyAll/Util.pm
index 8dceb1d..97315a8 100644
--- a/lib/Code/TidyAll/Util.pm
+++ b/lib/Code/TidyAll/Util.pm
@@ -41,7 +41,7 @@ sub can_load {
 
 sub tempdir_simple {
     my $template = shift || 'Code-TidyAll-XXXX';
-    return realpath( tempdir( $template, TMPDIR => 1, CLEANUP => 0 ) );
+    return realpath( tempdir( $template, TMPDIR => 1, CLEANUP => 1 ) );
 }
 
 sub dump_one_line {
diff --git a/lib/Test/Code/TidyAll.pm b/lib/Test/Code/TidyAll.pm
index a1d9f0d..0b9e4cf 100644
--- a/lib/Test/Code/TidyAll.pm
+++ b/lib/Test/Code/TidyAll.pm
@@ -52,9 +52,9 @@ Uses L<tidyall --check-only|tidyall> to check that all the files in your
 project are in a tidied and valid state, i.e. that no plugins throw errors or
 would change the contents of the file. Does not actually modify any files.
 
-By default, looks for config file C<tidyall.ini> in the current directory and
-parent directories, which is generally the right place if you are running
-L<prove|prove>.
+By default, looks for config file C<tidyall.ini> or C<.tidyallrc> in the
+current directory and parent directories, which is generally the right place if
+you are running L<prove|prove>.
 
 Passes mode = "test" by default; see L<modes|tidyall/MODES>.
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libcode-tidyall-perl.git