[REBUILD] De-bitrot Mojolicious stuff

- Bump Mojolicious prereq to 7.31 and fix all Mojo::File bitrot - Bump Mojolicious::Plugin::AssetPack to 1.42 - Fixes #69
Raku · May 5, 2017 · 8ce873a · 8ce873a
1 parent 40e5cd1
commit 8ce873a
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 16 deletions.
diff --git a/Build.PL b/Build.PL
@@ -40,9 +40,9 @@ my $build = Module::Build->new(
       'Mojo::URL'                        => '0',
       'Mojo::UserAgent'                  => '0',
       'Mojo::Util'                       => '0',
-      'Mojolicious'                      => '7.0',
+      'Mojolicious'                      => '7.31',
       'Mojolicious::Commands'            => '0',
-      'Mojolicious::Plugin::AssetPack'   => '1.18',
+      'Mojolicious::Plugin::AssetPack'   => '1.42',
       'POSIX'                            => '0',
       'Pithub'                           => '0.01030',
       'Pod::Usage'                       => '1.67',

diff --git a/lib/ModulesPerl6.pm b/lib/ModulesPerl6.pm
@@ -6,7 +6,7 @@ use constant SECRETS_FILE => $ENV{MODULESPERL6_SECRETS}
                                 // catfile $FindBin::Bin, '..', 'secrets';
 use Mojo::Base 'Mojolicious';
 use File::Glob qw/bsd_glob/;
-use Mojo::Util qw/slurp/;
+use Mojo::File qw/path/;
 use ModulesPerl6::Model::BuildStats;
 use ModulesPerl6::Model::Dists;
 use ModulesPerl6::Model::SiteTips;
@@ -27,7 +27,7 @@ sub startup {
         unless -r SECRETS_FILE;
 
     $self->secrets([
-        -r SECRETS_FILE ? slurp SECRETS_FILE : 'Perl 6 is awesome!'
+        -r SECRETS_FILE ? path(SECRETS_FILE)->slurp : 'Perl 6 is awesome!'
     ]);
 
     # ASSETS

diff --git a/lib/ModulesPerl6/DbBuilder.pm b/lib/ModulesPerl6/DbBuilder.pm
@@ -4,9 +4,10 @@ use Data::GUID;
 use File::Glob            qw/bsd_glob/;
 use File::Path            qw/make_path  remove_tree/;
 use File::Spec::Functions qw/catfile/;
+use Mojo::File            qw/path/;
 use Mojo::URL;
 use Mojo::UserAgent;
-use Mojo::Util            qw/slurp  trim/;
+use Mojo::Util            qw/trim/;
 use Try::Tiny;
 
 use ModulesPerl6::DbBuilder::Log;
@@ -136,7 +137,7 @@ sub _metas {
     }
     elsif ( -r $meta_list ) {
         log info => '... a file detected; trying to read';
-        $raw_data = slurp $meta_list;
+        $raw_data = path($meta_list)->slurp;
     }
     else {
         log fatal => 'Could not figure out how to load META.list. It does '

diff --git a/lib/ModulesPerl6/DbBuilder/Dist/Source.pm b/lib/ModulesPerl6/DbBuilder/Dist/Source.pm
@@ -5,9 +5,10 @@ use File::Spec::Functions qw/catfile/;
 use Image::Size qw/imgsize/;
 use JSON::Meth qw/$json/;
 use List::Util qw/uniqstr/;
+use Mojo::File qw/path/;
 use Mojo::JSON qw/from_json/;
 use Mojo::UserAgent;
-use Mojo::Util qw/slurp  spurt  decode  trim/;
+use Mojo::Util qw/decode  trim/;
 use Try::Tiny;
 
 use ModulesPerl6::DbBuilder::Log;
@@ -30,8 +31,10 @@ has _tag_aliases => Maybe[Ref['HASH']], (
     is => 'lazy',
     default => sub {
         my $raw_tags = eval {
-            from_json slurp $ENV{MODULESPERL6_TAG_ALIASES_FILE}
-                // catfile $FindBin::Bin, qw/.. tag-aliases.json/;
+            from_json path(
+                $ENV{MODULESPERL6_TAG_ALIASES_FILE}
+                // catfile $FindBin::Bin, qw/.. tag-aliases.json/
+            )->slurp;
         } || do { warn "\n\nFailed to load tag-aliases.json: $@\n\n"; exit; };
 
         my %tags;
@@ -164,7 +167,7 @@ sub _save_logo {
         return;
     }
 
-    spurt $tx->res->body => $logo;
+    path($logo)->spurt($tx->res->body);
 
     eval {
         my ($x, $y) = imgsize $logo;

diff --git a/lib/ModulesPerl6/DbBuilder/Dist/Source/GitHub.pm b/lib/ModulesPerl6/DbBuilder/Dist/Source/GitHub.pm
@@ -3,7 +3,8 @@ package ModulesPerl6::DbBuilder::Dist::Source::GitHub;
 use base 'ModulesPerl6::DbBuilder::Dist::Source';
 
 use Carp       qw/croak/;
-use Mojo::Util qw/slurp  decode/;
+use Mojo::File qw/path/;
+use Mojo::Util qw/decode/;
 use Pithub;
 use LWP::UserAgent;
 use Time::Moment;
@@ -36,7 +37,7 @@ has _token => Str, (
         my $file = $ENV{MODULES_PERL6_GITHUB_TOKEN_FILE} // 'github-token';
         -r $file or log fatal => "GitHub token file [$file] is missing "
                             . 'or has no read permissions';
-        return decode 'utf8', slurp $file;
+        return decode 'utf8', path($file)->slurp;
     },
 );
 

diff --git a/lib/ModulesPerl6/DbBuilder/Dist/Source/GitLab.pm b/lib/ModulesPerl6/DbBuilder/Dist/Source/GitLab.pm
@@ -3,7 +3,7 @@ package ModulesPerl6::DbBuilder::Dist::Source::GitLab;
 use base 'ModulesPerl6::DbBuilder::Dist::Source';
 
 use Carp       qw/croak/;
-use Mojo::Util qw/slurp  decode/;
+use Mojo::Util qw/decode/;
 
 use ModulesPerl6::DbBuilder::Log;
 use Mew;

diff --git a/lib/ModulesPerl6/SpriteMaker.pm b/lib/ModulesPerl6/SpriteMaker.pm
@@ -7,7 +7,7 @@ use File::Basename 'basename';
 use File::Spec::Functions qw/catfile  catdir/;
 use Imager::File::PNG;
 use Mojo::Base -base;
-use Mojo::Util qw/spurt/;
+use Mojo::File qw/path/;
 
 sub make_sprites {
     my $self = shift;
@@ -48,8 +48,8 @@ sub make_sprites {
 
     $css .= ".$class { background: url(/$opts{image_file})"
             . " no-repeat; display: inline-block; }\n";
-    spurt $sprite => $image_file;
-    spurt $css    => $css_file;
+    path($image_file)->spurt($sprite);
+    path(  $css_file)->spurt($css);
 }
 
 1;