Merge branch 'issue-14169' of https://0xacab.org/sutty/sutty into 17.3.alpine.panel.sutty.nl

app/controllers/build_stats_controller.rb

@@ -22,7 +22,12 @@ class BuildStatsController < ApplicationController
 
     @table = site.deployment_list.map do |deploy|
       type = deploy.class.name.underscore
-      urls = deploy.respond_to?(:urls) ? deploy.urls : [deploy.url].compact
+      urls = (deploy.respond_to?(:urls) ? deploy.urls : [deploy.url].compact).map do |url|
+        URI.parse(url)
+      rescue URI::Error
+        nil
+      end.compact
+
       urls = [nil] if urls.empty?
       build_stat = deploy.build_stats.where(status: true).last
       seconds = build_stat&.seconds || 0

app/jobs/deploy_job.rb

@@ -51,7 +51,11 @@ class DeployJob < ApplicationJob
           status = d.deploy(output: @output)
           seconds = d.build_stats.last.try(:seconds) || 0
           size = d.size
-          urls = d.respond_to?(:urls) ? d.urls : [d.url].compact
+          urls = (d.respond_to?(:urls) ? d.urls : [d.url].compact).map do |url|
+            URI.parse url
+          rescue URI::Error
+            nil
+          end.compact
         rescue StandardError => e
           status = false
           seconds ||= 0

app/mailers/deploy_mailer.rb

@@ -52,7 +52,7 @@ class DeployMailer < ApplicationMailer
             t << (row.map do |k, v|
               case k
               when :seconds then v[:human]
-              when :urls then url
+              when :urls then url.to_s
               else v
               end
             end)

app/models/deploy.rb

@@ -66,6 +66,22 @@ class Deploy < ApplicationRecord
                     })
   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(':'),
+                      'JEKYLL_ENV' => Rails.env,
+                      'LANG' => ENV['LANG'],
+                    })
+  end
+
   # Corre un comando, lo registra en la base de datos y devuelve el
   # estado.
   #

app/views/build_stats/index.haml

@@ -14,7 +14,7 @@
           - row[:urls].each do |url|
             %tr
               %th{ scope: 'row' }= row[:title]
-              %td= link_to_if url.present?, url, url, class: 'word-break-all'
+              %td= link_to_if (url.present? && uri.scheme.present?), url.to_s, url.to_s, class: 'word-break-all'
               %td
                 %time{ datetime: row[:seconds][:machine] }= row[:seconds][:human]
               %td= row[:size]

app/views/deploy_mailer/deployed.html.haml

@@ -13,7 +13,7 @@
         %tr
           %td= row[:title]
           %td= row[:status]
-          %td= link_to_if url.present?, url, url
+          %td= link_to_if (url.present? && uri.scheme.present?), url.to_s, url.to_s
           %td
             %time{ datetime: row[:seconds][:machine] }= row[:seconds][:human]
           %td= row[:size]