rebundler 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fa77336a2666fe374595f649959ec9a0ad40f390e21c55d8591a65c5e2561d5e
-  data.tar.gz: d6972a708a8e5c2e79b36c2d8fc384d6f287d691c4cac286e7aa5150fb3a380d
+  metadata.gz: 3a699f86063d76f1777e967eb5aa993fe2d65c355812dbd50ec4a599653bac37
+  data.tar.gz: b1724cdc2493ef5745b23acac611c4a820fce04afaff0b0e7983085a291639e1
 SHA512:
-  metadata.gz: de9facad64186665e93e445f39d97296046bad9a66c8d3c0a12cf5b9e2fc824609628d85c8ae414a947e81e8e3c1c282f6ab70c93648185eb34bf7c4085fcb5f
-  data.tar.gz: ac8700216a87393b021a8d3fa6da313473e810945da8d990c1b562cae6ce6e038edc9e674d9a69782c73fafac23201072935359dd837c231f52588c50c35f913
+  metadata.gz: a8be976be4c69cba77b1d4a031adfefb52917637693f6ebd2f64307df602d397904f1c1f38321ac0b7c1c8225374550da3e79b8242b37ac9311b09334da3daf6
+  data.tar.gz: f7eb7094cabef8b94a49a82e5ad7d295da07e8d66a91d6b77bd669c6f04176003acf3594acb058b80258a5632aece21492c88283cb186668b10aa1131c49a316

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 ## [Unreleased]
 
+## [0.3.1] - 2025-12-19
+
+- Fixed bug where comment on last gem in a block was not overwritten.
+
 ## [0.3.0] - 2025-12-18
 
 - Add support for tabs instead of spaces.

data/lib/rebundler/serializer.rb

@@ -3,24 +3,29 @@
 module Rebundler
   class Serializer
     def self.node_to_s(node)
-      return if node.nil?
+      lines = node.location.slice.lines
 
-      if node.block && block_given?
-        indent = detect_indent(node)
-        indented_content = yield.lines.map { |line| indent + line.lstrip }.join
+      # If a block is given, we replace the content of the node's block
+      # with the content of the passed block.
+      if node.block && block_given? && lines.size > 1
+        depth = find_depth(node)
+        tab_or_space = find_spacing_character(node)
 
-        stripped_block = node.location.slice.gsub(node.block.body.location.slice, "BLOCK")
-        stripped_block.gsub(/[#{WHITESPACE_CHARACTERS}]*BLOCK/, indented_content)
+        indented_content = yield.lines.map { |line| (tab_or_space * depth) + line }.join
+
+        lines.first + indented_content + "\n" + lines.last
       else
         node.location.slice
       end
     end
 
-    def self.detect_indent(node)
-      return "" unless node
+    def self.find_depth(node)
+      node.block.body.location.start_column
+    end
 
-      second_line = node.location.slice.lines[1]
-      second_line&.[](/\A[#{WHITESPACE_CHARACTERS}]*/) || "  "
+    def self.find_spacing_character(node)
+      # Assume it's formatted with tabs if there is ANY tab in the whole block of code.
+      node.location.slice.include?("\t") ? "\t" : " "
     end
   end
 end

data/lib/rebundler/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Rebundler
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

data/lib/rebundler/writer.rb

@@ -1,7 +1,13 @@
 # frozen_string_literal: true
 
+require "forwardable"
+
 module Rebundler
   class Writer
+    extend Forwardable
+
+    def_delegators :@parser, :preamble_nodes, :gem_sets, :frozen_string_literal
+
     def initialize(parser)
       @parser = parser
     end
@@ -35,19 +41,5 @@ module Rebundler
 
       buffer.reject(&:empty?).join("\n\n") + "\n"
     end
-
-    private
-
-    def preamble_nodes
-      @parser.preamble_nodes
-    end
-
-    def gem_sets
-      @parser.gem_sets
-    end
-
-    def frozen_string_literal
-      @parser.frozen_string_literal
-    end
   end
 end

data/lib/rebundler.rb

@@ -8,8 +8,6 @@ loader.setup
 module Rebundler
   class Error < StandardError; end
 
-  WHITESPACE_CHARACTERS = [" ", "\t"].join.freeze
-
   SORTABLE_NODES = %i[plugin gem].freeze
   BLOCK_NODES = %i[gemspec git group path platforms ruby source].freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rebundler
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Dennis Paagman