gem_sorter 0.5.0 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 70fd0cee6472698ca2168aa26c7db2524a0c678cdb0b4270010653026d5729e7
-  data.tar.gz: 3a9760914476b821fc87a3cb15293b7d90ebb6b3044b37520d4fb078d634b4ea
+  metadata.gz: e7eb0be5f76f0fe5bf85c828b98e7bc0aa2fedbab8131a0db6aefbd8664bfbf8
+  data.tar.gz: 893bb62c2c6e21857660a911c649c88c244f3eb3d8dcb2fdc9b8274e535bc26b
 SHA512:
-  metadata.gz: d4aaa1957dc88ff452f8d799aaa0468646e5f11972975edadf04c3f75f41efd3a620d28fbdc76b56140ded25e99a9be619b6281c521706315ea0a49858a7f1e9
-  data.tar.gz: 8b8a3eed7eba14a635b7153c2dbc4534161763d4a8db999110e55346b5b586aebf1eac692eaf928c1bacd1bdb584c68153eefa28110c142f90e2e986d36f606a
+  metadata.gz: b412dd7b89dd9a53115ec289b4010e7da6756b792e7cd16940fb0e06c53fbf44e96456d24cd84d0a9fa204babd2775252864a688382dfcb69baee4a3b44cbe92
+  data.tar.gz: e3b8fb028356f3c2de88c4c4bebde010325f8dc3b8d38bc1887c2c4ddf8c4f0f1162e3c86f9ea81992ccd7f88d9255e0f86b49089e6102f00e8151e6402360b3

data/README.md

@@ -2,6 +2,8 @@
   <img src="https://i.imgur.com/WHOyL9W.png" width="150" alt="GemSorter Logo">
 </p>
 
+[![Gem Version](https://badge.fury.io/rb/gem_sorter.svg)](https://badge.fury.io/rb/gem_sorter)
+
 # GemSorter
 
 GemSorter is a simple gem to sort the contents of your Gemfile alphabetically while preserving comments and group structure. It helps maintain a clean and organized Gemfile.
@@ -44,6 +46,7 @@ rake -r gem_sorter gemfile:sort
 * `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.
+* `force_update`: Pass `true` to update gems to their latest available versions from RubyGems, ignoring the lockfile. This will print a summary of updated gems and remind you to run `bundle install`.
 * `use_double_quotes`: Pass `true` to convert single quotes to double quotes in gem declarations.
 * `remove_versions`: Pass `true` to remove version constraints from gems while preserving other parameters like `require` or `platforms`. This option takes precedence over `update_versions` if both are enabled.
 
@@ -59,6 +62,7 @@ Create a file in the root of your project called `gem_sorter.yml`
 * `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.
+* `force_update`: Pass `true` to update gems to their latest available versions from RubyGems, ignoring the lockfile. This will print a summary of updated gems and remind you to run `bundle install`.
 * `use_double_quotes`: Pass `true` to convert single quotes to double quotes in gem declarations.
 * `remove_versions`: Pass `true` to remove version constraints from gems while preserving other parameters like `require` or `platforms`. This option takes precedence over `update_versions` if both are enabled.
 * `ignore_gems`: Pass an array of GEMs you want to ignore versions and comments
@@ -71,6 +75,7 @@ Example:
 backup: true
 update_comments: true
 update_versions: false
+force_update: false
 use_double_quotes: true
 remove_versions: true
 ignore_gems:

data/lib/gem_sorter/version.rb

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

data/lib/gem_sorter.rb

@@ -1,6 +1,8 @@
 # lib/gem_sorter.rb
 require 'net/http'
 require 'cgi'
+require 'openssl'
+require 'json'
 
 load File.expand_path('tasks/gem_sorter.rake', __dir__) if defined?(Rake)
 
@@ -11,22 +13,33 @@ module GemSorter
       @filepath = task_config.gemfile_path
       @content = File.read(task_config.gemfile_path)
       @versions = nil
+      @version_updates = []
     end
 
     def sort
+      ruby_line = extract_ruby_line(@content)
+      
       parts = @content.split(/^group/)
       main_section = parts.shift
       group_sections = parts
 
-      source_line, gems = process_main_section(main_section)
+      source_line, gems, _ = process_main_section(main_section)
 
       update_gem_summaries(gems) if @config.update_comments
-      update_version_text(gems) if @config.update_versions
+      if @config.force_update
+        force_update_versions(gems)
+      elsif @config.update_versions
+        update_version_text(gems)
+      end
       remove_versions(gems) if @config.remove_versions
       sorted_gems = sort_gem_blocks(gems)
 
       result = []
       result << source_line
+      if ruby_line
+        result << ''
+        result << ruby_line
+      end
       result << ''
       result.concat(sorted_gems)
       result << ''
@@ -34,7 +47,11 @@ module GemSorter
       group_sections.each do |section|
         group_gems = process_group_section(section)
         update_gem_summaries(group_gems) if @config.update_comments
-        update_version_text(group_gems) if @config.update_versions
+        if @config.force_update
+          force_update_versions(group_gems)
+        elsif @config.update_versions
+          update_version_text(group_gems)
+        end
         remove_versions(group_gems) if @config.remove_versions
         result << "group#{section.split("\n").first}"
         result.concat(sort_gem_blocks(group_gems).map { |line| "  #{line}" })
@@ -44,11 +61,19 @@ module GemSorter
 
       result = transform_to_double_quotes(result) if @config.use_double_quotes
 
+      print_version_updates if @config.force_update && !@version_updates.empty?
+
       result.join("\n")
     end
 
     private
 
+    def extract_ruby_line(content)
+      lines = content.split("\n")
+      ruby_line = lines.find { |line| line.strip.start_with?('ruby') }
+      ruby_line&.strip
+    end
+
     def transform_to_double_quotes(gem_file_content)
       return gem_file_content unless gem_file_content.is_a?(Array) || gem_file_content.is_a?(String)
       
@@ -100,6 +125,43 @@ module GemSorter
       end
     end
 
+    def force_update_versions(gems)
+      @versions ||= fetch_versions_from_lockfile("#{@filepath}.lock")
+      
+      gems.each do |gem_block|
+        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])
+        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]
+        
+        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
+      end
+    end
+
     def remove_versions(gems)
       gems.each do |gem_block|
         gem_name =  extract_gem_name(gem_block[:gem_line])
@@ -147,11 +209,14 @@ module GemSorter
       source_line = lines.shift
 
       gems = []
+      ruby_line = nil
       current_comments = []
 
       lines.each do |line|
         if line.start_with?('#')
           current_comments << line
+        elsif line.start_with?('ruby')
+          ruby_line = line
         elsif line.start_with?('gem')
           gems << {
             comments: current_comments,
@@ -161,7 +226,7 @@ module GemSorter
         end
       end
 
-      [source_line, gems]
+      [source_line, gems, ruby_line]
     end
 
     def process_group_section(section)
@@ -215,7 +280,7 @@ module GemSorter
         return get_summary(gem_name, true) unless remote
         nil
       end
-    rescue StandardError => e
+    rescue StandardError
       nil
     end
 
@@ -224,11 +289,18 @@ module GemSorter
       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}."
+        http = Net::HTTP.new(url.host, url.port)
+        http.use_ssl = true
+        http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+        
+        request = Net::HTTP::Get.new(url)
+        response = http.request(request)
+        
+        unless response.is_a?(Net::HTTPSuccess)
+          raise "Error: Could not fetch gem information from RubyGems for #{gem_name} version #{version}. Status: #{response.code}"
         end
-        match = response.match(/<input[^>]*id=["']gemfile_text["'][^>]*value=["']([^"']+)["']/)
+        
+        match = response.body.match(/<input[^>]*id=["']gemfile_text["'][^>]*value=["']([^"']+)["']/)
 
         if match
           CGI.unescapeHTML(match[1])
@@ -268,5 +340,51 @@ module GemSorter
       versions
     end
 
+    def fetch_latest_version(gem_name)
+      url = URI("https://rubygems.org/api/v1/gems/#{gem_name.strip}.json")
+
+      begin
+        http = Net::HTTP.new(url.host, url.port)
+        http.use_ssl = true
+        http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+        
+        request = Net::HTTP::Get.new(url)
+        response = http.request(request)
+        
+        unless response.is_a?(Net::HTTPSuccess)
+          return nil
+        end
+        
+        gem_data = JSON.parse(response.body)
+        gem_data['version']
+      rescue => e
+        nil
+      end
+    end
+
+    def extract_current_version(gem_line)
+      # Try to extract version from gem line
+      # Examples: gem "rails", "~> 7.0" or gem "rails", "7.0.0" or gem "rails", ">= 7.0", "< 8.0"
+      # Match first version string after gem name
+      version_match = gem_line.match(/gem\s+['"][^'"]+['"]\s*,\s*['"]([^'"]+)['"]/)
+      return nil unless version_match
+      
+      version_string = version_match[1]
+      # Extract semantic version (x.y.z) from version string, or return the full version string
+      semantic_version = version_string.match(/(\d+\.\d+\.\d+)/)
+      semantic_version ? semantic_version[1] : version_string
+    end
+
+    def print_version_updates
+      return if @version_updates.empty?
+
+      puts "\nThe following gems were updated:"
+      @version_updates.each do |update|
+        puts "  * #{update[:gem_name]} (#{update[:from_version]} -> #{update[:to_version]})"
+      end
+      puts "\nRun `bundle install` to install the updated gems."
+      puts ""
+    end
+
   end
 end

data/lib/task_config.rb

@@ -10,6 +10,7 @@ module GemSorter
       'update_versions' => false,
       'use_double_quotes' => false,
       'remove_versions' => false,
+      'force_update' => false,
       'gemfile_path' => 'Gemfile',
       'ignore_gems' => [],
       'ignore_gem_versions' => [],
@@ -22,6 +23,7 @@ module GemSorter
       @update_versions = nil
       @use_double_quotes = nil
       @remove_versions = nil
+      @force_update = nil
       @ignore_gems = nil
       @ignore_gem_versions = nil
       @ignore_gem_comments = nil
@@ -49,6 +51,10 @@ module GemSorter
       @remove_versions.nil? ? DEFAULT_CONFIG['remove_versions'] : @remove_versions
     end
 
+    def force_update
+      @force_update.nil? ? DEFAULT_CONFIG['force_update'] : @force_update
+    end
+
     def ignore_gems
       @ignore_gems.nil? ? DEFAULT_CONFIG['ignore_gems'] : @ignore_gems
     end
@@ -82,6 +88,7 @@ module GemSorter
       @gemfile_path = task_config['gemfile_path'] if task_config.key?('gemfile_path')
       @use_double_quotes = task_config['use_double_quotes'] if task_config.key?('use_double_quotes')
       @remove_versions = task_config['remove_versions'] if task_config.key?('remove_versions')
+      @force_update = task_config['force_update'] if task_config.key?('force_update')
       @ignore_gems = task_config['ignore_gems'] if task_config.key?('ignore_gems')
       @ignore_gem_versions = task_config['ignore_gem_versions'] if task_config.key?('ignore_gem_versions')
       @ignore_gem_comments = task_config['ignore_gem_comments'] if task_config.key?('ignore_gem_comments')
@@ -96,6 +103,7 @@ module GemSorter
       @gemfile_path = args[:gemfile_path] unless args[:gemfile_path].nil?
       @use_double_quotes = parse_boolean(args[:use_double_quotes]) unless args[:use_double_quotes].nil?
       @remove_versions = parse_boolean(args[:remove_versions]) unless args[:remove_versions].nil?
+      @force_update = parse_boolean(args[:force_update]) unless args[:force_update].nil?
       @ignore_gems = args[:ignore_gems] unless args[:ignore_gems].nil?
       @ignore_gem_versions = args[:ignore_gem_versions] unless args[:ignore_gem_versions].nil?
       @ignore_gem_comments = args[:ignore_gem_comments] unless args[:ignore_gem_comments].nil?

data/lib/tasks/gem_sorter.rake

@@ -3,8 +3,8 @@ require 'yaml'
 require 'task_config'
 
 namespace :gemfile do
-  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|
+  desc 'Sort gems in Gemfile alphabetically. Options: [backup=true|false] [update_comments=true|false] [update_versions=true|false] [force_update=true|false]'
+  task :sort, [:backup, :update_comments, :update_versions, :force_update] do |_t, args|
     task_config = GemSorter::TaskConfig.new(args)
     
     if File.exist?(task_config.gemfile_path)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gem_sorter
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.3
 platform: ruby
 authors:
 - Renan Garcia
@@ -70,7 +70,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.7
+rubygems_version: 3.6.8
 specification_version: 4
 summary: Sort gems in the Gemfile alphabetically
 test_files: []