fcom 0.10.0 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 68129781aa3cc8ae384295332a34c05c270d2c9dbbb60a415783e4e5305100b0
-  data.tar.gz: 5629104bbb23e2a2c196b3f39bed19403ced76bac870572a170ea659d5b1fd49
+  metadata.gz: 0e7928ac7aa3b85318f701ea1758c3d5ea6b66abedede5d30ffdde4a57e101d7
+  data.tar.gz: eccc91bfb11cae5d9d5c624c8d402261e09e7ae1bd49815ad815411431926a88
 SHA512:
-  metadata.gz: d749e928e35e8d967d24405f4003fec4493317c003d046ee394f0e7daf3ec01acd3eb3d2542ead6df1fa3fe8aebbc19297807aeab9ca198ffea2e698d3adf144
-  data.tar.gz: af623c1d0bec21086dd67e3b6641cb042610a5e19bc9c0cce524eebe16903b2f4b835cc03ca444bd1c243a3233d7363b299595b9a75de5306fa1069f7cee6bf4
+  metadata.gz: 69d76ea1e442afcd6d9921745ec71a1e4b825dd4a1df8d172a925f61ae55d73729eac97153f2ba413001fc410a7e4e8291942ab83c68559d0c92e94f5c751abe
+  data.tar.gz: bf57c916fba57fd8c2cb8cf522d369fce057b43b6b3d73492613d25657f7a3c693372a73968573aae8921bb569535a5650c510aaed782f061bec76d702f4a245

data/.github/dependabot.yml

@@ -1,8 +1,11 @@
+---
 version: 2
 updates:
-- package-ecosystem: bundler
-  directory: "/"
-  schedule:
-    interval: daily
-    time: "04:04"
-    timezone: America/Chicago
+  - package-ecosystem: bundler
+    directory: "/"
+    schedule:
+      interval: daily
+      time: "04:04"
+      timezone: America/Chicago
+    allow:
+      - dependency-type: all

data/.ruby-version

@@ -1 +1 @@
-3.3.3
+3.3.4

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## v0.12.0 (2024-07-21)
+- Default `--rg-options` to `--max-columns=2000`
+
+## v0.11.0 (2024-07-16)
+- Search back through renames
+
 ## v0.10.0 (2024-06-28)
 - Enforce only major and minor parts of required Ruby version (loosening the
   required Ruby version from 3.3.3 to 3.3.0)

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    fcom (0.10.0)
+    fcom (0.12.0)
       activesupport (>= 6, < 8)
       memo_wise (>= 1.7, < 2)
       rainbow (>= 3.0, < 4)
@@ -35,10 +35,10 @@ GEM
     language_server-protocol (3.17.0.3)
     memo_wise (1.9.0)
     method_source (1.1.0)
-    minitest (5.24.0)
+    minitest (5.24.1)
     mutex_m (0.2.0)
     parallel (1.25.1)
-    parser (3.3.3.0)
+    parser (3.3.4.0)
       ast (~> 2.4.1)
       racc
     prism (0.30.0)
@@ -52,7 +52,7 @@ GEM
     rainbow (3.1.1)
     rake (13.2.1)
     regexp_parser (2.9.2)
-    rexml (3.3.1)
+    rexml (3.3.2)
       strscan
     rspec (3.13.0)
       rspec-core (~> 3.13.0)
@@ -67,13 +67,13 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
     rspec-support (3.13.1)
-    rubocop (1.64.1)
+    rubocop (1.65.0)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.8, < 3.0)
+      regexp_parser (>= 2.4, < 3.0)
       rexml (>= 3.2.5, < 4.0)
       rubocop-ast (>= 1.31.1, < 2.0)
       ruby-progressbar (~> 1.7)
@@ -85,15 +85,15 @@ GEM
       rubocop-ast (>= 1.31.1, < 2.0)
     rubocop-rake (0.6.0)
       rubocop (~> 1.0)
-    rubocop-rspec (3.0.1)
+    rubocop-rspec (3.0.3)
       rubocop (~> 1.61)
     ruby-progressbar (1.13.0)
-    runger_release_assistant (0.8.0)
+    runger_release_assistant (0.10.0)
       activesupport (>= 6, < 8)
       memo_wise (>= 1.7, < 2)
       rainbow (>= 3.0, < 4)
       slop (~> 4.8)
-    runger_style (2.8.0)
+    runger_style (2.12.0)
       prism (>= 0.24.0)
       rubocop (>= 1.38.0, < 2)
     slop (4.10.1)
@@ -120,7 +120,7 @@ DEPENDENCIES
   runger_style
 
 RUBY VERSION
-   ruby 3.3.3p89
+   ruby 3.3.4p94
 
 BUNDLED WITH
    2.5.11

data/bin/githooks/pre-push

@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+
+set -euo pipefail # exit on any error, don't allow undefined variables, pipes don't swallow errors
+
+lint gitleaks
+
+background-and-notify lint rubocop
+background-and-notify lint shellcheck

data/lib/fcom/querier.rb

@@ -5,6 +5,7 @@ require_relative 'options_helpers.rb'
 # This class executes a system command to retrieve the git history, which is passed through `rg`
 # (ripgrep), and then ultimately is fed back to `fcom` for parsing.
 class Fcom::Querier
+  prepend MemoWise
   include ::Fcom::OptionsHelpers
 
   def initialize(options)
@@ -13,6 +14,7 @@ class Fcom::Querier
 
   # rubocop:disable Metrics/CyclomaticComplexity
   # rubocop:disable Metrics/PerceivedComplexity
+  # rubocop:disable Metrics/MethodLength
   def query
     expression_to_match = search_string
     expression_to_match = Regexp.escape(expression_to_match).gsub('\\ ', ' ') unless regex_mode?
@@ -24,37 +26,88 @@ class Fcom::Querier
 
     quote = expression_to_match.include?('"') ? "'" : '"'
 
-    command = <<~COMMAND.squish
-      git log
-        --format="commit %s|%H|%an|%cr (%ci)"
-        --patch
-        --full-diff
-        --no-textconv
-        #{%(--author="#{author}") if author}
-        #{"--since=#{days}.day" unless days.nil?}
-        --
-        #{path}
-        |
-
-      rg #{quote}(#{expression_to_match})|(^commit )|(^diff )#{quote}
-        --color never
-        #{'--ignore-case' if ignore_case?}
-        #{@options[:rg_options]}
-        |
-
-      #{'exe/' if development?}fcom #{quote}#{search_string}#{quote}
-        #{"--days #{days}" if days}
-        #{'--regex' if regex_mode?}
-        #{'--debug' if debug?}
-        #{'--ignore-case' if ignore_case?}
-        --path #{path}
-        --parse-mode
-        --repo #{repo}
-    COMMAND
-
-    Fcom.logger.debug("Executing command: #{command}")
-    system(command)
+    commands =
+      filename_by_most_recent_containing_commit.map do |commit, path_at_commit|
+        <<~COMMAND.squish
+          git log
+            --format="commit %s|%H|%an|%cr (%ci)"
+            --patch
+            --full-diff
+            --no-textconv
+            #{%(--author="#{author}") if author}
+            #{"--since=#{days}.day" unless days.nil?}
+            #{commit}
+            --
+            #{path_at_commit}
+            |
+
+          rg #{quote}(#{expression_to_match})|(^commit )|(^diff )#{quote}
+            --color never
+            #{'--ignore-case' if ignore_case?}
+            #{@options[:rg_options]}
+            |
+
+          #{'exe/' if development?}fcom #{quote}#{search_string}#{quote}
+            #{"--days #{days}" if days}
+            #{'--regex' if regex_mode?}
+            #{'--debug' if debug?}
+            #{'--ignore-case' if ignore_case?}
+            --path #{path_at_commit}
+            --parse-mode
+            --repo #{repo}
+        COMMAND
+      end
+
+    previous_command_generated_output = false
+
+    commands.each do |command|
+      Fcom.logger.debug("Executing command: #{command}")
+      output = `#{command}`
+
+      if output.empty?
+        previous_command_generated_output = false
+      else
+        if previous_command_generated_output
+          puts("\n\n") # print blank lines for spacing
+        end
+
+        previous_command_generated_output = true
+
+        puts(output)
+      end
+    end
   end
+  # rubocop:enable Metrics/MethodLength
   # rubocop:enable Metrics/PerceivedComplexity
   # rubocop:enable Metrics/CyclomaticComplexity
+
+  private
+
+  memo_wise \
+  def filename_by_most_recent_containing_commit
+    {
+      most_recent_commit_with_file => path,
+    }.merge(renames.transform_keys { "#{_1}^" })
+  end
+
+  memo_wise \
+  def most_recent_commit_with_file
+    if system(%(test -e "#{path}"))
+      'HEAD'
+    else
+      `git log --all -1 --format="%H" -- "#{path}"`.rstrip
+    end
+  end
+
+  memo_wise \
+  def renames
+    `git log HEAD --format=%H --name-status --follow --diff-filter=R -- '#{path}'`.
+      split(/\n(?=[0-9a-f]{40})/).
+      to_h do |sha_and_name_info|
+        sha_and_name_info.
+          match(/(?<sha>[0-9a-f]{40})\n\nR\d+\s+(?<previous_name>\S+)?/).
+          named_captures.
+          values_at('sha', 'previous_name')
+      end
+  end
 end

data/lib/fcom/version.rb

@@ -2,6 +2,6 @@
 
 # rubocop:disable Style/StaticClass
 class Fcom
-  VERSION = '0.10.0'
+  VERSION = '0.12.0'
 end
 # rubocop:enable Style/StaticClass

data/lib/fcom.rb

@@ -75,7 +75,7 @@ class Fcom
       options.string(
         '--rg-options',
         'additional options passed directly to `rg` (e.g. `--rg-options "--max-columns 1000"`)',
-        default: '',
+        default: '--max-columns=2000',
       )
       options.bool('--debug', 'print debugging info', default: false)
       options.bool('--parse-mode', 'whether we are in parse mode', default: false, help: false)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fcom
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.12.0
 platform: ruby
 authors:
 - David Runger
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-06-28 00:00:00.000000000 Z
+date: 2024-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -108,6 +108,7 @@ files:
 - Rakefile
 - bin/_guard-core
 - bin/console
+- bin/githooks/pre-push
 - bin/guard
 - bin/release
 - bin/rspec
@@ -145,7 +146,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.14
+rubygems_version: 3.5.15
 signing_key:
 specification_version: 4
 summary: CLI tool for parsing git history