Merge lp:~philsf/mmrrsim/fix-lp-1255148 into lp:mmrrsim

[Felipe Figueiredo]

[lp:~philsf/mmrrsim/fix-lp-1255148]

234. By Felipe Figueiredo on 2013-12-02

* ChangeLog: File updated.

[Felipe Figueiredo (philsf)]

review: Approve

=== modified file 'ChangeLog'
--- ChangeLog	2013-10-22 04:04:45 +0000
+++ ChangeLog	2013-12-02 03:32:16 +0000
@@ -1,3 +1,20 @@
[phone]  Felipe Figueiredo  <[e-mail]>
+
+	* lib/MMRRSim/Config.pm (read_traps_file, read_acs_file): Provide
+	a more useful error message when aborting because of missing files.
+
+	* lib/MMRRSim/Config.pm (read_traps_file, read_acs_file): Provide
+	default files in distribution as shared data files. Don't
+	abort if they can be used when no local traps or ACs file is
+	available.
+
+	* lib/MMRRSim/Config.pm: Include dependency File::ShareDir;
+
+	* Makefile.PL: Include new build-dependency
+	File::ShareDir::Install.
+
+	* MANIFEST: File updated.
+
 2013-10-22  Felipe Figueiredo  <[e-mail]> MMRRSim 0.6.0
 
 	* lib/MMRRSim.pm, lib/MMRRSim/Config.pm: Add new dependencies:

=== modified file 'MANIFEST'
--- MANIFEST	2013-10-16 22:00:20 +0000
+++ MANIFEST	2013-12-02 03:32:16 +0000
@@ -11,4 +11,6 @@
 MANIFEST.SKIP
 mmrrsim.ini
 README
+share/ac.csv
+share/traps.csv
 Traps_5_and_ACs_15.png

=== modified file 'Makefile.PL'
--- Makefile.PL	2013-10-22 03:49:28 +0000
+++ Makefile.PL	2013-12-02 03:32:16 +0000
@@ -2,18 +2,27 @@
 
 use ExtUtils::MakeMaker;
 
+use File::ShareDir::Install;
+install_share dist => "share";
+
 WriteMakefile (
     NAME => 'MMRRSim',
     VERSION_FROM => 'lib/MMRRSim.pm',
     ABSTRACT_FROM => 'lib/MMRRSim.pm',
     MIN_PERL_VERSION => '5.010',
 
+    CONFIGURE_REQUIRES => {
+	ExtUtils::MakeMaker => 0,
+	File::ShareDir::Install => "0.03"
+    },
+
     PREREQ_PM => {
       Config::Simple => 0,
       Moose => 0,
       Log::Handler => 0,
       Text::CSV => 0,
       POSIX => 0,
+      File::ShareDir => 0,
     },
  
     EXE_FILES => [ 'bin/mmrrsim' ],
@@ -21,3 +30,7 @@
     DISTNAME => 'MMRRSim',
     AUTHOR => 'Felipe Figueiredo <[e-mail]>',
     );
+{
+    package MY;
+    use File::ShareDir::Install qw(postamble);
+}

=== modified file 'lib/MMRRSim/Config.pm'
--- lib/MMRRSim/Config.pm	2013-10-22 02:59:43 +0000
+++ lib/MMRRSim/Config.pm	2013-12-02 03:32:16 +0000
@@ -6,6 +6,7 @@
 use Moose;
 use Config::Simple;
 use Text::CSV;
+use File::ShareDir;
 
 has config_file => (is => 'ro', isa => 'Str', default => 'mmrrsim.ini'  );
 has params      => (is => 'rw', isa => 'HashRef', default => sub { {} } );
@@ -39,7 +40,16 @@
 
 sub read_traps_file {
     my $self = shift;
-    open(my $fh, "<", $self->traps_file) or die $!;
+
+    my $traps_file = $self->traps_file;
+
+## If no traps file is present in the local dir, fall back to module
+## provided default file
+    if ( (! -r $traps_file) ) {
+	$traps_file = File::ShareDir::dist_file('MMRRSim','traps.csv');
+    }
+
+    open(my $fh, "<", $traps_file) or die "Problem opening traps file: $!";
     my @traps;
     my $csv = Text::CSV->new({ eol => $\});
     while ( my $row = $csv->getline( $fh ) ) {
@@ -52,7 +62,17 @@
 
 sub read_acs_file {
     my $self = shift;
-    open(my $fh, "<", $self->acs_file) or die $!;
+    my $acs_file = $self->acs_file;
+
+## If no ACs file is present in the local dir, fall back to module
+## provided default file
+    if ( (! -r $acs_file) ) {
+	$acs_file = File::ShareDir::dist_file('MMRRSim','ac.csv');
+    }
+## If flight mode is not AC, we don't need an ACs file.
+    return if ( (! -r $acs_file) && ($self->params->{flight_mode} ne "AC") );
+
+    open(my $fh, "<", $acs_file) or die "Problem opening ACs file: $!";
     my @acs;
     my $csv = Text::CSV->new({ eol => $\});
     while ( my $row = $csv->getline( $fh ) ) {

=== added directory 'share'
=== renamed file 'ac.csv' => 'share/ac.csv'
=== renamed file 'traps.csv' => 'share/traps.csv'