gem_sorter 0.3.0 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 91f751af186dcb78cb90b9acbf22c086e895dc6b74ad6b202783fe3f6d799a3d
-  data.tar.gz: dc18ef774b7be132570b526e510c95022b0da490b45fd4483d6ec6ae39a0b1aa
+  metadata.gz: 23ad354c6590f6069b457d39322ffa803bc7d501bdd50c10354b01a0022e6ead
+  data.tar.gz: b29aaf076531e4cefc4fcff337a5d7b289339d11abdd4e225407ad71ed7bd267
 SHA512:
-  metadata.gz: 3c527d936237f42547330dc39c740aaca01788a20a3c6e73024ebcddd11dbbce80d74bdeab5d7c39391d7beca6b23264a20fd25e79a1f44c58bb588164ae7238
-  data.tar.gz: 9a640f1ee3d35cd1aa019cea2b9e0eb7898c3d39d0635334660f527073faeea0d5cf860ce5dfc7c90478d8c5f2361b61dbb083621805f95ae153a7900ef85d26
+  metadata.gz: b4cf94efd7f4793231a708c14d69a36328e4a705c7cbcd1f6cda1e8ea11c2dee251fa303c3e791a8e340fd5aa70289059cee164d40d620e138aa16fe806b6d09
+  data.tar.gz: b13e25e3fa906eebbdd712f2bcb7fe1f82168263f250768a22fd5b6c29c05857f4ff454e7f4d1da9d80eec319a3d3323f2d1b930e01571a815546f05fd096665

data/lib/gem_sorter/version.rb

@@ -1,3 +1,3 @@
 module GemSorter
-  VERSION = '0.3.0'
+  VERSION = '0.3.2'
 end

data/lib/gem_sorter.rb

@@ -49,33 +49,33 @@ module GemSorter
     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]
+        gem_name =  extract_gem_name(gem_block[:gem_line])
         next if @config.ignore_gems.include?(gem_name) || @config.ignore_gem_versions.include?(gem_name)
 
         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(',')
+        if base != gem_block[:gem_line]
+          gem_block[:gem_line] = [base.strip, extra_params].select { |value| !value.nil? && !value.empty? }.join(',')
+        end
       end
     end
 
     def extract_params(gem_line)
-      return nil unless gem_line =~ /gem\s*"([^"]+)"/
+      return nil unless gem_line =~ /gem\s+['"][^'"]+['"]/
 
-      if gem_line =~ /gem\s*"[^"]*"\s*,\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?
+        params_with_colon = additional_params.scan(/(\w+:\s*[^,]+(?:,\s*[^,]+)*|\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]
+        gem_name = extract_gem_name(gem_block[:gem_line])
         next if @config.ignore_gems.include?(gem_name) || @config.ignore_gem_comments.include?(gem_name)
 
         if summary = get_summary(gem_name, false)
@@ -84,6 +84,10 @@ module GemSorter
       end
     end
 
+    def extract_gem_name(gem_line)
+      gem_line.match(/gem\s+['"]([^'"]+)['"]/)[1]
+    end
+
     def process_main_section(section)
       lines = section.split("\n").map(&:strip).reject(&:empty?)
       source_line = lines.shift

data/lib/task_config.rb

@@ -1,66 +1,68 @@
 require 'yaml'
 
-class GemSorter::TaskConfig
-  attr_reader :backup, :update_comments, :update_versions, :ignore_gems, :gemfile_path
-
-  DEFAULT_CONFIG = {
-    'backup' => false,
-    'update_comments' => false,
-    'update_versions' => false,
-    'gemfile_path' => 'Gemfile',
-    'ignore_gems' => [],
-    'ignore_gem_versions' => [],
-    'ignore_gem_comments' => [],
-  }.freeze
-
-  def initialize(args = nil)
-    @backup = nil
-    @update_comments = nil
-    @update_versions = nil
-    @ignore_gems = nil
-    @ignore_gem_versions = nil
-    @ignore_gem_comments = nil
-    @gemfile_path = nil
-    load_config(args)
-  end
+module GemSorter
+  class TaskConfig
+    attr_reader :backup, :update_comments, :update_versions, :ignore_gems, :gemfile_path
+
+    DEFAULT_CONFIG = {
+      'backup' => false,
+      'update_comments' => false,
+      'update_versions' => false,
+      'gemfile_path' => 'Gemfile',
+      'ignore_gems' => [],
+      'ignore_gem_versions' => [],
+      'ignore_gem_comments' => []
+    }.freeze
+
+    def initialize(args = nil)
+      @backup = nil
+      @update_comments = nil
+      @update_versions = nil
+      @ignore_gems = nil
+      @ignore_gem_versions = nil
+      @ignore_gem_comments = nil
+      @gemfile_path = nil
+      load_config(args)
+    end
 
-  def backup
-    @backup.nil? ? DEFAULT_CONFIG['backup'] : @backup
-  end
+    def backup
+      @backup.nil? ? DEFAULT_CONFIG['backup'] : @backup
+    end
 
-  def update_comments
-    @update_comments.nil? ? DEFAULT_CONFIG['update_comments'] : @update_comments
-  end
+    def update_comments
+      @update_comments.nil? ? DEFAULT_CONFIG['update_comments'] : @update_comments
+    end
 
-  def update_versions
-    @update_versions.nil? ? DEFAULT_CONFIG['update_versions'] : @update_versions
-  end
+    def update_versions
+      @update_versions.nil? ? DEFAULT_CONFIG['update_versions'] : @update_versions
+    end
 
-  def ignore_gems
-    @ignore_gems.nil? ? DEFAULT_CONFIG['ignore_gems'] : @ignore_gems
-  end
+    def ignore_gems
+      @ignore_gems.nil? ? DEFAULT_CONFIG['ignore_gems'] : @ignore_gems
+    end
 
-  def ignore_gem_versions
-    @ignore_gem_versions.nil? ? DEFAULT_CONFIG['ignore_gem_versions'] : @ignore_gem_versions
-  end
+    def ignore_gem_versions
+      @ignore_gem_versions.nil? ? DEFAULT_CONFIG['ignore_gem_versions'] : @ignore_gem_versions
+    end
 
-  def ignore_gem_comments
-    @ignore_gem_comments.nil? ? DEFAULT_CONFIG['ignore_gem_comments'] : @ignore_gem_comments
-  end
+    def ignore_gem_comments
+      @ignore_gem_comments.nil? ? DEFAULT_CONFIG['ignore_gem_comments'] : @ignore_gem_comments
+    end
 
-  def gemfile_path
-    @gemfile_path.nil? ? DEFAULT_CONFIG['gemfile_path'] : @gemfile_path
-  end
+    def gemfile_path
+      @gemfile_path.nil? ? DEFAULT_CONFIG['gemfile_path'] : @gemfile_path
+    end
 
-  private
+    private
 
-  def load_config(args)
-    load_config_from_file
-    load_config_from_args(args)
-  end
+    def load_config(args)
+      load_config_from_file
+      load_config_from_args(args)
+    end
+
+    def load_config_from_file
+      return unless File.exist?(gem_sorter_config_file_path)
 
-  def load_config_from_file
-    if File.exist?(gem_sorter_config_file_path)
       task_config = YAML.load_file(gem_sorter_config_file_path)
       @backup = task_config['backup'] if task_config.key?('backup')
       @update_comments = task_config['update_comments'] if task_config.key?('update_comments')
@@ -70,25 +72,25 @@ class GemSorter::TaskConfig
       @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')
     end
-  end
 
-  def load_config_from_args(args)
-    return unless args
+    def load_config_from_args(args)
+      return unless args
 
-    @backup = parse_boolean(args[:backup]) unless args[:backup].nil?
-    @update_comments = parse_boolean(args[:update_comments]) unless args[:update_comments].nil?
-    @update_versions = parse_boolean(args[:update_versions]) unless args[:update_versions].nil?
-    @gemfile_path = args[:gemfile_path] unless args[:gemfile_path].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?
-  end
+      @backup = parse_boolean(args[:backup]) unless args[:backup].nil?
+      @update_comments = parse_boolean(args[:update_comments]) unless args[:update_comments].nil?
+      @update_versions = parse_boolean(args[:update_versions]) unless args[:update_versions].nil?
+      @gemfile_path = args[:gemfile_path] unless args[:gemfile_path].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?
+    end
 
-  def parse_boolean(value)
-    value.to_s.downcase == 'true'
-  end
+    def parse_boolean(value)
+      value.to_s.downcase == 'true'
+    end
 
-  def gem_sorter_config_file_path
-    'gem_sorter.yml'
+    def gem_sorter_config_file_path
+      'gem_sorter.yml'
+    end
   end
-end
+end

metadata

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