gem_sorter 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5b1e869f1a6001e39cb365ed94c07b7ae077002230b6b8310e3931b5021f96a6
-  data.tar.gz: 5d1dcf0f273f0c410fc7f4aa1221d0e61a7fa8ec8f86e20f01d46f8c601a06ab
+  metadata.gz: 9a7e010153615999089999a370d116a6404dbdaf855bcb6257c801279baec90b
+  data.tar.gz: 23c131930d94049ad3c90f556fd2e8fc3a7b2c74b3a7eadbed026fb4ef08b333
 SHA512:
-  metadata.gz: 1bdc7618f04fd23841944fb2daf70255b3e9fbf83a780dfacf9a82f0b0ccc08dafbe5583bfeebffc8d6424374b7e9e9819ade35884b2cefd656d0aa0c8d5698a
-  data.tar.gz: 234b92e7d4829520db13b04707f9e6c5fdfebe6bde74a25eac7cd06ea8e435a173567287b32654d82c1c28ee9db4ee41e052f75376b81d603eee67787d17b300
+  metadata.gz: e0f45801b449beff02390ae7227ef679148214cbf79a96068ef17fa7d668eff14bc7fa64d78309fbeb02e32e9677813adcb96a3371ca2a2d54690b91a26c9022
+  data.tar.gz: 29529cd23267c390d2bafe645a10d612d6f22aca97706157501091952f5266ba3ec735e52f47bdab733318ce41ada18cb28e81230efe091e18702d1f9e8bb59e

data/README.md

@@ -7,6 +7,7 @@ GemSorter is a simple gem to sort the contents of your Gemfile alphabetically wh
 * Preserves comments and their association with gems.
 * Maintains group structure in the Gemfile.
 * Optionally creates a backup of the original Gemfile.
+* Update the comments of the gems based on their descriptions.
 
 ## Installation
 Add the gem to your project's `Gemfile`:
@@ -24,14 +25,16 @@ rake gemfile:sort
 
 ### Options
 * `backup`: Pass `true` to create a backup of your Gemfile as `Gemfile.old` before sorting.
+* `update_comments`: Pass `true` to update the comments of the gems based on their descriptions.
+* `update_versions`: Pass `true` to update the versions of the gems based on the lockfile.
 
 Example:
 
 ```bash
-rake gemfile:sort[true]
+rake gemfile:sort[true,true,true]
 ```
 
-This will sort your Gemfile and create a backup.
+This will sort your Gemfile, create a backup, and update comments and versions.
 
 ## Example
 ### Input Gemfile
@@ -40,12 +43,11 @@ source "https://rubygems.org"
 
 # Framework
 gem "rails"
-# Web server
-gem "puma"
+gem "puma", "~> 5.3"
 
 group :development do
-  gem "pry"
   gem "dotenv-rails"
+  gem "pry"
 end
 ```
 
@@ -53,13 +55,15 @@ end
 ```ruby
 source "https://rubygems.org"
 
-# Web server
-gem "puma"
-# Framework
-gem "rails"
+# A Ruby/Rack web server built for parallelism.
+gem "puma", "~> 5.3"
+# Full-stack web application framework.
+gem "rails", "~> 8.0", ">= 8.0.1"
 
 group :development do
-  gem "dotenv-rails"
+  # Autoload dotenv in Rails.
+  gem 'dotenv-rails', '~> 3.1', '>= 3.1.7'
+  # A runtime developer console and IRB alternative with powerful introspection capabilities.
   gem "pry"
 end
 ```

data/lib/gem_sorter/version.rb

@@ -1,3 +1,3 @@
-module GemfileSorter
-  VERSION = '0.1.0'
+module GemSorter
+  VERSION = '0.2.0'
 end

data/lib/gem_sorter.rb

@@ -1,4 +1,6 @@
 # lib/gem_sorter.rb
+require 'net/http'
+require 'cgi'
 
 load File.expand_path('tasks/gem_sorter.rake', __dir__) if defined?(Rake)
 
@@ -7,15 +9,19 @@ module GemSorter
     def initialize(filepath)
       @filepath = filepath
       @content = File.read(filepath)
+      @versions = nil
     end
 
-    def sort
+    def sort(update_comments = false, update_versions = false)
       parts = @content.split(/^group/)
       main_section = parts.shift
       group_sections = parts
 
       source_line, gems = process_main_section(main_section)
 
+      update_gem_summaries(gems) if update_comments
+      update_version_text(gems) if update_versions
+
       sorted_gems = sort_gem_blocks(gems)
 
       result = []
@@ -26,6 +32,8 @@ module GemSorter
 
       group_sections.each do |section|
         group_gems = process_group_section(section)
+        update_gem_summaries(group_gems) if update_comments
+        update_version_text(group_gems) if update_versions
         result << "group#{section.split("\n").first}"
         result.concat(sort_gem_blocks(group_gems).map { |line| "  #{line}" })
         result << 'end'
@@ -37,6 +45,40 @@ module GemSorter
 
     private
 
+    def update_version_text(gems)
+      @versions ||= fetch_versions_from_lockfile("#{@filepath}.lock")
+      gems.each do |gem_block|
+        gem_name = gem_block[:gem_line].match(/gem\s*"([^"]+)"/)[1]
+        version = @versions[gem_name]
+        extra_params = extract_params(gem_block[:gem_line])
+        base = version ? "#{fetch_gemfile_text(gem_name, version, gem_block[:gem_line])}" : gem_block[:gem_line]
+        return base if base == gem_block[:gem_line]
+
+        gem_block[:gem_line] = [base, extra_params].select { |value| !value.nil? && !value.empty? }.join(',')
+      end
+    end
+
+    def extract_params(gem_line)
+      return nil unless gem_line =~ /gem\s*"([^"]+)"/
+
+      if gem_line =~ /gem\s*"[^"]*"\s*,\s*(.*)/
+        additional_params = $1.strip
+        return nil if additional_params.empty?
+        params_with_colon = additional_params.scan(/(\w+:\s*[^,]+)/).flatten
+        return params_with_colon.join(', ') unless params_with_colon.empty?
+      end
+      nil
+    end
+
+    def update_gem_summaries(gems)
+      gems.each do |gem_block|
+        gem_name = gem_block[:gem_line].match(/gem\s*"([^"]+)"/)[1]
+        if summary = get_summary(gem_name, false)
+          gem_block[:comments] = ["# #{summary}"]
+        end
+      end
+    end
+
     def process_main_section(section)
       lines = section.split("\n").map(&:strip).reject(&:empty?)
       source_line = lines.shift
@@ -83,7 +125,12 @@ module GemSorter
 
     def sort_gem_blocks(gems)
       sorted = gems.sort_by do |gem_block|
-        gem_block[:gem_line].match(/gem\s*"([^"]+)"/)[1].downcase
+        match_data = gem_block[:gem_line].match(/gem\s*['"]([^'"]+)['"]/)
+        if match_data
+          match_data[1].downcase
+        else
+          ''
+        end
       end
 
       result = []
@@ -94,5 +141,69 @@ module GemSorter
 
       result
     end
+
+    def get_summary(gem_name, remote)
+      source = remote ? "-r" : "-l"
+      output = `gem list -d #{source} -e #{gem_name}`
+      if output.include?(gem_name)
+        summary = output.split("\n").last.strip
+        summary
+      else
+        return get_summary(gem_name, true) unless remote
+        nil
+      end
+    rescue StandardError => e
+      nil
+    end
+
+    def fetch_gemfile_text(gem_name, version, original)
+      base_url = "https://rubygems.org/gems/#{gem_name.strip}"
+      url = URI(version ? "#{base_url}/versions/#{version.strip}" : base_url)
+
+      begin
+        response = Net::HTTP.get(url)
+        unless response
+          raise "Error: Could not fetch gem information from RubyGems for #{gem_name} version #{version}."
+        end
+        match = response.match(/<input[^>]*id=["']gemfile_text["'][^>]*value=["']([^"']+)["']/)
+
+        if match
+          CGI.unescapeHTML(match[1])
+        else
+          raise "Error: Could not extract Gemfile text for #{gem_name} version #{version}."
+        end
+
+      rescue => e
+        puts e.message
+
+        original
+      end
+    end
+
+    def fetch_versions_from_lockfile(lockfile_path)
+      return {} unless File.exist?(lockfile_path)
+    
+      versions = {}
+      inside_specs = false
+    
+      File.readlines(lockfile_path).each do |line|
+        line.strip!
+
+        if line == "specs:"
+          inside_specs = true
+          next
+        end
+
+        inside_specs = false if inside_specs && line.empty?
+
+        if inside_specs && line =~ /^([^\s]+)\s\(([^)]+)\)$/
+          gem_name, gem_version = $1, $2
+          gem_version = gem_version.match(/(\d+\.\d+\.\d+)/)[0] if gem_version =~ /(\d+\.\d+\.\d+)/
+          versions[gem_name] = gem_version
+        end
+      end
+      versions
+    end
+
   end
-end
+end

data/lib/tasks/gem_sorter.rake

@@ -1,9 +1,14 @@
 require 'gem_sorter'
 
 namespace :gemfile do
-  desc 'Sort gems in Gemfile alphabetically'
-  task :sort, [:backup] do |_t, args|
-    args.with_defaults(backup: 'false')
+  desc 'Sort gems in Gemfile alphabetically. Options: [backup=true|false] [update_comments=true|false] [update_versions=true|false]'
+  task :sort, [:backup, :update_comments, :update_versions] do |_t, args|
+    args.with_defaults(
+      backup: 'false',
+      update_comments: 'false',
+      update_versions: 'false'
+    )
+    
     gemfile_path = 'Gemfile'
 
     if File.exist?(gemfile_path)
@@ -12,8 +17,8 @@ namespace :gemfile do
         puts 'Original Gemfile backed up as Gemfile.old'
       end
 
-      sorter = Gem::Sorter.new(gemfile_path)
-      sorted_content = sorter.sort
+      sorter = ::GemSorter::Sorter.new(gemfile_path)
+      sorted_content = sorter.sort(args.update_comments.downcase == 'true', args.update_versions.downcase == 'true')
 
       File.write(gemfile_path, sorted_content)
 
@@ -22,4 +27,4 @@ namespace :gemfile do
       puts 'Error: Gemfile not found in current directory'
     end
   end
-end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: gem_sorter
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Renan Garcia
 bindir: bin
 cert_chain: []
-date: 2025-01-02 00:00:00.000000000 Z
+date: 2025-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake