rebundler 0.2.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b98128fc72f25553bf3989f1cda39f09d0b38553185bbb9bd6e92a3fe4646cc8
-  data.tar.gz: 580694dd7a91592f95f1c32173e625f1a17c6c7dfc9bfc1c708bc565e422f4fa
+  metadata.gz: 3a699f86063d76f1777e967eb5aa993fe2d65c355812dbd50ec4a599653bac37
+  data.tar.gz: b1724cdc2493ef5745b23acac611c4a820fce04afaff0b0e7983085a291639e1
 SHA512:
-  metadata.gz: c83d1b995968f668a96b656036c9ba19f646bf3af2ee32611867ba820894acdfbead0b9662e60f1db3d08e1a8cef8476283cf3be855aefed921b7bf00e15d5d9
-  data.tar.gz: a4f681d93564b7111de675f8b576f62b3837fe0f2704f75cfa96d4a0ff7a0b106e726c09a26e7a8b8744a44f2ba24200a95be42249a8987f991583c1bf98c257
+  metadata.gz: a8be976be4c69cba77b1d4a031adfefb52917637693f6ebd2f64307df602d397904f1c1f38321ac0b7c1c8225374550da3e79b8242b37ac9311b09334da3daf6
+  data.tar.gz: f7eb7094cabef8b94a49a82e5ad7d295da07e8d66a91d6b77bd669c6f04176003acf3594acb058b80258a5632aece21492c88283cb186668b10aa1131c49a316

data/CHANGELOG.md

@@ -1,5 +1,43 @@
 ## [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.
+- Add support for `git_source`.
+- Some refactoring.
+
+## [0.2.0] - 2025-12-06
+
+Notable changes:
+
+- Add CI mode.
+
+  If you run `bundle exec rebundle --ci`, rebundler will run in CI mode, which will compare the output
+  of the current Gemfile to a freshly formatted one. If there are differences, rebundler will exit
+  with a non-zero status code. This does not write to the Gemfile.
+
+- Major internal refactor.
+
+## [0.1.3] - 2025-09-09
+
+Notable changes:
+
+- Merge equal groups into each other.
+
+## [0.1.2] - 2025-09-09
+
+Notable changes:
+
+- Ignore dashes and underscores when sorting gems.
+
+## [0.1.1] - 2025-09-09
+
+No notable changes.
+
 ## [0.1.0] - 2024-11-17
 
-- Initial release
+Initial release.

data/README.md

@@ -59,6 +59,15 @@ This does **not** load the plugin and means you have to run rebundler yourself b
 $ bundle exec rebundle
 ```
 
+### 3. CI mode
+
+If you run `bundle exec rebundle --ci`, rebundler will run in CI mode, which will compare the output
+of the current Gemfile to a freshly formatted one.
+
+If there are differences, rebundler will exit with a non-zero status code.
+
+This does not write to the Gemfile.
+
 ## Development
 
 After checking out the repo, run `bundle install` to install dependencies. Then, run `rake test` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.

data/lib/rebundler/serializer.rb

@@ -3,39 +3,29 @@
 module Rebundler
   class Serializer
     def self.node_to_s(node)
-      return if node.nil?
+      lines = node.location.slice.lines
 
-      case node.type
-      when :call_node
-        [node.name, node_to_s(node.arguments)].compact.join(" ")
-      when :keyword_hash_node
-        node.elements.map do |element|
-          key = node_to_s(element.key)
-          value = node_to_s(element.value)
+      # 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)
 
-          "#{key} #{value}"
-        end
-      when :symbol_node
-        "#{node.opening}#{node.value}#{node.closing}"
-      when :string_node
-        "#{node.opening}#{node.content}#{node.closing}"
-      when :array_node
-        separator = node.opening == "[" ? ", " : " "
+        indented_content = yield.lines.map { |line| (tab_or_space * depth) + line }.join
 
-        node.opening + node.elements.map do |element|
-          node_to_s(element)
-        end.join(separator) + node.closing
-      when :true_node
-        "true"
-      when :false_node
-        "false"
-      when :arguments_node
-        return if node.child_nodes.empty?
-
-        node.child_nodes.map { |child| node_to_s(child) }.join(", ")
+        lines.first + indented_content + "\n" + lines.last
       else
-        raise Rebundler::Error, "Unsupported node type: #{node.type}"
+        node.location.slice
       end
     end
+
+    def self.find_depth(node)
+      node.block.body.location.start_column
+    end
+
+    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.2.0"
+  VERSION = "0.3.1"
 end

data/lib/rebundler/visitor.rb

@@ -16,9 +16,12 @@ module Rebundler
       when :gem
         parsed_gem = GemFetcher.parse_gem(node)
         @current_set.gems << parsed_gem if parsed_gem
+      when :git_source
+        @parser.preamble_nodes << node
       when *BLOCK_NODES
         if node.block
-          name = Serializer.node_to_s(node)
+          # Use the full block declaration (e.g., "group :development do") as the unique name
+          name = node.location.slice.lines.first.strip
 
           previous_set = @current_set
           @current_set = @parser.find_or_build_set(name:, node:)

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
@@ -16,43 +22,24 @@ module Rebundler
       end
 
       gem_sets.sort.each do |set|
-        set_buffer = []
-
-        set_buffer << [Serializer.node_to_s(set.node), set.node.block.opening].compact.join(" ") if set.node
-
-        set_buffer << [set.plugins, set.gems].map do |nodes|
+        gem_content = [set.plugins, set.gems].map do |nodes|
           sorted = nodes.sort_by { |node| node[:name].tr("-_", "").downcase }
 
           sorted.map do |gem|
-            line = +""
-            line << "  " if set.node
-            line << Serializer.node_to_s(gem[:node])
+            line = +Serializer.node_to_s(gem[:node])
             line << " # #{gem[:summary]}" if gem[:summary]
-
             line
           end.join("\n")
         end.reject(&:empty?).join("\n\n")
 
-        set_buffer << set.node.block.closing if set.node&.block
-
-        buffer << set_buffer.join("\n")
+        buffer << if set.node
+                    Serializer.node_to_s(set.node) { gem_content }
+                  else
+                    gem_content
+                  end
       end
 
       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

metadata

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