rubosquad 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 703916ceaa4f309f64ef44eafdb3719c5e0951533d626e3c70ea8373c1922013
-  data.tar.gz: 8d3e8703e33ba946ce9b4d44682648f9e5f43eea1c4a46bd8ced66220d599368
+  metadata.gz: bc5a605727814b79d31d6d01ace3cb53ea6889e1c47e29ce27d612a31a6aea85
+  data.tar.gz: f6fc4368c48f1dc19d8081161dc10beafe3caeb7f6d7511c2cb26c13d891a12c
 SHA512:
-  metadata.gz: 99c82cfa77be12ceb60eac05e5d74296c4a300923c46f6193e400b8b821661c30871d5ce685e7ccabf9a84724e8642895eabce1cb50814ba166cfd248942321e
-  data.tar.gz: fa45abefc6483e9dfdc11172ec3ad9531c6a024e1ed0714f17a74fa279f7e83c76edf5dde0c0f3da2c2d4179f2a5f24b92849366ff300fe97c06cf5e4320cb60
+  metadata.gz: 6d4adf406923dc9b9613bd0c90b68f6dd51023f4c03f07d05b406de2c98dd0b632cee46105c96432e0c8019ee7baa3eeed0fbea5a80d0746bb4141ceca777f04
+  data.tar.gz: af009b59c62ce252ad5cd99b97fedd079c4d52d7dd4dd2a7401eaf9d476016676717c4a570559902cdd6c9ce4c3db8bdc10c64fcaa11a8fd5cd187c6cdf7e93e

data/lib/rubosquad.rb

@@ -2,32 +2,80 @@
 
 require 'open3'
 require 'set'
-# Get the list of changed Ruby files, excluding this script
+require 'optparse'
+
+# Get the list of changed Ruby files in the current branch compared to main
 module Rubosquad
-  class CLI 
-    def self.run 
-      script_name = File.basename(__FILE__)
-      changed_files = `git diff --name-only main | grep '\.rb$'`.split("\n").reject { |file| file == script_name }
+  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
+        end
+      end.parse!
+
+      # Get the base branch (try main, then master, then origin/main, then origin/master)
+      base_branch = detect_base_branch
+
+      unless base_branch
+        Rails.logger.debug 'Error: Could not find main or master branch.'
+        exit 1
+      end
+
+      # Get current branch name
+      current_branch = `git rev-parse --abbrev-ref HEAD`.strip
+
+      if current_branch == base_branch
+        Rails.logger.debug "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$/)
+      end
+
+      # Filter out deleted files and files that don't exist
+      changed_files = changed_files.select { |file| File.exist?(file) }
 
       if changed_files.empty?
-        puts 'No Ruby files have changed.'
+        Rails.logger.debug 'No Ruby files have changed.'
         exit 0
       end
 
-      puts 'Running Rubocop on changed files:'
-      changed_files.each { |file| puts "- #{file}" }
+      comparison_info = if current_branch == base_branch
+                          "working directory changes on #{base_branch}"
+                        else
+                          "#{current_branch} vs #{base_branch}"
+                        end
 
-      # Check for available RuboCop extensions
+      Rails.logger.debug "\nRunning Rubocop on changed files (#{comparison_info}):"
+      changed_files.each { |file| puts "  - #{file}" }
+      Rails.logger.debug
+
+      # 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 { |ext| system("gem list -i #{ext} > /dev/null 2>&1") }
+      available_extensions = extensions.select do |ext|
+        require ext
+        true
+      rescue LoadError
+        false
+      end
 
       # Construct the RuboCop command
-      command = "rubocop -A --format offenses --format simple #{available_extensions.map do |ext|
+
+      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:"
+      Rails.logger.debug "\nRubocop Output:"
+      Rails.logger.debug '==Error type: Legend: C = Convention, W = Warning, E = Error, F = Fatal=='
 
       # Process and colorize output
       processed_output = ''
@@ -54,26 +102,40 @@ module Rubosquad
         end
       end
 
-      puts processed_output
+      Rails.logger.debug processed_output
 
       if status.success?
-        puts "\nRubocop auto-corrections complete."
+        Rails.logger.debug "\nRubocop auto-corrections complete."
       else
-        puts "\nRubocop completed with offenses:"
+        Rails.logger.debug "\nRubocop completed with offenses:"
 
         offenses = stdout.scan(/(\d+) offense.* detected/)
         total_offenses = offenses.flatten.map(&:to_i).sum
 
-        puts "Files inspected: #{stdout[/(\d+) files? inspected/, 1] || 'Unknown'}"
-        puts "Total offenses detected: #{total_offenses}"
+        Rails.logger.debug "Files inspected: #{stdout[/(\d+) files? inspected/, 1] || 'Unknown'}"
+        Rails.logger.debug "Total offenses detected: #{total_offenses}"
 
         unless stderr.strip.empty?
-          puts "\nStandard error:"
-          puts stderr
+          Rails.logger.debug "\nStandard error:"
+          Rails.logger.debug stderr
         end
       end
 
-      puts "\nRuboCop extensions used: #{available_extensions.join(', ')}"
+      Rails.logger.debug "\nRuboCop extensions used: #{available_extensions.join(', ')}"
+    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']
+
+      candidates.each do |branch|
+        # Check if the branch exists
+        result = `git rev-parse --verify #{branch} 2>/dev/null`.strip
+        return branch unless result.empty?
+      end
+
+      nil
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubosquad
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - LucasWaki
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-09-06 00:00:00.000000000 Z
+date: 2025-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop
@@ -24,7 +24,8 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
-description: A tool to run RuboCop on changed Ruby files in a Git repository
+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
 executables:
 - rubosquad
@@ -55,5 +56,5 @@ requirements: []
 rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
-summary: Run RuboCop on changed files
+summary: Run RuboCop on changed files in your branch/PR
 test_files: []