From ef00ce4d128093a46be68a86006b2e9390db6257 Mon Sep 17 00:00:00 2001
From: f <f@sutty.nl>
Date: Mon, 14 Mar 2022 13:39:54 -0300
Subject: [PATCH 1/8] poder ver la salida opcionalmente

---
 app/models/deploy.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/models/deploy.rb b/app/models/deploy.rb
index 3f034ad5..0a11f1b8 100644
--- a/app/models/deploy.rb
+++ b/app/models/deploy.rb
@@ -48,7 +48,7 @@ class Deploy < ApplicationRecord
   #
   # @param [String]
   # @return [Boolean]
-  def run(cmd)
+  def run(cmd, output: false)
     r = nil
     lines = []
 
@@ -61,6 +61,7 @@ class Deploy < ApplicationRecord
         # TODO: Enviar a un websocket para ver el proceso en vivo?
         o.each do |line|
           lines << line
+          puts line if output
         end
       end
     end

From 8e89643bdb03a73ba3d65cd698575e5139ea3987 Mon Sep 17 00:00:00 2001
From: f <f@sutty.nl>
Date: Mon, 14 Mar 2022 13:40:17 -0300
Subject: [PATCH 2/8] leer la salida por separado para no bloquear el programa

---
 app/models/deploy.rb | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/app/models/deploy.rb b/app/models/deploy.rb
index 0a11f1b8..427e7091 100644
--- a/app/models/deploy.rb
+++ b/app/models/deploy.rb
@@ -55,14 +55,15 @@ class Deploy < ApplicationRecord
     time_start
     Dir.chdir(site.path) do
       Open3.popen2e(env, cmd, unsetenv_others: true) do |_, o, t|
-        r = t.value
-        # XXX: Tenemos que leer línea por línea porque en salidas largas
-        # se cuelga la IO
         # TODO: Enviar a un websocket para ver el proceso en vivo?
-        o.each do |line|
-          lines << line
-          puts line if output
+        Thread.new do
+          o.each do |line|
+            lines << line
+
+            puts line if output
+          end
         end
+        r = t.value
       end
     end
     time_stop

From f3c3da81e0fe35ddc971333fd49658e8784846e8 Mon Sep 17 00:00:00 2001
From: f <f@sutty.nl>
Date: Tue, 15 Mar 2022 16:03:16 -0300
Subject: [PATCH 3/8] poder ver la salida si lo ejecutamos desde la terminal

---
 app/jobs/deploy_job.rb     | 10 ++++++----
 app/models/deploy_local.rb | 26 +++++++++++++-------------
 2 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/app/jobs/deploy_job.rb b/app/jobs/deploy_job.rb
index 70997ce1..4146abad 100644
--- a/app/jobs/deploy_job.rb
+++ b/app/jobs/deploy_job.rb
@@ -5,7 +5,9 @@ class DeployJob < ApplicationJob
   class DeployException < StandardError; end
 
   # rubocop:disable Metrics/MethodLength
-  def perform(site, notify = true, time = Time.now)
+  def perform(site, notify: true, time: Time.now, output: false)
+    @output = output
+
     ActiveRecord::Base.connection_pool.with_connection do
       @site = Site.find(site)
 
@@ -21,7 +23,7 @@ class DeployJob < ApplicationJob
                 "#{@site.name} la tarea estuvo más de 10 minutos esperando, volviendo al estado original"
         end
 
-        DeployJob.perform_in(60, site, notify, time)
+        DeployJob.perform_in(60, site, notify: notify, time: time, output: output)
         return
       end
 
@@ -55,12 +57,12 @@ class DeployJob < ApplicationJob
   end
 
   def deploy_locally
-    deploy_local.deploy
+    deploy_local.deploy(output: @output)
   end
 
   def deploy_others
     @site.deploys.where.not(type: 'DeployLocal').find_each do |d|
-      @deployed[d.type.underscore.to_sym] = d.deploy
+      @deployed[d.type.underscore.to_sym] = d.deploy(output: @output)
     end
   end
 
diff --git a/app/models/deploy_local.rb b/app/models/deploy_local.rb
index 4fa588f5..4f9318d8 100644
--- a/app/models/deploy_local.rb
+++ b/app/models/deploy_local.rb
@@ -12,12 +12,12 @@ class DeployLocal < Deploy
   #
   # Pasamos variables de entorno mínimas para no filtrar secretos de
   # Sutty
-  def deploy
+  def deploy(output: false)
     return false unless mkdir
-    return false unless yarn
-    return false unless bundle
+    return false unless yarn(output: output)
+    return false unless bundle(output: output)
 
-    jekyll_build
+    jekyll_build(output: output)
   end
 
   # Sólo permitimos un deploy local
@@ -79,27 +79,27 @@ class DeployLocal < Deploy
     File.exist? yarn_lock
   end
 
-  def gem
-    run %(gem install bundler --no-document)
+  def gem(output: false)
+    run %(gem install bundler --no-document), output: output
   end
 
   # Corre yarn dentro del repositorio
-  def yarn
+  def yarn(output: false)
     return true unless yarn_lock?
 
-    run 'yarn install --production'
+    run 'yarn install --production', output: output
   end
 
-  def bundle
+  def bundle(output: false)
     if Rails.env.production?
-      run %(bundle install --no-cache --path="#{gems_dir}")
+      run %(bundle install --no-cache --path="#{gems_dir}"), output: output
     else
-      run %(bundle install)
+      run %(bundle install), output: output
     end
   end
 
-  def jekyll_build
-    run %(bundle exec jekyll build --trace --profile --destination "#{escaped_destination}")
+  def jekyll_build(output: false)
+    run %(bundle exec jekyll build --trace --profile --destination "#{escaped_destination}"), output: output
   end
 
   # no debería haber espacios ni caracteres especiales, pero por si

From 1071eba2005c3d3857101bd264c188897a9efe22 Mon Sep 17 00:00:00 2001
From: f <f@sutty.nl>
Date: Wed, 16 Mar 2022 18:19:04 -0300
Subject: [PATCH 4/8] implementar la misma api en todos los deploys

---
 app/models/deploy.rb                    |  2 +-
 app/models/deploy_alternative_domain.rb |  2 +-
 app/models/deploy_hidden_service.rb     |  2 +-
 app/models/deploy_localized_domain.rb   | 12 ++++++++++++
 app/models/deploy_private.rb            |  4 ++--
 app/models/deploy_www.rb                |  2 +-
 app/models/deploy_zip.rb                |  2 +-
 7 files changed, 19 insertions(+), 7 deletions(-)
 create mode 100644 app/models/deploy_localized_domain.rb

diff --git a/app/models/deploy.rb b/app/models/deploy.rb
index 427e7091..0cc92ff1 100644
--- a/app/models/deploy.rb
+++ b/app/models/deploy.rb
@@ -11,7 +11,7 @@ class Deploy < ApplicationRecord
   belongs_to :site
   has_many :build_stats, dependent: :destroy
 
-  def deploy
+  def deploy(**)
     raise NotImplementedError
   end
 
diff --git a/app/models/deploy_alternative_domain.rb b/app/models/deploy_alternative_domain.rb
index e4960e65..ae0ff300 100644
--- a/app/models/deploy_alternative_domain.rb
+++ b/app/models/deploy_alternative_domain.rb
@@ -5,7 +5,7 @@ class DeployAlternativeDomain < Deploy
   store :values, accessors: %i[hostname], coder: JSON
 
   # Generar un link simbólico del sitio principal al alternativo
-  def deploy
+  def deploy(**)
     File.symlink?(destination) ||
       File.symlink(site.hostname, destination).zero?
   end
diff --git a/app/models/deploy_hidden_service.rb b/app/models/deploy_hidden_service.rb
index d4d2b822..dcac712e 100644
--- a/app/models/deploy_hidden_service.rb
+++ b/app/models/deploy_hidden_service.rb
@@ -2,7 +2,7 @@
 
 # Genera una versión onion
 class DeployHiddenService < DeployWww
-  def deploy
+  def deploy(**)
     return true if fqdn.blank?
 
     super
diff --git a/app/models/deploy_localized_domain.rb b/app/models/deploy_localized_domain.rb
new file mode 100644
index 00000000..59e17dcd
--- /dev/null
+++ b/app/models/deploy_localized_domain.rb
@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+# Soportar dominios localizados
+class DeployLocalizedDomain < DeployAlternativeDomain
+  store :values, accessors: %i[hostname locale], coder: JSON
+
+  # Generar un link simbólico del sitio principal al alternativo
+  def deploy(**)
+    File.symlink?(destination) ||
+      File.symlink(File.join(site.hostname, locale), destination).zero?
+  end
+end
diff --git a/app/models/deploy_private.rb b/app/models/deploy_private.rb
index 3a6595f9..134c5876 100644
--- a/app/models/deploy_private.rb
+++ b/app/models/deploy_private.rb
@@ -7,8 +7,8 @@
 # jekyll-private-data
 class DeployPrivate < DeployLocal
   # No es necesario volver a instalar dependencias
-  def deploy
-    jekyll_build
+  def deploy(output: false)
+    jekyll_build(output: output)
   end
 
   # Hacer el deploy a un directorio privado
diff --git a/app/models/deploy_www.rb b/app/models/deploy_www.rb
index 5602b0fc..db552bf2 100644
--- a/app/models/deploy_www.rb
+++ b/app/models/deploy_www.rb
@@ -6,7 +6,7 @@ class DeployWww < Deploy
 
   before_destroy :remove_destination!
 
-  def deploy
+  def deploy(**)
     File.symlink?(destination) ||
       File.symlink(site.hostname, destination).zero?
   end
diff --git a/app/models/deploy_zip.rb b/app/models/deploy_zip.rb
index ec8973d1..f1726e6e 100644
--- a/app/models/deploy_zip.rb
+++ b/app/models/deploy_zip.rb
@@ -12,7 +12,7 @@ class DeployZip < Deploy
   # y generar un zip accesible públicamente.
   #
   # rubocop:disable Metrics/MethodLength
-  def deploy
+  def deploy(**)
     FileUtils.rm_f path
 
     time_start

From f2eea5fbcbf746bb061fcbfb363f06bf8e68d85f Mon Sep 17 00:00:00 2001
From: f <f@sutty.nl>
Date: Mon, 18 Apr 2022 17:27:43 -0300
Subject: [PATCH 5/8] no fallar al cerrarse la salida

---
 app/models/deploy.rb | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/models/deploy.rb b/app/models/deploy.rb
index 0cc92ff1..b45fa350 100644
--- a/app/models/deploy.rb
+++ b/app/models/deploy.rb
@@ -62,7 +62,10 @@ class Deploy < ApplicationRecord
 
             puts line if output
           end
+        rescue IOError => e
+          ExceptionNotifier.notify(e, data: { site: site.name })
         end
+
         r = t.value
       end
     end

From a4eef2edc096db2e185e94b3aa5588e72e9e02bf Mon Sep 17 00:00:00 2001
From: f <f@sutty.nl>
Date: Tue, 28 Jun 2022 15:07:08 -0300
Subject: [PATCH 6/8] =?UTF-8?q?notificar=20correctamente=20la=20excepci?=
 =?UTF-8?q?=C3=B3n?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/deploy.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/deploy.rb b/app/models/deploy.rb
index b45fa350..1c730c06 100644
--- a/app/models/deploy.rb
+++ b/app/models/deploy.rb
@@ -63,7 +63,7 @@ class Deploy < ApplicationRecord
             puts line if output
           end
         rescue IOError => e
-          ExceptionNotifier.notify(e, data: { site: site.name })
+          ExceptionNotifier.notify_exception(e, data: { site: site.name })
         end
 
         r = t.value

From d18536f5871bc860d749edfdea3f9765e47d98d3 Mon Sep 17 00:00:00 2001
From: f <f@sutty.nl>
Date: Wed, 29 Jun 2022 18:41:51 -0300
Subject: [PATCH 7/8] no generar issues para log

---
 app/models/deploy.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/models/deploy.rb b/app/models/deploy.rb
index 1c730c06..65159bce 100644
--- a/app/models/deploy.rb
+++ b/app/models/deploy.rb
@@ -63,7 +63,8 @@ class Deploy < ApplicationRecord
             puts line if output
           end
         rescue IOError => e
-          ExceptionNotifier.notify_exception(e, data: { site: site.name })
+          lines << e.message
+          puts e.message if output
         end
 
         r = t.value

From b590396a6bba72d890b4f63fbf292558ce69881f Mon Sep 17 00:00:00 2001
From: f <f@sutty.nl>
Date: Thu, 23 Mar 2023 19:11:33 -0300
Subject: [PATCH 8/8] fix: implementar output

---
 app/models/deploy_reindex.rb | 2 +-
 app/models/deploy_rsync.rb   | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/models/deploy_reindex.rb b/app/models/deploy_reindex.rb
index d6b2be65..f3eb3d23 100644
--- a/app/models/deploy_reindex.rb
+++ b/app/models/deploy_reindex.rb
@@ -2,7 +2,7 @@
 
 # Reindexa los artículos al terminar la compilación
 class DeployReindex < Deploy
-  def deploy
+  def deploy(**)
     time_start
 
     site.reset
diff --git a/app/models/deploy_rsync.rb b/app/models/deploy_rsync.rb
index 996f8cdd..a658de6b 100644
--- a/app/models/deploy_rsync.rb
+++ b/app/models/deploy_rsync.rb
@@ -5,8 +5,8 @@
 class DeployRsync < Deploy
   store :values, accessors: %i[destination host_keys], coder: JSON
 
-  def deploy
-    ssh? && rsync
+  def deploy(output: false)
+    ssh? && rsync(output: output)
   end
 
   # El espacio remoto es el mismo que el local
@@ -83,8 +83,8 @@ class DeployRsync < Deploy
   # Sincroniza hacia el directorio remoto
   #
   # @return [Boolean]
-  def rsync
-    run %(rsync -aviH --timeout=5 #{Shellwords.escape source}/ #{Shellwords.escape destination}/)
+  def rsync(output: output)
+    run %(rsync -aviH --timeout=5 #{Shellwords.escape source}/ #{Shellwords.escape destination}/), output: output
   end
 
   # El origen es el destino de la compilación