fcom 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 54c08eaf4c06c0d65d9b829cf88206a0d25688a0397437a7836d1cfc638cd80c
-  data.tar.gz: c27ea916068ede38ac90fb4edcabd69a56c5a05021c4f62f63fc1dfab03451c8
+  metadata.gz: 4a056a9aab3e0ea48cc82af0c6d3c296ca8497d3c144e37961b1db241ddc92e2
+  data.tar.gz: b27fa969ce900aa5c19fe0d818cc0728b1e43c108419baa40ba226121fcadfe8
 SHA512:
-  metadata.gz: 403933bb82c011b46e7f37e23b95ae574186d8caf8e5ba568303648974e99a48b3adec5db3573e26e060e1c25ed746084312edc74d52c39ccc05bf4233262866
-  data.tar.gz: 71b7c9699ac233c2d648fe46af0b00f507605ed78be6e1e9880edb93f20d91162c751e8405ef85d75b1e392b70a95ee5baec196c6bc5ad9df97687c045b03bfb
+  metadata.gz: 3c197afe0ccab572607fe42ca4ca723260eb8540bc3b18bd31a6cdc2aa2e35738400ae2d3c14dae4c0fa36a5a062eca4c4c03726599dfd3ec1c9651aee2153a3
+  data.tar.gz: c1503d963d3e9c5c4b8c508c1afc22fcdb08eb6cc095503245a56ea1d66da9fa644939d95ab5144f03106530aa7133d4383085a786b74dddbfc3341b8101de1f

data/CHANGELOG.md

@@ -1,6 +1,13 @@
 ## Unreleased
 [no unreleased changes yet]
 
+## v1.1.0 (2026-08-28)
+- Don't include Git patch metadata as matching lines.
+- Remove the hidden `--development` option. Use `bundle exec ruby exe/fcom` for development searches.
+
+## 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.
 

data/Gemfile.lock

@@ -10,7 +10,7 @@ GIT
 PATH
   remote: .
   specs:
-    fcom (1.0.0)
+    fcom (1.1.0)
       activesupport (>= 6)
       memo_wise (>= 1.7)
       rainbow (>= 3.0)
@@ -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 (1.0.0)
+  fcom (1.1.0)
   i18n (1.15.2) sha256=00f9eb62412fe593b2a65a97daa75300d37abb8f7202ec748e94b6d46a9dd1b5
   io-console (0.9.2) sha256=efa74f891dd03c0939a931dfc6e74c2813d904763d456ea9762b0525e748db08
   irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3

data/README.md

@@ -4,9 +4,9 @@
 
 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)" --repo davidrunger/fcom`, I get this output:
+For example, if I use `fcom` to search this repo with `fcom 'rename.?\b' --commits 2 --author "David Runger"`, I get this output:
 
-![](https://s3.amazonaws.com/screens.davidrunger.com/2019-12-28-20-50-09-oect2(1).png)
+![fcom screenshot](https://david-runger-public-uploads.s3.us-east-1.amazonaws.com/fcom-screenshot.png)
 
 ## Table of Contents
 
@@ -108,9 +108,7 @@ The performance of `fcom`'s querying and parsing of git history can significantl
 
 ## Development
 
-After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run
-the tests. You can also run `bin/console` for an interactive prompt that will allow you to
-experiment.
+After checking out the repo, run `bin/setup` to install dependencies. Then, run `bundle exec rake spec` to run the tests. To run a search using the local executable, use `bundle exec ruby exe/fcom`, for example `bundle exec ruby exe/fcom 'rename.?\b' --commits 2`. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
 
 To install this gem onto your local machine, run (in this repository's root directory):
 

data/lib/fcom/options_helpers.rb

@@ -32,10 +32,6 @@ module Fcom::OptionsHelpers
     @options.debug?
   end
 
-  def development?
-    @options.development?
-  end
-
   def repo
     @options[:repo]
   end

data/lib/fcom/parser.rb

@@ -14,13 +14,15 @@ class Fcom::Parser
   end
 
   def parse
-    expression_to_match = search_string
-    if fixed_strings?
-      expression_to_match = Regexp.escape(expression_to_match).gsub('\\ ', ' ')
-    end
+    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)",
+        "\\A(?:[+-]\\s?.*(?:#{expression_to_match}).*|Omitted long (?:matching )?line)",
         ignore_case? ? Regexp::IGNORECASE : nil,
       )
 
@@ -43,6 +45,8 @@ class Fcom::Parser
           when old_filename == new_filename then old_filename
           else "#{old_filename} --> #{new_filename}"
           end
+      elsif line.match?(%r{\A(?:---|\+\+\+) })
+        next
       elsif line.match?(regex) && (filename.blank? || path_match?(filename))
         if previous_commit
           title, sha, author, date = previous_commit.split('|')

data/lib/fcom/querier.rb

@@ -16,10 +16,12 @@ class Fcom::Querier
   end
 
   def query
-    expression_to_match = search_string
-    if fixed_strings?
-      expression_to_match = Regexp.escape(expression_to_match).gsub('\\ ', ' ')
-    end
+    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')
@@ -92,6 +94,7 @@ class Fcom::Querier
       git log
         --format="commit %s|%H|%an|%cr (%ci)"
         --patch
+        --unified=0
         --full-diff
         --diff-algorithm=default
         --topo-order
@@ -113,9 +116,7 @@ class Fcom::Querier
         #{@options[:rg_options]}
         |
 
-      #{if development?
-          File.join(__dir__, '../../exe/')
-        end}fcom #{quote}#{search_string}#{quote}
+      fcom #{quote}#{search_string}#{quote}
         #{if days
             "--days #{days}"
           end}

data/lib/fcom/version.rb

@@ -2,5 +2,5 @@
 
 # rubocop:disable-next Style/StaticClass
 class Fcom
-  VERSION = '1.0.0'
+  VERSION = '1.1.0'
 end

data/lib/fcom.rb

@@ -79,7 +79,6 @@ class Fcom
       )
       options.bool('--debug', 'print debugging info', default: false)
       options.bool('--parse-mode', 'whether we are in parse mode', default: false, help: false)
-      options.bool('--development', 'use local `fcom` executable', default: false, help: false)
     end
   end
 end

metadata

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