merged

diff --git a/.travis.yml b/.travis.yml
new file mode 100644 (file)
index 0000000..01c0852
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,46 @@
+language: perl
+perl:
+   - "5.16"
+   - "5.14"
+   - "5.12"
+   - "5.10"
+
+install:
+   # git bits sometimes needed...
+   - git config user.name 'Travis-CI'
+   - git config user.email 'travis@nowhere.dne'
+
+   # ensure we have the latest cpanm
+   - echo y | perlbrew install-cpanm
+
+   # see if we can't speed things up a bit
+   - rm -rf ~/.cpanm
+   - mkdir ~/.cpanm
+   - sudo mount tmpfs -t tmpfs ~/.cpanm
+
+   # these fail on parallel test runs
+   #    Net::Server:  https://rt.cpan.org/Ticket/Display.html?id=84126
+   - cpanm --metacpan --skip-satisfied Net::Server Template File::Remove Filesys::Notify::Simple Config::Any CGI::Simple Plack
+
+   # for testing
+   - cpanm --metacpan --skip-satisfied YAML
+
+   # enable various test options, including parallel testing
+   - export AUTOMATED_TESTING=1 HARNESS_OPTIONS=j10:c HARNESS_TIMER=1
+
+   # M::I deps
+   - cpanm --metacpan --skip-satisfied Module::Install Module::Install::AuthorRequires Module::Install::CheckConflicts Module::Install::AuthorTests Module::Install::Authority
+
+   # author deps -- wish there was a better way
+   - cpanm --metacpan --skip-satisfied CatalystX::LeakChecker Catalyst::Devel Catalyst::Engine::PSGI Starman MooseX::Daemonize
+   - cpanm --metacpan --skip-satisfied Test::Without::Module Test::NoTabs Test::Pod Test::Pod::Coverage Test::Spelling Pod::Coverage::TrustPod
+   - cpanm --metacpan --skip-satisfied --installdeps .
+
+   # we want these for our tests, but not for any others
+   - export AUTHOR_TESTING=1
+   - export RELEASE_TESTING=1
+
+   - make manifest
+
+script:
+   - make disttest

diff --git a/Makefile.PL b/Makefile.PL
index 8e6c2c9..365aef1 100644 (file)
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -69,6 +69,10 @@ requires 'Plack' => '0.9991'; # IIS6+7 fix middleware
 requires 'Plack::Middleware::ReverseProxy' => '0.04';
 requires 'Plack::Test::ExternalServer';
 
+# Install the standalone Regex dispatch modules in order to ease the
+# depreciation transition
+requires 'Catalyst::DispatchType::Regex' => '5.90021';
+
 test_requires 'Class::Data::Inheritable';
 test_requires 'Test::Exception';
 test_requires 'Test::More' => '0.88';

diff --git a/t/author/spelling.t b/t/author/spelling.t
index 4aec50d..4213b3b 100644 (file)
--- a/t/author/spelling.t
+++ b/t/author/spelling.t
@@ -104,6 +104,7 @@ add_stopwords(qw(
     jon
     konobi
     marcus
+    mgrimes
     miyagawa
     mst
     naughton