rubosquad 0.2.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ea0148cd8d05e66b5990557a84a80ff89fa053929e4bbec510aafbc12007e9ff
-  data.tar.gz: fd638cb0a18a6a1b0dc77495b38c9b55dadee1045fbba4f79a6ea74b4c59bb62
+  metadata.gz: b1893fc681cd5d1150871642903b53296899cc9524d0a747d0dee72d3e95a388
+  data.tar.gz: bb45d13fe8ecde3a2a66e9d3e89c3edd1aca115c3d9851b12a48110737630fb6
 SHA512:
-  metadata.gz: e7878218fff87254f16cd8e6c54613301ca65c5ccf39cffd0b420cb0bb6eb7411a3bdf0991436acb634b353e3f2aa86726f9e1176ffc537b97b02e946b5dc7b2
-  data.tar.gz: d89bd634df027b5ce0cc35d9e91e3349d5ef936d15cb9883eb500ba8fda11faeee33f0de7c7e4504bb8f0d7bd21ad37de58078ce94c5b4a76fcfbb48033ad6a0
+  metadata.gz: dcd1d7ac80333b7b0289a248500661b1e929db8eb2b117a0696ae92e147afab5c0f6fb7a4d9311a06de214a70d94c84a4e9a44e4565e30cb277f707043085a63
+  data.tar.gz: a73bb07f1eb5c63a8da472e6aef8d795fdafaa7da2804abb8bba2338d4bdcdd6080e8b94d69502b392d0f003daae4eb143fcd9ebb9164923265d6acec09077d1

data/bin/rubosquad

@@ -3,4 +3,4 @@
 
 require 'rubosquad'
 
-Rubosquad::CLI.run
+Rubosquad::CLI.run

data/lib/rubosquad.rb

@@ -4,138 +4,177 @@ require 'open3'
 require 'set'
 require 'optparse'
 
-# Get the list of changed Ruby files in the current branch compared to main
 module Rubosquad
   class CLI
-    def self.run
-      options = {}
-      OptionParser.new do |opts|
-        opts.banner = 'Usage: rubosquad [options]'
-        opts.on('-a', '--auto-correct', 'Run with rubocop -a instead of -A') do
-          options[:auto_correct] = true
+    class << self
+      def run
+        options = parse_options
+        base_branch = detect_base_branch
+
+        unless base_branch
+          puts 'Error: Could not find main or master branch.'
+          exit 1
         end
-      end.parse!
 
-      # Get the base branch (try main, then master, then origin/main, then origin/master)
-      base_branch = detect_base_branch
+        current_branch = resolve_current_branch
+        files = resolve_changed_files(base_branch, current_branch)
 
-      unless base_branch
-        puts 'Error: Could not find main or master branch.'
-        exit 1
+        if files.empty?
+          puts 'No Ruby files have changed.'
+          exit 0
+        end
+
+        print_file_list(files, current_branch, base_branch)
+        run_rubocop(options, files)
       end
 
-      # Get current branch name
-      current_branch = `git rev-parse --abbrev-ref HEAD`.strip
-
-      if current_branch == base_branch
-        puts "Warning: You are on the #{base_branch} branch. Comparing working directory changes."
-        # Compare working directory + staged changes against HEAD
-        changed_files = `git diff --name-only HEAD`.split("\n")
-        changed_files += `git diff --name-only --cached`.split("\n")
-        changed_files = changed_files.uniq.grep(/\.rb$/)
-      else
-        # Compare current branch against base branch (all commits since divergence)
-        changed_files = `git diff --name-only #{base_branch}...HEAD`.split("\n").grep(/\.rb$/)
+      def detect_base_branch
+        candidates = %w[main master origin/main origin/master]
+
+        candidates.each do |branch|
+          stdout, _stderr, status = Open3.capture3('git', 'rev-parse', '--verify', branch)
+          return branch if status.success? && !stdout.strip.empty?
+        end
+
+        nil
       end
 
-      # Filter out deleted files and files that don't exist
-      changed_files = changed_files.select { |file| File.exist?(file) }
+      private
+
+      def parse_options
+        options = {}
+        OptionParser.new do |opts|
+          opts.banner = 'Usage: rubosquad [options]'
+          opts.on('-A', '--unsafe-auto-correct', 'Run with rubocop -A (unsafe auto-corrections) instead of -a') do
+            options[:unsafe_auto_correct] = true
+          end
+        end.parse!
+        options
+      end
 
-      if changed_files.empty?
-        puts 'No Ruby files have changed.'
-        exit 0
+      def resolve_current_branch
+        stdout, stderr, status = Open3.capture3('git', 'rev-parse', '--abbrev-ref', 'HEAD')
+        unless status.success?
+          puts "Error: Failed to determine current branch: #{stderr.strip}"
+          exit 1
+        end
+        stdout.strip
       end
 
-      comparison_info = if current_branch == base_branch
-                          "working directory changes on #{base_branch}"
-                        else
-                          "#{current_branch} vs #{base_branch}"
-                        end
-
-      puts "\nRunning Rubocop on changed files (#{comparison_info}):"
-      changed_files.each { |file| puts "  - #{file}" }
-      puts
-
-      # Check for available RuboCop extensions that can actually be loaded
-      extensions = %w[rubocop-factory_bot rubocop-rails rubocop-rspec rubocop-rspec_rails]
-      available_extensions = extensions.select do |ext|
-        require ext
-        true
-      rescue LoadError
-        false
+      def resolve_changed_files(base_branch, current_branch)
+        files = if current_branch == base_branch
+                  puts "Warning: You are on the #{base_branch} branch. Comparing working directory changes."
+                  base_branch_files
+                else
+                  feature_branch_files(base_branch)
+                end
+        files.select { |f| File.exist?(f) }
       end
 
-      # Construct the RuboCop command
-
-      rubocop_option = options[:auto_correct] ? '-a' : '-A'
-      command = "rubocop #{rubocop_option} --format offenses --format simple #{available_extensions.map do |ext|
-        "--require #{ext}"
-      end.join(' ')} #{changed_files.join(' ')}"
-
-      stdout, stderr, status = Open3.capture3(command)
-
-      puts "\nRubocop Output:"
-      puts '==Error type: Legend: C = Convention, W = Warning, E = Error, F = Fatal=='
-
-      # Process and colorize output
-      processed_output = ''
-      seen_files = Set.new
-      current_file = nil
-
-      stdout.each_line do |line|
-        if line.start_with?('==')
-          file_path = line.strip.gsub(/^==\s*|\s*==$/, '')
-          current_file = file_path
-          processed_output += if seen_files.add?(file_path)
-                                "\n\e[36m#{line}\e[0m"
-                              else
-                                "\n#{line}"
-                              end
-        elsif line.match?(/^[A-Z]:/)
-          parts = line.split(':')
-          offense_type = parts.shift
-          line_col = parts.shift(2).map(&:strip).join(':')
-          message = parts.join(':').strip
-          processed_output += "[#{current_file}:#{line_col}] - #{offense_type}: #{message}\n"
-        else
-          processed_output += line
+      def base_branch_files
+        unstaged, stderr, status = Open3.capture3('git', 'diff', '--name-only', 'HEAD')
+        unless status.success?
+          puts "Error: Failed to get unstaged changes: #{stderr.strip}"
+          exit 1
+        end
+
+        staged, stderr, status = Open3.capture3('git', 'diff', '--name-only', '--cached')
+        unless status.success?
+          puts "Error: Failed to get staged changes: #{stderr.strip}"
+          exit 1
+        end
+
+        (unstaged.split("\n") + staged.split("\n")).uniq.grep(/\.rb$/)
+      end
+
+      def feature_branch_files(base_branch)
+        stdout, stderr, status = Open3.capture3('git', 'diff', '--name-only', "#{base_branch}...HEAD")
+        unless status.success?
+          puts "Error: Failed to diff against #{base_branch}: #{stderr.strip}"
+          exit 1
         end
+        stdout.split("\n").grep(/\.rb$/)
       end
 
-      puts processed_output
+      def print_file_list(files, current_branch, base_branch)
+        comparison = if current_branch == base_branch
+                       "working directory changes on #{base_branch}"
+                     else
+                       "#{current_branch} vs #{base_branch}"
+                     end
+        puts "\nRunning Rubocop on changed files (#{comparison}):"
+        files.each { |f| puts "  - #{f}" }
+        puts
+      end
 
-      if status.success?
-        puts "\nRubocop auto-corrections complete."
-      else
-        puts "\nRubocop completed with offenses:"
+      def run_rubocop(options, files)
+        extensions = detect_extensions
+        cmd = build_rubocop_cmd(options, extensions, files)
+        stdout, stderr, status = Open3.capture3(*cmd)
 
-        offenses = stdout.scan(/(\d+) offense.* detected/)
-        total_offenses = offenses.flatten.map(&:to_i).sum
+        puts "\nRubocop Output:"
+        puts '==Error type: Legend: C = Convention, W = Warning, E = Error, F = Fatal=='
+        puts format_output(stdout)
 
-        puts "Files inspected: #{stdout[/(\d+) files? inspected/, 1] || 'Unknown'}"
-        puts "Total offenses detected: #{total_offenses}"
+        print_rubocop_result(stdout, stderr, status, extensions)
+        exit status.exitstatus unless status.success?
+      end
 
-        unless stderr.strip.empty?
-          puts "\nStandard error:"
-          puts stderr
+      def detect_extensions
+        %w[rubocop-factory_bot rubocop-rails rubocop-rspec rubocop-rspec_rails].select do |ext|
+          Gem::Specification.find_by_name(ext)
+          true
+        rescue Gem::LoadError
+          false
         end
       end
 
-      puts "\nRuboCop extensions used: #{available_extensions.join(', ')}"
-    end
+      def build_rubocop_cmd(options, extensions, files)
+        flag = options[:unsafe_auto_correct] ? '-A' : '-a'
+        cmd = ['rubocop', flag, '--format', 'offenses', '--format', 'simple']
+        extensions.each { |ext| cmd.push('--require', ext) }
+        cmd.concat(files)
+      end
 
-    # Detect the base branch to compare against
-    def self.detect_base_branch
-      # Try different possible base branch names
-      candidates = ['main', 'master', 'origin/main', 'origin/master']
+      def format_output(stdout)
+        lines = []
+        seen_files = Set.new
+        current_file = nil
+
+        stdout.each_line do |line|
+          if line.start_with?('==')
+            file_path = line.strip.gsub(/^==\s*|\s*==$/, '')
+            current_file = file_path
+            lines << (seen_files.add?(file_path) ? "\n\e[36m#{line}\e[0m" : "\n#{line}")
+          elsif line.match?(/^[A-Z]:/)
+            parts = line.split(':')
+            offense_type = parts.shift
+            line_col = parts.shift(2).map(&:strip).join(':')
+            message = parts.join(':').strip
+            lines << "[#{current_file || 'unknown'}:#{line_col}] - #{offense_type}: #{message}\n"
+          else
+            lines << line
+          end
+        end
 
-      candidates.each do |branch|
-        # Check if the branch exists
-        result = `git rev-parse --verify #{branch} 2>/dev/null`.strip
-        return branch unless result.empty?
+        lines.join
       end
 
-      nil
+      def print_rubocop_result(stdout, stderr, status, extensions)
+        if status.success?
+          puts "\nRubocop auto-corrections complete."
+        else
+          puts "\nRubocop completed with offenses:"
+          total = stdout.scan(/(\d+) offense.* detected/).flatten.map(&:to_i).sum
+          puts "Files inspected: #{stdout[/(\d+) files? inspected/, 1] || 'Unknown'}"
+          puts "Total offenses detected: #{total}"
+          unless stderr.strip.empty?
+            puts "\nStandard error:"
+            puts stderr
+          end
+        end
+        puts "\nRuboCop extensions used: #{extensions.join(', ')}" unless extensions.empty?
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubosquad
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.4.0
 platform: ruby
 authors:
 - LucasWaki
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-10-23 00:00:00.000000000 Z
+date: 2026-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.50'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.50'
 description: A tool to run RuboCop with auto-correct on Ruby files changed in your
   Git branch compared to main
 email: lucas.waki@cloudwalk.io
@@ -37,7 +37,8 @@ files:
 homepage: https://github.com/cw-lucaswaki/rubosquad
 licenses:
 - MIT
-metadata: {}
+metadata:
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -46,7 +47,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="