grepfruit 3.1.0 → 3.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 50c38c621aa4a7c34b262cd61c45ced836cca10158b33566d709fd76bdb18f9f
-  data.tar.gz: f0a93887ab397d50a0a22e0600bb06925013632beab1040adf768c831bb6e5ac
+  metadata.gz: 51c0381a8449c749e2017cf4feac9cf35fb2c58e38f19a6a00fe994997d38b17
+  data.tar.gz: 61bca9861ce7d63331285d7b089e8521eac58f19465c293a50b07c5e4eb3cf01
 SHA512:
-  metadata.gz: 50838340c7e1b6168675ee64bf0f0608beaa708237d12b40efc0fb8099afbde20ae5f18860747984e37e60cf090d4ff4b5e96667cd728dd51299bc5b44ebcdf2
-  data.tar.gz: 66e4d2c8cda063641243eaad779c43bd5fba37ecaad1bda19c81de996986688ff2eb825d86260da1f6a2bda0b522de73c5e5af304b3fe166f2d0438d15fa270f
+  metadata.gz: e16bd1bc1c78d56b9253e2be32788f7dc5a03584de099e6ff6e7b78f581ea7ba9af018dc6c7b17dda06a7f55ab61488181237320b16fc3cd5768422a16d0cf8f
+  data.tar.gz: 948e8fadc208c058cfa943eeabb79a8b17d499fb78277e757b0655357dd028d8f312d008c52098c14bdcc2d1e94279fcefc1a821467e54020a26b209a72000d1

data/CHANGELOG.md

@@ -1,7 +1,12 @@
+## v3.1.1
+
+- Fixed JSON timestamp to reflect result generation time
+- Minor optimization
+
 ## v3.1.0
 
 - Added --include option to specify files to include in the search
-- Both --exclude and --include options can now accept multiple patterns
+- Both --exclude and --include options can now accept wildcard patterns
 
 ## v3.0.0
 

data/lib/grepfruit/cli.rb

@@ -26,9 +26,9 @@ module Grepfruit
           exclude: options[:exclude] || [],
           include: options[:include] || [],
           truncate: options[:truncate]&.to_i,
-          search_hidden: !!options[:search_hidden],
+          search_hidden: options[:search_hidden],
           jobs: options[:jobs]&.to_i,
-          json_output: !!options[:json]
+          json_output: options[:json]
         ).run
       end
 
@@ -36,9 +36,7 @@ module Grepfruit
 
       def validate_options!(options)
         error_exit("You must specify a regex pattern using the -r or --regex option.") unless options[:regex]
-
-        jobs = options[:jobs]&.to_i
-        error_exit("Number of jobs must be at least 1") if jobs && jobs < 1
+        error_exit("Number of jobs must be at least 1") if (jobs = options[:jobs]&.to_i) && jobs < 1
       end
 
       def create_regex(pattern)

data/lib/grepfruit/decorator.rb

@@ -4,9 +4,10 @@ module Grepfruit
 
     private
 
-    def green(text) = "#{COLORS[:green]}#{text}#{COLORS[:reset]}"
-    def red(text) = "#{COLORS[:red]}#{text}#{COLORS[:reset]}"
-    def cyan(text) = "#{COLORS[:cyan]}#{text}#{COLORS[:reset]}"
+    def colorize(text, color) = "#{COLORS[color]}#{text}#{COLORS[:reset]}"
+    def green(text) = colorize(text, :green)
+    def red(text) = colorize(text, :red)
+    def cyan(text) = colorize(text, :cyan)
 
     def number_of_files(num) = "#{num} file#{'s' if num != 1}"
     def number_of_matches(num) = "#{num} match#{'es' if num != 1}"
@@ -16,8 +17,8 @@ module Grepfruit
     end
 
     def processed_line(line)
-      stripped_line = line.strip
-      truncate && stripped_line.length > truncate ? "#{stripped_line[0...truncate]}..." : stripped_line
+      stripped = line.strip
+      truncate && stripped.length > truncate ? "#{stripped[0...truncate]}..." : stripped
     end
 
     def display_results(lines, files, files_with_matches)
@@ -41,7 +42,7 @@ module Grepfruit
         directory: dir,
         exclusions: (excluded_paths + excluded_lines).map { |path_parts| path_parts.join("/") },
         inclusions: included_paths.map { |path_parts| path_parts.join("/") },
-        timestamp: @start_time.strftime("%Y-%m-%dT%H:%M:%S%z")
+        timestamp: Time.now.strftime("%Y-%m-%dT%H:%M:%S%z")
       }
 
       summary = {

data/lib/grepfruit/search.rb

@@ -1,8 +1,6 @@
 require "find"
 require "etc"
 
-require_relative "decorator"
-
 Warning[:experimental] = false
 
 module Grepfruit
@@ -20,49 +18,77 @@ module Grepfruit
       @search_hidden = search_hidden
       @jobs = jobs || Etc.nprocessors
       @json_output = json_output
-      @start_time = Time.now
     end
 
     def run
       puts "Searching for #{regex.inspect} in #{dir.inspect}...\n\n" unless json_output
 
-      all_lines, total_files_with_matches, total_files = [], 0, 0
-      raw_matches = []
-      workers = create_workers
+      display_final_results(execute_search)
+    end
+
+    private
+
+    def execute_search
+      results = SearchResults.new
+      workers = Array.new(jobs) { create_persistent_worker }
       file_enumerator = create_file_enumerator
       active_workers = {}
 
       workers.each do |worker|
-        assign_file_to_worker(worker, file_enumerator, active_workers) && total_files += 1
+        assign_file_to_worker(worker, file_enumerator, active_workers, results)
       end
 
       while active_workers.any?
-        ready_worker, (file_results, has_matches) = Ractor.select(*active_workers.keys)
+        ready_worker, worker_result = Ractor.select(*active_workers.keys)
         active_workers.delete(ready_worker)
 
-        total_files_with_matches += 1 if process_worker_result(file_results, has_matches, all_lines, raw_matches)
-
-        assign_file_to_worker(ready_worker, file_enumerator, active_workers) && total_files += 1
+        results.increment_files_with_matches if process_worker_result(worker_result, results)
+        assign_file_to_worker(ready_worker, file_enumerator, active_workers, results)
       end
 
-      workers.each(&:close_outgoing)
+      shutdown_workers(workers)
+      results
+    end
 
+    def display_final_results(results)
       if json_output
-        display_json_results(raw_matches, total_files, total_files_with_matches)
+        display_json_results(results.raw_matches, results.total_files, results.total_files_with_matches)
       else
-        display_results(all_lines, total_files, total_files_with_matches)
+        display_results(results.all_lines, results.total_files, results.total_files_with_matches)
       end
     end
 
-    private
+    def create_persistent_worker
+      Ractor.new do
+        loop do
+          work = Ractor.receive
+          break if work == :quit
+
+          file_path, pattern, exc_lines, base_dir = work
+          file_results, has_matches = [], false
+
+          File.foreach(file_path).with_index do |line, line_num|
+            next unless line.valid_encoding? && line.match?(pattern)
+
+            relative_path = file_path.delete_prefix("#{base_dir}/")
+            next if exc_lines.any? { "#{relative_path}:#{line_num + 1}".end_with?(_1.join("/")) }
+
+            file_results << [relative_path, line_num + 1, line]
+            has_matches = true
+          end
+
+          Ractor.yield([file_results, has_matches])
+        end
+      end
+    end
 
-    def assign_file_to_worker(worker, file_enumerator, active_workers)
+    def assign_file_to_worker(worker, file_enumerator, active_workers, results)
       file_path = get_next_file(file_enumerator)
-      return false unless file_path
+      return unless file_path
 
       worker.send([file_path, regex, excluded_lines, dir])
       active_workers[worker] = file_path
-      true
+      results.total_files += 1
     end
 
     def get_next_file(enumerator)
@@ -71,27 +97,9 @@ module Grepfruit
       nil
     end
 
-    def create_workers
-      Array.new(jobs) do
-        Ractor.new do
-          loop do
-            file_path, pattern, exc_lines, base_dir = Ractor.receive
-            results, has_matches = [], false
-
-            File.foreach(file_path).with_index do |line, line_num|
-              next unless line.valid_encoding? && line.match?(pattern)
-
-              relative_path = file_path.delete_prefix("#{base_dir}/")
-              next if exc_lines.any? { "#{relative_path}:#{line_num + 1}".end_with?(_1.join("/")) }
-
-              results << [relative_path, line_num + 1, line]
-              has_matches = true
-            end
-
-            Ractor.yield([results, has_matches])
-          end
-        end
-      end
+    def shutdown_workers(workers)
+      workers.each { |worker| worker.send(:quit) }
+      workers.each(&:close_outgoing)
     end
 
     def create_file_enumerator
@@ -109,36 +117,32 @@ module Grepfruit
       end
     end
 
-    def process_worker_result(file_results, has_matches, all_lines, raw_matches)
+    def process_worker_result(worker_result, results)
+      file_results, has_matches = worker_result
+
       if has_matches
-        raw_matches.concat(file_results) if json_output
+        results.add_raw_matches(file_results) if json_output
 
         unless json_output
           colored_lines = file_results.map do |relative_path, line_num, line_content|
             "#{cyan("#{relative_path}:#{line_num}")}: #{processed_line(line_content)}"
           end
-          all_lines.concat(colored_lines)
+          results.add_lines(colored_lines)
           print red("M")
         end
-        true
       else
         print green(".") unless json_output
-        false
       end
-    end
-
-    def excluded_path?(path)
-      rel_path = relative_path(path)
 
-      not_included_path?(path, rel_path) || matches_pattern?(excluded_paths, rel_path) || excluded_hidden?(path)
+      has_matches
     end
 
-    def not_included_path?(path, rel_path)
-      File.file?(path) && included_paths.any? && !matches_pattern?(included_paths, rel_path)
-    end
+    def excluded_path?(path)
+      rel_path = path.delete_prefix("#{dir}/")
 
-    def excluded_hidden?(path)
-      !search_hidden && File.basename(path).start_with?(".")
+      (File.file?(path) && included_paths.any? && !matches_pattern?(included_paths, rel_path)) ||
+        matches_pattern?(excluded_paths, rel_path) ||
+        (!search_hidden && File.basename(path).start_with?("."))
     end
 
     def matches_pattern?(pattern_list, path)
@@ -147,9 +151,5 @@ module Grepfruit
         File.fnmatch?(pattern, path, File::FNM_PATHNAME) || File.fnmatch?(pattern, File.basename(path))
       end
     end
-
-    def relative_path(path)
-      path.delete_prefix("#{dir}/")
-    end
   end
 end

data/lib/grepfruit/search_results.rb

@@ -0,0 +1,25 @@
+module Grepfruit
+  class SearchResults
+    attr_reader :all_lines, :raw_matches, :total_files_with_matches
+    attr_accessor :total_files
+
+    def initialize
+      @all_lines = []
+      @raw_matches = []
+      @total_files = 0
+      @total_files_with_matches = 0
+    end
+
+    def increment_files_with_matches
+      @total_files_with_matches += 1
+    end
+
+    def add_lines(lines)
+      @all_lines.concat(lines)
+    end
+
+    def add_raw_matches(matches)
+      @raw_matches.concat(matches)
+    end
+  end
+end

data/lib/grepfruit/version.rb

@@ -1,3 +1,3 @@
 module Grepfruit
-  VERSION = "3.1.0".freeze
+  VERSION = "3.1.1".freeze
 end

data/lib/grepfruit.rb

@@ -1,4 +1,6 @@
 require_relative "grepfruit/version"
+require_relative "grepfruit/decorator"
+require_relative "grepfruit/search_results"
 require_relative "grepfruit/search"
 require_relative "grepfruit/cli"
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: grepfruit
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.1.1
 platform: ruby
 authors:
 - enjaku4
 bindir: exe
 cert_chain: []
-date: 2025-07-07 00:00:00.000000000 Z
+date: 2025-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-cli
@@ -37,6 +37,7 @@ files:
 - lib/grepfruit/cli.rb
 - lib/grepfruit/decorator.rb
 - lib/grepfruit/search.rb
+- lib/grepfruit/search_results.rb
 - lib/grepfruit/version.rb
 homepage: https://github.com/brownboxdev/grepfruit
 licenses: