quick_check 0.1.1 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4ea26165117cca41f73e40de4f2975ac21bfa9d86b3d097dabfe43fbf3147416
-  data.tar.gz: 85d0174ff222df297448f18b3d6333b2cecc6aec6a82afacd86076568843f9f0
+  metadata.gz: e665ad565d365abca56c8521560fb97dd507683c8eec6d7c81084b2b393cf2d0
+  data.tar.gz: e82c198675cbc2aa956395d6b327088db5f5d4ad85f96a39c5abafb6830f57e4
 SHA512:
-  metadata.gz: 4c4631164f1ce412d3ee1c3ee1d100197ea2311c3ea28d246a3edc3854466194670a4faabcfae939e44c97caeed2552ed1a5cc1e09f9b5ec46c0f307d82bfe1b
-  data.tar.gz: 48b7538d2f0600a3381d8847eeab3455630612a715f0dbe70d996cd312fb9b7c15bd05083323eb9cc9f0eab788e1f40452dfa10332f623ef30ac9381c268d4e2
+  metadata.gz: 60f09a0569f3d80c90d95b41bc1d289cf136331bdf639e50d3c85931262488e9f6a5edc9678241b6ed1b9c570bfd8791031b8056acd1b51f7769cd85a3da3505
+  data.tar.gz: 2e38a08ee04981404e46b4099882a07927397aa66a9961704f480bb30b48cdb691af989e5c48cfb84d17475767e81309b8e3aed9801b616840b45ec2fbe9556b

data/README.md

@@ -27,6 +27,7 @@ qc
   - Staged (index) changes
   - Untracked files (new specs not yet added)
   - All committed changes on your branch vs base (`main`/`master`)
+  - Renames and copies are tracked so moved tests still run
 - You can disable branch commits with `--no-committed`
 - Auto-detects base branch (`main` or `master`) or configure via `.quick_check.yml`
 - Auto-detects framework and command:
@@ -99,10 +100,10 @@ If no config is present, `qc` will use the first existing branch among `main` or
 
 ## How it works
 
-- Unstaged: `git diff --name-only --diff-filter=AM`
-- Staged: `git diff --name-only --cached --diff-filter=AM`
+- Unstaged: `git diff --name-only -M -C --diff-filter=ACMR`
+- Staged: `git diff --name-only --cached -M -C --diff-filter=ACMR`
 - Untracked: `git ls-files --others --exclude-standard`
-- Committed vs base: `git diff --name-only --diff-filter=AM <base>...HEAD`
+- Committed vs base: `git diff --name-only -M -C --diff-filter=ACMR <base>...HEAD`
 
 Files are filtered to `spec/**/*_spec.rb` and/or `test/**/*_test.rb`, de-duplicated, sorted, and then:
 

data/lib/quick_check/cli.rb

@@ -17,7 +17,7 @@ module QuickCheck
       @argv = argv
       @options = {
         base_branch: nil,
-        include_committed_diff: false,
+        include_committed_diff: true,
         include_staged: true,
         include_unstaged: true,
         custom_command: nil,
@@ -126,28 +126,72 @@ module QuickCheck
       files = []
 
       if @options[:include_unstaged]
-        files.concat(git_diff_name_only(["--name-only", "--diff-filter=AM"]))
+        files.concat(git_diff_name_only(["--name-only", "-M", "-C", "--diff-filter=ACMR"]))
         files.concat(git_untracked_files)
       end
 
       if @options[:include_staged]
-        files.concat(git_diff_name_only(["--name-only", "--cached", "--diff-filter=AM"]))
+        files.concat(git_diff_name_only(["--name-only", "--cached", "-M", "-C", "--diff-filter=ACMR"]))
       end
 
       if @options[:include_committed_diff]
         current_branch = git_current_branch
         if current_branch && base_branch && current_branch != base_branch
-          # Include files changed on this branch vs base
-          range = diff_range_against_base(base_branch)
-          files.concat(git_diff_name_only(["--name-only", "--diff-filter=AM", range])) if range
+          upstream_branch = git_upstream_branch(current_branch)
+          # Prefer upstream tracking branch to correctly handle rebases (only shows local changes)
+          if upstream_branch && upstream_has_differences?(upstream_branch)
+            changed_files = diff_range_against_upstream(upstream_branch)
+            files.concat(changed_files) if changed_files
+          elsif !upstream_branch
+            # Fall back to base branch if no upstream exists
+            changed_files = diff_range_against_base(base_branch)
+            files.concat(changed_files) if changed_files
+          end
         end
       end
 
       files = files.compact.uniq
       rspec_specs = files.select { |f| f.match?(%r{\Aspec/.+_spec\.rb\z}) }
+      rspec_specs += infer_rspec_from_source(files)
       minitest_tests = files.select { |f| f.match?(%r{\Atest/.+_test\.rb\z}) }
 
-      { rspec: rspec_specs.sort, minitest: minitest_tests.sort }
+      { rspec: rspec_specs.uniq, minitest: minitest_tests.uniq }
+    end
+
+    def infer_rspec_from_source(files)
+      candidates = []
+      files.each do |path|
+        next unless path.end_with?(".rb")
+
+        if path =~ %r{\Aapp/models/(.+)\.rb\z}
+          spec_path = File.join("spec", "models", "#{$1}_spec.rb")
+          candidates << spec_path if File.file?(spec_path)
+          next
+        end
+
+        if path =~ %r{\Aapp/controllers/(.+?)(?:_controller)?\.rb\z}
+          controller_path = Regexp.last_match(1)
+          req_base = File.join("spec", "requests", controller_path)
+          req_variants = [
+            "#{req_base}_spec.rb",
+            "#{req_base}_controller_spec.rb"
+          ].select { |p| File.file?(p) }
+          if req_variants.any?
+            candidates.concat(req_variants)
+          else
+            ctrl_spec = File.join("spec", "controllers", "#{controller_path}_controller_spec.rb")
+            candidates << ctrl_spec if File.file?(ctrl_spec)
+          end
+          next
+        end
+
+        if path =~ %r{\Alib/(.+)\.rb\z}
+          spec_path = File.join("spec", "lib", "#{$1}_spec.rb")
+          candidates << spec_path if File.file?(spec_path)
+          next
+        end
+      end
+      candidates
     end
 
     def ensure_git_repo!
@@ -196,12 +240,17 @@ module QuickCheck
     end
 
     def branch_exists?(name)
+      local_branch_exists?(name) || remote_branch_exists?(name)
+    end
+
+    def local_branch_exists?(name)
       ok, _out, _err = run_cmd(["git", "show-ref", "--verify", "--quiet", "refs/heads/#{name}"])
-      return true if ok
+      ok
+    end
 
-      # fall back to remote branch
-      ok, _out, _err = run_cmd(["git", "ls-remote", "--heads", "origin", name])
-      ok && !_out.to_s.strip.empty?
+    def remote_branch_exists?(name)
+      ok, out, _err = run_cmd(["git", "ls-remote", "--heads", "origin", name])
+      ok && !out.to_s.strip.empty?
     end
 
     def git_current_branch
@@ -214,13 +263,50 @@ module QuickCheck
       ok ? out.to_s.strip : nil
     end
 
-    def diff_range_against_base(base)
-      # Prefer the symmetric range base...HEAD if base exists
-      if branch_exists?(base)
-        "#{base}...HEAD"
-      else
-        nil
+    def git_upstream_branch(branch)
+      # Get the upstream tracking branch for the current branch
+      ok, out, _err = run_cmd(["git", "rev-parse", "--abbrev-ref", "--symbolic-full-name", "#{branch}@{u}"])
+      if ok && !out.to_s.strip.empty?
+        upstream = out.to_s.strip
+        # Verify the upstream branch actually exists
+        ok_check, _out_check, _err_check = run_cmd(["git", "rev-parse", "--verify", "--quiet", upstream])
+        return upstream if ok_check
       end
+      nil
+    rescue StandardError
+      nil
+    end
+
+    def upstream_has_differences?(upstream)
+      # Only use upstream if it has local commits (avoids testing already-pushed changes)
+      ok, out, _err = run_cmd(["git", "rev-list", "--count", "#{upstream}..HEAD"])
+      return false unless ok
+      out.to_s.strip.to_i > 0
+    end
+
+    def diff_range_against_upstream(upstream)
+      files = git_log_first_parent_files(upstream, "HEAD")
+      files.empty? ? nil : files
+    end
+
+    def diff_range_against_base(base)
+      base_ref = if local_branch_exists?(base)
+                   base
+                 elsif remote_branch_exists?(base)
+                   "origin/#{base}"
+                 else
+                   return nil
+                 end
+      files = git_log_first_parent_files(base_ref, "HEAD")
+      files.empty? ? nil : files
+    end
+
+    def git_log_first_parent_files(base_ref, head_ref)
+      # Use --first-parent to exclude merge commits, only showing changes from direct branch commits
+      cmd = ["git", "log", "--first-parent", "--name-only", "--diff-filter=ACMR", "--format=", "#{base_ref}..#{head_ref}"]
+      ok, out, _err = run_cmd(cmd)
+      return [] unless ok
+      out.split("\n").map(&:strip).reject(&:empty?).uniq
     end
 
     def git_diff_name_only(args)

data/lib/quick_check/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module QuickCheck
-  VERSION = "0.1.1"
+  VERSION = "0.1.3"
 end

data/spec/quick_check/cli_spec.rb

@@ -53,7 +53,7 @@ RSpec.describe QuickCheck::CLI do
 
   it "runs rspec for changed rspec files" do
     stubs = base_git_stubs.merge(
-      "git diff --name-only --diff-filter=ACMR" => { stdout: "spec/models/user_spec.rb\n" }
+      "git diff --name-only -M -C --diff-filter=ACMR" => { stdout: "spec/models/user_spec.rb\n" }
     )
 
     status, out, _err = run_cli(["--dry-run"], git_outputs: stubs)
@@ -63,7 +63,7 @@ RSpec.describe QuickCheck::CLI do
 
   it "infers rspec from app source change" do
     stubs = base_git_stubs.merge(
-      "git diff --name-only --diff-filter=ACMR" => { stdout: "app/models/user.rb\n" }
+      "git diff --name-only -M -C --diff-filter=ACMR" => { stdout: "app/models/user.rb\n" }
     )
     status, out, _err = run_cli(["--dry-run"], git_outputs: stubs, existing_files: [
       File.join("spec", "models", "user_spec.rb")
@@ -74,7 +74,7 @@ RSpec.describe QuickCheck::CLI do
 
   it "maps controller to request spec with both base names" do
     stubs = base_git_stubs.merge(
-      "git diff --name-only --diff-filter=ACMR" => { stdout: "app/controllers/account/users_controller.rb\n" }
+      "git diff --name-only -M -C --diff-filter=ACMR" => { stdout: "app/controllers/account/users_controller.rb\n" }
     )
     existing = [
       File.join("spec", "requests", "account", "users_spec.rb"),
@@ -87,7 +87,7 @@ RSpec.describe QuickCheck::CLI do
 
   it "falls back to controller spec when no request spec exists" do
     stubs = base_git_stubs.merge(
-      "git diff --name-only --diff-filter=ACMR" => { stdout: "app/controllers/home_controller.rb\n" }
+      "git diff --name-only -M -C --diff-filter=ACMR" => { stdout: "app/controllers/home_controller.rb\n" }
     )
     existing = [File.join("spec", "controllers", "home_controller_spec.rb")]
     status, out, _err = run_cli(["--dry-run"], git_outputs: stubs, existing_files: existing)
@@ -97,7 +97,7 @@ RSpec.describe QuickCheck::CLI do
 
   it "runs minitest through rails test when test files change and rails present" do
     stubs = base_git_stubs.merge(
-      "git diff --name-only --diff-filter=ACMR" => { stdout: "test/models/user_test.rb\n" }
+      "git diff --name-only -M -C --diff-filter=ACMR" => { stdout: "test/models/user_test.rb\n" }
     )
     allow_any_instance_of(QuickCheck::CLI).to receive(:rails_available?).and_return(true)
     status, out, _err = run_cli(["--dry-run"], git_outputs: stubs, existing_files: [File.join("bin", "rails")])
@@ -107,11 +107,59 @@ RSpec.describe QuickCheck::CLI do
 
   it "runs per-file minitest when no rails" do
     stubs = base_git_stubs.merge(
-      "git diff --name-only --diff-filter=ACMR" => { stdout: "test/models/user_test.rb\n" }
+      "git diff --name-only -M -C --diff-filter=ACMR" => { stdout: "test/models/user_test.rb\n" }
     )
 
     status, out, _err = run_cli(["--dry-run"], git_outputs: stubs)
     expect(out.lines.map(&:strip)).to include("ruby -I test test/models/user_test.rb")
     expect(status).to eq(0)
   end
+
+  it "uses first-parent to handle rebases correctly" do
+    stubs = base_git_stubs.merge(
+      "git show-ref --verify --quiet refs/heads/main" => { success: true },
+      "git log --first-parent --name-only --diff-filter=ACMR --format= main..HEAD" => { stdout: "spec/my_feature_spec.rb\n" }
+    )
+
+    status, out, _err = run_cli(["--base", "main", "--dry-run", "--no-unstaged", "--no-staged"], git_outputs: stubs)
+    expect(status).to eq(0)
+    expect(out).to include("bundle exec rspec spec/my_feature_spec.rb")
+  end
+
+  it "prefers upstream branch over base branch when upstream has differences" do
+    stubs = base_git_stubs.merge(
+      "git rev-parse --abbrev-ref --symbolic-full-name feature@{u}" => { stdout: "origin/feature\n" },
+      "git rev-parse --verify --quiet origin/feature" => { success: true },
+      "git rev-list --count origin/feature..HEAD" => { stdout: "5\n" },
+      "git log --first-parent --name-only --diff-filter=ACMR --format= origin/feature..HEAD" => { stdout: "spec/my_local_change_spec.rb\n" }
+    )
+
+    status, out, _err = run_cli(["--base", "main", "--dry-run", "--no-unstaged", "--no-staged"], git_outputs: stubs)
+    expect(status).to eq(0)
+    expect(out).to include("bundle exec rspec spec/my_local_change_spec.rb")
+  end
+
+  it "does not include committed changes when upstream is in sync" do
+    stubs = base_git_stubs.merge(
+      "git rev-parse --abbrev-ref --symbolic-full-name feature@{u}" => { stdout: "origin/feature\n" },
+      "git rev-parse --verify --quiet origin/feature" => { success: true },
+      "git rev-list --count origin/feature..HEAD" => { stdout: "0\n" }
+    )
+
+    status, out, _err = run_cli(["--base", "main", "--dry-run", "--no-unstaged", "--no-staged"], git_outputs: stubs)
+    expect(status).to eq(0)
+    expect(out).to include("No changed/added test files detected.")
+  end
+
+  it "falls back to base branch when no upstream exists" do
+    stubs = base_git_stubs.merge(
+      "git rev-parse --abbrev-ref --symbolic-full-name feature@{u}" => { success: false, exitstatus: 128 },
+      "git show-ref --verify --quiet refs/heads/main" => { success: true },
+      "git log --first-parent --name-only --diff-filter=ACMR --format= main..HEAD" => { stdout: "spec/my_feature_spec.rb\n" }
+    )
+
+    status, out, _err = run_cli(["--base", "main", "--dry-run", "--no-unstaged", "--no-staged"], git_outputs: stubs)
+    expect(status).to eq(0)
+    expect(out).to include("bundle exec rspec spec/my_feature_spec.rb")
+  end
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: quick_check
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.3
 platform: ruby
 authors:
 - Kasvit
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-08-27 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies: []
 description: Adds the `qc` command to run only changed or newly added RSpec files
   from uncommitted changes and vs base branch (main/master).
@@ -32,7 +31,6 @@ homepage: https://github.com/kasvit/quick_check
 licenses:
 - MIT
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -47,8 +45,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
-signing_key:
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Run changed/added RSpec specs quickly
 test_files: []