X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FSchema%2FLoader%2FUtils.pm;h=fca3c2f828a223d532b272c55a3f5fa6cf0d872f;hb=83bce685261042f92421f313dd724a910c8d8f0e;hp=2c65bb19a9686cda01bb44beb4e26c3656124851;hpb=b564fc4be40e41844d607e7121bd55f895e19270;p=dbsrgits%2FDBIx-Class-Schema-Loader.git

diff --git a/lib/DBIx/Class/Schema/Loader/Utils.pm b/lib/DBIx/Class/Schema/Loader/Utils.pm
index 2c65bb1..fca3c2f 100644
--- a/lib/DBIx/Class/Schema/Loader/Utils.pm
+++ b/lib/DBIx/Class/Schema/Loader/Utils.pm
@@ -5,11 +5,13 @@ use strict;
 use warnings;
 use Test::More;
 use String::CamelCase 'wordsplit';
+use Carp::Clan qw/^DBIx::Class/;
+use Scalar::Util 'looks_like_number';
 use namespace::clean;
 use Exporter 'import';
 use Data::Dumper ();
 
-our @EXPORT_OK = qw/split_name dumper dumper_squashed eval_package_without_redefine_warnings class_path no_warnings warnings_exist warnings_exist_silent slurp_file write_file/;
+our @EXPORT_OK = qw/split_name dumper dumper_squashed eval_package_without_redefine_warnings class_path no_warnings warnings_exist warnings_exist_silent slurp_file write_file array_eq sigwarn_silencer/;
 
 use constant BY_CASE_TRANSITION_V7 =>
     qr/(?<=[[:lower:]\d])[\W_]*(?=[[:upper:]])|[\W_]+/;
@@ -48,15 +50,21 @@ sub dumper_squashed($) {
     return $dd->Values([ $val ])->Dump;
 }
 
+# copied from DBIx::Class::_Util, import from there once it's released
+sub sigwarn_silencer {
+    my $pattern = shift;
+
+    croak "Expecting a regexp" if ref $pattern ne 'Regexp';
+
+    my $orig_sig_warn = $SIG{__WARN__} || sub { CORE::warn(@_) };
+
+    return sub { &$orig_sig_warn unless $_[0] =~ $pattern };
+}
+
 sub eval_package_without_redefine_warnings {
     my ($pkg, $code) = @_;
 
-    my $warn_handler = $SIG{__WARN__} || sub { warn @_ };
-
-    local $SIG{__WARN__} = sub {
-        $warn_handler->(@_)
-            unless $_[0] =~ /^Subroutine \S+ redefined/;
-    };
+    local $SIG{__WARN__} = sigwarn_silencer(qr/^Subroutine \S+ redefined/);
 
     # This hairiness is to handle people using "use warnings FATAL => 'all';"
     # in their custom or external content.
@@ -143,8 +151,13 @@ sub warnings_exist_silent(&$$) {
 }
 
 sub slurp_file($) {
-    open my $fh, '<:encoding(UTF-8)', shift;
+    my $file_name = shift;
+
+    open my $fh, '<:encoding(UTF-8)', $file_name,
+        or croak "Can't open '$file_name' for reading: $!";
+
     my $data = do { local $/; <$fh> };
+
     close $fh;
 
     $data =~ s/$CRLF|$LF/\n/g;
@@ -153,10 +166,31 @@ sub slurp_file($) {
 }
 
 sub write_file($$) {
-    open my $fh, '>:encoding(UTF-8)', shift;
+    my $file_name = shift;
+
+    open my $fh, '>:encoding(UTF-8)', $file_name,
+        or croak "Can't open '$file_name' for writing: $!";
+
     print $fh shift;
     close $fh;
 }
 
+sub array_eq($$) {
+    no warnings 'uninitialized';
+    my ($a, $b) = @_;
+
+    return unless @$a == @$b;
+
+    for (my $i = 0; $i < @$a; $i++) {
+        if (looks_like_number $a->[$i]) {
+            return unless $a->[$i] == $b->[$i];
+        }
+        else {
+            return unless $a->[$i] eq $b->[$i];
+        }
+    }
+    return 1;
+}
+
 1;
 # vim:et sts=4 sw=4 tw=0: