Remove public generate function from Gruntmaster::Page

diff --git a/gruntmaster-genallpages b/gruntmaster-genallpages
index efa61fb18cd87fdfeab93084222fcddeb64584b7..8d18eaa62a24aeca900ecc7d6cefa162505e1505 100755 (executable)
--- a/gruntmaster-genallpages
+++ b/gruntmaster-genallpages
@@ -3,12 +3,12 @@ use v5.14;
 
 use Gruntmaster::Page;
 use Gruntmaster::Page::Log;
-use Gruntmaster::Data qw/contests jobcard problems users/;
+use Gruntmaster::Data qw/contests jobcard problems users PUBLISH/;
 
 sub generate{
   my $what = shift;
-  say STDERR "Generating $what";
-  Gruntmaster::Page::generate $what;
+  say STDERR "Generating page $what";
+  PUBLISH genpage => $what;
 }
 
 generate "index.html";

diff --git a/gruntmaster-genpage b/gruntmaster-genpage
index bac0eb4040fcbb4f0b721016004fdbfd9fc1732a..4f6c7f2893726bd3e2393e8e022fbecc89205c2f 100755 (executable)
--- a/gruntmaster-genpage
+++ b/gruntmaster-genpage
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 use v5.14;
 
-use Gruntmaster::Page qw/generate/;
+use Gruntmaster::Data qw/PUBLISH/;
 
-generate $_ for @ARGV;
+PUBLISH genpage => $_ for @ARGV;

diff --git a/gruntmaster-paged b/gruntmaster-paged
index ef2bf81f34bfce83bf6a8122dd882686454dc1b6..0bb9653d34d0743cebad249df1ee9b3e3224591d 100755 (executable)
--- a/gruntmaster-paged
+++ b/gruntmaster-paged
@@ -2,9 +2,9 @@
 use v5.14;
 
 use Gruntmaster::Data qw/SUBSCRIBE WAIT_FOR_MESSAGES/;
-use Gruntmaster::Page qw/_generate/;
+use Gruntmaster::Page;
 
-SUBSCRIBE 'genpage', \&_generate;
+SUBSCRIBE 'genpage', \&Gruntmaster::Page::generate;
 WAIT_FOR_MESSAGES 86400 while 1;
 
 1;

diff --git a/lib/Gruntmaster/Page.pm b/lib/Gruntmaster/Page.pm
index c7f92bbf5a599c8ba57625a7d0012b7e937d71c2..e0086507d16027ecdd5100512b83cfcf5ebb797a 100644 (file)
--- a/lib/Gruntmaster/Page.pm
+++ b/lib/Gruntmaster/Page.pm
@@ -3,8 +3,6 @@ package Gruntmaster::Page;
 use 5.014000;
 use strict;
 use warnings;
-use parent qw/Exporter/;
-our @EXPORT_OK = qw/generate _generate/;
 
 use Fcntl qw/:flock/;
 use File::Basename qw/fileparse/;
@@ -48,7 +46,7 @@ sub declaregen{
        declaregen 'Pb::Entry'          => qr,^${contest}pb/$component$,;
 }
 
-sub _generate{
+sub generate{
        my ($path) = @_;
        my ($path_noext, $ext) = $path =~ m/^(.*)\.(.*)$/;
        my ($basename, $directories) = fileparse $path_noext;
@@ -79,10 +77,6 @@ sub _generate{
        close $typemap;
 }
 
-sub generate{
-       PUBLISH 'genpage', shift;
-}
-
 1;
 __END__
 # Below is stub documentation for your module. You'd better edit it!