1.004001

[p5sagit/strictures.git] / lib / strictures.pm

diff --git a/lib/strictures.pm b/lib/strictures.pm
index e7882d6..6b44c3d 100644 (file)
--- a/lib/strictures.pm
+++ b/lib/strictures.pm
@@ -5,7 +5,7 @@ use warnings FATAL => 'all';
 
 use constant _PERL_LT_5_8_4 => ($] < 5.008004) ? 1 : 0;
 
-our $VERSION = '1.002002'; # 1.2.2
+our $VERSION = '1.004001'; # 1.4.1
 
 sub VERSION {
   for ($_[1]) {
@@ -23,6 +23,9 @@ sub VERSION {
 
 my $extras_load_warned;
 
+our $Smells_Like_VCS = (-e '.git' || -e '.svn'
+  || (-e '../../dist.ini' && (-e '../../.git' || -e '../../.svn')));
+
 sub import {
   strict->import;
   warnings->import(FATAL => 'all');
@@ -30,13 +33,13 @@ sub import {
   my $extra_tests = do {
     if (exists $ENV{PERL_STRICTURES_EXTRA}) {
       if (_PERL_LT_5_8_4 and $ENV{PERL_STRICTURES_EXTRA}) {
-        die 'PERL_STRICTUTRES_EXTRA checks are not available on perls older than 5.8.4, '
+        die 'PERL_STRICTURES_EXTRA checks are not available on perls older than 5.8.4: '
           . "please unset \$ENV{PERL_STRICTURES_EXTRA}\n";
       }
       $ENV{PERL_STRICTURES_EXTRA};
     } elsif (! _PERL_LT_5_8_4) {
-      !!($0 =~ /^x?t\/.*(?:load|compile|coverage|use_ok).*\.t$/
-         and (-e '.git' or -e '.svn'))
+      !!((caller)[1] =~ /^(?:t|xt|lib|blib)/
+         and $Smells_Like_VCS)
     }
   };
   if ($extra_tests) {
@@ -90,13 +93,15 @@ is equivalent to
   use strict;
   use warnings FATAL => 'all';
 
-except when called from a file where $0 matches:
+except when called from a file which matches:
 
-  /^x?t\/.*(?:load|compile|coverage|use_ok).*\.t$/
+  (caller)[1] =~ /^(?:t|xt|lib|blib)/
 
 and when either '.git' or '.svn' is present in the current directory (with
-the intention of only forcing extra tests on the author side) - or when the
-PERL_STRICTURES_EXTRA environment variable is set, in which case
+the intention of only forcing extra tests on the author side) - or when '.git'
+or '.svn' is present two directories up along with 'dist.ini' (which would
+indicate we are in a 'dzil test' operation, via L<Dist::Zilla>) -
+or when the PERL_STRICTURES_EXTRA environment variable is set, in which case
 
   use strictures 1;
 
@@ -135,8 +140,8 @@ syntax (and not so obvious mistakes that cause things to accidentally compile
 as such) get caught, but not at the cost of an XS dependency and not at the
 cost of blowing things up on another machine.
 
-Therefore, strictures turns on indirect checking only when it thinks it's
-running in a compilation (or pod coverage) test - though if this causes
+Therefore, strictures turns on additional checking, but only when it thinks
+it's running in a test file in a VCS checkout - though if this causes
 undesired behaviour this can be overridden by setting the
 PERL_STRICTURES_EXTRA environment variable.