synvert-core 0.15.0 → 0.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 0a0989b728790ffffeda701daec03337d96a350c
-  data.tar.gz: 0134e7d75925587df9f2f300410bb70199c792d5
+SHA256:
+  metadata.gz: b73d8898436945c3266c9d0e4eec002491c3b031e1d571f94b3a59443142a9dd
+  data.tar.gz: c8afb1ce36ef5d3e826ebbc7ca10103175661e14f8ea1af1ae5a1a83b8714dbf
 SHA512:
-  metadata.gz: 91178d81160d6e6fb51133de73e81b1353453719dd5c35b926ea7cef137f9c1b1a10cb88eee1a565d6aea6c1b4563c155d9282434bc192cbacb7176d710ec7c4
-  data.tar.gz: a179c5ad2606cac974a40150868ed5f6f598df342afeab1411a564c12678e850bc7696d497089299175b88615ae14356a06f182b7620dbece14458dce8344a1c
+  metadata.gz: b7198c44b3696f0c0f640fe378ff3b9923799517998d6be38177096a552b33885bf5df6113d1aa1a0b68432bff79d0322587648d221bd6fbaebcf75ab8b2d32d
+  data.tar.gz: 39b8bf09735971e108b112b96b3377df988b82e891c76d5050fef978aec81bf340ff096463ac9416848fd9b8e412b95537377d0647d11a6028d5ab909cac4fa4

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 # CHANGELOG
 
+## 0.17.0 (2021-01-29)
+
+* Ignore `gem_spec` check if `Gemfile.lock` does not eixst
+
+## 0.16.0 (2021-01-17)
+
+* Use parser 3.0.0
+* Fix magic number
+* Add `within_direct_node` scope
+
 ## 0.15.0 (2018-05-23)
 
 * Use parser 2.5.1.1

data/Gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in synvert.gemspec

data/Guardfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 guard :rspec, cmd: 'bundle exec rspec' do
   watch(%r{^spec/.+_spec\.rb$})
   watch(%r{^lib/(.+)\.rb$})     { |m| "spec/#{m[1]}_spec.rb" }

data/Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "bundler/gem_tasks"
 require 'rspec/core/rake_task'
 

data/lib/synvert/core.rb

@@ -1,6 +1,5 @@
-require "synvert/core/version"
+# frozen_string_literal: true
 
-# coding: utf-8
 require "synvert/core/version"
 require 'bundler'
 require 'parser'

data/lib/synvert/core/configuration.rb

@@ -1,4 +1,5 @@
-# encoding: utf-8
+# frozen_string_literal: true
+
 require 'singleton'
 
 module Synvert::Core

data/lib/synvert/core/engine.rb

@@ -1,4 +1,4 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 module Synvert::Core
   # Engine defines how to encode / decode other files (like erb).

data/lib/synvert/core/engine/erb.rb

@@ -1,4 +1,5 @@
-# encoding: utf-8
+# frozen_string_literal: true
+
 require 'erubis'
 
 module Synvert::Core

data/lib/synvert/core/exceptions.rb

@@ -1,13 +1,15 @@
+# frozen_string_literal: true
+
 module Synvert::Core
   # Rewriter not found exception.
-  class RewriterNotFound < Exception
+  class RewriterNotFound < RuntimeError
   end
 
   # Gemfile.lock not found exception.
-  class GemfileLockNotFound < Exception
+  class GemfileLockNotFound < RuntimeError
   end
 
   # Method not supported exception.
-  class MethodNotSupported < Exception
+  class MethodNotSupported < RuntimeError
   end
 end

data/lib/synvert/core/node_ext.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Parser::AST
   # ArgumentsNode allows to handle all args as one node or handle all args as an array.
   class ArgumentsNode
@@ -133,9 +135,11 @@ module Parser::AST
         self.children
       when :def, :block
         return [] if self.children[2].nil?
+
         :begin == self.children[2].type ? self.children[2].body : self.children[2..-1]
       when :defs
         return [] if self.children[3].nil?
+
         :begin == self.children[3].type ? self.children[3].body : self.children[3..-1]
       else
         raise Synvert::Core::MethodNotSupported.new "body is not handled for #{self.debug_info}"
@@ -234,7 +238,7 @@ module Parser::AST
     # @return [Parser::AST::Node] variable nodes.
     # @raise [Synvert::Core::MethodNotSupported] if calls on other node.
     def left_value
-      if [:masgn, :lvasgn, :ivasgn].include? self.type
+      if %i[masgn lvasgn ivasgn].include? self.type
         self.children[0]
       else
         raise Synvert::Core::MethodNotSupported.new "left_value is not handled for #{self.debug_info}"
@@ -246,7 +250,7 @@ module Parser::AST
     # @return [Array<Parser::AST::Node>] variable nodes.
     # @raise [Synvert::Core::MethodNotSupported] if calls on other node.
     def right_value
-      if [:masgn, :lvasgn, :ivasgn].include? self.type
+      if %i[masgn lvasgn ivasgn].include? self.type
         self.children[1]
       else
         raise Synvert::Core::MethodNotSupported.new "right_value is not handled for #{self.debug_info}"
@@ -425,6 +429,7 @@ module Parser::AST
         end
       when Array
         return false unless expected.length == actual.length
+
         actual.zip(expected).all? { |a, e| match_value?(a, e) }
       when NilClass
         actual.nil?

data/lib/synvert/core/rewriter.rb

@@ -1,4 +1,4 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 module Synvert::Core
   # Rewriter is the top level namespace in a snippet.

data/lib/synvert/core/rewriter/action.rb

@@ -1,9 +1,10 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 module Synvert::Core
   # Action defines rewriter action, add, replace or remove code.
   class Rewriter::Action
     DEFAULT_OPTIONS = { autoindent: true }
+    DEFAULT_INDENT = 2
 
     # Initialize an action.
     #
@@ -45,4 +46,3 @@ module Synvert::Core
     end
   end
 end
-

data/lib/synvert/core/rewriter/action/append_action.rb

@@ -1,8 +1,10 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 module Synvert::Core
-  # AppendWithAction to append code to the bottom of node body.
+  # AppendAction to append code to the bottom of node body.
   class Rewriter::AppendAction < Rewriter::Action
+    END_LENGTH = "\nend".length
+
     # Begin position to append code.
     #
     # @return [Integer] begin position.
@@ -10,7 +12,7 @@ module Synvert::Core
       if :begin == @node.type
         @node.loc.expression.end_pos
       else
-        @node.loc.expression.end_pos - @node.indent - 4
+        @node.loc.expression.end_pos - @node.indent - END_LENGTH
       end
     end
 
@@ -28,8 +30,8 @@ module Synvert::Core
     # @param node [Parser::AST::Node]
     # @return [String] n times whitesphace
     def indent(node)
-      if [:block, :class].include? node.type
-        ' ' * (node.indent + 2)
+      if %i[block class].include? node.type
+        ' ' * (node.indent + DEFAULT_INDENT)
       else
         ' ' * node.indent
       end

data/lib/synvert/core/rewriter/action/insert_action.rb

@@ -1,13 +1,22 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 module Synvert::Core
   # InsertAction to insert code to the top of node body.
   class Rewriter::InsertAction < Rewriter::Action
+    DO_LENGTH = " do".length
+
     # Begin position to insert code.
     #
     # @return [Integer] begin position.
     def begin_pos
-      insert_position(@node)
+      case @node.type
+      when :block
+        @node.children[1].children.empty? ? @node.children[0].loc.expression.end_pos + DO_LENGTH : @node.children[1].loc.expression.end_pos
+      when :class
+        @node.children[1] ? @node.children[1].loc.expression.end_pos : @node.children[0].loc.expression.end_pos
+      else
+        @node.children.last.loc.expression.end_pos
+      end
     end
 
     # End position, always same to begin position.
@@ -19,27 +28,13 @@ module Synvert::Core
 
   private
 
-    # Insert position.
-    #
-    # @return [Integer] insert position.
-    def insert_position(node)
-      case node.type
-      when :block
-        node.children[1].children.empty? ? node.children[0].loc.expression.end_pos + 3 : node.children[1].loc.expression.end_pos
-      when :class
-        node.children[1] ? node.children[1].loc.expression.end_pos : node.children[0].loc.expression.end_pos
-      else
-        node.children.last.loc.expression.end_pos
-      end
-    end
-
     # Indent of the node.
     #
     # @param node [Parser::AST::Node]
     # @return [String] n times whitesphace
     def indent(node)
-      if [:block, :class].include? node.type
-        ' ' * (node.indent + 2)
+      if %i[block class].include? node.type
+        ' ' * (node.indent + DEFAULT_INDENT)
       else
         ' ' * node.indent
       end

data/lib/synvert/core/rewriter/action/insert_after_action.rb

@@ -1,4 +1,4 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 module Synvert::Core
   # InsertAfterAction to insert code next to the node.

data/lib/synvert/core/rewriter/action/remove_action.rb

@@ -1,4 +1,4 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 module Synvert::Core
   # RemoveAction to remove code.

data/lib/synvert/core/rewriter/action/replace_erb_stmt_with_expr_action.rb

@@ -1,4 +1,4 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 module Synvert::Core
   # ReplaceErbStmtWithExprAction to replace erb stmt code to expr,

data/lib/synvert/core/rewriter/action/replace_with_action.rb

@@ -1,4 +1,4 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 module Synvert::Core
   # ReplaceWithAction to replace code.

data/lib/synvert/core/rewriter/condition.rb

@@ -1,4 +1,4 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 module Synvert::Core
   # Condition checks if rules matches.

data/lib/synvert/core/rewriter/condition/if_exist_condition.rb

@@ -1,4 +1,4 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 module Synvert::Core
   # IfExistCondition checks if matching node exists in the node children.

data/lib/synvert/core/rewriter/condition/if_only_exist_condition.rb

@@ -1,4 +1,4 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 module Synvert::Core
   # IfExistCondition checks if node has only one child node and the child node matches rules.

data/lib/synvert/core/rewriter/condition/unless_exist_condition.rb

@@ -1,4 +1,4 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 module Synvert::Core
   # UnlessExistCondition checks if matching node doesn't exist in the node children.

data/lib/synvert/core/rewriter/gem_spec.rb

@@ -1,4 +1,4 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 module Synvert::Core
   # GemSpec checks and compares gem version.
@@ -27,15 +27,14 @@ module Synvert::Core
     # @raise [Synvert::Core::GemfileLockNotFound] raise if Gemfile.lock does not exist.
     def match?
       gemfile_lock_path = File.join(Configuration.instance.get(:path), 'Gemfile.lock')
-      if File.exists? gemfile_lock_path
-        parser = Bundler::LockfileParser.new(File.read(gemfile_lock_path))
-        if spec = parser.specs.find { |spec| spec.name == @name }
-          Gem::Version.new(spec.version).send(OPERATORS[@operator], @version)
-        else
-          false
-        end
+      # if Gemfile.lock does not exist, just ignore this check
+      return true unless File.exist?(gemfile_lock_path)
+
+      parser = Bundler::LockfileParser.new(File.read(gemfile_lock_path))
+      if spec = parser.specs.find { |spec| spec.name == @name }
+        Gem::Version.new(spec.version).send(OPERATORS[@operator], @version)
       else
-        raise GemfileLockNotFound.new 'Gemfile.lock does not exist'
+        false
       end
     end
   end

data/lib/synvert/core/rewriter/helper.rb

@@ -1,4 +1,4 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 module Synvert::Core
   # Rewriter::Helper provides some helper methods to make it easier to write a snippet.

data/lib/synvert/core/rewriter/instance.rb

@@ -1,4 +1,4 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 module Synvert::Core
   # Instance is an execution unit, it finds specified ast nodes,
@@ -91,7 +91,7 @@ module Synvert::Core
         unless Configuration.instance.get(:skip_files).include? file_path
           begin
             conflict_actions = []
-            source = self.class.file_source(file_path)
+            source = +self.class.file_source(file_path)
             ast = self.class.file_ast(file_path)
 
             @current_file = file_path
@@ -108,7 +108,7 @@ module Synvert::Core
             if @actions.length > 0
               @actions.sort_by! { |action| action.send(@options[:sort_by]) }
               conflict_actions = get_conflict_actions
-              @actions.reverse.each do |action|
+              @actions.reverse_each do |action|
                 source[action.begin_pos...action.end_pos] = action.rewritten_code
                 source = remove_code_or_whole_line(source, action.line)
               end
@@ -156,15 +156,28 @@ module Synvert::Core
     # DSL #
     #######
 
-    # Parse within_node dsl, it creates a [Synvert::Core::Rewriter::WithinScope] to find matching ast nodes,
+    # Parse within_node dsl, it creates a [Synvert::Core::Rewriter::WithinScope] to find recursive matching ast nodes,
     # then continue operating on each matching ast node.
     #
     # @param rules [Hash] rules to find mathing ast nodes.
     # @param block [Block] block code to continue operating on the matching nodes.
     def within_node(rules, &block)
-      Rewriter::WithinScope.new(self, rules, &block).process
+      Rewriter::WithinScope.new(self, rules, { recursive: true }, &block).process
     end
 
+    alias_method :with_node, :within_node
+
+    # Parse within_direct_node dsl, it creates a [Synvert::Core::Rewriter::WithinScope] to find direct matching ast nodes,
+    # then continue operating on each matching ast node.
+    #
+    # @param rules [Hash] rules to find mathing ast nodes.
+    # @param block [Block] block code to continue operating on the matching nodes.
+    def within_direct_node(rules, &block)
+      Rewriter::WithinScope.new(self, rules, { recursive: false }, &block).process
+    end
+
+    alias_method :with_direct_node, :within_direct_node
+
     # Parse goto_node dsl, it creates a [Synvert::Core::Rewriter::GotoScope] to go to a child node,
     # then continue operating on the child node.
     #
@@ -174,8 +187,6 @@ module Synvert::Core
       Rewriter::GotoScope.new(self, child_node_name, &block).process
     end
 
-    alias_method :with_node, :within_node
-
     # Parse if_exist_node dsl, it creates a [Synvert::Core::Rewriter::IfExistCondition] to check
     # if matching nodes exist in the child nodes, if so, then continue operating on each matching ast node.
     #

data/lib/synvert/core/rewriter/ruby_version.rb

@@ -1,4 +1,4 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 module Synvert::Core
   # GemSpec checks and compares gem version.

data/lib/synvert/core/rewriter/scope.rb

@@ -1,4 +1,4 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 module Synvert::Core
   # Scope finds out nodes which match rules.

data/lib/synvert/core/rewriter/scope/goto_scope.rb

@@ -1,4 +1,4 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 module Synvert::Core
   # Go to and change its scope to a child node.
@@ -18,6 +18,7 @@ module Synvert::Core
     def process
       current_node = @instance.current_node
       return unless current_node
+
       child_node = current_node.send @child_node_name
       @instance.process_with_other_node child_node do
         @instance.instance_eval &@block

data/lib/synvert/core/rewriter/scope/within_scope.rb

@@ -1,4 +1,4 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 module Synvert::Core
   # WithinScope finds out nodes which match rules, then change its scope to matching node.
@@ -7,10 +7,12 @@ module Synvert::Core
     #
     # @param instance [Synvert::Core::Rewriter::Instance]
     # @param rules [Hash]
+    # @param options [Hash]
     # @param block [Block]
-    def initialize(instance, rules, &block)
+    def initialize(instance, rules, options = { recursive: true }, &block)
       @instance = instance
       @rules = rules
+      @options = options
       @block = block
     end
 
@@ -19,12 +21,9 @@ module Synvert::Core
     def process
       current_node = @instance.current_node
       return unless current_node
+
+      matching_nodes = find_matching_nodes(current_node)
       @instance.process_with_node current_node do
-        matching_nodes = []
-        matching_nodes << current_node if current_node.match? @rules
-        current_node.recursive_children do |child_node|
-          matching_nodes << child_node if child_node.match? @rules
-        end
         matching_nodes.each do |matching_node|
           @instance.process_with_node matching_node do
             @instance.instance_eval &@block
@@ -32,5 +31,22 @@ module Synvert::Core
         end
       end
     end
+
+    private
+
+    def find_matching_nodes(current_node)
+      matching_nodes = []
+      if @options[:recursive]
+        matching_nodes << current_node if current_node.match? @rules
+        current_node.recursive_children do |child_node|
+          matching_nodes << child_node if child_node.match? @rules
+        end
+      else
+        current_node.each do |child_node|
+          matching_nodes << child_node if child_node.match? @rules
+        end
+      end
+      matching_nodes
+    end
   end
 end

data/lib/synvert/core/rewriter/warning.rb

@@ -1,4 +1,4 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 module Synvert::Core
   # Warning is used to save warning message.

data/lib/synvert/core/version.rb

@@ -1,7 +1,7 @@
-# coding: utf-8
+# frozen_string_literal: true
 
 module Synvert
   module Core
-    VERSION = "0.15.0"
+    VERSION = "0.17.0"
   end
 end

data/spec/spec_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
 
 require 'synvert/core'

data/spec/support/parser_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ParserHelper
   def parse(code)
     Parser::CurrentRuby.parse code

data/spec/synvert/core/configuration_spec.rb

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 module Synvert::Core
   describe Configuration do
     it 'sets / gets' do
       Configuration.instance.set :key, 'value'
-      expect(Configuration.instance.get :key).to eq 'value'
+      expect(Configuration.instance.get(:key)).to eq 'value'
     end
   end
 end

data/spec/synvert/core/engine/erb_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 module Synvert::Core

data/spec/synvert/core/node_ext_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Parser::AST::Node do
@@ -102,12 +104,12 @@ describe Parser::AST::Node do
   describe '#arguments' do
     it 'gets for def node' do
       node = parse("def test(foo, bar); foo + bar; end")
-      expect(node.arguments.map { |argument| argument.to_source }).to eq ['foo', 'bar']
+      expect(node.arguments.map { |argument| argument.to_source }).to eq %w[foo bar]
     end
 
     it 'gets for defs node' do
       node = parse("def self.test(foo, bar); foo + bar; end")
-      expect(node.arguments.map { |argument| argument.to_source }).to eq ['foo', 'bar']
+      expect(node.arguments.map { |argument| argument.to_source }).to eq %w[foo bar]
     end
 
     it 'gets for block node' do

data/spec/synvert/core/rewriter/action/append_action_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 module Synvert::Core

data/spec/synvert/core/rewriter/action/insert_action_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 module Synvert::Core

data/spec/synvert/core/rewriter/action/insert_after_action_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 module Synvert::Core

data/spec/synvert/core/rewriter/action/remove_action_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 module Synvert::Core

data/spec/synvert/core/rewriter/action/replace_erb_stmt_with_expr_action_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 module Synvert::Core

data/spec/synvert/core/rewriter/action/replace_with_action_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 module Synvert::Core
@@ -28,10 +30,10 @@ module Synvert::Core
         source = "  its(:size) { should == 1 }"
         send_node = Parser::CurrentRuby.parse(source)
         instance = double(current_node: send_node)
-        Rewriter::ReplaceWithAction.new(instance, """describe '#size' do
+        Rewriter::ReplaceWithAction.new(instance, "describe '#size' do
   subject { super().size }
   it { {{body}} }
-end""", autoindent: false)
+end", autoindent: false)
       }
 
       it 'gets begin_pos' do
@@ -43,10 +45,10 @@ end""", autoindent: false)
       end
 
       it 'gets rewritten_code' do
-        expect(subject.rewritten_code).to eq """describe '#size' do
+        expect(subject.rewritten_code).to eq "describe '#size' do
   subject { super().size }
   it { should == 1 }
-end"""
+end"
       end
     end
   end

data/spec/synvert/core/rewriter/action_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 module Synvert::Core

data/spec/synvert/core/rewriter/condition/if_exist_condition_spec.rb

@@ -1,14 +1,16 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 module Synvert::Core
   describe Rewriter::IfExistCondition do
     let(:source) {
-      """
+      "
       RSpec.configure do |config|
         config.include EmailSpec::Helpers
         config.include EmailSpec::Methods
       end
-      """
+      "
     }
     let(:node) { Parser::CurrentRuby.parse(source) }
     let(:instance) { double(:current_node => node) }

data/spec/synvert/core/rewriter/condition/if_only_exist_condition_spec.rb

@@ -1,25 +1,27 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 module Synvert::Core
   describe Rewriter::IfOnlyExistCondition do
     let(:source) {
-      """
+      "
       RSpec.configure do |config|
         config.include EmailSpec::Helpers
         config.include EmailSpec::Methods
       end
-      """
+      "
     }
     let(:node) { Parser::CurrentRuby.parse(source) }
     let(:instance) { double(:current_node => node) }
 
     describe '#process' do
       it 'gets matching nodes' do
-        source = """
+        source = "
           RSpec.configure do |config|
             config.include EmailSpec::Helpers
           end
-        """
+        "
         node = Parser::CurrentRuby.parse(source)
         instance = double(:current_node => node)
         run = false

data/spec/synvert/core/rewriter/condition/unless_exist_condition_spec.rb

@@ -1,14 +1,16 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 module Synvert::Core
   describe Rewriter::UnlessExistCondition do
     let(:source) {
-      """
+      "
       RSpec.configure do |config|
         config.include EmailSpec::Helpers
         config.include EmailSpec::Methods
       end
-      """
+      "
     }
     let(:node) { Parser::CurrentRuby.parse(source) }
     let(:instance) { double(:current_node => node) }

data/spec/synvert/core/rewriter/condition_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 module Synvert::Core

data/spec/synvert/core/rewriter/gem_spec_spec.rb

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 module Synvert::Core
   describe Rewriter::GemSpec do
-    let(:gemfile_lock_content) { """
+    let(:gemfile_lock_content) { "
 GEM
   remote: https://rubygems.org/
   specs:
@@ -12,41 +14,40 @@ GEM
       slop (~> 3.4, >= 3.4.5)
     rake (10.1.1)
     slop (3.4.7)
-      """
-    }
+    "}
 
     it 'returns true if version in Gemfile.lock is greater than definition' do
-      expect(File).to receive(:exists?).with('./Gemfile.lock').and_return(true)
+      expect(File).to receive(:exist?).with('./Gemfile.lock').and_return(true)
       expect(File).to receive(:read).with('./Gemfile.lock').and_return(gemfile_lock_content)
       gem_spec = Rewriter::GemSpec.new('ast', {gte: '1.0.0'})
       expect(gem_spec).to be_match
     end
 
     it 'returns true if version in Gemfile.lock is equal to definition' do
-      expect(File).to receive(:exists?).with('./Gemfile.lock').and_return(true)
+      expect(File).to receive(:exist?).with('./Gemfile.lock').and_return(true)
       expect(File).to receive(:read).with('./Gemfile.lock').and_return(gemfile_lock_content)
       gem_spec = Rewriter::GemSpec.new('ast', '1.1.0')
       expect(gem_spec).to be_match
     end
 
     it 'returns false if version in Gemfile.lock is less than definition' do
-      expect(File).to receive(:exists?).with('./Gemfile.lock').and_return(true)
+      expect(File).to receive(:exist?).with('./Gemfile.lock').and_return(true)
       expect(File).to receive(:read).with('./Gemfile.lock').and_return(gemfile_lock_content)
       gem_spec = Rewriter::GemSpec.new('ast', {gt: '1.2.0'})
       expect(gem_spec).not_to be_match
     end
 
     it 'returns false if gem does not exist in Gemfile.lock' do
-      expect(File).to receive(:exists?).with('./Gemfile.lock').and_return(true)
+      expect(File).to receive(:exist?).with('./Gemfile.lock').and_return(true)
       expect(File).to receive(:read).with('./Gemfile.lock').and_return(gemfile_lock_content)
       gem_spec = Rewriter::GemSpec.new('synvert', '1.0.0')
       expect(gem_spec).not_to be_match
     end
 
     it 'raise Synvert::Core::GemfileLockNotFound if Gemfile.lock does not exist' do
-      expect(File).to receive(:exists?).with('./Gemfile.lock').and_return(false)
+      expect(File).to receive(:exist?).with('./Gemfile.lock').and_return(false)
       gem_spec = Rewriter::GemSpec.new('ast', '1.1.0')
-      expect { gem_spec.match? }.to raise_error(Synvert::Core::GemfileLockNotFound)
+      expect(gem_spec).to be_match
     end
   end
 end

data/spec/synvert/core/rewriter/helper_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 module Synvert::Core

data/spec/synvert/core/rewriter/instance_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 module Synvert::Core
@@ -12,7 +14,7 @@ module Synvert::Core
     it 'parses within_node' do
       scope = double()
       block = Proc.new {}
-      expect(Rewriter::WithinScope).to receive(:new).with(instance, type: 'send', message: 'create', &block).and_return(scope)
+      expect(Rewriter::WithinScope).to receive(:new).with(instance, { type: 'send', message: 'create' }, { recursive: true }, &block).and_return(scope)
       expect(scope).to receive(:process)
       instance.within_node(type: 'send', message: 'create', &block)
     end
@@ -20,11 +22,27 @@ module Synvert::Core
     it 'parses with_node' do
       scope = double()
       block = Proc.new {}
-      expect(Rewriter::WithinScope).to receive(:new).with(instance, type: 'send', message: 'create', &block).and_return(scope)
+      expect(Rewriter::WithinScope).to receive(:new).with(instance, { type: 'send', message: 'create' }, { recursive: true }, &block).and_return(scope)
       expect(scope).to receive(:process)
       instance.with_node(type: 'send', message: 'create', &block)
     end
 
+    it 'parses within_direct_node' do
+      scope = double()
+      block = Proc.new {}
+      expect(Rewriter::WithinScope).to receive(:new).with(instance, { type: 'send', message: 'create' }, { recursive: false }, &block).and_return(scope)
+      expect(scope).to receive(:process)
+      instance.within_direct_node(type: 'send', message: 'create', &block)
+    end
+
+    it 'parses with_direct_node' do
+      scope = double()
+      block = Proc.new {}
+      expect(Rewriter::WithinScope).to receive(:new).with(instance, { type: 'send', message: 'create' }, { recursive: false }, &block).and_return(scope)
+      expect(scope).to receive(:process)
+      instance.with_direct_node(type: 'send', message: 'create', &block)
+    end
+
     it 'parses goto_node' do
       scope = double()
       block = Proc.new {}
@@ -96,20 +114,20 @@ module Synvert::Core
             replace_with 'create {{arguments}}'
           end
         end
-        input = """
+        input = "
 it 'uses factory_girl' do
   user = FactoryGirl.create :user
   post = FactoryGirl.create :post, user: user
   assert post.valid?
 end
-"""
-        output = """
+"
+        output = "
 it 'uses factory_girl' do
   user = create :user
   post = create :post, user: user
   assert post.valid?
 end
-"""
+"
         expect(Dir).to receive(:glob).with('./spec/**/*_spec.rb').and_return(['spec/models/post_spec.rb'])
         expect(File).to receive(:read).with('spec/models/post_spec.rb').and_return(input)
         expect(File).to receive(:write).with('spec/models/post_spec.rb', output)
@@ -124,16 +142,16 @@ end
             end
           end
         end
-        input = """
+        input = "
         RSpec.configure do |config|
           config.include FactoryGirl::Syntax::Methods
         end
-        """
-        output = """
+        "
+        output = "
         RSpec.configure do |config|
           config.include FactoryGirl::Syntax::Methods
         end
-        """
+        "
         expect(Dir).to receive(:glob).with('./spec/spec_helper.rb').and_return(['spec/spec_helper.rb'])
         expect(File).to receive(:read).with('spec/spec_helper.rb').and_return(input)
         expect(File).not_to receive(:write).with('spec/spec_helper.rb', output)
@@ -148,16 +166,16 @@ end
             end
           end
         end
-        input = """
+        input = "
         RSpec.configure do |config|
           config.include FactoryGirl::Syntax::Methods
         end
-        """
-        output = """
+        "
+        output = "
         RSpec.configure do |config|
           config.include FactoryGirl::Syntax::Methods
         end
-        """
+        "
         expect(Dir).to receive(:glob).with('./spec/spec_helper.rb').and_return(['spec/spec_helper.rb']).twice
         expect(File).to receive(:read).with('spec/spec_helper.rb').and_return(input).once
         expect(File).not_to receive(:write).with('spec/spec_helper.rb', output)
@@ -171,20 +189,20 @@ end
             replace_with 'create {{arguments}}'
           end
         end
-        input = """
+        input = "
 it 'uses factory_girl' do
   user = FactoryGirl.create :user
   post = FactoryGirl.create :post, user: user
   assert post.valid?
 end
-"""
-        output = """
+"
+        output = "
 it 'uses factory_girl' do
   user = create :user
   post = create :post, user: user
   assert post.valid?
 end
-"""
+"
         expect(Dir).to receive(:glob).with('./spec/**/*_spec.rb').and_return(['spec/models/post_spec.rb']).twice
         expect(File).to receive(:read).with('spec/models/post_spec.rb').and_return(input)
         expect(File).to receive(:write).with('spec/models/post_spec.rb', output)
@@ -205,7 +223,7 @@ end
         instance.instance_variable_set :@actions, [action1, action2, action3]
         conflict_actions = instance.send(:get_conflict_actions)
         expect(conflict_actions).to eq []
-        expect(instance.instance_variable_get :@actions).to eq [action1, action2, action3]
+        expect(instance.instance_variable_get(:@actions)).to eq [action1, action2, action3]
       end
 
       it "has no conflict" do
@@ -216,7 +234,7 @@ end
         instance.instance_variable_set :@actions, [action1, action2, action3]
         conflict_actions = instance.send(:get_conflict_actions)
         expect(conflict_actions).to eq [action2, action1]
-        expect(instance.instance_variable_get :@actions).to eq [action3]
+        expect(instance.instance_variable_get(:@actions)).to eq [action3]
       end
     end
 

data/spec/synvert/core/rewriter/scope/goto_scope_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 module Synvert::Core

data/spec/synvert/core/rewriter/scope/within_scope.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 module Synvert::Core
@@ -6,13 +8,13 @@ module Synvert::Core
       rewriter = Rewriter.new('foo', 'bar')
       Rewriter::Instance.new(rewriter, 'file pattern')
     }
-    let(:source) {"""
+    let(:source) {"
 describe Post do
   it 'gets post' do
     FactoryGirl.create :post
   end
 end
-    """
+    "
     }
     let(:node) { Parser::CurrentRuby.parse(source) }
     before do

data/spec/synvert/core/rewriter/scope_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 module Synvert::Core

data/spec/synvert/core/rewriter/warning_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 module Synvert::Core

data/spec/synvert/core/rewriter_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 module Synvert::Core
@@ -92,7 +94,7 @@ module Synvert::Core
           add_file 'foo.bar', 'FooBar'
         end
         rewriter.process
-        expect(File.read './foo.bar').to eq 'FooBar'
+        expect(File.read('./foo.bar')).to eq 'FooBar'
         FileUtils.rm './foo.bar'
       end
 
@@ -112,7 +114,7 @@ module Synvert::Core
           remove_file 'foo.bar'
         end
         rewriter.process
-        expect(File.exist? './foo.bar').to be_falsey
+        expect(File.exist?('./foo.bar')).to be_falsey
       end
 
       it 'does nothing if file not exist' do
@@ -120,7 +122,7 @@ module Synvert::Core
           remove_file 'foo.bar'
         end
         rewriter.process
-        expect(File.exist? './foo.bar').to be_falsey
+        expect(File.exist?('./foo.bar')).to be_falsey
       end
 
       it 'does nothing in sandbox mode' do
@@ -204,11 +206,11 @@ module Synvert::Core
       context "exist?" do
         it 'returns true if rewriter exists' do
           Rewriter.new 'group', 'rewriter'
-          expect(Rewriter.exist? 'group', 'rewriter').to be_truthy
+          expect(Rewriter.exist?('group', 'rewriter')).to be_truthy
         end
 
         it 'returns false if rewriter does not exist' do
-          expect(Rewriter.exist? 'group', 'rewriter').to be_falsey
+          expect(Rewriter.exist?('group', 'rewriter')).to be_falsey
         end
       end
 

data/synvert-core.gemspec

@@ -18,11 +18,11 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "parser", "~> 2.5.0"
+  spec.add_runtime_dependency "parser", "~> 3.0.0"
   spec.add_runtime_dependency "activesupport"
   spec.add_runtime_dependency "erubis"
 
-  spec.add_development_dependency "bundler", "~> 1.6"
+  spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"
   spec.add_development_dependency "guard"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: synvert-core
 version: !ruby/object:Gem::Version
-  version: 0.15.0
+  version: 0.17.0
 platform: ruby
 authors:
 - Richard Huang
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-05-23 00:00:00.000000000 Z
+date: 2021-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.5.0
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.5.0
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -56,16 +56,16 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -194,7 +194,7 @@ homepage: https://github.com/xinminlabs/synvert-core
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -209,9 +209,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: convert ruby code to better syntax.
 test_files: