dead_end 1.1.1 → 1.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4690f965eeee0b3f75ce6d3f27360a73639a3cb918ee77fafb77c559e278a035
-  data.tar.gz: 95ea085f4a5cf1f8b5882b717fe5f6c08fac7ab97568c9c3022632a52988351e
+  metadata.gz: ac6f2a5183bb09317d83211f3b1f7049154011ae0fbd73f08152864303a763bd
+  data.tar.gz: b6ea7a79863ffcc8664f3b693fabe49635f17fa48ed8e4529eeb48de9808b9c2
 SHA512:
-  metadata.gz: be19b5b8999599b226de6f0c511d91ce091867b67b30c8e9c5e56b0c3c06ac78c229b1c08823921c0fc461977e2e08d4fb6c2a8d4a796c47d0410ee84ac82da0
-  data.tar.gz: 3c5254b82d3f6e17cbd3012f4b82c2f9ae0df533f521c41eeea08e14ff5e8b8c6fdd17a6aa4b40b655437510d10f9f059df611b8c4496558230741cec7812f15
+  metadata.gz: a5b1524a4a5844d932dfdbd7874b81c43fbe4a98ac30ee4258e8eaefbf33a98d470a96721ce7ee0ec8e61e5f3ce525dabecde40b3900f5e5b8964b71676d49df
+  data.tar.gz: f9c2bf9a500f3428627a4de15af3e7d75ce0446e2042f68b39ab27a97da0c60171b7449241a60b358c8d5045c46f65a3bab3ed1d11cd4881eb5c8da06414d5ba

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.6
+
+- Consider if syntax error caused an unexpected variable instead of end (https://github.com/zombocom/dead_end/pull/58)
+
+## 1.1.5
+
+- Parse error once and not twice if there's more than one available (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)

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    dead_end (1.1.1)
+    dead_end (1.1.6)
 
 GEM
   remote: https://rubygems.org/
@@ -33,4 +33,4 @@ DEPENDENCIES
   stackprof
 
 BUNDLED WITH
-   2.2.3
+   2.2.11

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,7 +64,7 @@ end
 # we can attempt to disable this behavior in a production context.
 if !DeadEnd::IsProduction.call
   class NoMethodError
-    alias :original_to_s :to_s
+    alias :dead_end_original_to_s :to_s
 
     def to_s
       return super if DeadEnd::IsProduction.call
@@ -93,7 +95,7 @@ if !DeadEnd::IsProduction.call
       message << $/
       message
     rescue => e
-      puts "DeadEnd Internal error: #{e.original_to_s}"
+      puts "DeadEnd Internal error: #{e.dead_end_original_to_s}"
       puts "DeadEnd Internal backtrace:"
       puts backtrace.map {|l| "    " + l }.join($/)
       super

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.1"
+  VERSION = "1.1.6"
 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/)
-        @error_symbol = :unmatched_syntax
+      when /expecting end-of-input/
         @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 .* expecting '(?<unmatched_symbol>.*)'/
+        @unmatched_symbol = $1.to_sym if $1
+        @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.1
+  version: 1.1.6
 platform: ruby
 authors:
 - schneems
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-12-30 00:00:00.000000000 Z
+date: 2021-02-25 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