gem_sorter 0.5.3 → 0.5.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e7eb0be5f76f0fe5bf85c828b98e7bc0aa2fedbab8131a0db6aefbd8664bfbf8
-  data.tar.gz: 893bb62c2c6e21857660a911c649c88c244f3eb3d8dcb2fdc9b8274e535bc26b
+  metadata.gz: 981a2ef59205d15bdb574b03a7f7d162e3d2a2319b2d81f19380deb8bc1b03ab
+  data.tar.gz: 0bd57414513bcb5d5d9ebb5578bc13d9cc1239d4816b3d5e0bdcb5d80baaff68
 SHA512:
-  metadata.gz: b412dd7b89dd9a53115ec289b4010e7da6756b792e7cd16940fb0e06c53fbf44e96456d24cd84d0a9fa204babd2775252864a688382dfcb69baee4a3b44cbe92
-  data.tar.gz: e3b8fb028356f3c2de88c4c4bebde010325f8dc3b8d38bc1887c2c4ddf8c4f0f1162e3c86f9ea81992ccd7f88d9255e0f86b49089e6102f00e8151e6402360b3
+  metadata.gz: 94f6b10e1b084a7521cc35ef3a7c0ed7516c4e7a298ea9f3077c40fab480b7e5454e656d5fc50f7d349bf682e17fb26dc85c60490aa72e4224e227d01ca5baea
+  data.tar.gz: 9b8b8b08728f9c987b7041d1e9b1053c6dfab936eb1553dd1674cc07e0ed11080aea410db656593372eaa8fa2a26b754118ff2589577f5a5cb31a26b13c2e8fb

data/README.md

@@ -36,7 +36,20 @@ Once installed, you can use the provided Rake task to sort your Gemfile:
 rake gemfile:sort
 ```
 
-You can also run the gem_sorter globally, without needing to add it to your Gemfile:
+### Inside a Rails application
+When you add `gem_sorter` to a Rails app's `Gemfile`, the `gemfile:sort` task is
+registered automatically through a Railtie, using Rails' own task-loading
+pipeline. This means the task is reliably available under both `bin/rails` and
+`bin/rake`, and the gem no longer defines tasks during application boot:
+
+```bash
+bin/rails gemfile:sort
+# or
+bin/rake gemfile:sort
+```
+
+### Standalone (global)
+You can also run gem_sorter globally, without adding it to your Gemfile:
 
 ```bash
 rake -r gem_sorter gemfile:sort

data/lib/gem_sorter/railtie.rb

@@ -0,0 +1,13 @@
+require 'rails/railtie'
+
+module GemSorter
+  # Registers the gem's rake tasks through the Rails task-loading pipeline.
+  # Using a Railtie ensures the tasks are available reliably inside a Rails
+  # application (under both `bin/rails` and `bin/rake`) without defining tasks
+  # during `Bundler.require`, which is order-dependent and could break boot.
+  class Railtie < Rails::Railtie
+    rake_tasks do
+      load File.expand_path('../tasks/gem_sorter.rake', __dir__)
+    end
+  end
+end

data/lib/gem_sorter/version.rb

@@ -1,3 +1,3 @@
 module GemSorter
-  VERSION = '0.5.3'
+  VERSION = '0.5.7'
 end

data/lib/gem_sorter.rb

@@ -4,7 +4,14 @@ require 'cgi'
 require 'openssl'
 require 'json'
 
-load File.expand_path('tasks/gem_sorter.rake', __dir__) if defined?(Rake)
+# Inside a Rails app, let the Railtie register the rake tasks through Rails'
+# own task-loading pipeline (reliable and not tied to require order). When used
+# standalone (e.g. `rake -r gem_sorter gemfile:sort`), load the tasks directly.
+if defined?(Rails::Railtie)
+  require 'gem_sorter/railtie'
+elsif defined?(Rake)
+  load File.expand_path('tasks/gem_sorter.rake', __dir__)
+end
 
 module GemSorter
   class Sorter
@@ -132,36 +139,37 @@ module GemSorter
         gem_name = extract_gem_name(gem_block[:gem_line])
         next if @config.ignore_gems.include?(gem_name) || @config.ignore_gem_versions.include?(gem_name)
 
-        # Try to get current version from lockfile first, then from gem line
-        current_version = @versions[gem_name] || extract_current_version(gem_block[:gem_line])
+        original_line = gem_block[:gem_line]
         latest_version = fetch_latest_version(gem_name)
-        
+
         next unless latest_version
 
-        extra_params = extract_params(gem_block[:gem_line])
-        new_gemfile_text = fetch_gemfile_text(gem_name, latest_version, gem_block[:gem_line])
-        
-        next unless new_gemfile_text && new_gemfile_text != gem_block[:gem_line]
-        
+        extra_params = extract_params(original_line)
+        new_gemfile_text = fetch_gemfile_text(gem_name, latest_version, original_line)
+
+        next unless new_gemfile_text && new_gemfile_text != original_line
+
         gem_block[:gem_line] = [new_gemfile_text.strip, extra_params].select { |value| !value.nil? && !value.empty? }.join(',')
-        
-        # Track version update if version changed
-        # Compare semantic versions (x.y.z) for accurate comparison
-        current_semantic = current_version&.match(/(\d+\.\d+\.\d+)/)
-        current_semantic = current_semantic ? current_semantic[1] : nil
-        latest_semantic = latest_version.match(/(\d+\.\d+\.\d+)/)
-        latest_semantic = latest_semantic ? latest_semantic[1] : nil
-        
-        if current_semantic != latest_semantic
-          @version_updates << {
-            gem_name: gem_name,
-            from_version: current_version || 'no version specified',
-            to_version: latest_version
-          }
-        end
+
+        next unless version_changed?(original_line, new_gemfile_text)
+
+        @version_updates << {
+          gem_name: gem_name,
+          from_version: extract_current_version(original_line) || 'no version specified',
+          to_version: latest_version
+        }
       end
     end
 
+    # Detects whether a gem line actually changed version between what is declared
+    # in the Gemfile and what RubyGems returns. The comparison is based purely on
+    # the version constraint, ignoring cosmetic differences (e.g. quote style), so
+    # re-running the task does not report the same update again. The lockfile is
+    # intentionally not consulted here: it stays stale until `bundle install` runs.
+    def version_changed?(original_line, new_gemfile_text)
+      extract_current_version(original_line) != extract_current_version(new_gemfile_text)
+    end
+
     def remove_versions(gems)
       gems.each do |gem_block|
         gem_name =  extract_gem_name(gem_block[:gem_line])
@@ -300,10 +308,10 @@ module GemSorter
           raise "Error: Could not fetch gem information from RubyGems for #{gem_name} version #{version}. Status: #{response.code}"
         end
         
-        match = response.body.match(/<input[^>]*id=["']gemfile_text["'][^>]*value=["']([^"']+)["']/)
+        gemfile_text = extract_gemfile_text_from_html(response.body)
 
-        if match
-          CGI.unescapeHTML(match[1])
+        if gemfile_text
+          gemfile_text
         else
           raise "Error: Could not extract Gemfile text for #{gem_name} version #{version}."
         end
@@ -315,6 +323,23 @@ module GemSorter
       end
     end
 
+    # Extracts the ready-to-paste Gemfile line from a RubyGems gem/version page.
+    #
+    # RubyGems renders it inside an <input id="gemfile_text"> element. The markup
+    # lists the attributes as `value="..." id="gemfile_text"` (value first), and
+    # the value itself may contain both single quotes and ">" characters, e.g.
+    #   <input type="text" value="gem 'rails', '>= 8.0'" id="gemfile_text" ...>
+    # so the value is captured by its own surrounding quote character rather than
+    # by relying on tag boundaries or attribute order. A second pattern covers the
+    # reverse `id="gemfile_text" ... value="..."` ordering just in case.
+    def extract_gemfile_text_from_html(body)
+      match = body.match(/\svalue=(["'])(.*?)\1(?=[^>]*\bid=["']gemfile_text["'])/m) ||
+              body.match(/\bid=["']gemfile_text["'][^>]*?\svalue=(["'])(.*?)\1/m)
+      return nil unless match
+
+      CGI.unescapeHTML(match[2])
+    end
+
     def fetch_versions_from_lockfile(lockfile_path)
       return {} unless File.exist?(lockfile_path)
     

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gem_sorter
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.5.7
 platform: ruby
 authors:
 - Renan Garcia
@@ -47,6 +47,7 @@ extra_rdoc_files: []
 files:
 - README.md
 - lib/gem_sorter.rb
+- lib/gem_sorter/railtie.rb
 - lib/gem_sorter/version.rb
 - lib/task_config.rb
 - lib/tasks/gem_sorter.rake
@@ -70,7 +71,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.8
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Sort gems in the Gemfile alphabetically
 test_files: []