grepfruit 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 32c9440099c6773c0462e07588d75db0dbc068417e01f1d9a1449dcdc2ee1031
-  data.tar.gz: 6ee33ae41606b4ee5d65204e6a9ae0c7d162d0b3fe6a30bac230aec272e91940
+  metadata.gz: d6d72bac5375937fd7214c4d0f13de9f619695de3614202af1d877aaffdaf1f4
+  data.tar.gz: 7d1abd0f67111b48ccf0e988c8bfcab18fd90cf0510d02571292d29f2b4642b1
 SHA512:
-  metadata.gz: be872e34b8520febbadefc4ab7a747f7bdf0bc4f59fc4a7b09902d6eb3b1caba434820b6745c0086dacde3d82c21c21c0722f3e7b492a014c08311586188b865
-  data.tar.gz: 10c7be4bc77fa12b3f7da587ac921073424af09df6534d4df4929f8d24402a76daf349fd2ded696be121469dbea1fb1fad7323ba11559809dfa3aa87d5827286
+  metadata.gz: 18e978abd3bd6beeb29e14b88e8847f1410e3adfe8e1ad4b82910075cae099e25e5139c4ca8c4077b3666e7b2ad63911eb9a5cb637c8b3306ac42ad908f3caf1
+  data.tar.gz: 7d48ec2fd3f5f04baa4c69b9187675e0664c46d728907702aaa9a82f62b4689f999fc923bf5cc6035feb298d80350d9cd4f2906e006276b79b6e1a9768a6bc5b

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## v1.1.2
+
+- Refactored code significantly for improved search efficiency and easier maintenance
+- Enhanced search result output for better readability
+
 ## v1.1.1
 
 - Added test dataset to make testing and development easier

data/exe/grepfruit

@@ -21,7 +21,7 @@ OptionParser.new do |opts|
   end
 
   opts.on("-e", "--exclude x,y,z", Array, "Comma-separated list of files and directories to exclude") do |exclude|
-    options[:exclude] = exclude.map { |path| path.split("/") }
+    options[:exclude] = exclude
   end
 
   opts.on("-t", "--truncate N", Integer, "Truncate output to N characters") do |truncate|
@@ -40,4 +40,4 @@ end
 
 options[:dir] = ARGV[0] if ARGV[0]
 
-Grepfruit.run(**options)
+Grepfruit::Search.new(**options).run

data/lib/grepfruit/version.rb

@@ -1,3 +1,3 @@
 module Grepfruit
-  VERSION = "1.1.1"
+  VERSION = "1.1.2"
 end

data/lib/grepfruit.rb

@@ -1,53 +1,6 @@
 require_relative "grepfruit/version"
-require "pathname"
-require "find"
+require_relative "search"
 
 module Grepfruit
-  def self.run(dir:, regex:, exclude:, truncate:, search_hidden:)
-    lines = []
-    files = 0
-    excluded_lines = exclude.select { |e| e.any? { |s| s.include?(":") } }
-    excluded_paths = exclude - excluded_lines
-
-    puts "Searching for #{regex.inspect} in #{dir.inspect}...\n\n"
-
-    Find.find(dir) do |path|
-      Find.prune if excluded_paths.any? { |e| path.split("/").last(e.length) == e } || !search_hidden && File.basename(path).start_with?(".")
-
-      next if File.directory?(path) || File.symlink?(path)
-
-      files += 1
-
-      match = false
-
-      File.foreach(path).with_index do |line, line_num|
-        next unless line.valid_encoding?
-
-        if line.match?(regex)
-          path_with_line = "#{Pathname.new(path).relative_path_from(Pathname.new(dir))}:#{line_num + 1}"
-
-          next if excluded_lines.any? { |e| path_with_line.split("/").last(e.length) == e }
-
-          processed_line = line.strip
-          processed_line = "#{processed_line[0..truncate - 1]}..." if truncate && processed_line.length > truncate
-          lines << "\e[36m#{path_with_line}\e[0m: #{processed_line}"
-          match = true
-        end
-      end
-
-      print match ? "\e[31mF\e[0m" : "\e[32m.\e[0m"
-    end
-
-    puts "\n\n"
-
-    if lines.empty?
-      puts "#{files} file#{'s' if files > 1} checked, \e[32mno matches found\e[0m"
-      exit(0)
-    else
-      puts "Matches:\n\n"
-      puts "#{lines.join("\n")}\n\n"
-      puts "#{files} file#{'s' if files > 1} checked, \e[31m#{lines.size} match#{'es' if lines.size > 1} found\e[0m"
-      exit(1)
-    end
-  end
+  class Error < StandardError; end
 end

data/lib/search.rb

@@ -0,0 +1,101 @@
+require "pathname"
+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:)
+      @dir = dir
+      @regex = regex
+      @excluded_lines, @excluded_paths = exclude.map { |e| e.split("/") }.partition { |e| e.last.include?(":") }
+      @truncate = truncate
+      @search_hidden = search_hidden
+    end
+
+    def run
+      lines, files = [], 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)
+
+        next if File.directory?(path) || File.symlink?(path)
+
+        files += 1
+
+        match = false
+
+        File.foreach(path).with_index do |line, line_num|
+          next unless line.valid_encoding?
+
+          if line.match?(regex)
+            next if excluded_line?(path, line_num)
+
+            lines << "#{CYAN}#{relative_path_with_line_num(path, line_num)}#{RESET}: #{processed_line(line)}"
+            match = true
+          end
+        end
+
+        print match ? "#{RED}M#{RESET}" : "#{GREEN}.#{RESET}"
+      end
+
+      puts "\n\n" if files.positive?
+
+      if lines.empty?
+        puts "#{number_of_files(files)} checked, #{GREEN}no matches found#{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}"
+        exit(1)
+      end
+    end
+
+    private
+
+    def excluded_path?(path)
+      excluded?(excluded_paths, relative_path(path))
+    end
+
+    def excluded_line?(path, line_num)
+      excluded?(excluded_lines, relative_path_with_line_num(path, line_num))
+    end
+
+    def excluded?(list, path)
+      list.any? { |e| path.split("/").last(e.length) == e }
+    end
+
+    def relative_path(path)
+      Pathname.new(path).relative_path_from(Pathname.new(dir)).to_s
+    end
+
+    def relative_path_with_line_num(path, line_num)
+      "#{relative_path(path)}:#{line_num + 1}"
+    end
+
+    def processed_line(line)
+      stripped_line = line.strip
+      truncate && stripped_line.length > truncate ? "#{stripped_line[0..truncate - 1]}..." : stripped_line
+    end
+
+    def hidden?(path)
+      File.basename(path).start_with?(".")
+    end
+
+    def number_of_files(num)
+      "#{num} file#{'s' if num > 1}"
+    end
+
+    def number_of_matches(num)
+      "#{num} match#{'es' if num > 1}"
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grepfruit
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - enjaku4
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-08-05 00:00:00.000000000 Z
+date: 2024-08-15 00:00:00.000000000 Z
 dependencies: []
 description:
 email:
@@ -24,6 +24,7 @@ files:
 - grepfruit.gemspec
 - lib/grepfruit.rb
 - lib/grepfruit/version.rb
+- lib/search.rb
 homepage: https://github.com/enjaku4/grepfruit
 licenses:
 - MIT
@@ -50,7 +51,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.33
+rubygems_version: 3.5.11
 signing_key:
 specification_version: 4
 summary: A Ruby gem for searching text patterns in files with colorized output