onlylogs 0.12.0 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fae4a8382ece2fa6c8e6c302c0aedda949910921850215d9bcc7f3e86a628fec
-  data.tar.gz: c94139e2bc001f2a2bbe7488aabd5394858442105159fb790d42c86d688c3a75
+  metadata.gz: df2635aae242c5b3d3d1881c3dcb4c9297662200134c403b6f722036ef8f2357
+  data.tar.gz: f6faaccddcbd4042a0d6cb4cee8f087ce0ff7e9c75e66f0e403ee5c7de2edbc3
 SHA512:
-  metadata.gz: 45f50c071249d629b837bd02f1e785974da7698dcedd6ecd65a55093f853959f24a01290d4b6e1f52d199d09604bf114dcf591daf9ebb8d2d8da34705211a8af
-  data.tar.gz: cae201c83159e1b5476979c19b98fed07185eb221e600275a780ac4855f4f4cdf76a81805769c151edcf9a5551ce4eb93b62f5adfbfdde5d73f719bbee11b56c
+  metadata.gz: e649a51a9841c162ad4c418eea5047462505054a040f5314fec37f171109fb39bf4198e12d107b04f52d77cc19d84ab873e5435ca28bb77c1b4aad17677d02b6
+  data.tar.gz: 4e6b8ab9a92d4317c04de55e4f560642e77baa8d8b73c7f583fdb181383eed1965c6e731cbb871ede1aa2ce291a0f3a4dd07759eada1e0d4fc1f5fb069ab479d

data/app/controllers/onlylogs/queries_controller.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "sqlite_shards"
+
 module Onlylogs
   class QueriesController < ViewerController
     before_action :set_log_file

data/app/models/onlylogs/grep.rb

@@ -12,22 +12,27 @@ module Onlylogs
     # is deliberately not a number, because only the caller knows how long it
     # can afford to hold the thread it runs on. Anything serving a request
     # should pass one.
+    # +context+ asks for that many lines before and after each match, yielded with
+    # <tt>context: true</tt>. It needs ripgrep: plain grep is run without byte
+    # offsets, so its context lines could not be told apart from matches, and
+    # +context+ is ignored there. Context never reaches outside the byte window.
     def self.grep(pattern, file_path, start_position: 0, end_position: nil, regexp_mode: false,
-      case_sensitive: true, max_matches: Onlylogs.max_line_matches, timeout: nil, &block)
+      case_sensitive: true, max_matches: Onlylogs.max_line_matches, context: 0, timeout: nil, &block)
+      context = 0 unless Onlylogs.ripgrep_enabled?
       command_args = search_command(pattern, file_path, start_position: start_position,
         end_position: end_position, regexp_mode: regexp_mode, case_sensitive: case_sensitive,
-        max_matches: max_matches)
+        max_matches: max_matches, context: context)
 
       results = []
 
-      # Set up parsing logic based on whether ripgrep includes byte offsets
+      # ripgrep prints "offset:line" for a match and "offset-line" for context
       parse_line = if Onlylogs.ripgrep_enabled?
         ->(line) {
-          parts = line.split(":", 2)
-          [parts[0].to_i + start_position, parts[1] || ""]
+          offset, separator, content = line.partition(/[:-]/)
+          [offset.to_i + start_position, content, separator == "-"]
         }
       else
-        ->(line) { [nil, line] }
+        ->(line) { [nil, line, false] }
       end
 
       matches = 0
@@ -36,13 +41,17 @@ module Onlylogs
         query: pattern, regexp: regexp_mode, case_sensitive: case_sensitive, start_position: start_position,
         end_position: end_position, max_matches: max_matches) do |payload|
         each_output_line(command_args, timeout: timeout) do |line|
-          byte_offset, content = parse_line.call(line.chomp)
+          line = line.chomp
+          next if context.positive? && line == GROUP_SEPARATOR
+
+          byte_offset, content, context_line = parse_line.call(line)
 
           # Use String.new to create a copy and prevent memory retention from IO buffers
           content = String.new(content, encoding: Encoding::UTF_8).scrub
 
           result = {byte_offset: byte_offset, content: content}
-          matches += 1
+          result[:context] = true if context_line
+          matches += 1 unless context_line
 
           if block_given?
             yield result
@@ -62,16 +71,19 @@ module Onlylogs
       block_given? ? nil : results
     end
 
+    GROUP_SEPARATOR = "--"
+
     # The scripts run under LC_ALL=C. ripgrep folds case over Unicode anyway,
     # grep then folds ASCII only: "error" finds "ERROR" with both engines, but
     # "über" finds "Über" with ripgrep only.
     def self.search_command(pattern, file_path, start_position: 0, end_position: nil, regexp_mode: false,
-      case_sensitive: true, max_matches: Onlylogs.max_line_matches)
+      case_sensitive: true, max_matches: Onlylogs.max_line_matches, context: 0)
       script_name = Onlylogs.ripgrep_enabled? ? "super_ripgrep" : "super_grep"
       super_grep_path = ::File.expand_path("../../../bin/#{script_name}", __dir__)
 
       command_args = [super_grep_path]
       command_args += ["--max-matches", max_matches.to_s] if max_matches.present?
+      command_args += ["--context", context.to_s] if context.positive?
       command_args << "--regexp" if regexp_mode
       command_args << "--case-insensitive" unless case_sensitive
 

data/app/models/onlylogs/queries_record.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "sqlite_shards"
+
 module Onlylogs
   # Saved queries live in a database kept in each log directory, shared by all log files in it:
   # see File#with_database.

data/bin/super_ripgrep

@@ -12,6 +12,10 @@ while [[ $# -gt 0 ]]; do
       max_matches="$2"
       shift 2
       ;;
+    --context)
+      context="$2"
+      shift 2
+      ;;
     --start-position)
       start_position="$2"
       shift 2
@@ -67,6 +71,11 @@ query_regex="${query_regex//$placeholder/$actual_color_regex}"
 rg_cmd="rg --color=never --no-filename --byte-offset --no-mmap"
 [ -n "$max_matches" ] && rg_cmd="$rg_cmd --max-count=$max_matches"
 [ "$case_insensitive" = true ] && rg_cmd="$rg_cmd --ignore-case"
+# Context lines come out as "offset-line" instead of "offset:line", with "--" between groups
+case "$context" in
+  "" | *[!0-9]*) ;;
+  *) rg_cmd="$rg_cmd --context=$context" ;;
+esac
 
 # Handle byte range if specified
 if [ -n "$start_position" ] || [ -n "$end_position" ]; then

data/lib/onlylogs/engine.rb

@@ -8,7 +8,16 @@ module Onlylogs
   class Engine < ::Rails::Engine
     isolate_namespace Onlylogs
 
+    # Load the viewer's code on first use instead of at boot, so apps that only use the
+    # loggers don't need the frameworks it builds on (e.g. Action Cable).
+    paths.all_paths.select(&:eager_load?).each do |path|
+      path.skip_eager_load!
+      path.autoload!
+    end
+
     initializer "onlylogs.assets" do |app|
+      next unless app.config.respond_to?(:assets)
+
       %w[images javascript stylesheets builds fonts].each do |subdir|
         path = root.join("app/assets", subdir)
         app.config.assets.paths << path if path.exist?

data/lib/onlylogs/version.rb

@@ -1,3 +1,3 @@
 module Onlylogs
-  VERSION = "0.12.0"
+  VERSION = "0.13.0"
 end

data/lib/onlylogs.rb

@@ -1,4 +1,3 @@
-require "sqlite_shards"
 require "onlylogs/version"
 require "onlylogs/configuration"
 require "onlylogs/engine"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: onlylogs
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.13.0
 platform: ruby
 authors:
 - Alessandro Rodi
@@ -94,7 +94,6 @@ files:
 - app/javascript/onlylogs/controllers/queries_controller.js
 - app/javascript/onlylogs/controllers/range_slider_controller.js
 - app/javascript/onlylogs/controllers/text_selection_controller.js
-- app/jobs/onlylogs/application_job.rb
 - app/models/onlylogs/ansi_color_parser.rb
 - app/models/onlylogs/batch_sender.rb
 - app/models/onlylogs/file.rb

data/app/jobs/onlylogs/application_job.rb

@@ -1,4 +0,0 @@
-module Onlylogs
-  class ApplicationJob < ActiveJob::Base
-  end
-end