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

app/models/site/find_and_replace.rb

@@ -37,7 +37,7 @@ class Site
 
       author = GitAuthor.new email: "sutty@#{Site.domain}", name: 'Sutty'
 
-      repository.commit(file: modified,
+      repository.commit(add: modified,
                         message: I18n.t('sites.find_and_replace'),
                         usuarie: author)
     end

app/models/site/repository.rb

@@ -114,14 +114,21 @@ class Site
     end
 
     # Guarda los cambios en git
-    def commit(file:, usuarie:, message:, remove: false)
-      file = [file] unless file.respond_to? :each
-
+    #
+    # @param :add [Array] Archivos a agregar
+    # @param :rm [Array] Archivos a eliminar
+    # @param :usuarie [Usuarie] Quién hace el commit
+    # @param :message [String] Mensaje
+    def commit(add: [], rm: [], usuarie:, message:)
       # Cargar el árbol actual
       rugged.index.read_tree rugged.head.target.tree
 
-      file.each do |f|
-        remove ? rm(f) : add(f)
+      add.each do |file|
+        rugged.index.add(relativize(file))
+      end
+
+      rm.each do |file|
+        rugged.index.remove(relativize(file))
       end
 
       # Escribir los cambios para que el repositorio se vea tal cual
@@ -142,14 +149,6 @@ class Site
       { name: 'Sutty', email: "sutty@#{Site.domain}", time: Time.now }
     end
 
-    def add(file)
-      rugged.index.add(relativize(file))
-    end
-
-    def rm(file)
-      rugged.index.remove(relativize(file))
-    end
-
     # Garbage collection
     #
     # @return [Boolean]
@@ -158,10 +157,8 @@ class Site
       cmd = 'git gc'
 
       r = nil
-      Dir.chdir(path) do
-        Open3.popen2e(env, cmd, unsetenv_others: true) do |_, _, t|
-          r = t.value
-        end
+      Open3.popen2e(env, cmd, unsetenv_others: true, chdir: path) do |_, _, t|
+        r = t.value
       end
 
       r&.success?

app/services/lfs_object_service.rb

@@ -22,7 +22,7 @@ class LfsObjectService
     Site::Writer.new(site: site, file: path, content: pointer).save
 
     # Commitear el pointer
-    site.repository.commit(file: path, usuarie: author, message: File.basename(path))
+    site.repository.commit(add: [path], usuarie: author, message: File.basename(path))
 
     # Eliminar el pointer
     FileUtils.rm(path)

app/services/post_service.rb

@@ -16,7 +16,7 @@ PostService = Struct.new(:site, :usuarie, :post, :params, keyword_init: true) do
       post.slug.value = p[:slug] if p[:slug].present?
     end
 
-    commit(action: :created, file: update_related_posts) if post.update(post_params)
+    commit(action: :created, add: update_related_posts) if post.update(post_params)
 
     update_site_license!
 
@@ -34,7 +34,7 @@ PostService = Struct.new(:site, :usuarie, :post, :params, keyword_init: true) do
     # Los artículos anónimos siempre son borradores
     params[:draft] = true
 
-    commit(action: :created) if post.update(anon_post_params)
+    commit(action: :created, add: [post.path.absolute]) if post.update(anon_post_params)
     post
   end
 
@@ -42,9 +42,13 @@ PostService = Struct.new(:site, :usuarie, :post, :params, keyword_init: true) do
     post.usuaries << usuarie
     params[:post][:draft] = true if site.invitade? usuarie
 
+    # Eliminar ("mover") el archivo si cambió de ubicación.
+    rm = []
+    rm << post.path.value_was if post.path.changed?
+
     # Es importante que el artículo se guarde primero y luego los
     # relacionados.
-    commit(action: :updated, file: update_related_posts) if post.update(post_params)
+    commit(action: :updated, add: update_related_posts, rm: rm) if post.update(post_params)
 
     update_site_license!
 
@@ -56,7 +60,7 @@ PostService = Struct.new(:site, :usuarie, :post, :params, keyword_init: true) do
   def destroy
     post.destroy!
 
-    commit(action: :destroyed) if post.destroyed?
+    commit(action: :destroyed, rm: [post.path.absolute]) if post.destroyed?
 
     post
   end
@@ -85,15 +89,15 @@ PostService = Struct.new(:site, :usuarie, :post, :params, keyword_init: true) do
 
     # TODO: Implementar transacciones!
     posts.save_all(validate: false) &&
-      commit(action: :reorder, file: files)
+      commit(action: :reorder, add: files)
   end
 
   private
 
-  def commit(action:, file: nil)
-    site.repository.commit(file: file || post.path.absolute,
+  def commit(action:, add: [], rm: [])
+    site.repository.commit(add: add,
+                           rm: rm,
                            usuarie: usuarie,
-                           remove: action == :destroyed,
                            message: I18n.t("post_service.#{action}",
                                            title: post&.title&.value))
   end

app/services/site_service.rb

@@ -95,7 +95,7 @@ SiteService = Struct.new(:site, :usuarie, :params, keyword_init: true) do
   def commit_config(action:)
     site.repository
         .commit(usuarie: usuarie,
-                file: site.config.path,
+                add: [site.config.path],
                 message: I18n.t("site_service.#{action}",
                                 name: site.name))
   end