From c9866a0eecfca61d5c3136ffa412045687728dc3 Mon Sep 17 00:00:00 2001
From: f <f@sutty.nl>
Date: Wed, 30 Aug 2023 15:33:48 -0300
Subject: [PATCH] =?UTF-8?q?fix:=20mover=20m=C3=A9todos=20a=20deploy?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/deploy.rb       | 36 ++++++++++++++++++++++++++++++++++++
 app/models/deploy_local.rb | 36 ------------------------------------
 2 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/app/models/deploy.rb b/app/models/deploy.rb
index abf5591f..c01a378f 100644
--- a/app/models/deploy.rb
+++ b/app/models/deploy.rb
@@ -55,6 +55,28 @@ class Deploy < ApplicationRecord
     @gems_dir ||= Rails.root.join('_storage', 'gems', site.name)
   end
 
+  # Un entorno que solo tiene lo que necesitamos
+  #
+  # @return [Hash]
+  def env
+    # XXX: This doesn't support Windows paths :B
+    paths = [File.dirname(`which bundle`), '/usr/local/bin', '/usr/bin', '/bin']
+
+    # Las variables de entorno extra no pueden superponerse al local.
+    extra_env.merge({
+                      'HOME' => home_dir,
+                      'PATH' => paths.join(':'),
+                      'SPREE_API_KEY' => site.tienda_api_key,
+                      'SPREE_URL' => site.tienda_url,
+                      'AIRBRAKE_PROJECT_ID' => site.id.to_s,
+                      'AIRBRAKE_PROJECT_KEY' => site.airbrake_api_key,
+                      'JEKYLL_ENV' => Rails.env,
+                      'LANG' => ENV['LANG'],
+                      'YARN_CACHE_FOLDER' => yarn_cache_dir,
+                      'GEMS_SOURCE' => ENV['GEMS_SOURCE']
+                    })
+  end
+
   # Corre un comando, lo registra en la base de datos y devuelve el
   # estado.
   #
@@ -142,4 +164,18 @@ class Deploy < ApplicationRecord
   def non_local_deploys
     @non_local_deploys ||= site.deploys.where.not(type: 'DeployLocal')
   end
+
+  # Consigue todas las variables de entorno configuradas por otros
+  # deploys.
+  #
+  # @deprecated Solo tenía sentido para Distributed Press v0
+  # @return [Hash]
+  def extra_env
+    @extra_env ||=
+      non_local_deploys.reduce({}) do |extra_env, deploy|
+        extra_env.tap do |e|
+          e.merge! deploy.local_env
+        end
+      end
+  end
 end
diff --git a/app/models/deploy_local.rb b/app/models/deploy_local.rb
index 9228581f..edf85bf5 100644
--- a/app/models/deploy_local.rb
+++ b/app/models/deploy_local.rb
@@ -68,28 +68,6 @@ class DeployLocal < Deploy
     FileUtils.mkdir_p destination
   end
 
-  # Un entorno que solo tiene lo que necesitamos
-  #
-  # @return [Hash]
-  def env
-    # XXX: This doesn't support Windows paths :B
-    paths = [File.dirname(`which bundle`), '/usr/local/bin', '/usr/bin', '/bin']
-
-    # Las variables de entorno extra no pueden superponerse al local.
-    extra_env.merge({
-                      'HOME' => home_dir,
-                      'PATH' => paths.join(':'),
-                      'SPREE_API_KEY' => site.tienda_api_key,
-                      'SPREE_URL' => site.tienda_url,
-                      'AIRBRAKE_PROJECT_ID' => site.id.to_s,
-                      'AIRBRAKE_PROJECT_KEY' => site.airbrake_api_key,
-                      'JEKYLL_ENV' => Rails.env,
-                      'LANG' => ENV['LANG'],
-                      'YARN_CACHE_FOLDER' => yarn_cache_dir,
-                      'GEMS_SOURCE' => ENV['GEMS_SOURCE']
-                    })
-  end
-
   def yarn_cache_dir
     Rails.root.join('_yarn_cache').to_s
   end
@@ -160,20 +138,6 @@ class DeployLocal < Deploy
     FileUtils.rm_rf destination
   end
 
-  # Consigue todas las variables de entorno configuradas por otros
-  # deploys.
-  #
-  # @deprecated Solo tenía sentido para Distributed Press v0
-  # @return [Hash]
-  def extra_env
-    @extra_env ||=
-      non_local_deploys.reduce({}) do |extra_env, deploy|
-        extra_env.tap do |e|
-          e.merge! deploy.local_env
-        end
-      end
-  end
-
   # Genera opciones extra desde los otros deploys
   #
   # @param :args [Hash]