grepfruit 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8e88618b796ae6c0d9f54ec4bc64033e44ecee9fef5a3a889a0585dff11741e4
-  data.tar.gz: 1d6acc4c77b5175b9d13b3c4eb23b8ed069caf6f8e031037a1ec0244d945fa5c
+  metadata.gz: 96acccb252509097d33a932f2d463358358d1ee20aea951561e94c7aed2e995d
+  data.tar.gz: 1dd758ab6f2fef47cea4890cf8fe09ed4f31cd5477d04e0be9891614ed605457
 SHA512:
-  metadata.gz: 1690b2abec8f59847eace9a70cbaa9d8b08c54d64e35b76ef5d8f2ce6c707478a044e40fad514932f2bbcd9ec2cd289129e05b47497b102ab83fa6ed78dd631b
-  data.tar.gz: 322537a62dbb5d81731af9d973f8b5e69dc557e0721cfabbd8add2da69712b88a231371d5842b2e710fa882b7d03c9e7fd3ed9dfc4a3a5422c893ce0b9f21050
+  metadata.gz: '02887d74be8c339a488626d15d53fc8609b5ec8b6ec68396d988b30d5bd147e1f643d6dc07bfdb75a71db40f4c18e5d40e556ea464814664ff8dcfa676fb5beb'
+  data.tar.gz: 17d41be73711460f8da710759850b53f2d622d5a03442e00521123c2c0c964e01effdb93e97a768e5d75db33d4087ec03a64a42d4466f462d4d5a65e4def5b2c

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## v2.0.1
+
+- Enhanced output to include the number of files with matches
+
 ## v2.0.0
 
 - Added support for Ruby 3.4

data/lib/grepfruit/version.rb

@@ -1,3 +1,3 @@
 module Grepfruit
-  VERSION = "2.0.0"
+  VERSION = "2.0.1"
 end

data/lib/search.rb

@@ -3,11 +3,6 @@ require "find"
 
 module Grepfruit
   class Search
-    CYAN = "\e[36m"
-    RED = "\e[31m"
-    GREEN = "\e[32m"
-    RESET = "\e[0m"
-
     attr_reader :dir, :regex, :excluded_paths, :excluded_lines, :truncate, :search_hidden
 
     def initialize(dir:, regex:, exclude:, truncate:, search_hidden:)
@@ -19,48 +14,65 @@ module Grepfruit
     end
 
     def run
-      lines, files = [], 0
+      lines, files, files_with_matches = [], 0, 0
 
       puts "Searching for #{regex.inspect} in #{dir.inspect}...\n\n"
 
       Find.find(dir) do |path|
-        Find.prune if excluded_path?(path) || !search_hidden && hidden?(path)
+        Find.prune if excluded_path?(path)
 
-        next if File.directory?(path) || File.symlink?(path)
+        next if not_searchable?(path)
 
         files += 1
+        match = process_file(path, lines)
+
+        if match
+          files_with_matches += 1
+          print "#{COLORS[:red]}M#{COLORS[:reset]}"
+        else
+          print "#{COLORS[:green]}.#{COLORS[:reset]}"
+        end
+      end
 
-        match = false
+      display_results(lines, files, files_with_matches)
+    end
 
-        File.foreach(path).with_index do |line, line_num|
-          next unless line.valid_encoding?
+    COLORS = { cyan: "\e[36m", red: "\e[31m", green: "\e[32m", reset: "\e[0m" }
+    private_constant :COLORS
 
-          if line.match?(regex) && !excluded_line?(path, line_num)
-            lines << "#{CYAN}#{relative_path_with_line_num(path, line_num)}#{RESET}: #{processed_line(line)}"
-            match = true
-          end
-        end
+    private
 
-        print match ? "#{RED}M#{RESET}" : "#{GREEN}.#{RESET}"
+    def not_searchable?(path)
+      File.directory?(path) || File.symlink?(path)
+    end
+
+    def process_file(path, lines)
+      lines_size = lines.size
+
+      File.foreach(path).with_index do |line, line_num|
+        next if !line.valid_encoding? || !line.match?(regex) || excluded_line?(path, line_num)
+
+        lines << "#{COLORS[:cyan]}#{relative_path_with_line_num(path, line_num)}#{COLORS[:reset]}: #{processed_line(line)}"
       end
 
+      lines.size > lines_size
+    end
+
+    def display_results(lines, files, files_with_matches)
       puts "\n\n" if files.positive?
 
       if lines.empty?
-        puts "#{number_of_files(files)} checked, #{GREEN}no matches found#{RESET}"
+        puts "#{number_of_files(files)} checked, #{COLORS[:green]}no matches found#{COLORS[:reset]}"
         exit(0)
       else
-        puts "Matches:\n\n"
-        puts "#{lines.join("\n")}\n\n"
-        puts "#{number_of_files(files)} checked, #{RED}#{number_of_matches(lines.size)} found#{RESET}"
+        puts "Matches:\n\n#{lines.join("\n")}\n\n"
+        puts "#{number_of_files(files)} checked, #{COLORS[:red]}#{number_of_matches(lines.size)} found in #{number_of_files(files_with_matches)}#{COLORS[:reset]}"
         exit(1)
       end
     end
 
-    private
-
     def excluded_path?(path)
-      excluded?(excluded_paths, relative_path(path))
+      excluded?(excluded_paths, relative_path(path)) || !search_hidden && hidden?(path)
     end
 
     def excluded_line?(path, line_num)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grepfruit
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - enjaku4
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-12-25 00:00:00.000000000 Z
+date: 2024-12-26 00:00:00.000000000 Z
 dependencies: []
 description:
 email: