dead_end 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9fb84957790492d9f453b8863ea276ffc603ccb365fee3621f322e3f19e172e5
-  data.tar.gz: 798626bcc0dfa8457ef1fed8fb9ab8c9783a12ee109d94310a0cf787b2a0491a
+  metadata.gz: 7d7d236a8a3634efc153e2a20f511072c2b10f97553595ddb3309b88f74dbbb8
+  data.tar.gz: 5cb84a34d16f9c7714791f01864cfb1b05095b8eb9587be5cfbc86aed1c31a20
 SHA512:
-  metadata.gz: 44624834e772d2c0d5c0035eb373571cb379cf6417a1d3422528f312c06771ef00c45e3c1ceebb8f78fa4ebce232fd99798f957c408a8a3a78710e65f18da7ce
-  data.tar.gz: 478fce76c26ffcf975111bb51a8ea71c20aa0ecbabb606d621d715e3d7055a818e82e5b1bc11cc7143e5cd4e120da257c1b33dc30a1b07356dacb782ad7299bf
+  metadata.gz: 41f2022c9faba2cd907b91f9dbd2200172af5ddaa6117f80c7dc7229665026e89d06284cfd43d439dfe879f541ee77b57cb09334c49d1f7732ba1ab484197852
+  data.tar.gz: 667597674b31cda70837d9e11c46ccf3f4d7374445f56d8fc1f1f4fda3bd4cad0fdf2c2517620224aea683be21b7142101787aac0cb40e7a296ac039be2af0d3

data/.circleci/config.yml

@@ -13,6 +13,14 @@ references:
       command: bundle exec standardrb
 
 jobs:
+  "ruby-2-5":
+    docker:
+      - image: circleci/ruby:2.5
+    steps:
+      - checkout
+      - ruby/install-deps
+      - <<: *unit
+
   "ruby-2-6":
     docker:
       - image: circleci/ruby:2.6
@@ -49,6 +57,7 @@ workflows:
   version: 2
   build:
     jobs:
+      - "ruby-2-5"
       - "ruby-2-6"
       - "ruby-2-7"
       - "ruby-3-0"

data/.standard.yml

@@ -1 +1 @@
-ruby_version: 2.6.6
+ruby_version: 2.5.9

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 ## HEAD (unreleased)
 
+## 2.0.1
+
+- Reintroduce Ruby 2.5 support (https://github.com/zombocom/dead_end/pull/90)
+- Support naked braces/brackets/parens, invert labels on banner (https://github.com/zombocom/dead_end/pull/89)
+- Handle mismatched end when using rescue without begin (https://github.com/zombocom/dead_end/pull/83)
+- CLI returns non-zero exit code when syntax error is found (https://github.com/zombocom/dead_end/pull/86)
+- Let -v respond with gem version instead of 'unknown' (https://github.com/zombocom/dead_end/pull/82)
+
 ## 2.0.0
 
 - Support "endless" oneline method definitions for Ruby 3+ (https://github.com/zombocom/dead_end/pull/80)

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    dead_end (2.0.0)
+    dead_end (2.0.1)
 
 GEM
   remote: https://rubygems.org/
@@ -60,4 +60,4 @@ DEPENDENCIES
   standard
 
 BUNDLED WITH
-   2.2.27
+   2.2.29

data/exe/dead_end

@@ -35,6 +35,8 @@ parser = OptionParser.new do |opts|
     Options:
   EOM
 
+  opts.version = DeadEnd::VERSION
+
   opts.on("--help", "Help - displays this message") do |v|
     puts opts
     exit
@@ -62,9 +64,15 @@ options[:record_dir] = "tmp" if ENV["DEBUG"]
 
 warn "Record dir: #{options[:record_dir]}" if options[:record_dir]
 
-DeadEnd.call(
+display = DeadEnd.call(
   source: file.read,
   filename: file.expand_path,
   terminal: options[:terminal],
   record_dir: options[:record_dir]
 )
+
+if display.document_ok?
+  exit(0)
+else
+  exit(1)
+end

data/lib/dead_end/around_block_scan.rb

@@ -194,7 +194,7 @@ module DeadEnd
     end
 
     private def after_lines
-      @code_lines[after_index.next..] || []
+      @code_lines[after_index.next..-1] || []
     end
   end
 end

data/lib/dead_end/banner.rb

@@ -0,0 +1,58 @@
+# frozen_string_literal: true
+
+module DeadEnd
+  class Banner
+    attr_reader :invalid_obj
+
+    def initialize(invalid_obj:)
+      @invalid_obj = invalid_obj
+    end
+
+    def call
+      case invalid_obj.error_symbol
+      when :missing_end
+        <<~EOM
+          DeadEnd: Missing `end` detected
+
+          This code has a missing `end`. Ensure that all
+          syntax keywords (`def`, `do`, etc.) have a matching `end`.
+        EOM
+      when :unmatched_syntax
+        case unmatched_symbol
+        when :end
+          <<~EOM
+            DeadEnd: Unmatched `end` detected
+
+            This code has an unmatched `end`. Ensure that all `end` lines
+            in your code have a matching syntax keyword  (`def`,  `do`, etc.)
+            and that you don't have any extra `end` lines.
+          EOM
+        when :|
+          <<~EOM
+            DeadEnd: Unmatched `|` character detected
+
+            Example:
+
+              `do |x` should be `do |x|`
+          EOM
+        when *WhoDisSyntaxError::CHARACTERS.keys
+          <<~EOM
+            DeadEnd: Unmatched `#{unmatched_symbol}` character detected
+
+            It appears a `#{missing_character}` might be missing.
+          EOM
+        else
+          "DeadEnd: Unmatched `#{unmatched_symbol}` detected"
+        end
+      end
+    end
+
+    private def unmatched_symbol
+      invalid_obj.unmatched_symbol
+    end
+
+    private def missing_character
+      WhoDisSyntaxError::CHARACTERS[unmatched_symbol]
+    end
+  end
+end

data/lib/dead_end/clean_document.rb

@@ -231,7 +231,7 @@ module DeadEnd
     #
     def join_consecutive!
       consecutive_groups = @document.select(&:ignore_newline_not_beg?).map do |code_line|
-        take_while_including(code_line.index..) do |line|
+        take_while_including(code_line.index..-1) do |line|
           line.ignore_newline_not_beg?
         end
       end
@@ -252,7 +252,7 @@ module DeadEnd
     #     expect(lines[1].to_s).to eq("")
     def join_trailing_slash!
       trailing_groups = @document.select(&:trailing_slash?).map do |code_line|
-        take_while_including(code_line.index..) { |x| x.trailing_slash? }
+        take_while_including(code_line.index..-1) { |x| x.trailing_slash? }
       end
       join_groups(trailing_groups)
       self
@@ -286,7 +286,7 @@ module DeadEnd
         )
 
         # Hide the rest of the lines
-        lines[1..].each do |line|
+        lines[1..-1].each do |line|
           # The above lines already have newlines in them, if add more
           # then there will be double newline, use an empty line instead
           @document[line.index] = CodeLine.new(line: "", index: line.index, lex: [])
@@ -300,7 +300,7 @@ module DeadEnd
     # Like `take_while` except when it stops
     # iterating, it also returns the line
     # that caused it to stop
-    def take_while_including(range = 0..)
+    def take_while_including(range = 0..-1)
       take_next_and_stop = false
       @document[range].take_while do |line|
         next if take_next_and_stop

data/lib/dead_end/display_invalid_blocks.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require_relative "banner"
 require_relative "capture_code_context"
 require_relative "display_code_with_line_numbers"
 
@@ -21,11 +22,15 @@ module DeadEnd
       @invalid_obj = invalid_obj
     end
 
+    def document_ok?
+      @blocks.none? { |b| !b.hidden? }
+    end
+
     def call
-      if @blocks.any? { |b| !b.hidden? }
-        found_invalid_blocks
-      else
+      if document_ok?
         @io.puts "Syntax OK"
+      else
+        found_invalid_blocks
       end
       self
     end
@@ -50,43 +55,7 @@ module DeadEnd
     end
 
     def banner
-      case @invalid_obj.error_symbol
-      when :missing_end
-        <<~EOM
-          DeadEnd: Missing `end` detected
-
-          This code has a missing `end`. Ensure that all
-          syntax keywords (`def`, `do`, etc.) have a matching `end`.
-        EOM
-      when :unmatched_syntax
-        case @invalid_obj.unmatched_symbol
-        when :end
-          <<~EOM
-            DeadEnd: Unmatched `end` detected
-
-            This code has an unmatched `end`. Ensure that all `end` lines
-            in your code have a matching syntax keyword  (`def`,  `do`, etc.)
-            and that you don't have any extra `end` lines.
-          EOM
-        when :|
-          <<~EOM
-            DeadEnd: Unmatched `|` character detected
-
-            Example:
-
-              `do |x` should be `do |x|`
-          EOM
-        when :"}"
-          <<~EOM
-            DeadEnd: Unmatched `}` character detected
-
-            This code has an unmatched `}`. Ensure that opening curly braces are
-            closed: `{ }`.
-          EOM
-        else
-          "DeadEnd: Unmatched `#{@invalid_obj.unmatched_symbol}` detected"
-        end
-      end
+      Banner.new(invalid_obj: @invalid_obj).call
     end
 
     def indent(string, with: "    ")

data/lib/dead_end/lex_all.rb

@@ -15,7 +15,7 @@ module DeadEnd
       last_lineno = source_lines.count
 
       until lineno >= last_lineno
-        lines = source_lines[lineno..]
+        lines = source_lines[lineno..-1]
 
         @lex.concat(Ripper.lex(lines.join, "-", lineno + 1))
         lineno = @lex.last.first.first + 1

data/lib/dead_end/version.rb

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

data/lib/dead_end/who_dis_syntax_error.rb

@@ -8,6 +8,7 @@ module DeadEnd
   #   puts WhoDisSyntaxError.new("def foo;").call.error_symbol
   #   # => :missing_end
   class WhoDisSyntaxError < Ripper
+    CHARACTERS = {"{": :"}", "}": :"{", "[": :"]", "]": :"[", "(": :")", ")": :"("}
     class Null
       def error_symbol
         :missing_end
@@ -58,8 +59,16 @@ module DeadEnd
       when /expecting end-of-input/
         @unmatched_symbol = :end
         @error_symbol = :unmatched_syntax
-      when /unexpected .* expecting '(?<unmatched_symbol>.*)'/
-        @unmatched_symbol = $1.to_sym if $1
+      when /unexpected .* expecting ['`]?(?<unmatched_symbol>[^']*)/
+        if $1
+          character = $1.to_sym
+          @unmatched_symbol = CHARACTERS[character] || character
+          @unmatched_symbol = :end if @unmatched_symbol == :keyword_end
+        end
+        @error_symbol = :unmatched_syntax
+      when /unexpected '(?<unmatched_symbol>.*)'/
+        @unmatched_symbol = $1.to_sym
+        @unmatched_symbol = :end if @unmatched_symbol == :keyword_end
         @error_symbol = :unmatched_syntax
       when /unexpected `end'/, # Ruby 2.7 and 3.0
            /unexpected end/, # Ruby 2.6

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dead_end
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - schneems
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-10-11 00:00:00.000000000 Z
+date: 2021-10-19 00:00:00.000000000 Z
 dependencies: []
 description: When you get an "unexpected end" in your syntax this gem helps you find
   it
@@ -38,6 +38,7 @@ files:
 - lib/dead_end.rb
 - lib/dead_end/around_block_scan.rb
 - lib/dead_end/auto.rb
+- lib/dead_end/banner.rb
 - lib/dead_end/block_expand.rb
 - lib/dead_end/capture_code_context.rb
 - lib/dead_end/clean_document.rb