Change to MX::Declare

diff --git a/lib/Gitalist/Git/HasUtils.pm b/lib/Gitalist/Git/HasUtils.pm
index 99a2d61..df63d09 100644 (file)
--- a/lib/Gitalist/Git/HasUtils.pm
+++ b/lib/Gitalist/Git/HasUtils.pm
@@ -1,27 +1,29 @@
-package Gitalist::Git::HasUtils;
-use Moose::Role;
-use Gitalist::Git::Util;
-use namespace::autoclean;
-
-sub BUILD {}
-after BUILD => sub {
-    my $self = shift;
-    $self->meta->get_attribute('_util')->get_read_method_ref->($self); # Force value build.
-};
-
-has _util => ( isa => 'Gitalist::Git::Util',
-               lazy => 1,
-               is => 'bare',
-               builder => '_build_util',
-               handles => [ 'run_cmd',
-                            'run_cmd_fh',
-                            'run_cmd_list',
-                            'get_gpp_object',
-                            'gpp',
-                        ],
-           );
-
-sub _build_util { confess(shift() . " cannot build _util") }
+use MooseX::Declare;
+
+role Gitalist::Git::HasUtils {
+    use Gitalist::Git::Util;
+
+    method BUILD {}
+    after BUILD {
+        # Force value build
+        $self->meta->get_attribute('_util')->get_read_method_ref->($self);
+    }
+
+    has _util => (
+        isa => 'Gitalist::Git::Util',
+        lazy => 1,
+        is => 'bare',
+        builder => '_build_util',
+        handles => [qw/
+            run_cmd
+            run_cmd_fh
+            run_cmd_list
+            get_gpp_object
+            gpp
+        /],
+    );
+    method _build_util { confess(shift() . " cannot build _util") }
+}
 
 1;