use reusable I/O utils, more solid error handling

diff --git a/lib/System/Introspector/MountPoints.pm b/lib/System/Introspector/MountPoints.pm
index f6fdf15..f6ad0e4 100644 (file)
--- a/lib/System/Introspector/MountPoints.pm
+++ b/lib/System/Introspector/MountPoints.pm
@@ -1,19 +1,28 @@
 package System::Introspector::MountPoints;
 use Moo;
 
+use System::Introspector::Util qw(
+    handle_from_file
+    transform_exceptions
+);
+
 sub gather {
     my ($self) = @_;
     return {
-        mtab  => $self->_parse_tab_fh($self->_open_fh('/etc/mtab')),
-        fstab => $self->_parse_tab_fh($self->_open_fh('/etc/fstab')),
+        mtab => transform_exceptions {
+            return { entries
+                => $self->_parse_tab_fh($self->_open_fh('/etc/mtab')) };
+        },
+        fstab => transform_exceptions {
+            return { entries
+                => $self->_parse_tab_fh($self->_open_fh('/etc/fstab')) };
+        },
     };
 }
 
 sub _open_fh {
     my ($self, $file) = @_;
-    open my $fh, '<', $file
-        or die "Unable to open $file: $!\n";
-    return $fh;
+    return handle_from_file $file;
 }
 
 sub _parse_tab_fh {

diff --git a/t/mountpoints.t b/t/mountpoints.t
index 4f3428e..8f8e5b7 100644 (file)
--- a/t/mountpoints.t
+++ b/t/mountpoints.t
@@ -22,7 +22,8 @@ my $run_test = sub {
     my $tab = shift;
     return sub {
         for my $field (@fields) {
-            ok not(grep { not defined $_->{$field} } @$tab),
+            my @entries = @{ $tab->{entries} };
+            ok not(grep { not defined $_->{$field} } @entries),
                 "all have $field";
         }
     };