Cleanups

diff --git a/Makefile.PL b/Makefile.PL
index 24970e2..10cf985 100644 (file)
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -1,18 +1,15 @@
-use ExtUtils::MakeMaker;
-WriteMakefile(
-    'NAME'         => 'Catalyst::Plugin::Cache',
-    'VERSION_FROM' => 'lib/Catalyst/Plugin/Cache.pm',
-    'PREREQ_PM'    => {
-        'Catalyst'        => '5.7',
-        'Storable'        => 0,
-        'Task::Weaken'    => 0,
-        'Test::Deep'      => 0,
-        'Test::Exception' => 0,
-        'Test::More'      => 0,
-        'MRO::Compat'     => 0,
-       'ok'              => 0,
-   },
-    'INSTALLDIRS' => 'site',
-    'EXE_FILES'   => [],
-    'PL_FILES'    => {},
-);
+use inc::Module::Install;
+
+name 'Catalyst-Plugin-Cache';
+all_from 'lib/Catalyst/Plugin/Cache.pm';
+requires        'Catalyst'        => '5.7';
+requires 'Storable'        => 0;
+requires        'Task::Weaken'    => 0;
+test_requires        'Test::Deep'      => 0;
+test_requires        'Test::Exception' => 0;
+test_requires        'Test::More'      => '0.88';
+requires        'MRO::Compat'     => 0;
+
+resources repository => 'http://dev.catalyst.perl.org/repos/Catalyst/trunk/Catalyst-Plugin-Cache';
+WriteAll;
+

diff --git a/t/basic.t b/t/basic.t
index 1ea8e7e..acf247c 100644 (file)
--- a/t/basic.t
+++ b/t/basic.t
@@ -6,7 +6,7 @@ use warnings;
 use Test::More 'no_plan';
 use Test::Exception;
 
-use ok "Catalyst::Plugin::Cache";
+use_ok "Catalyst::Plugin::Cache";
 
 use Catalyst::Plugin::Cache::Backend::Memory;
 

diff --git a/t/config_backend_class.t b/t/config_backend_class.t
index 82812d2..a0c0355 100644 (file)
--- a/t/config_backend_class.t
+++ b/t/config_backend_class.t
@@ -3,9 +3,9 @@
 use strict;
 use warnings;
 
-use Test::More 'no_plan';
+use Test::More;
 
-use ok "Catalyst::Plugin::Cache";
+use_ok "Catalyst::Plugin::Cache";
 
 {
     package MockApp;
@@ -35,3 +35,5 @@ ok( $registered, "registered a backend" );
 
 is_deeply( $registered, MyCache->new({ param => "foo" }), "params sent correctly" );
 
+done_testing;
+

diff --git a/t/currying_conf.t b/t/currying_conf.t
index b9f50fa..df5f049 100644 (file)
--- a/t/currying_conf.t
+++ b/t/currying_conf.t
@@ -3,12 +3,12 @@
 use strict;
 use warnings;
 
-use Test::More 'no_plan';
+use Test::More;
 use Test::Deep qw/superhashof cmp_deeply/;
 
 use Scalar::Util qw/refaddr/;
 
-use ok "Catalyst::Plugin::Cache";
+use_ok "Catalyst::Plugin::Cache";
 
 {
     package MockApp;
@@ -57,3 +57,5 @@ cmp_deeply( { @{ $c->cache("foo")->meta } }, superhashof({ bah => "foo" }), "met
 
 is( refaddr( $c->cache("bar") ), refaddr( $c->cache("bar") ), "since bar is hard coded as an object it's always the same" );
 
+done_testing;
+

diff --git a/t/key_regexes.t b/t/key_regexes.t
index 4c19c33..5598a43 100644 (file)
--- a/t/key_regexes.t
+++ b/t/key_regexes.t
@@ -3,10 +3,10 @@
 use strict;
 use warnings;
 
-use Test::More 'no_plan';
+use Test::More;
 
-use ok "Catalyst::Plugin::Cache";
-use ok "Catalyst::Plugin::Cache::Choose::KeyRegexes";
+use_ok "Catalyst::Plugin::Cache";
+use_ok "Catalyst::Plugin::Cache::Choose::KeyRegexes";
 
 use Catalyst::Plugin::Cache::Backend::Memory;
 
@@ -59,4 +59,5 @@ is( $c->get_cache_backend("bar_store")->get("baz_laa"), undef, "no non match in
 is( $c->get_cache_backend("bar_store")->get("foo_laa"), undef, "no foo key" );
 is( $c->get_cache_backend("bar_store")->get("bar_laa"), "laa", "has bar key" );
 
+done_testing;