From c880888f1e95e00d29e9d590124ef2e48c4efc3b Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Mon, 6 Sep 2021 21:44:46 -0400 Subject: [PATCH] File::Slurp -> File::Slurper --- flake.nix | 2 +- src/lib/Hydra/Controller/API.pm | 1 - src/lib/Hydra/Controller/Build.pm | 1 - src/lib/Hydra/Controller/User.pm | 4 ++-- src/lib/Hydra/Helper/AddBuilds.pm | 1 - src/lib/Hydra/Helper/Email.pm | 1 - src/script/hydra-eval-jobset | 4 ++-- src/script/hydra-init | 6 +++--- src/script/hydra-send-stats | 4 ++-- 9 files changed, 10 insertions(+), 14 deletions(-) diff --git a/flake.nix b/flake.nix index ab31092e..a769cfa8 100644 --- a/flake.nix +++ b/flake.nix @@ -454,7 +454,7 @@ DigestSHA1 EmailMIME EmailSender - FileSlurp + FileSlurper FileWhich final.nix.perl-bindings git diff --git a/src/lib/Hydra/Controller/API.pm b/src/lib/Hydra/Controller/API.pm index b2167b5b..ccc37298 100644 --- a/src/lib/Hydra/Controller/API.pm +++ b/src/lib/Hydra/Controller/API.pm @@ -12,7 +12,6 @@ use JSON::Any; use DateTime; use Digest::SHA qw(sha256_hex); use Text::Diff; -use File::Slurp; use IPC::Run qw(run); diff --git a/src/lib/Hydra/Controller/Build.pm b/src/lib/Hydra/Controller/Build.pm index 765dcbd7..27535f2e 100644 --- a/src/lib/Hydra/Controller/Build.pm +++ b/src/lib/Hydra/Controller/Build.pm @@ -8,7 +8,6 @@ use Hydra::Helper::Nix; use Hydra::Helper::CatalystUtils; use File::Basename; use File::stat; -use File::Slurp; use Data::Dump qw(dump); use Nix::Store; use Nix::Config; diff --git a/src/lib/Hydra/Controller/User.pm b/src/lib/Hydra/Controller/User.pm index 852dd16d..f22075b9 100644 --- a/src/lib/Hydra/Controller/User.pm +++ b/src/lib/Hydra/Controller/User.pm @@ -4,7 +4,7 @@ use utf8; use strict; use warnings; use base 'Hydra::Base::Controller::REST'; -use File::Slurp; +use File::Slurper qw(read_text); use Crypt::RandPasswd; use Digest::SHA1 qw(sha1_hex); use Hydra::Helper::Nix; @@ -165,7 +165,7 @@ sub github_login :Path('/github-login') Args(0) { my $client_id = $c->config->{github_client_id} or die "github_client_id not configured."; my $client_secret = $c->config->{github_client_secret} // do { my $client_secret_file = $c->config->{github_client_secret_file} or die "github_client_secret nor github_client_secret_file is configured."; - my $client_secret = read_file($client_secret_file); + my $client_secret = read_text($client_secret_file); $client_secret =~ s/\s+//; $client_secret; }; diff --git a/src/lib/Hydra/Helper/AddBuilds.pm b/src/lib/Hydra/Helper/AddBuilds.pm index 6923c72a..bf520321 100644 --- a/src/lib/Hydra/Helper/AddBuilds.pm +++ b/src/lib/Hydra/Helper/AddBuilds.pm @@ -15,7 +15,6 @@ use File::stat; use File::Path; use File::Temp; use File::Spec; -use File::Slurp; use Hydra::Helper::CatalystUtils; our @ISA = qw(Exporter); diff --git a/src/lib/Hydra/Helper/Email.pm b/src/lib/Hydra/Helper/Email.pm index 6bd9e517..b66f427b 100644 --- a/src/lib/Hydra/Helper/Email.pm +++ b/src/lib/Hydra/Helper/Email.pm @@ -5,7 +5,6 @@ use warnings; use Email::MIME; use Email::Sender::Simple qw(sendmail); use Exporter 'import'; -use File::Slurp; use Hydra::Helper::Nix; use Sys::Hostname::Long; diff --git a/src/script/hydra-eval-jobset b/src/script/hydra-eval-jobset index 4d44a4b0..cca2243d 100755 --- a/src/script/hydra-eval-jobset +++ b/src/script/hydra-eval-jobset @@ -7,7 +7,7 @@ use Config::General; use Data::Dump qw(dump); use Digest::SHA qw(sha256_hex); use Encode; -use File::Slurp; +use File::Slurper qw(read_text); use Hydra::Helper::AddBuilds; use Hydra::Helper::CatalystUtils; use Hydra::Helper::Email; @@ -569,7 +569,7 @@ sub checkJobsetWrapped { die "multiple alternatives for the input containing the declarative project specification are not supported\n" if scalar @declInputs != 1; my $declFile = $declInput->{storePath} . "/" . $project->declfile; - my $declText = read_file($declFile) + my $declText = read_text($declFile) or die "Couldn't read declarative specification file $declFile: $!\n"; my $declSpec; eval { diff --git a/src/script/hydra-init b/src/script/hydra-init index 6bc38470..f0914439 100755 --- a/src/script/hydra-init +++ b/src/script/hydra-init @@ -5,7 +5,7 @@ use warnings; use Hydra::Schema; use Hydra::Helper::Nix; use Hydra::Model::DB; -use File::Slurp; +use File::Slurper qw(read_text); use SQL::SplitStatement; use List::Util qw(max); @@ -25,7 +25,7 @@ my $maxSchemaVersion = max (map { /.*\/upgrade-(\d.*)\.sql/; $1 } (glob "$home/s my @tables = $dbh->tables; if (! grep { /SchemaVersion/i } @tables) { print STDERR "initialising the Hydra database schema...\n"; - my $schema = read_file( + my $schema = read_text( $dbh->{Driver}->{Name} eq 'Pg' ? "$home/sql/hydra.sql" : die "unsupported database type $dbh->{Driver}->{Name}\n"); my @statements = $sql_splitter->split($schema); @@ -58,7 +58,7 @@ QUOTE for (my $n = $schemaVersion; $n < $maxSchemaVersion; $n++) { my $m = $n + 1; print STDERR "upgrading Hydra schema from version $n to $m\n"; - my $schema = read_file("$home/sql/upgrade-$m.sql"); + my $schema = read_text("$home/sql/upgrade-$m.sql"); my @statements = $sql_splitter->split($schema); eval { $dbh->begin_work; diff --git a/src/script/hydra-send-stats b/src/script/hydra-send-stats index 8b015ae7..85807631 100755 --- a/src/script/hydra-send-stats +++ b/src/script/hydra-send-stats @@ -5,7 +5,7 @@ use warnings; use utf8; use Hydra::Helper::Nix; use Net::Statsd; -use File::Slurp; +use File::Slurper qw(read_text); use JSON; use Getopt::Long qw(:config gnu_getopt); @@ -93,7 +93,7 @@ while (1) { 1; } or do { warn "$@"; }; - my $meminfo = read_file("/proc/meminfo", err_mode => 'quiet') // ""; + my $meminfo = read_text("/proc/meminfo") // ""; $meminfo =~ m/Dirty:\s*(\d+) kB/; if (defined $1) { my $dirty = $1 / (1024.0 * 1024.0);