fcom 0.15.1 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0c8b0dd7d7b36e4bd151dfa83cd99252084903d32659371c5c69290ae38f206a
-  data.tar.gz: 82cb2f4608be68669c1c2cd2d3738e2d1b43e36ed5bf7cf2d4385d89b4e0a748
+  metadata.gz: e65d9caf74b1e93ed107925a8e601991eea9e93852015fa9d70b6f4f22852689
+  data.tar.gz: 361e48b4cd8174078afd0c2e278efbe366119cb5dfd4fcfb3324440b8080f5f5
 SHA512:
-  metadata.gz: fe72bb3397bd44703fa4ddb905beaa7dca2126327a8d1fb5c4d05864e24b4df004d536a609e6e6b4097a3d8414745999e9aec17baab57c0f781d249308c2316f
-  data.tar.gz: feb8dfbe3440a91cd81d27656d99368b853b3e32d279dbcf2be8078a7038810b6c1295bca521e82d8f8b55364065e78b22d8eec66823700d764b9b8204e9e9f4
+  metadata.gz: d5c2b6e11a0c0eea3949ec3108233f589f8b3dc36b6e4db046aa1293e190476e86666195b672845cc975e89bf1b3686a5bb5e55b2373ea0d3f47c2b71f433a1f
+  data.tar.gz: '096901b32e4d02674839c3817eb67292b1182d2331a5fa71a7916e9b9fdf22a82404630cde1129bd9db23e1a53da0b82cd957e49662567bd280c9d2bb1c2dfc3'

data/.github/dependabot.yml

@@ -9,3 +9,7 @@ updates:
       timezone: America/Chicago
     allow:
       - dependency-type: all
+  - package-ecosystem: github-actions
+    directory: "/"
+    schedule:
+      interval: weekly

data/.github/workflows/ruby.yml

@@ -15,8 +15,8 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
-    - uses: ruby/setup-ruby@v1
+    - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+    - uses: ruby/setup-ruby@95ef2b042f9d7a56d8268cba8559e2842e2ad01b # v1.321.0
       with:
         bundler-cache: true
     - name: Run RuboCop

data/CHANGELOG.md

@@ -1,6 +1,12 @@
 ## Unreleased
 [no unreleased changes yet]
 
+## v1.0.1 (2026-08-28)
+- Don't include commits or files whose matches are only in diff context lines.
+
+## v1.0.0 (2026-08-28)
+- **BREAKING CHANGE:** interpret search strings as regular expressions by default. Use `-F`/`--fixed-strings` to search for fixed strings.
+
 ## v0.15.1 (2026-08-15)
 - Exit cleanly with a clear message when interrupting a search with Ctrl-C.
 

data/Gemfile.lock

@@ -1,6 +1,6 @@
 GIT
   remote: https://github.com/davidrunger/pry-byebug
-  revision: 7c0c1cac48b00f51e652a25423aeccd5eed5c966
+  revision: a02f6ab4317cade079f3d9b3455e803acd6fccbe
   specs:
     pry-byebug (3.10.1)
       pry (>= 0.13)
@@ -10,7 +10,7 @@ GIT
 PATH
   remote: .
   specs:
-    fcom (0.15.1)
+    fcom (1.0.1)
       activesupport (>= 6)
       memo_wise (>= 1.7)
       rainbow (>= 3.0)
@@ -73,7 +73,7 @@ GEM
     racc (1.8.1)
     rainbow (3.1.1)
     rake (13.4.2)
-    rbs (4.1.3)
+    rbs (4.2.0)
       logger
       prism (>= 1.6.0)
       tsort
@@ -100,8 +100,8 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
     rspec-support (3.13.7)
-    rubocop (1.89.0)
-      json (~> 2.3)
+    rubocop (1.90.0)
+      json (>= 2.3)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.1.0)
       parallel (>= 1.10)
@@ -114,9 +114,9 @@ GEM
     rubocop-ast (1.50.0)
       parser (>= 3.3.7.2)
       prism (~> 1.7)
-    rubocop-performance (1.26.1)
+    rubocop-performance (1.27.0)
       lint_roller (~> 1.1)
-      rubocop (>= 1.75.0, < 2.0)
+      rubocop (>= 1.89.0, < 2.0)
       rubocop-ast (>= 1.47.1, < 2.0)
     rubocop-rake (0.7.1)
       lint_roller (~> 1.1)
@@ -135,7 +135,7 @@ GEM
       rainbow (>= 3.0)
       rake (>= 13.2.1)
       slop (~> 4.8)
-    runger_style (5.14.0)
+    runger_style (5.19.1)
       prism (>= 0.24.0)
       rubocop (>= 1.72.0)
     securerandom (0.4.1)
@@ -177,7 +177,7 @@ CHECKSUMS
   diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962
   drb (2.2.3) sha256=0b00d6fdb50995fe4a45dea13663493c841112e4068656854646f418fda13373
   erb (6.0.7) sha256=c5ca6dc25b0ef974a44dc8f59fe847577122483b1968a38dec305c60bf91ee92
-  fcom (0.15.1)
+  fcom (1.0.1)
   i18n (1.15.2) sha256=00f9eb62412fe593b2a65a97daa75300d37abb8f7202ec748e94b6d46a9dd1b5
   io-console (0.9.2) sha256=efa74f891dd03c0939a931dfc6e74c2813d904763d456ea9762b0525e748db08
   irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3
@@ -198,7 +198,7 @@ CHECKSUMS
   racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f
   rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a
   rake (13.4.2) sha256=cb825b2bd5f1f8e91ca37bddb4b9aaf345551b4731da62949be002fa89283701
-  rbs (4.1.3) sha256=0c4474a9751cdc14364bfad0b3e53678323bbdc2c31683b0445932867dbab8c4
+  rbs (4.2.0) sha256=51f7b886dcc05bc09e10b901daa6a81829f6adc03101d6ca9ea4aac6103e0674
   rdoc (8.0.0) sha256=03bf8c08a9639658855a0cfd77c0abca8325c227693f7f33f82957811348c469
   readline (0.0.4) sha256=6138eef17be2b98298b672c3ea63bf9cb5158d401324f26e1e84f235879c1d6a
   regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb
@@ -208,15 +208,15 @@ CHECKSUMS
   rspec-expectations (3.13.5) sha256=33a4d3a1d95060aea4c94e9f237030a8f9eae5615e9bd85718fe3a09e4b58836
   rspec-mocks (3.13.8) sha256=086ad3d3d17533f4237643de0b5c42f04b66348c28bf6b9c2d3f4a3b01af1d47
   rspec-support (3.13.7) sha256=0640e5570872aafefd79867901deeeeb40b0c9875a36b983d85f54fb7381c47c
-  rubocop (1.89.0) sha256=4dee8e3ee9c45e474834efd9e8d6fd031e8331c8dacdff0de4ad65ae0a6faae7
+  rubocop (1.90.0) sha256=9eb4c065b5c5154e4ef554c547972f3905a9eb6b53e657e580b6796b54bf8242
   rubocop-ast (1.50.0) sha256=b9ca88300da0803ee222ad20cdb30494c0a784eed06fdc35d254b06d662788db
-  rubocop-performance (1.26.1) sha256=cd19b936ff196df85829d264b522fd4f98b6c89ad271fa52744a8c11b8f71834
+  rubocop-performance (1.27.0) sha256=eeeb1374d062a368ee1c787b70eb0b0cc4b184cb1f8565f424760946146d61ce
   rubocop-rake (0.7.1) sha256=3797f2b6810c3e9df7376c26d5f44f3475eda59eb1adc38e6f62ecf027cbae4d
   rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2
   ruby-progressbar (1.13.0) sha256=80fc9c47a9b640d6834e0dc7b3c94c9df37f08cb072b7761e4a71e22cff29b33
   runger_byebug (11.4.0) sha256=569e22ba2215f57e7f69e145fcb63be401e29fcd312f7936d813e12d0c7bbee6
   runger_release_assistant (4.3.1) sha256=3246c925240739eb12b9e6b9526a77ea00fcf0a0941441ff5ffacefb7e3e4d83
-  runger_style (5.14.0) sha256=4fbed1be49c06a3f3358e47cedfce7d1d0e20d8aeaef22e751d0742f1b8c5755
+  runger_style (5.19.1) sha256=d085f17bbfd0f9356692b0bc65199f4e9fb08a87d15b4bffe4bbd61368f9874e
   securerandom (0.4.1) sha256=cc5193d414a4341b6e225f0cb4446aceca8e50d5e1888743fac16987638ea0b1
   slop (4.10.1) sha256=844322b5ffcf17ed4815fdb173b04a20dd82b4fd93e3744c88c8fafea696d9c7
   tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f

data/README.md

@@ -4,8 +4,7 @@
 
 This is a CLI tool that I use to parse the git history of a repo.
 
-For example, if I use `fcom` to search this repo with `fcom "line.(green|red)" --regex --repo
-davidrunger/fcom`, I get this output:
+For example, if I use `fcom` to search this repo with `fcom "line.(green|red)" --repo davidrunger/fcom`, I get this output:
 
 ![](https://s3.amazonaws.com/screens.davidrunger.com/2019-12-28-20-50-09-oect2(1).png)
 
@@ -58,24 +57,24 @@ Usage: fcom <search string> [options]
 
 Examples:
   fcom update
-  fcom 'def update'
+  fcom 'user.update!' --fixed-strings
   fcom "def update" --days 60
-  fcom "[Uu]ser.*slug" -d 365 --regex
+  fcom "[Uu]ser.*slug" -d 365
   fcom options --path spec/
-  fcom "line.(green|red)" -d 365 --regex --repo davidrunger/fcom -a "David Runger"
-
-    --repo             GitHub repo (in form `username/repo`)
-    -d, --days         number of days to search back
-    -c, --commits      maximum number of commits to show
-    -r, --regex        interpret search string as a regular expression
-    -i, --ignore-case  search case-insensitively
-    -p, --path         path (directory or file) used to filter results
-    -a, --author       author
-    --rg-options       additional options passed directly to `rg` (e.g. `--rg-options "--max-columns 1000"`)
-    --debug            print debugging info
-    --init             create an `.fcom.yml` config file
-    -v, --version      print the version
-    -h, --help         print this help information
+  fcom "line.(green|red)" -d 365 --repo davidrunger/fcom -a "David Runger"
+
+    --repo               GitHub repo (in form `username/repo`)
+    -d, --days           number of days to search back
+    -c, --commits        maximum number of commits to show
+    -F, --fixed-strings  interpret search string as a fixed string
+    -i, --ignore-case    search case-insensitively
+    -p, --path           path (directory or file) used to filter results
+    -a, --author         author
+    --rg-options         additional options passed directly to `rg` (e.g. `--rg-options "--max-columns 1000"`)
+    --debug              print debugging info
+    --init               create an `.fcom.yml` config file
+    -v, --version        print the version
+    -h, --help           print this help information
 ```
 
 ## The `.fcom.yml` config file

data/exe/fcom

@@ -16,11 +16,11 @@ opts =
 
       Examples:
         fcom update
-        fcom 'def update'
+        fcom 'user.update!' --fixed-strings
         fcom "def update" --days 60
-        fcom "[Uu]ser.*slug" -d 365 --regex
+        fcom "[Uu]ser.*slug" -d 365
         fcom options --path spec/
-        fcom "line.(green|red)" -d 365 --regex --repo davidrunger/fcom -a "David Runger"
+        fcom "line.(green|red)" -d 365 --repo davidrunger/fcom -a "David Runger"
     BANNER
 
     Fcom.define_slop_options(o)
@@ -41,7 +41,9 @@ opts =
   end
 
 # Note: mutating the globally accessible `Fcom.logger` constant like this is not thread-safe
-Fcom.logger.level = Logger::DEBUG if opts.debug?
+if opts.debug?
+  Fcom.logger.level = Logger::DEBUG
+end
 
 if !system('which rg > /dev/null')
   puts("fcom requires that `rg` (ripgrep) be available on your PATH, but it's not.".red)

data/lib/fcom/options_helpers.rb

@@ -24,8 +24,8 @@ module Fcom::OptionsHelpers
     @options[:path]
   end
 
-  def regex_mode?
-    @options.regex?
+  def fixed_strings?
+    @options.fixed_strings?
   end
 
   def debug?

data/lib/fcom/parser.rb

@@ -14,8 +14,12 @@ class Fcom::Parser
   end
 
   def parse
-    expression_to_match = search_string
-    expression_to_match = Regexp.escape(expression_to_match).gsub('\\ ', ' ') unless regex_mode?
+    expression_to_match =
+      if fixed_strings?
+        Regexp.escape(search_string).gsub('\\ ', ' ')
+      else
+        search_string
+      end
     regex =
       Regexp.new(
         "((\\+|-)\\s?.*#{expression_to_match}.*|Omitted long (matching )?line)",
@@ -28,7 +32,9 @@ class Fcom::Parser
     $stdin.each do |line|
       line.chomp!
       if (match = line.match(/^commit (.*)/)&.[](1))
-        break if commit_limit_reached?
+        if commit_limit_reached?
+          break
+        end
 
         previous_commit = match
       elsif line.match?(/^diff /)
@@ -45,7 +51,9 @@ class Fcom::Parser
           short_sha = sha[0, 8]
           sha_with_url = "#{short_sha} ( https://github.com/#{repo}/commit/#{short_sha} )"
 
-          puts("\n\n") if a_commit_has_matched # print commit separator, if needed
+          if a_commit_has_matched # print commit separator, if needed
+            puts("\n\n")
+          end
           puts([title, sha_with_url, author, date])
           puts(COMMIT_HEADER_SEPARATOR)
 
@@ -77,8 +85,10 @@ class Fcom::Parser
   end
 
   def path_match?(filename)
-    return true if path == Fcom::ROOT_PATH
-
-    filename.include?(path.delete_prefix('./'))
+    if path == Fcom::ROOT_PATH
+      true
+    else
+      filename.include?(path.delete_prefix('./'))
+    end
   end
 end

data/lib/fcom/querier.rb

@@ -16,8 +16,12 @@ class Fcom::Querier
   end
 
   def query
-    expression_to_match = search_string
-    expression_to_match = Regexp.escape(expression_to_match).gsub('\\ ', ' ') unless regex_mode?
+    expression_to_match =
+      if fixed_strings?
+        Regexp.escape(search_string).gsub('\\ ', ' ')
+      else
+        search_string
+      end
 
     if expression_to_match.nil? || expression_to_match.empty?
       puts('provide expression to match as first argument')
@@ -30,7 +34,9 @@ class Fcom::Querier
     remaining_commits = commits
 
     filename_by_most_recent_containing_commit.each do |commit, path_at_commit|
-      break if remaining_commits && remaining_commits <= 0
+      if remaining_commits && remaining_commits <= 0
+        break
+      end
 
       command = query_command(commit, path_at_commit, expression_to_match, quote, remaining_commits)
       Fcom.logger.debug("Executing command: #{command}")
@@ -43,7 +49,7 @@ class Fcom::Querier
         if first_byte
           # Add spacing if needed
           if a_previous_command_generated_output_not_yet_spaced
-            print "\n\n"
+            print("\n\n")
           end
 
           a_previous_command_generated_output_not_yet_spaced = true
@@ -53,14 +59,18 @@ class Fcom::Querier
           # Now read the rest line by line
           stdout.each_line do |line|
             puts(line)
-            commits_printed += 1 if line.chomp == Fcom::Parser::COMMIT_HEADER_SEPARATOR
+            if line.chomp == Fcom::Parser::COMMIT_HEADER_SEPARATOR
+              commits_printed += 1
+            end
           end
         end
       rescue Errno::EIO
         # The command produced no output.
       end
 
-      remaining_commits -= commits_printed if remaining_commits
+      if remaining_commits
+        remaining_commits -= commits_printed
+      end
     end
   rescue Interrupt
     puts("\nSearch interrupted.")
@@ -84,12 +94,15 @@ class Fcom::Querier
       git log
         --format="commit %s|%H|%an|%cr (%ci)"
         --patch
+        --unified=0
         --full-diff
         --diff-algorithm=default
         --topo-order
         --no-textconv
         --stdin
-        #{%(--author="#{author}") if author}
+        #{if author
+            %(--author="#{author}")
+          end}
         #{days_limiter}
         --
         #{path_at_commit}
@@ -97,16 +110,30 @@ class Fcom::Querier
 
       rg #{quote}(#{expression_to_match})|(^commit )|(^diff )#{quote}
         --color never
-        #{'--ignore-case' if ignore_case?}
+        #{if ignore_case?
+            '--ignore-case'
+          end}
         #{@options[:rg_options]}
         |
 
-      #{File.join(__dir__, '../../exe/') if development?}fcom #{quote}#{search_string}#{quote}
-        #{"--days #{days}" if days}
-        #{"--commits #{commits_limit}" if commits_limit}
-        #{'--regex' if regex_mode?}
-        #{'--debug' if debug?}
-        #{'--ignore-case' if ignore_case?}
+      #{if development?
+          File.join(__dir__, '../../exe/')
+        end}fcom #{quote}#{search_string}#{quote}
+        #{if days
+            "--days #{days}"
+          end}
+        #{if commits_limit
+            "--commits #{commits_limit}"
+          end}
+        #{if fixed_strings?
+            '--fixed-strings'
+          end}
+        #{if debug?
+            '--debug'
+          end}
+        #{if ignore_case?
+            '--ignore-case'
+          end}
         --path #{path_at_commit}
         --parse-mode
         --repo #{repo}

data/lib/fcom/version.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
-# rubocop:disable Style/StaticClass
+# rubocop:disable-next Style/StaticClass
 class Fcom
-  VERSION = '0.15.1'
+  VERSION = '1.0.1'
 end
-# rubocop:enable Style/StaticClass

data/lib/fcom.rb

@@ -10,10 +10,9 @@ using Rainbow
 
 # This `Fcom` class is the namespace within which most of the gem's code is written.
 # We need to define the class before requiring the modules.
-# rubocop:disable Lint/EmptyClass
+# rubocop:disable-next Lint/EmptyClass
 class Fcom
 end
-# rubocop:enable Lint/EmptyClass
 
 Dir["#{File.dirname(__FILE__)}/fcom/*.rb"].each { |file| require file }
 
@@ -56,9 +55,9 @@ class Fcom
       options.integer('-d', '--days', 'number of days to search back')
       options.integer('-c', '--commits', 'maximum number of commits to show')
       options.bool(
-        '-r',
-        '--regex',
-        'interpret search string as a regular expression',
+        '-F',
+        '--fixed-strings',
+        'interpret search string as a fixed string',
         default: false,
       )
       options.bool('-i', '--ignore-case', 'search case-insensitively', default: false)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fcom
 version: !ruby/object:Gem::Version
-  version: 0.15.1
+  version: 1.0.1
 platform: ruby
 authors:
 - David Runger