spacebar/kamal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make verify_local_dependencies private

Browse Source 
We don't need to what it returns, it raises if there is a problem.

Move it out of the run_locally block to make it easier to add hooks.
This commit is contained in:
Donal McBreen
2023-05-05 09:50:27 +01:00
parent 4e9c39f26d
commit 340ed94fa9
2 changed files with 29 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
lib/mrsk/cli/build.rb
View File

@@ -14,11 +14,11 @@ class Mrsk::Cli::Build < Mrsk::Cli::Base
with_lock do
cli = self
verify_local_dependencies
run_locally do
begin
if cli.verify_local_dependencies
MRSK.with_verbosity(:debug) { execute *MRSK.builder.push }
end
MRSK.with_verbosity(:debug) { execute *MRSK.builder.push }
rescue SSHKit::Command::Failed => e
if e.message =~ /(no builder)|(no such file or directory)/
error "Missing compatible builder, so creating a new one first"
@@ -82,21 +82,18 @@ class Mrsk::Cli::Build < Mrsk::Cli::Base
end
end
private
def verify_local_dependencies
run_locally do
begin
execute *MRSK.builder.ensure_local_dependencies_installed
rescue SSHKit::Command::Failed => e
build_error = e.message =~ /command not found/ ?
"Docker is not installed locally" :
"Docker buildx plugin is not installed locally"
desc "", "" # Really a private method, but needed to be invoked from #push
def verify_local_dependencies
run_locally do
begin
execute *MRSK.builder.ensure_local_dependencies_installed
rescue SSHKit::Command::Failed => e
build_error = e.message =~ /command not found/ ?
"Docker is not installed locally" :
"Docker buildx plugin is not installed locally"
raise BuildError, build_error
raise BuildError, build_error
end
end
end
true
end
end