dead_end 1.1.0 → 1.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8b372fd8bb6cb9f7b3a601fcb32a539ae361fa19e3f64471d6c446564532750c
-  data.tar.gz: fc78d6a4ff9f86663af64dc6acf1bf2a0bced8fded065a2e0b52210e19766496
+  metadata.gz: 8e2b1b2c93acbc5dde38ac7da8fc9dee057389e676bde9eb95683395b6b78ad8
+  data.tar.gz: 0ef003bc94de8db02a1a0573bc77a0045b63207c6dd24557ec8f7b9dc76383f0
 SHA512:
-  metadata.gz: 5ee131a4f8574bec7a8e9054b4085524cf49692afeb40387144f9461f34323b533944b1c9683b0772c43858ed348fb6eb889ae89ecfb765b0c26b805e93dee4c
-  data.tar.gz: bffe41e67a11e342ad5db8a36b7faa81c1ea24eab2a37bb67c77762cd0be470f12cc55b8baf9e9696e2ed321943eed348328b637220102d2e9e1678c17ef3d18
+  metadata.gz: 8a6f4849d79629110326aba138ab290ca0bdc9eedf427b13b21ed1cbae084be28d017bf20644684552dbb660bd9547b514951eb909cc894304d25db8b020310b
+  data.tar.gz: 8f1056255fa656d206e1e2b4160b903b6d88d60043f150e1fbf943a852901488e52e0819fd29bb059109ff015e01a7167688010733d49b81057bb62d2d000bd0

data/.circleci/config.yml

@@ -32,6 +32,14 @@ jobs:
       - ruby/install-deps
       - <<: *unit
 
+  "ruby-3-0":
+    docker:
+      - image: circleci/ruby:3.0
+    steps:
+      - checkout
+      - ruby/install-deps
+      - <<: *unit
+
 workflows:
   version: 2
   build:
@@ -39,3 +47,4 @@ workflows:
       - "ruby-2-5"
       - "ruby-2-6"
       - "ruby-2-7"
+      - "ruby-3-0"

data/CHANGELOG.md

@@ -1,5 +1,25 @@
 ## HEAD (unreleased)
 
+## 1.1.5
+
+- Source code with multiple syntax errors will be indentified by their first syntax error (https://github.com/zombocom/dead_end/pull/57)
+
+## 1.1.4
+
+- Avoid including demo gif in built gem (https://github.com/zombocom/dead_end/pull/53)
+
+## 1.1.3
+
+- Add compatibility with zeitwerk (https://github.com/zombocom/dead_end/pull/52)
+
+## 1.1.2
+
+- Namespace Kernel method aliases (https://github.com/zombocom/dead_end/pull/51)
+
+## 1.1.1
+
+- Safer NoMethodError annotation (https://github.com/zombocom/dead_end/pull/48)
+
 ## 1.1.0
 
 - Annotate NoMethodError in non-production environments (https://github.com/zombocom/dead_end/pull/46)

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    dead_end (1.1.0)
+    dead_end (1.1.5)
 
 GEM
   remote: https://rubygems.org/
@@ -33,4 +33,4 @@ DEPENDENCIES
   stackprof
 
 BUNDLED WITH
-   2.1.4
+   2.2.9

data/dead_end.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
   spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
-    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features|assets)/}) }
   end
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }

data/lib/dead_end/auto.rb

@@ -5,27 +5,29 @@ require_relative "../dead_end/internals"
 # Monkey patch kernel to ensure that all `require` calls call the same
 # method
 module Kernel
-  alias_method :original_require, :require
-  alias_method :original_require_relative, :require_relative
-  alias_method :original_load, :load
+  module_function
+
+  alias_method :dead_end_original_require, :require
+  alias_method :dead_end_original_require_relative, :require_relative
+  alias_method :dead_end_original_load, :load
 
   def load(file, wrap = false)
-    original_load(file)
+    dead_end_original_load(file)
   rescue SyntaxError => e
     DeadEnd.handle_error(e)
   end
 
   def require(file)
-    original_require(file)
+    dead_end_original_require(file)
   rescue SyntaxError => e
     DeadEnd.handle_error(e)
   end
 
   def require_relative(file)
     if Pathname.new(file).absolute?
-      original_require file
+      dead_end_original_require file
     else
-      original_require File.expand_path("../#{file}", caller_locations(1, 1)[0].absolute_path)
+      dead_end_original_require File.expand_path("../#{file}", caller_locations(1, 1)[0].absolute_path)
     end
   rescue SyntaxError => e
     DeadEnd.handle_error(e)
@@ -62,6 +64,8 @@ end
 # we can attempt to disable this behavior in a production context.
 if !DeadEnd::IsProduction.call
   class NoMethodError
+    alias :dead_end_original_to_s :to_s
+
     def to_s
       return super if DeadEnd::IsProduction.call
 
@@ -91,8 +95,9 @@ if !DeadEnd::IsProduction.call
       message << $/
       message
     rescue => e
-      puts "DeadEnd Internal error: #{e.message}"
-      puts "DeadEnd Internal backtrace: #{e.backtrace}"
+      puts "DeadEnd Internal error: #{e.dead_end_original_to_s}"
+      puts "DeadEnd Internal backtrace:"
+      puts backtrace.map {|l| "    " + l }.join($/)
       super
     end
   end

data/lib/dead_end/display_invalid_blocks.rb

@@ -82,7 +82,7 @@ module DeadEnd
             closed: `{ }`.
           EOM
         else
-          "DeadEnd: Unmatched #{@invalid_obj.unmatched_symbol}` detected"
+          "DeadEnd: Unmatched `#{@invalid_obj.unmatched_symbol}` detected"
         end
       end
 

data/lib/dead_end/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module DeadEnd
-  VERSION = "1.1.0"
+  VERSION = "1.1.5"
 end

data/lib/dead_end/who_dis_syntax_error.rb

@@ -42,22 +42,25 @@ module DeadEnd
     end
 
     def on_parse_error(msg)
+      return if @error_symbol && @unmatched_symbol
+
       @error = msg
       @unmatched_symbol = :unknown
 
-      if @error.match?(/unexpected end-of-input/)
+      case @error
+      when /unexpected end-of-input/
         @error_symbol = :missing_end
-      elsif @error.match?(/expecting end-of-input/)
+      when /expecting end-of-input/
         @error_symbol = :unmatched_syntax
         @unmatched_symbol = :end
-      elsif @error.match?(/unexpected `end'/) ||  # Ruby 2.7 & 3.0
-          @error.match?(/unexpected end,/) ||     # Ruby 2.6
-          @error.match?(/unexpected keyword_end/) # Ruby 2.5
-
-        @error_symbol = :unmatched_syntax
+      when /unexpected `end'/,      # Ruby 2.7 and 3.0
+           /unexpected end/,        # Ruby 2.6
+           /unexpected keyword_end/i # Ruby 2.5
 
         match = @error.match(/expecting '(?<unmatched_symbol>.*)'/)
         @unmatched_symbol = match[:unmatched_symbol].to_sym if match
+
+        @error_symbol = :unmatched_syntax
       else
         @error_symbol = :unknown
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dead_end
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.5
 platform: ruby
 authors:
 - schneems
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-12-29 00:00:00.000000000 Z
+date: 2021-02-11 00:00:00.000000000 Z
 dependencies: []
 description: When you get an "unexpected end" in your syntax this gem helps you find
   it
@@ -31,7 +31,6 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- assets/syntax_search.gif
 - bin/console
 - bin/setup
 - dead_end.gemspec
@@ -76,7 +75,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.3
 signing_key:
 specification_version: 4
 summary: Find syntax errors in your source in a snap