diff --git a/lib/telebugs/code_hunk.rb b/lib/telebugs/code_hunk.rb index fa00e35..3f386e8 100644 --- a/lib/telebugs/code_hunk.rb +++ b/lib/telebugs/code_hunk.rb @@ -13,7 +13,7 @@ def self.get(file, line) start_line = [line - AROUND_LINES, 1].max lines = get_lines(file, start_line, line + AROUND_LINES) - return { start_line: 0, lines: [] } if lines.empty? + return {start_line: 0, lines: []} if lines.empty? { start_line: start_line, @@ -37,7 +37,7 @@ def self.get(file, line) private_class_method def self.get_from_cache(file) Telebugs::FileCache[file] ||= File.foreach(file) - rescue StandardError + rescue nil end end diff --git a/lib/telebugs/config.rb b/lib/telebugs/config.rb index bb22e30..a0c6274 100644 --- a/lib/telebugs/config.rb +++ b/lib/telebugs/config.rb @@ -7,7 +7,7 @@ class Config ERROR_API_URL = "https://api.telebugs.com/2024-03-28/errors" attr_accessor :api_key, - :root_directory + :root_directory attr_reader :api_url @@ -32,7 +32,7 @@ def reset self.api_url = ERROR_API_URL self.root_directory = File.realpath( (defined?(Bundler) && Bundler.root) || - Dir.pwd, + Dir.pwd ) end end diff --git a/lib/telebugs/notice.rb b/lib/telebugs/notice.rb index df987aa..4d62f03 100644 --- a/lib/telebugs/notice.rb +++ b/lib/telebugs/notice.rb @@ -57,7 +57,7 @@ def attach_code(b) next unless File.exist?(frame[:file]) next unless frame[:line] next unless frame_belogns_to_root_directory?(frame) - next if frame[:file] =~ %r{vendor/bundle} + next if %r{vendor/bundle}.match?(frame[:file]) frame[:code] = CodeHunk.get(frame[:file], frame[:line]) end diff --git a/test/test_file_cache.rb b/test/test_file_cache.rb index 56b4426..b8ae010 100644 --- a/test/test_file_cache.rb +++ b/test/test_file_cache.rb @@ -14,17 +14,17 @@ def test_set_when_cache_limit_is_not_reached end assert_equal "value0", Telebugs::FileCache["key0"] - assert_equal "value#{max_size-1}", Telebugs::FileCache["key#{max_size-1}"] + assert_equal "value#{max_size - 1}", Telebugs::FileCache["key#{max_size - 1}"] end def test_set_when_cache_over_limit - max_size = 2*Telebugs::FileCache::MAX_SIZE + max_size = 2 * Telebugs::FileCache::MAX_SIZE max_size.times do |i| Telebugs::FileCache["key#{i}"] = "value#{i}" end assert_nil Telebugs::FileCache["key49"] assert_equal "value50", Telebugs::FileCache["key50"] - assert_equal "value#{max_size-1}", Telebugs::FileCache["key#{max_size-1}"] + assert_equal "value#{max_size - 1}", Telebugs::FileCache["key#{max_size - 1}"] end end diff --git a/test/test_notice.rb b/test/test_notice.rb index 1a8f6ee..3aabe78 100644 --- a/test/test_notice.rb +++ b/test/test_notice.rb @@ -4,16 +4,16 @@ class TestNotice < Minitest::Test def fixture_path(filename) - File.expand_path(File.join('test', 'fixtures', filename)) + File.expand_path(File.join("test", "fixtures", filename)) end def project_root_path(filename) - fixture_path(File.join('project_root', filename)) + fixture_path(File.join("project_root", filename)) end def setup Telebugs.configure do |c| - c.root_directory = project_root_path('') + c.root_directory = project_root_path("") end end @@ -52,12 +52,11 @@ def test_to_json_with_nested_errors def test_to_json_code error = RuntimeError.new error.set_backtrace([ - "#{project_root_path('code.rb')}:18:in `start'", + "#{project_root_path("code.rb")}:18:in `start'", fixture_path("notroot.txt:3:in `pineapple'"), - "#{project_root_path('vendor/bundle/ignored_file.rb')}:2:in `ignore_me'", + "#{project_root_path("vendor/bundle/ignored_file.rb")}:2:in `ignore_me'" ]) - n = Telebugs::Notice.new(error) json = JSON.parse(n.to_json) backtrace = json["errors"][0]["backtrace"]