From 368a4e08482b5fbb803a1129a2930a38da65def6 Mon Sep 17 00:00:00 2001
From: f <f@sutty.nl>
Date: Wed, 30 Aug 2023 16:40:33 -0300
Subject: [PATCH] fix: recolectar variables de entorno

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

diff --git a/app/models/deploy.rb b/app/models/deploy.rb
index c01a378f..55ec46f6 100644
--- a/app/models/deploy.rb
+++ b/app/models/deploy.rb
@@ -66,14 +66,8 @@ class Deploy < ApplicationRecord
     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
 
@@ -161,21 +155,14 @@ class Deploy < ApplicationRecord
     @deploy_local ||= site.deploys.find_by(type: 'DeployLocal')
   end
 
-  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
+      site.deployment_list.reduce({}) do |extra, deploy|
+        extra.merge deploy.local_env
       end
   end
 end
diff --git a/app/models/deploy_local.rb b/app/models/deploy_local.rb
index edf85bf5..0bb3958f 100644
--- a/app/models/deploy_local.rb
+++ b/app/models/deploy_local.rb
@@ -62,6 +62,20 @@ class DeployLocal < Deploy
     FileUtils.rm_rf(File.join(site.path, '.jekyll-cache'))
   end
 
+  # Opciones necesarias para la compilación del sitio
+  #
+  # @return [Hash]
+  def local_env
+    @local_env ||= {
+      '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,
+      'YARN_CACHE_FOLDER' => yarn_cache_dir,
+      'GEMS_SOURCE' => ENV['GEMS_SOURCE']
+    }
+  end
+
   private
 
   def mkdir
@@ -143,7 +157,7 @@ class DeployLocal < Deploy
   # @param :args [Hash]
   # @return [String]
   def extra_flags(**args)
-    non_local_deploys.map do |deploy|
+    site.deployment_list.map do |deploy|
       deploy.flags_for_build(**args)
     end.compact.join(' ')
   end