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

Extract puts_by_host

Browse Source
This commit is contained in:
David Heinemeier Hansson
2023-01-20 16:27:05 +01:00
parent 73c53dd138
commit 5d629d0600
4 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/mrsk/cli/app.rb
View File

@@ -36,7 +36,7 @@ class Mrsk::Cli::App < Mrsk::Cli::Base
desc "details", "Display details about app containers"
def details
on(MRSK.config.hosts) { |host| puts "App Host: #{host}\n" + capture(*MRSK.app.info, verbosity: Logger::INFO) + "\n\n" }
on(MRSK.config.hosts) { |host| puts_by_host host, capture(*MRSK.app.info, verbosity: Logger::INFO) }
end
desc "exec [CMD]", "Execute a custom task on servers passed in as CMD='bin/rake some:task'"
@@ -48,7 +48,7 @@ class Mrsk::Cli::App < Mrsk::Cli::Base
if options[:once]
on(MRSK.config.primary_host) { puts capture(*MRSK.app.send(runner, cmd), verbosity: Logger::INFO) }
else
on(MRSK.config.hosts) { |host| puts "App Host: #{host}\n" + capture(*MRSK.app.send(runner, cmd), verbosity: Logger::INFO) + "\n\n" }
on(MRSK.config.hosts) { |host| puts_by_host host, capture(*MRSK.app.send(runner, cmd), verbosity: Logger::INFO) }
end
end
@@ -80,18 +80,18 @@ class Mrsk::Cli::App < Mrsk::Cli::Base
if options[:once]
on(MRSK.config.primary_host) { puts capture(*MRSK.app.exec("bin/rails", "runner", "'#{expression}'"), verbosity: Logger::INFO) }
else
on(MRSK.config.hosts) { |host| puts "App Host: #{host}\n" + capture(*MRSK.app.exec("bin/rails", "runner", "'#{expression}'"), verbosity: Logger::INFO) + "\n\n" }
on(MRSK.config.hosts) { |host| puts_by_host host, capture(*MRSK.app.exec("bin/rails", "runner", "'#{expression}'"), verbosity: Logger::INFO) }
end
end
desc "containers", "List all the app containers currently on servers"
def containers
on(MRSK.config.hosts) { |host| puts "App Host: #{host}\n" + capture(*MRSK.app.list_containers, verbosity: Logger::INFO) + "\n\n" }
on(MRSK.config.hosts) { |host| puts_by_host host, capture(*MRSK.app.list_containers, verbosity: Logger::INFO) }
end
desc "current", "Return the current running container ID"
def current
on(MRSK.config.hosts) { |host| puts "App Host: #{host}\n" + capture(*MRSK.app.current_container_id, verbosity: Logger::INFO) + "\n\n" }
on(MRSK.config.hosts) { |host| puts_by_host host, capture(*MRSK.app.current_container_id, verbosity: Logger::INFO) }
end
desc "logs", "Show last 100 log lines from app on servers"
@@ -107,9 +107,9 @@ class Mrsk::Cli::App < Mrsk::Cli::Base
on(MRSK.config.hosts) do |host|
begin
puts "App Host: #{host}\n" + capture(*MRSK.app.logs(since: since, lines: lines, grep: grep), verbosity: Logger::INFO) + "\n\n"
puts_by_host host, capture(*MRSK.app.logs(since: since, lines: lines, grep: grep), verbosity: Logger::INFO)
rescue SSHKit::Command::Failed
puts "App Host: #{host}\nNothing found\n\n"
puts_by_host host, "Nothing found"
end
end
end

3
lib/mrsk/cli/base.rb
View File

@@ -1,6 +1,5 @@
require "thor"
require "sshkit"
require "sshkit/dsl"
require "mrsk/sshkit_with_ext"
module Mrsk::Cli
class Base < Thor

2
lib/mrsk/commands/base.rb
View File

@@ -1,5 +1,3 @@
require "sshkit"
module Mrsk::Commands
class Base
delegate :redact, to: Mrsk::Utils

8
lib/mrsk/sshkit_with_ext.rb Normal file
View File

@@ -0,0 +1,8 @@
require "sshkit"
require "sshkit/dsl"
class SSHKit::Backend::Abstract
def puts_by_host(host, output)
puts "App Host: #{host}\n#{output}\n\n"
end
end