grepfruit 2.0.1 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 96acccb252509097d33a932f2d463358358d1ee20aea951561e94c7aed2e995d
-  data.tar.gz: 1dd758ab6f2fef47cea4890cf8fe09ed4f31cd5477d04e0be9891614ed605457
+  metadata.gz: 523ee40a32ea4bc5c0d6b91ca60d147985a8d79b84396b17c3fd4b49f629f121
+  data.tar.gz: 84ee19de06fbb489a6dc9ac32365cc92a00b23fe11337b7d2c236f12ffa509c0
 SHA512:
-  metadata.gz: '02887d74be8c339a488626d15d53fc8609b5ec8b6ec68396d988b30d5bd147e1f643d6dc07bfdb75a71db40f4c18e5d40e556ea464814664ff8dcfa676fb5beb'
-  data.tar.gz: 17d41be73711460f8da710759850b53f2d622d5a03442e00521123c2c0c964e01effdb93e97a768e5d75db33d4087ec03a64a42d4466f462d4d5a65e4def5b2c
+  metadata.gz: 76821e2d3b8967d931491d66c7d25cbea24b8998d9c4d2603c13a8597c04484d6eb0cb046e5ad9470d9c546ca70ec729b3929447db66dbf7ccceba3767393575
+  data.tar.gz: 766456777c31d8c58a4e2ee6d4f6891ac8c280130c9c671894dd56d6e7e1c64e65ad512f0a73497ac6f94ab19653a7267d394fea152aca9a451cbfa874754e83

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## v2.0.3
+
+- Updated gemspec metadata to include the correct homepage URL
+
+## v2.0.2
+
+- Replaced `git ls-files` with `Dir.glob` in gemspec for improved portability and compatibility
+
 ## v2.0.1
 
 - Enhanced output to include the number of files with matches

data/README.md

@@ -1,11 +1,11 @@
 # Grepfruit
 
 [![Gem Version](https://badge.fury.io/rb/grepfruit.svg)](http://badge.fury.io/rb/grepfruit)
-[![Github Actions badge](https://github.com/enjaku4/grepfruit/actions/workflows/main.yml/badge.svg)](https://github.com/enjaku4/grepfruit/actions/workflows/main.yml)
+[![Github Actions badge](https://github.com/brownboxdev/grepfruit/actions/workflows/ci.yml/badge.svg)](https://github.com/brownboxdev/grepfruit/actions/workflows/ci.yml)
 
 Grepfruit is a Ruby gem for searching files within a directory for a specified regular expression pattern, with options to exclude certain files or directories from the search and colorized output for better readability.
 
-<img width="440" alt="Screenshot 2024-08-16 at 21 17 25" src="https://github.com/user-attachments/assets/3caaa1f4-5636-4ca1-ae45-6fc56f8945e4">
+<img width="431" alt="Screenshot 2024-12-26 at 18 01 39" src="https://github.com/user-attachments/assets/e3fdb4f7-c4d9-4c8d-9a5a-228f2be55d52" />
 
 Grepfruit was originally created to be used in CI/CD pipelines to search for `TODO` comments in Ruby on Rails applications and provide more user-friendly output than the standard `grep` command, but it is flexible enough to be used for other similar purposes as well.
 
@@ -14,7 +14,7 @@ Grepfruit was originally created to be used in CI/CD pipelines to search for `TO
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'grepfruit'
+gem "grepfruit"
 ```
 
 And then execute:
@@ -91,12 +91,12 @@ Encountered a bug?
 
 ## Contributing
 
-Before creating an issue or a pull request, please read the [contributing guidelines](https://github.com/enjaku4/grepfruit/blob/master/CONTRIBUTING.md).
+Before creating an issue or a pull request, please read the [contributing guidelines](https://github.com/brownboxdev/grepfruit/blob/master/CONTRIBUTING.md).
 
 ## License
 
-The gem is available as open source under the terms of the [MIT License](https://github.com/enjaku4/grepfruit/blob/master/LICENSE.txt).
+The gem is available as open source under the terms of the [MIT License](https://github.com/brownboxdev/grepfruit/blob/master/LICENSE.txt).
 
 ## Code of Conduct
 
-Everyone interacting in the Grepfruit project is expected to follow the [code of conduct](https://github.com/enjaku4/grepfruit/blob/master/CODE_OF_CONDUCT.md).
+Everyone interacting in the Grepfruit project is expected to follow the [code of conduct](https://github.com/brownboxdev/grepfruit/blob/master/CODE_OF_CONDUCT.md).

data/grepfruit.gemspec

@@ -4,7 +4,7 @@ Gem::Specification.new do |spec|
   spec.name = "grepfruit"
   spec.version = Grepfruit::VERSION
   spec.authors = ["enjaku4"]
-  spec.homepage = "https://github.com/enjaku4/grepfruit"
+  spec.homepage = "https://github.com/brownboxdev/grepfruit"
   spec.metadata["homepage_uri"] = spec.homepage
   spec.metadata["source_code_uri"] = spec.homepage
   spec.metadata["changelog_uri"] = "#{spec.homepage}/blob/master/CHANGELOG.md"
@@ -15,7 +15,7 @@ Gem::Specification.new do |spec|
 
   spec.files = [
     "grepfruit.gemspec", "README.md", "CHANGELOG.md", "LICENSE.txt"
-  ] + `git ls-files | grep -E '^(lib|exe)'`.split("\n")
+  ] + Dir.glob("{exe,lib}/**/*")
 
   spec.bindir = "exe"
   spec.executables = ["grepfruit"]

data/lib/grepfruit/decorator.rb

@@ -0,0 +1,58 @@
+module Grepfruit
+  module Decorator
+    COLORS = { cyan: "\e[36m", red: "\e[31m", green: "\e[32m", reset: "\e[0m" }
+    private_constant :COLORS
+
+    private
+
+    def green(text)
+      "#{COLORS[:green]}#{text}#{COLORS[:reset]}"
+    end
+
+    def red(text)
+      "#{COLORS[:red]}#{text}#{COLORS[:reset]}"
+    end
+
+    def cyan(text)
+      "#{COLORS[:cyan]}#{text}#{COLORS[:reset]}"
+    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
+
+    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 decorated_line(path, line_num, line)
+      "#{cyan(relative_path_with_line_num(path, line_num))}: #{processed_line(line)}"
+    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')}"
+        exit(0)
+      else
+        puts "Matches:\n\n#{lines.join("\n")}\n\n"
+        puts "#{number_of_files(files)} checked, #{red("#{number_of_matches(lines.size)} found in #{number_of_files(files_with_matches)}")}"
+        exit(1)
+      end
+    end
+  end
+end

data/lib/{search.rb → grepfruit/search.rb}

@@ -1,8 +1,12 @@
 require "pathname"
 require "find"
 
+require_relative "decorator"
+
 module Grepfruit
   class Search
+    include Decorator
+
     attr_reader :dir, :regex, :excluded_paths, :excluded_lines, :truncate, :search_hidden
 
     def initialize(dir:, regex:, exclude:, truncate:, search_hidden:)
@@ -28,18 +32,15 @@ module Grepfruit
 
         if match
           files_with_matches += 1
-          print "#{COLORS[:red]}M#{COLORS[:reset]}"
+          print red("M")
         else
-          print "#{COLORS[:green]}.#{COLORS[:reset]}"
+          print green(".")
         end
       end
 
       display_results(lines, files, files_with_matches)
     end
 
-    COLORS = { cyan: "\e[36m", red: "\e[31m", green: "\e[32m", reset: "\e[0m" }
-    private_constant :COLORS
-
     private
 
     def not_searchable?(path)
@@ -52,25 +53,12 @@ module Grepfruit
       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)}"
+        lines << decorated_line(path, line_num, 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, #{COLORS[:green]}no matches found#{COLORS[:reset]}"
-        exit(0)
-      else
-        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
-
     def excluded_path?(path)
       excluded?(excluded_paths, relative_path(path)) || !search_hidden && hidden?(path)
     end
@@ -83,29 +71,8 @@ module Grepfruit
       list.any? { path.split("/").last(_1.length) == _1 }
     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

data/lib/grepfruit/version.rb

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

data/lib/grepfruit.rb

@@ -1,5 +1,5 @@
 require_relative "grepfruit/version"
-require_relative "search"
+require_relative "grepfruit/search"
 
 module Grepfruit
   class Error < StandardError; end

metadata

@@ -1,17 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grepfruit
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.3
 platform: ruby
 authors:
 - enjaku4
-autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-12-26 00:00:00.000000000 Z
+date: 2025-05-16 00:00:00.000000000 Z
 dependencies: []
-description:
-email:
 executables:
 - grepfruit
 extensions: []
@@ -23,17 +20,17 @@ files:
 - exe/grepfruit
 - grepfruit.gemspec
 - lib/grepfruit.rb
+- lib/grepfruit/decorator.rb
+- lib/grepfruit/search.rb
 - lib/grepfruit/version.rb
-- lib/search.rb
-homepage: https://github.com/enjaku4/grepfruit
+homepage: https://github.com/brownboxdev/grepfruit
 licenses:
 - MIT
 metadata:
-  homepage_uri: https://github.com/enjaku4/grepfruit
-  source_code_uri: https://github.com/enjaku4/grepfruit
-  changelog_uri: https://github.com/enjaku4/grepfruit/blob/master/CHANGELOG.md
+  homepage_uri: https://github.com/brownboxdev/grepfruit
+  source_code_uri: https://github.com/brownboxdev/grepfruit
+  changelog_uri: https://github.com/brownboxdev/grepfruit/blob/master/CHANGELOG.md
   rubygems_mfa_required: 'true'
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -51,8 +48,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.27
-signing_key:
+rubygems_version: 3.6.2
 specification_version: 4
 summary: A Ruby gem for searching text patterns in files with colorized output
 test_files: []