rebundler 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f39f0bba7935159299bb736312beb6b0452d8997bb1f6c5bf574747b08d05af3
-  data.tar.gz: f8920192f0a6bf48ba31f21f67f8cba06d1a682e00196a89750aed089bb392bb
+  metadata.gz: 5b1b0b72d8ab93bb647d7798d0a5baf75b453e279a82488c4e4fb91d27f59889
+  data.tar.gz: 74d512496ca8a94348cf3dadd24f866d95d7c84651185a976846fd29b0c0d41f
 SHA512:
-  metadata.gz: 8a1144be379a959ed76e26635daf82a9e535dc8e8ac416f2509206c95f9b6673b349f62ed80260f7703e83781cf657d20ef7e0e5ba3b6ef732e7404c6e4cb543
-  data.tar.gz: fa7d2a0423b94382e778ac048defebfe6301d994d860f1040f1cac509e9f617903234ea2eea1f2c5400f8d020183d14bd370a8617287fe0c1203a474f039d024
+  metadata.gz: b821a15b955e764523e0e37bc84c7f44873fa4b9ba73e6223897d862ef96ee90df82412e539968d18ade95460eacfd8956cd03f4f9c0128e48c88bf365059a73
+  data.tar.gz: 2d78eec32c5ccb0d4d3378ee024919516e8ecbddcd57ed227f0d63ef9368d15c6e1b3c792c2f30919831167e2f2b1f56ae984ce5ccda81833047e4a7c5b6faab

data/.rubocop.yml

@@ -23,6 +23,3 @@ Style/StringConcatenation:
 
 Layout/LineLength:
   Enabled: false
-
-Lint/ItWithoutArgumentsInBlock:
-  Enabled: false

data/CHANGELOG.md

@@ -1,3 +1,19 @@
+## [0.6.0] - 2026-06-18
+
+- Add support for the `install_if` directive. `install_if` blocks are now parsed and
+  formatted like other directive blocks (`group`, `path`, etc.).
+- Fixed a crash when a block was empty.
+- Fall back to a gem's `description` when its `summary` is `nil` or blank, so the
+  generated trailing comment is still populated.
+- Declare `prism` and `zeitwerk` as runtime dependencies in the gemspec (they were
+  previously only in the Gemfile), fixing standalone installs of the gem.
+- Internal refactoring (inlined the summarizer into `GemDeclaration`) and dependency updates.
+
+## [0.5.1] - 2026-03-13
+
+- Remove references to running as a bundler plugin. This does not work well, so decided to remove it.
+- Fixed Ruby 3.3 support.
+
 ## [0.5.0] - 2026-03-13
 
 - Major internal refactor and clean up.

data/README.md

@@ -18,41 +18,15 @@ This is a real life example from my own project. That looks a lot better, doesn'
 
 ## Known limitations
 
-- **Probably does not work with all possible Gemfile configurations.** It is designed to work with the most common setups right now. If you encounter an issue, please open an issue on GitHub. I strive to support each sensible configuration.
+- **Probably does not work with all possible Gemfile configurations.** It is designed to work with the most common setups right now. If you encounter an issue, please open an issue on GitHub. I strive to support most sensible configurations.
 
 ## Installation
 
-There are two ways to install Rebundler.
+First add `rebundler` to your Gemfile. `bundle add rebundler`. There are two ways to run Rebundler.
 
-### 1. Automatic mode
+### 1. Writing mode
 
-> [!NOTE]
-> This does not seem to work properly yet, I need to dig into why later.
-
-Simply add them gem to your Gemfile. the location does not matter as it will be resorted immediately.
-
-```ruby
-gem "rebundler"
-```
-
-This installs a Bundler plugin that automatically runs after installing gems. You should see a message in your terminal after running `bundle`:
-
-```sh
-$ bundle
-
-...
-
-Reordering and annotating Gemfile...
-Bundle complete! 10 Gemfile dependencies, 45 gems now installed.
-```
-
-### 2. Manual mode
-
-```ruby
-gem "rebundler", require: false
-```
-
-This does **not** load the plugin and means you have to run rebundler yourself by running the `rebundle` command:
+If you run `bundle exec rebundle`, rebundler will reorder and annotate your Gemfile.
 
 ```sh
 $ bundle exec rebundle
@@ -60,7 +34,7 @@ Reordering and annotating Gemfile...
 ✓ Gemfile has been reordered and annotated
 ```
 
-### 3. CI mode
+### 2. 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.
@@ -69,6 +43,12 @@ If there are differences, rebundler will exit with a non-zero status code.
 
 This does not write to the Gemfile.
 
+```sh
+❯ bundle exec rebundle --ci
+Checking if Gemfile is properly formatted...
+✓ Gemfile is properly formatted
+```
+
 ### Options
 
 ### `--force`
@@ -112,7 +92,7 @@ new_content = parser.format(overwrite_comments: true)
 
 ## 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.
+After checking out the repo, run `bundle install` to install dependencies. Then, run `bundle exec minitest` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
 
 ## Contributing
 

data/lib/rebundler/gem_declaration.rb

@@ -1,15 +1,55 @@
 # frozen_string_literal: true
 
 module Rebundler
-  GemDeclaration = Data.define(:name, :summary, :node) do
+  class GemDeclaration
+    include Comparable
+
+    attr_reader :node
+
+    def initialize(node: nil)
+      @node = node
+    end
+
+    def name = @node.arguments.child_nodes[0].content
+    def normalized_name = name.tr("-_", "").downcase
+
+    def summary
+      gem = find_loaded_gem || find_external_gem
+
+      return if gem.nil?
+
+      if gem.summary.nil? || gem.summary == ""
+        gem.description
+      else
+        gem.summary
+      end
+    end
+
     def <=>(other)
-      raise ArgumentError, "comparison of GemDeclaration with #{other.class} failed" unless other.is_a?(GemDeclaration)
+      unless other.is_a?(GemDeclaration)
+        raise ArgumentError,
+              "comparison of GemDeclaration with #{other.class} failed"
+      end
 
       normalized_name <=> other.normalized_name
     end
 
-    def normalized_name
-      name.tr("-_", "").downcase
+    private
+
+    def find_loaded_gem
+      Gem::Specification.find_by_name(name)
+    rescue Gem::MissingSpecError
+      nil
+    end
+
+    def find_external_gem
+      spec = Gem::SpecFetcher.fetcher.spec_for_dependency(Gem::Dependency.new(name))
+
+      return if spec.nil? || spec.first.empty?
+
+      spec.first.first.first
+    rescue SocketError, Errno::ECONNREFUSED, Errno::ETIMEDOUT, Timeout::Error => e
+      raise Rebundler::Error, "Network error while fetching gem info for '#{name}': #{e.message}"
     end
   end
 end

data/lib/rebundler/gem_set.rb

@@ -16,7 +16,10 @@ module Rebundler
     end
 
     def <=>(other)
-      raise ArgumentError, "comparison of GemSet with #{other.class} failed" unless other.is_a?(GemSet)
+      unless other.is_a?(GemSet)
+        raise ArgumentError,
+              "comparison of GemSet with #{other.class} failed"
+      end
 
       # Default first, then sort by name
       [default ? 0 : 1, name.to_s] <=> [other.default ? 0 : 1, other.name.to_s]

data/lib/rebundler/serializer.rb

@@ -41,7 +41,7 @@ module Rebundler
 
     def self.find_spacing_character(node)
       # Assume it's formatted with tabs if ANY line starts with a tab.
-      any_line_starts_with_tab = node.location.slice.split("\n").any? { it.start_with?("\t") }
+      any_line_starts_with_tab = node.location.slice.split("\n").any? { |line| line.start_with?("\t") }
 
       any_line_starts_with_tab ? "\t" : " "
     end

data/lib/rebundler/version.rb

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

data/lib/rebundler/visitor.rb

@@ -11,13 +11,18 @@ module Rebundler
     def visit_call_node(node)
       case node.name
       when :plugin
-        @current_set.plugins << parse_gem_with_comment(node)
+        @current_set.plugins << GemDeclaration.new(node:)
       when :gem
-        @current_set.gems << parse_gem_with_comment(node)
+        @current_set.gems << GemDeclaration.new(node:)
       when :git_source
+        # :git_source is a special case where it's a directive with a block that
+        # we don't want to add it as a set, which would happen if it's parsed in
+        # the condition for DIRECTIVE_AND_BLOCK_NODES below.
         @parser.directives << node
       when *DIRECTIVE_AND_BLOCK_NODES
         if node.block
+          return unless node.block.body
+
           # Use the full block declaration (e.g., "group :development do") as the unique name
           name = node.location.slice.lines.first.strip
 
@@ -42,12 +47,5 @@ module Rebundler
         @parser.gem_sets << set
       end
     end
-
-    def parse_gem_with_comment(node)
-      name = node.arguments.child_nodes[0].content
-      summary = Summarizer.summarize(name)
-
-      GemDeclaration.new(name:, summary:, node:)
-    end
   end
 end

data/lib/rebundler.rb

@@ -2,12 +2,11 @@
 
 require "zeitwerk"
 loader = Zeitwerk::Loader.for_gem
-loader.ignore("#{__dir__}/bundler")
 loader.setup
 
 module Rebundler
   class Error < StandardError; end
 
   SORTABLE_NODES = %i[plugin gem].freeze
-  DIRECTIVE_AND_BLOCK_NODES = %i[gemspec git group path platforms ruby source].freeze
+  DIRECTIVE_AND_BLOCK_NODES = %i[gemspec git group path platforms ruby source install_if].freeze
 end

metadata

@@ -1,14 +1,42 @@
 --- !ruby/object:Gem::Specification
 name: rebundler
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Dennis Paagman
 bindir: exe
 cert_chain: []
 date: 1980-01-02 00:00:00.000000000 Z
-dependencies: []
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: prism
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.9'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.9'
+- !ruby/object:Gem::Dependency
+  name: zeitwerk
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.8'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.8'
 email:
 - dennis@paagman.dev
 executables:
@@ -22,7 +50,6 @@ files:
 - README.md
 - Rakefile
 - exe/rebundle
-- lib/bundler/rebundle.rb
 - lib/rebundler.rb
 - lib/rebundler/Rakefile
 - lib/rebundler/formatter.rb
@@ -30,11 +57,9 @@ files:
 - lib/rebundler/gem_set.rb
 - lib/rebundler/parser.rb
 - lib/rebundler/serializer.rb
-- lib/rebundler/summarizer.rb
 - lib/rebundler/version.rb
 - lib/rebundler/visitor.rb
 - mise.toml
-- plugins.rb
 homepage: https://github.com/dennispaagman/rebundler
 licenses:
 - MIT
@@ -57,7 +82,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.3
+rubygems_version: 4.0.10
 specification_version: 4
 summary: Rebundler makes your Gemfile look good.
 test_files: []

data/lib/bundler/rebundle.rb

@@ -1,44 +0,0 @@
-# frozen_string_literal: true
-
-require "bundler"
-require "tempfile"
-
-module Bundler
-  class Rebundle < Bundler::Plugin::API
-    command "rebundle"
-
-    hook "after-install-all" do
-      parse_and_write_gemfile!
-    end
-
-    def exec(command, args)
-      send command, args
-    end
-
-    def self.parse_and_write_gemfile!
-      Bundler.ui.info "Reordering and annotating Gemfile..."
-
-      file = Bundler.root.to_s + "/Gemfile"
-
-      begin
-        # Load all gems in the Gemfile so we can use them to grab the summary instead of
-        # having to hit rubygems.org
-        Bundler.setup
-
-        parser = ::Rebundler::Parser.from_file(file)
-        content = parser.format
-
-        # Use atomic write to prevent corruption if write fails
-        Tempfile.create("Gemfile", Bundler.root.to_s) do |tmp|
-          tmp.write(content)
-          tmp.flush
-          tmp.close
-          FileUtils.mv(tmp.path, file)
-        end
-      rescue StandardError => e
-        Bundler.ui.error "Error parsing Gemfile: #{e.message}"
-        raise Bundler::PluginError, e
-      end
-    end
-  end
-end

data/lib/rebundler/summarizer.rb

@@ -1,33 +0,0 @@
-# frozen_string_literal: true
-
-require "timeout"
-
-module Rebundler
-  class Summarizer
-    class << self
-      def summarize(name)
-        find_loaded_gem_summary(name) || find_external_gem_summary(name)
-      end
-
-      private
-
-      def find_loaded_gem_summary(name)
-        gem = Gem::Specification.find_by_name(name)
-
-        gem.summary
-      rescue Gem::MissingSpecError
-        nil
-      end
-
-      def find_external_gem_summary(name)
-        spec = Gem::SpecFetcher.fetcher.spec_for_dependency Gem::Dependency.new(name)
-
-        return if spec.nil? || spec.first.empty?
-
-        spec.first.first.first.summary
-      rescue SocketError, Errno::ECONNREFUSED, Errno::ETIMEDOUT, Timeout::Error => e
-        raise Rebundler::Error, "Network error while fetching gem info for '#{name}': #{e.message}"
-      end
-    end
-  end
-end

data/plugins.rb

@@ -1,3 +0,0 @@
-# frozen_string_literal: true
-
-require "lib/rebundler"