Bug 13899: Add changes as asked in Comment 5

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Fixed a small conflict on PerlDependencies.pm

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>

diff --git a/C4/Installer/PerlDependencies.pm b/C4/Installer/PerlDependencies.pm
index 4b2067e..7e382bd 100644 (file)
--- a/C4/Installer/PerlDependencies.pm
+++ b/C4/Installer/PerlDependencies.pm
@@ -732,6 +732,11 @@ our $PERL_DEPS = {
         'required' => '0',
         'min_ver'  => '0.31',
     },
+    'Devel::Cover' => {
+        'usage'    => 'Test code coverage',
+        'required' => '0',
+        'min_ver'  => '1.17',
+    },
 };
 
 1;

diff --git a/misc/devel/coverage.pl b/misc/devel/coverage.pl
index 804fc8d..f41c921 100755 (executable)
--- a/misc/devel/coverage.pl
+++ b/misc/devel/coverage.pl
@@ -22,6 +22,7 @@ coverage.pl
 
 =head1 SYNOPSIS
 
+You have to be in yout Koha/src directory
 ./misc/devel/coverage.pl
 
 =head1 DESCRIPTION
@@ -32,21 +33,14 @@ This script make a cover on all files to see which modules are not tested yet
 
 use Modern::Perl;
 use C4::Context;
+use Cwd;
 
+#Die if you are not in your Koha src directory
 my $KOHA_PATH = C4::Context->config("intranetdir");
+die "ERROR : You are not in Koha src/ directory"
+  unless $KOHA_PATH eq getcwd;
 
-chdir $KOHA_PATH;
-
-eval{
-       require Devel::Cover;
-};
-
-if ($@) {
-       say "Devel::Cover needs to be installed";
-       exit 1;
-}
-
-#Delete old coverage
+# Delete old coverage
 system("cover -delete");
 
 #Start the cover
@@ -54,5 +48,5 @@ system("PERL5OPT=-MDevel::Cover /usr/bin/prove -r t/");
 
 #Create the HTML output
 system("cover");
-
-say("file://$KOHA_PATH/cover_db/coverage.html");
\ No newline at end of file
+say("file://$KOHA_PATH/cover_db/coverage.html")
+  unless !-e "$KOHA_PATH/cover_db/coverage.html";