rspectre 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: ba92a8e8133dfaf7b4b3482717139be699fb8f25
-  data.tar.gz: 760cdddf1a3aeb9db71b54fa637f8009218eccc1
+SHA256:
+  metadata.gz: faf75c69148e3ed8340132dca49bcf008e8aa39b51bf366e2bb9265c8c38e84c
+  data.tar.gz: aefe0c552bd1a55be839be57e22f6758632ece9e669609c9369c1f2ff59451ec
 SHA512:
-  metadata.gz: f60346768b3217d357455cc3f8c8e8d3048e0f1ee859ff7bf796e3f8b85f5a57457dcc3b2170e146baf211438ef4679c144de46c2fcf4d6c1c164d90d660e411
-  data.tar.gz: '06917b75a86f56f949b6edbd681af187b392af58ef4d8ccf567145ed7775914090b5ae0060516ef049cdea8b7358e336fbc30c6bf73b9501fdeff6100fbcdd38'
+  metadata.gz: c4d1ff2a8a61cbfd0e474a1bd40204ee719eab8f76c65a4dd5bd51702558651983af4e51fabf190b7992c5d6ce386705b64a8a49bf5f7f27dd4d98f63f890ae5
+  data.tar.gz: 76d3218da62b89ad85b905af19245824583399d5e9221538161f0e14f8ae8e029fb65d8bf8c2902e403d664c478dc8aba4ac7490951cd80f6ea59955ad7a876c

data/bin/rspectre

@@ -8,7 +8,7 @@ require 'optparse'
 
 require 'rspectre'
 
-options = { rspec: %w[--fail-fast spec], :'auto-correct' => false }
+options = { rspec: %w[--fail-fast spec], 'auto-correct': false }
 
 OptionParser.new do |opts|
   opts.banner = 'Usage: rspectre [options]'

data/lib/rspectre.rb

@@ -15,6 +15,7 @@ require 'rspectre/auto_corrector'
 require 'rspectre/color'
 require 'rspectre/node'
 require 'rspectre/offense'
+require 'rspectre/permissive_ast_builder'
 require 'rspectre/runner'
 require 'rspectre/source_map'
 require 'rspectre/source_map/parser'

data/lib/rspectre/auto_corrector.rb

@@ -1,24 +1,72 @@
 # frozen_string_literal: true
 
 module RSpectre
-  class AutoCorrector < Parser::Rewriter
-    include Concord.new(:filename, :nodes)
+  class AutoCorrector < Parser::TreeRewriter
+    include Concord.new(:filename, :nodes, :buffer)
 
-    def correct
+    def initialize(filename, nodes)
       buffer = Parser::Source::Buffer.new("(#{filename})")
       buffer.source = File.read(filename)
 
+      super(filename, nodes, buffer)
+    end
+
+    def correct
       File.open(filename, 'w') do |file|
         file.write(rewrite(buffer, Parser::CurrentRuby.new.parse(buffer)))
       end
     end
 
     def on_block(node)
-      remove(node.location.expression) if nodes.any? do |offense_node|
+      remove(removal_range(node)) if nodes.any? do |offense_node|
         node == offense_node && node.location.line == offense_node.location.line
       end
 
       super
     end
+
+    private
+
+    # This corrects for cases which contains heredocs which do not get removed in all cases if we
+    # just use the `expression` range.
+    def removal_range(node)
+      Parser::Source::Range.new(
+        buffer,
+        node.location.expression.begin_pos,
+        range_end(node)
+      )
+    end
+
+    def range_end(node) # rubocop:disable Metrics/MethodLength
+      location = node.location.expression
+
+      last_line    = location.last_line
+      end_location = location.end
+
+      walk(node) do |child|
+        child_location = child.location
+
+        next unless child_location.respond_to?(:heredoc_end)
+
+        heredoc_end = child_location.heredoc_end
+
+        if heredoc_end.last_line > last_line
+          last_line    = heredoc_end.last_line
+          end_location = heredoc_end
+        end
+      end
+
+      end_location.end_pos
+    end
+
+    def walk(node, &block)
+      yield node
+
+      node.children.each do |child|
+        next unless child.is_a?(::Parser::AST::Node)
+
+        walk(child, &block)
+      end
+    end
   end
 end

data/lib/rspectre/offense.rb

@@ -26,6 +26,7 @@ module RSpectre
       puts to_s
     end
 
+    # rubocop:disable Layout/IndentHeredoc
     def to_s
       <<~DOC
 
@@ -34,6 +35,7 @@ module RSpectre
               #{highlight}
       DOC
     end
+    # rubocop:enable Layout/IndentHeredoc
 
     def description
       DESCRIPTIONS.fetch(type)

data/lib/rspectre/permissive_ast_builder.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+# See: https://github.com/whitequark/parser/issues/323#issuecomment-253606403
+# Solution to: https://github.com/dgollahon/rspectre/issues/17
+# See also: https://github.com/whitequark/parser/blob/c25585d8d91f3470d9cdfd6f3b6a553ad9a809fb/lib/parser/builders/default.rb#L2076
+
+module RSpectre
+  class PermissiveASTBuilder < ::Parser::Builders::Default
+    def string_value(token)
+      token.first
+    end
+  end
+end

data/lib/rspectre/runner.rb

@@ -36,5 +36,5 @@ module RSpectre
 
       RSpec::Core::Runner.new(rspec_config).tap { |runner| runner.setup($stderr, StringIO.new) }
     end
-  end # Rspec
+  end
 end

data/lib/rspectre/source_map.rb

@@ -20,26 +20,16 @@ module RSpectre
     end
 
     def find_method(target_selector, line)
-      candidates = find_methods(target_selector, line)
-
-      if candidates.one?
-        candidates.first
-      else
-        warn Color.yellow("Unable to resolve `#{target_selector}` on line #{line}.")
-      end
-    end
-
-    private
-
-    def find_methods(target_selector, line)
       block_nodes(line).select do |node|
         send, = *node
         _receiver, selector = *send
 
         selector.equal?(target_selector)
-      end
+      end.first
     end
 
+    private
+
     def block_nodes(line)
       map.fetch(line, []).select { |node| node.type.equal?(:block) }
     end

data/lib/rspectre/source_map/parser.rb

@@ -28,7 +28,10 @@ module RSpectre
       end
 
       def parsed_source
-        ::Parser::CurrentRuby.parse(raw_source, file)
+        parser = ::Parser::CurrentRuby.new(PermissiveASTBuilder.new)
+        buffer = ::Parser::Source::Buffer.new(file, source: raw_source)
+
+        parser.parse(buffer)
       end
 
       def raw_source

data/lib/rspectre/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RSpectre
-  VERSION = '0.0.1'
+  VERSION = '0.0.2'
 end

metadata

@@ -1,11 +1,11 @@
 --- !ruby/object:Gem::Specification
 name: rspectre
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Daniel Gollahon
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
 date: 2017-03-25 00:00:00.000000000 Z
@@ -100,30 +100,30 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.47'
+        version: 0.60.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.47'
+        version: 0.60.0
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.15'
+        version: 1.30.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.15'
-description: 
-email: 
+        version: 1.30.1
+description:
+email:
 executables:
 - rspectre
 extensions: []
@@ -139,6 +139,7 @@ files:
 - lib/rspectre/linter/unused_subject.rb
 - lib/rspectre/node.rb
 - lib/rspectre/offense.rb
+- lib/rspectre/permissive_ast_builder.rb
 - lib/rspectre/runner.rb
 - lib/rspectre/source_map.rb
 - lib/rspectre/source_map/parser.rb
@@ -148,7 +149,7 @@ homepage: http://github.com/dgollahon/rspectre
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -163,9 +164,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.11
-signing_key: 
+rubygems_version: 3.0.8
+signing_key:
 specification_version: 4
 summary: A tool for linting RSpec test suites.
 test_files: []