synvert-core 1.15.0 → 1.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 82066eb2fad44d4ca47831672a31195bba96aa07206aa23e449d5c519b94b23d
-  data.tar.gz: 70a8566412fc3cf9004441a07e706c79807820003155b4bafdc03cf4c62042cc
+  metadata.gz: dd4c09ec590b3d1bce36465a50c319c4530aa2d28c08906fa008f33e72cccc55
+  data.tar.gz: 5591fd4d4a992ac99d5d523b958d7aa4e2caf56deaa5203dc8cf4ad537c3be32
 SHA512:
-  metadata.gz: b33e55196d7d3e13097e7b101ee693111e5a49ad6d93015eba85886214abb125b5a938908ca0feadef772ef6eecdaa8874fc2d8d6ecff044d5506f685db8bc8d
-  data.tar.gz: aa7f05784e6e8710903c47e6616dac0a18bca66b0f04fc6b7089ff8d47f8c5c6d073bdb45fccb04b25765feed6b28313ea08dd80d166e0283cd931e2d9482229
+  metadata.gz: 5c24a6a380ad2b418639b834818100c8ebcb19255e33c78a19b99b299d2cf6ad24024a0e6d4543d205bee939f53646f3180db257cad05c96bb011334849e79ec
+  data.tar.gz: 1025d6ebfab92f0a04d939aa57b5e2170e957fec465d7996b36abc5f4e334996f615e5cfc5b7db0b9a9ae076de2eac3108fa6e7a7446640b5de1fd4929fc48a5

data/CHANGELOG.md

@@ -1,5 +1,17 @@
 # CHANGELOG
 
+## 1.17.0 (2023-01-21)
+
+* Add `add_action` dsl
+* Remove `any_value`
+* No access to `Instance#current_mutation`
+
+## 1.16.0 (2022-12-29)
+
+* Add `Instance#query_adapter` and `Instance#mutation_adapter`
+* One instance handle only one file
+* Use `instance.file_path` instead of `instance.current_file`
+
 ## 1.15.0 (2022-11-30)
 
 * Load snippet from github

data/Gemfile.lock

@@ -1,19 +1,19 @@
 PATH
   remote: .
   specs:
-    synvert-core (1.15.0)
+    synvert-core (1.17.0)
       activesupport (< 7.0.0)
       erubis
-      node_mutation (>= 1.7.1)
-      node_query (>= 1.10.0)
+      node_mutation (>= 1.8.2)
+      node_query (>= 1.12.0)
       parallel
       parser
-      parser_node_ext (>= 0.4.1)
+      parser_node_ext (>= 0.6.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.1.7)
+    activesupport (6.1.7.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -48,20 +48,18 @@ GEM
       rb-inotify (~> 0.9, >= 0.9.10)
     lumberjack (1.2.8)
     method_source (1.0.0)
-    minitest (5.16.3)
+    minitest (5.17.0)
     nenv (0.3.0)
-    node_mutation (1.7.1)
-      activesupport (< 7.0.0)
+    node_mutation (1.8.2)
       erubis
-    node_query (1.10.0)
-      activesupport (< 7.0.0)
+    node_query (1.12.0)
     notiffany (0.1.3)
       nenv (~> 0.1)
       shellany (~> 0.0)
     parallel (1.22.1)
-    parser (3.1.3.0)
+    parser (3.2.0.0)
       ast (~> 2.4.1)
-    parser_node_ext (0.4.1)
+    parser_node_ext (0.6.1)
       parser
     pry (0.14.1)
       coderay (~> 1.1)

data/README.md

@@ -59,43 +59,51 @@ Want to use the CLI, check out [synvert-ruby](https://github.com/xinminlabs/synv
 
 DSLs are as follows
 
-* [configure](./Synvert/Core/Rewriter.html#configure-instance_method) - configure the rewriter
-* [description](./Synvert/Core/Rewriter.html#description-instance_method) - set description of the rewriter
-* [if_ruby](./Synvert/Core/Rewriter.html#if_ruby-instance_method) - check if ruby version is greater than or equal to the specified ruby version
-* [if_gem](./Synvert/Core/Rewriter.html#if_gem-instance_method) - compare version of specified gem
-* [within_files](./Synvert/Core/Rewriter.html#within_files-instance_method) - find specified files
-* [within_file](./Synvert/Core/Rewriter.html#within_file-instance_method) - alias to within_files
-* [add_file](./Synvert/Core/Rewriter.html#add_file-instance_method) - add a new file
-* [remove_file](./Synvert/Core/Rewriter.html#remove_file-instance_method) - remove a file
-* [helper_method](./Synvert/Core/Rewriter.html#helper_method-instance_method) - define a helper method
-* [add_snippet](./Synvert/Core/Rewriter.html#add_snippet-instance_method) - call another rewriter
-* [todo](./Synvert/Core/Rewriter.html#todo-instance_method) - set todo
-* [redo_until_no_change](./Synvert/Core/Rewriter.html#redo_until_no_change-instance_method) - run the snippet until no change
+* [configure](https://xinminlabs.github.io/synvert-core-ruby/Synvert/Core/Rewriter.html#configure-instance_method) - configure the rewriter
+* [description](https://xinminlabs.github.io/synvert-core-ruby/Synvert/Core/Rewriter.html#description-instance_method) - describe what the rewriter does
+* [if_ruby](https://xinminlabs.github.io/synvert-core-ruby/Synvert/Core/Rewriter.html#if_ruby-instance_method) - check if ruby version is greater than or equal to the specified ruby version
+* [if_gem](https://xinminlabs.github.io/synvert-core-ruby/Synvert/Core/Rewriter.html#if_gem-instance_method) - compare version of specified gem
+* [within_files](https://xinminlabs.github.io/synvert-core-ruby/Synvert/Core/Rewriter.html#within_files-instance_method) - find specified files
+* [within_file](https://xinminlabs.github.io/synvert-core-ruby/Synvert/Core/Rewriter.html#within_file-instance_method) - alias to within_files
+* [add_file](https://xinminlabs.github.io/synvert-core-ruby/Synvert/Core/Rewriter.html#add_file-instance_method) - add a new file
+* [remove_file](https://xinminlabs.github.io/synvert-core-ruby/Synvert/Core/Rewriter.html#remove_file-instance_method) - remove a file
+* [helper_method](https://xinminlabs.github.io/synvert-core-ruby/Synvert/Core/Rewriter.html#helper_method-instance_method) - define a helper method
+* [add_snippet](https://xinminlabs.github.io/synvert-core-ruby/Synvert/Core/Rewriter.html#add_snippet-instance_method) - call another rewriter
+* [todo](https://xinminlabs.github.io/synvert-core-ruby/Synvert/Core/Rewriter.html#todo-instance_method) - set todo
+* [redo_until_no_change](https://xinminlabs.github.io/synvert-core-ruby/Synvert/Core/Rewriter.html#redo_until_no_change-instance_method) - run the snippet until no change
 
 Scopes:
 
-* [within_node](./Synvert/Core/Rewriter/Instance.html#within_node-instance_method) - recursively find matching ast nodes
-* [with_node](./Synvert/Core/Rewriter/Instance.html#with_node-instance_method) - alias to within_node
-* [find_node](./Synvert/Core/Rewriter/Instance.html#find_node-instance_method) - alias to within_node
-* [goto_node](./Synvert/Core/Rewriter/Instance.html#goto_node-instance_method) - go to a child node
+* [within_node](https://xinminlabs.github.io/synvert-core-ruby/Synvert/Core/Rewriter/Instance.html#within_node-instance_method) - recursively find matching ast nodes
+* [with_node](https://xinminlabs.github.io/synvert-core-ruby/Synvert/Core/Rewriter/Instance.html#with_node-instance_method) - alias to within_node
+* [find_node](https://xinminlabs.github.io/synvert-core-ruby/Synvert/Core/Rewriter/Instance.html#find_node-instance_method) - alias to within_node
+* [goto_node](https://xinminlabs.github.io/synvert-core-ruby/Synvert/Core/Rewriter/Instance.html#goto_node-instance_method) - go to a child node
 
 Conditions:
 
-* [if_exist_node](./Synvert/Core/Rewriter/Instance.html#if_exist_node-instance_method) - check if matching node exist in the child nodes
-* [unless_exist_node](./Synvert/Core/Rewriter/Instance.html#unless_exist_node-instance_method) - check if matching node doesn't exist in the child nodes
-* [if_only_exist_node](./Synvert/Core/Rewriter/Instance.html#if_only_exist_node-instance_method) - check if current node has only one child node and the child node matches
+* [if_exist_node](https://xinminlabs.github.io/synvert-core-ruby/Synvert/Core/Rewriter/Instance.html#if_exist_node-instance_method) - check if matching node exist in the child nodes
+* [unless_exist_node](https://xinminlabs.github.io/synvert-core-ruby/Synvert/Core/Rewriter/Instance.html#unless_exist_node-instance_method) - check if matching node doesn't exist in the child nodes
+* [if_only_exist_node](https://xinminlabs.github.io/synvert-core-ruby/Synvert/Core/Rewriter/Instance.html#if_only_exist_node-instance_method) - check if current node has only one child node and the child node matches
 
 Actions:
 
-* [append](./Synvert/Core/Rewriter/Instance.html#append-instance_method) - append the code to the bottom of current node body
-* [prepend](./Synvert/Core/Rewriter/Instance.html#prepend-instance_method) - prepend the code to the bottom of current node body
-* [insert](./Synvert/Core/Rewriter/Instance.html#insert-instance_method) - insert code
-* [insert_after](./Synvert/Core/Rewriter/Instance.html#insert_after-instance_method) - insert the code next to the current node
-* [insert_before](./Synvert/Core/Rewriter/Instance.html#insert_before-instance_method) - insert the code previous to the current node
-* [replace](./Synvert/Core/Rewriter/Instance.html#replace-instance_method) - replace the code of specified child nodes
-* [delete](./Synvert/Core/Rewriter/Instance.html#delete-instance_method) - delete the code specified child nodes
-* [wrap](./Synvert/Core/Rewriter/Instance.html#wrap-instance_method) - wrap the current node with code
-* [replace_with](./Synvert/Core/Rewriter/Instance.html#replace_with-instance_method) - replace the whole code of current node
-* [warn](./Synvert/Core/Rewriter/Instance.html#warn-instance_method) - warn message
-* [replace_erb_stmt_with_expr](./Synvert/Core/Rewriter/Instance.html#replace_erb_stmt_with_expr-instance_method) - replace erb stmt code to expr code
-* [noop](./Synvert/Core/Rewriter/Instance.html#noop-instance_method) - no operation
+* [append](https://xinminlabs.github.io/synvert-core-ruby/Synvert/Core/Rewriter/Instance.html#append-instance_method) - append the code to the bottom of current node body
+* [prepend](https://xinminlabs.github.io/synvert-core-ruby/Synvert/Core/Rewriter/Instance.html#prepend-instance_method) - prepend the code to the bottom of current node body
+* [insert](https://xinminlabs.github.io/synvert-core-ruby/Synvert/Core/Rewriter/Instance.html#insert-instance_method) - insert code
+* [insert_after](https://xinminlabs.github.io/synvert-core-ruby/Synvert/Core/Rewriter/Instance.html#insert_after-instance_method) - insert the code next to the current node
+* [insert_before](https://xinminlabs.github.io/synvert-core-ruby/Synvert/Core/Rewriter/Instance.html#insert_before-instance_method) - insert the code previous to the current node
+* [replace](https://xinminlabs.github.io/synvert-core-ruby/Synvert/Core/Rewriter/Instance.html#replace-instance_method) - replace the code of specified child nodes
+* [delete](https://xinminlabs.github.io/synvert-core-ruby/Synvert/Core/Rewriter/Instance.html#delete-instance_method) - delete the code specified child nodes
+* [wrap](https://xinminlabs.github.io/synvert-core-ruby/Synvert/Core/Rewriter/Instance.html#wrap-instance_method) - wrap the current node with code
+* [replace_with](https://xinminlabs.github.io/synvert-core-ruby/Synvert/Core/Rewriter/Instance.html#replace_with-instance_method) - replace the whole code of current node
+* [warn](https://xinminlabs.github.io/synvert-core-ruby/Synvert/Core/Rewriter/Instance.html#warn-instance_method) - warn message
+* [replace_erb_stmt_with_expr](https://xinminlabs.github.io/synvert-core-ruby/Synvert/Core/Rewriter/Instance.html#replace_erb_stmt_with_expr-instance_method) - replace erb stmt code to expr code
+* [noop](https://xinminlabs.github.io/synvert-core-ruby/Synvert/Core/Rewriter/Instance.html#noop-instance_method) - no operation
+* [add_action](https://xinminlabs.github.io/synvert-core-ruby/Synvert/Core/Rewriter/Instance.html#add_action-instance_method) - add custom action
+
+Attributes:
+
+* [file_path](https://xinminlabs.github.io/synvert-core-ruby/Synvert/Core/Rewriter/Instance.html#file_path-instance_method) - current file path
+* [node](https://xinminlabs.github.io/synvert-core-ruby/Synvert/Core/Rewriter/Instance.html#node-instance_method) - current ast node
+* [query_adapter](https://xinminlabs.github.io/synvert-core-ruby/Synvert/Core/Rewriter/Instance.html#query_adapter-instance_method) - [query adapter](https://xinminlabs.github.io/node-query-ruby/NodeQuery/Adapter.html) to get some helper methods
+* [mutation_adapter](https://xinminlabs.github.io/synvert-core-ruby/Synvert/Core/Rewriter/Instance.html#mutation_adapter-instance_method) - [mutation adapter](https://xinminlabs.github.io/node-mutation-ruby/NodeMutation/Adapter.html) to get some helper methods

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

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-require 'parallel'
 
 module Synvert::Core
   # Instance is an execution unit, it finds specified ast nodes,
@@ -12,12 +11,12 @@ module Synvert::Core
     # Initialize an Instance.
     #
     # @param rewriter [Synvert::Core::Rewriter]
-    # @param file_patterns [Array<String>] pattern list to find files, e.g. ['spec/**/*_spec.rb']
+    # @param file_path [Array<String>]
     # @yield block code to find nodes, match conditions and rewrite code.
-    def initialize(rewriter, file_patterns, &block)
+    def initialize(rewriter, file_path, &block)
       @rewriter = rewriter
       @actions = []
-      @file_patterns = file_patterns
+      @file_path = file_path
       @block = block
       strategy = NodeMutation::Strategy::KEEP_RUNNING
       if rewriter.options[:strategy] == Strategy::ALLOW_INSERT_AT_SAME_POSITION
@@ -27,20 +26,54 @@ module Synvert::Core
       rewriter.helpers.each { |helper| singleton_class.send(:define_method, helper[:name], &helper[:block]) }
     end
 
+    # @!attribute [r] file_path
+    #   @return file path
     # @!attribute [rw] current_node
-    #   @return current parsing node
-    # @!attribute [rw] current_file
-    #   @return current filename
-    # @!attribute [rw] current_mutation
-    #   @return current mutation
-    attr_accessor :current_node, :current_file, :current_mutation
+    #   @return current ast node
+    # @!attribute [r] query_adapter
+    #   @return NodeQuery Adapter
+    # @!attribute [r] mutation_adapter
+    #   @return NodeMutation Adapter
+    attr_reader :file_path, :current_node, :query_adapter, :mutation_adapter
+    attr_accessor :current_node
 
     # Process the instance.
     # It finds specified files, for each file, it executes the block code, rewrites the original code,
     # then writes the code back to the original file.
     def process
-      get_file_paths.each do |file_path|
-        process_file(file_path)
+      puts @file_path if Configuration.show_run_process
+
+      absolute_file_path = File.join(Configuration.root_path, @file_path)
+      while true
+        source = read_source(absolute_file_path)
+        @current_mutation = NodeMutation.new(source)
+        @mutation_adapter = NodeMutation.adapter
+        @query_adapter = NodeQuery.adapter
+        begin
+          node = parse_code(@file_path, source)
+
+          process_with_node(node) do
+            instance_eval(&@block)
+          rescue NoMethodError => e
+            puts [
+              "error: #{e.message}",
+              "file: #{file_path}",
+              "source: #{source}",
+              "line: #{current_node.line}"
+            ].join("\n")
+            raise
+          end
+
+          result = @current_mutation.process
+          if result.affected?
+            @rewriter.add_affected_file(file_path)
+            write_source(absolute_file_path, result.new_source)
+          end
+          break unless result.conflicted?
+        rescue Parser::SyntaxError
+          puts "[Warn] file #{file_path} was not parsed correctly."
+          # do nothing, iterate next file
+        end
       end
     end
 
@@ -48,17 +81,36 @@ module Synvert::Core
     # It finds specified files, for each file, it executes the block code, tests the original code,
     # then returns the actions.
     def test
-      if Configuration.number_of_workers > 1
-        Parallel.map(get_file_paths, in_processes: Configuration.number_of_workers) do |file_path|
-          test_file(file_path)
-        end
-      else
-        get_file_paths.map do |file_path|
-          test_file(file_path)
+      absolute_file_path = File.join(Configuration.root_path, file_path)
+      source = read_source(absolute_file_path)
+      @current_mutation = NodeMutation.new(source)
+      @mutation_adapter = NodeMutation.adapter
+      @query_adapter = NodeQuery.adapter
+      begin
+        node = parse_code(file_path, source)
+
+        process_with_node(node) do
+          instance_eval(&@block)
+        rescue NoMethodError => e
+          puts [
+            "error: #{e.message}",
+            "file: #{file_path}",
+            "source: #{source}",
+            "line: #{current_node.line}"
+          ].join("\n")
+          raise
         end
+
+        result = @current_mutation.test
+        result.file_path = file_path
+        result
+      rescue Parser::SyntaxError
+        puts "[Warn] file #{file_path} was not parsed correctly."
+        # do nothing, iterate next file
       end
     end
 
+
     # Gets current node, it allows to get current node in block code.
     #
     # @return [Parser::AST::Node]
@@ -343,6 +395,15 @@ module Synvert::Core
       @current_mutation.noop(@current_node)
     end
 
+    # Add a custom action.
+    # @example
+    #   remover_action = NodeMutation::RemoveAction.new(node)
+    #   add_action(remover_action)
+    # @param action [Synvert::Core::Rewriter::Action] action
+    def add_action(action)
+      @current_mutation.actions << action.process
+    end
+
     # It creates a {Synvert::Core::Rewriter::Warning} to save warning message.
     # @example
     #   within_files 'vendor/plugins' do
@@ -353,115 +414,8 @@ module Synvert::Core
       @rewriter.add_warning Rewriter::Warning.new(self, message)
     end
 
-    # Match any value but nil.
-    # @example
-    #   type: 'hash', nothing_value: 'true', status_value: any_value
-    # @return [NodeQuery::AnyValue]
-    def any_value
-      NodeQuery::AnyValue.new
-    end
-
     private
 
-    # Process one file.
-    #
-    # @param file_path [String]
-    def process_file(file_path)
-      puts file_path if Configuration.show_run_process
-
-      @current_file = File.join(Configuration.root_path, file_path)
-      while true
-        source = read_source(@current_file)
-        @current_mutation = NodeMutation.new(source)
-        begin
-          node = parse_code(file_path, source)
-
-          process_with_node(node) do
-            instance_eval(&@block)
-          rescue NoMethodError => e
-            puts [
-              "error: #{e.message}",
-              "file: #{file_path}",
-              "source: #{source}",
-              "line: #{current_node.line}"
-            ].join("\n")
-            raise
-          end
-
-          result = @current_mutation.process
-          if result.affected?
-            @rewriter.add_affected_file(file_path)
-            write_source(@current_file, result.new_source)
-          end
-          break unless result.conflicted?
-        rescue Parser::SyntaxError
-          puts "[Warn] file #{file_path} was not parsed correctly."
-          # do nothing, iterate next file
-        end
-      end
-    end
-
-    # Test one file.
-    #
-    # @param file_path [String]
-    def test_file(file_path)
-      @current_file = File.join(Configuration.root_path, file_path)
-      source = read_source(@current_file)
-      @current_mutation = NodeMutation.new(source)
-      begin
-        node = parse_code(@current_file, source)
-
-        process_with_node(node) do
-          instance_eval(&@block)
-        rescue NoMethodError => e
-          puts [
-            "error: #{e.message}",
-            "file: #{file_path}",
-            "source: #{source}",
-            "line: #{current_node.line}"
-          ].join("\n")
-          raise
-        end
-
-        result = @current_mutation.test
-        result.file_path = file_path
-        result
-      rescue Parser::SyntaxError
-        puts "[Warn] file #{file_path} was not parsed correctly."
-        # do nothing, iterate next file
-      end
-    end
-
-    # Get file paths.
-    # @return [Array<String>] file paths
-    def get_file_paths
-      Dir.chdir(Configuration.root_path) do
-        only_paths = Configuration.only_paths.size > 0 ? Configuration.only_paths : ["."]
-        only_paths.flat_map do |only_path|
-          @file_patterns.flat_map do |file_pattern|
-            pattern = only_path == "." ? file_pattern : File.join(only_path, file_pattern)
-            Dir.glob(pattern)
-          end
-        end - get_skip_files
-      end
-    end
-
-    # Get skip files.
-    # @return [Array<String>] skip files
-    def get_skip_files
-      Configuration.skip_paths.flat_map do |skip_path|
-        if File.directory?(skip_path)
-          Dir.glob(File.join(skip_path, "**/*"))
-        elsif File.file?(skip_path)
-          [skip_path]
-        elsif skip_path.end_with?("**") || skip_path.end_with?("**/")
-          Dir.glob(File.join(skip_path, "*"))
-        else
-          Dir.glob(skip_path)
-        end
-      end
-    end
-
     # Read file source.
     # @param file_path [String] file path
     # @return [String] file source

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

@@ -8,7 +8,7 @@ module Synvert::Core
     # @param instance [Synvert::Core::Rewriter::Instance]
     # @param message [String] warning message.
     def initialize(instance, message)
-      @file_path = instance.current_file
+      @file_path = instance.file_path
       @line = instance.current_node.loc.expression.line
       @message = message
     end

data/lib/synvert/core/rewriter.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'parallel'
 require 'fileutils'
 
 module Synvert::Core
@@ -223,11 +224,16 @@ module Synvert::Core
       return if @ruby_version && !@ruby_version.match?
       return if @gem_spec && !@gem_spec.match?
 
-      instance = Rewriter::Instance.new(self, Array(file_patterns), &block)
       if @options[:write_to_file]
-        instance.process
+        handle_one_file(Array(file_patterns)) do |file_path|
+          instance = Rewriter::Instance.new(self, file_path, &block)
+          instance.process
+        end
       else
-        results = instance.test
+        results = handle_one_file(Array(file_patterns)) do |file_path|
+          instance = Rewriter::Instance.new(self, file_path, &block)
+          instance.test
+        end
         merge_test_results(results)
       end
     end
@@ -357,6 +363,52 @@ module Synvert::Core
 
     private
 
+    # Handle one file.
+    # @param file_patterns [String] file patterns to find files.
+    # @yield [file_path] block to handle file.
+    # @yieldparam file_path [String] file path.
+    def handle_one_file(file_patterns)
+      if Configuration.number_of_workers > 1
+        Parallel.map(get_file_paths(file_patterns), in_processes: Configuration.number_of_workers) do |file_path|
+          yield(file_path)
+        end
+      else
+        get_file_paths(file_patterns).map do |file_path|
+          yield(file_path)
+        end
+      end
+    end
+
+    # Get file paths.
+    # @return [Array<String>] file paths
+    def get_file_paths(file_patterns)
+      Dir.chdir(Configuration.root_path) do
+        only_paths = Configuration.only_paths.size > 0 ? Configuration.only_paths : ["."]
+        only_paths.flat_map do |only_path|
+          file_patterns.flat_map do |file_pattern|
+            pattern = only_path == "." ? file_pattern : File.join(only_path, file_pattern)
+            Dir.glob(pattern)
+          end
+        end - get_skip_files
+      end
+    end
+
+    # Get skip files.
+    # @return [Array<String>] skip files
+    def get_skip_files
+      Configuration.skip_paths.flat_map do |skip_path|
+        if File.directory?(skip_path)
+          Dir.glob(File.join(skip_path, "**/*"))
+        elsif File.file?(skip_path)
+          [skip_path]
+        elsif skip_path.end_with?("**") || skip_path.end_with?("**/")
+          Dir.glob(File.join(skip_path, "*"))
+        else
+          Dir.glob(skip_path)
+        end
+      end
+    end
+
     def merge_test_results(results)
       @test_results += results.select { |result| result.affected? }
     end

data/lib/synvert/core/version.rb

@@ -2,6 +2,6 @@
 
 module Synvert
   module Core
-    VERSION = '1.15.0'
+    VERSION = '1.17.0'
   end
 end

data/lib/synvert/core.rb

@@ -7,6 +7,7 @@ require 'parser/current'
 require 'parser_node_ext'
 require_relative './core/node_ext'
 require 'active_support'
+require 'active_support/core_ext'
 require 'erubis'
 require 'set'
 require 'node_query'

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

@@ -6,7 +6,7 @@ module Synvert::Core
   describe Rewriter::Instance do
     let(:instance) {
       rewriter = Rewriter.new('foo', 'bar')
-      Rewriter::Instance.new(rewriter, ['file pattern'])
+      Rewriter::Instance.new(rewriter, 'code.rb')
     }
 
     it 'parses find_node' do
@@ -97,98 +97,98 @@ module Synvert::Core
     end
 
     it 'parses append' do
-      instance.current_mutation = double
+      instance.instance_variable_set(:@current_mutation, double)
       instance.current_node = double
-      expect(instance.current_mutation).to receive(:append).with(instance.current_node, 'Foobar')
+      expect(instance.instance_variable_get(:@current_mutation)).to receive(:append).with(instance.current_node, 'Foobar')
       instance.append 'Foobar'
     end
 
     it 'parses prepend' do
-      instance.current_mutation = double
+      instance.instance_variable_set(:@current_mutation, double)
       instance.current_node = double
-      expect(instance.current_mutation).to receive(:prepend).with(instance.current_node, 'Foobar')
+      expect(instance.instance_variable_get(:@current_mutation)).to receive(:prepend).with(instance.current_node, 'Foobar')
       instance.prepend 'Foobar'
     end
 
     it 'parses insert at end' do
-      instance.current_mutation = double
+      instance.instance_variable_set(:@current_mutation, double)
       instance.current_node = double
-      expect(instance.current_mutation).to receive(:insert).with(instance.current_node, 'Foobar', at: 'end', to: 'receiver')
+      expect(instance.instance_variable_get(:@current_mutation)).to receive(:insert).with(instance.current_node, 'Foobar', at: 'end', to: 'receiver')
       instance.insert 'Foobar', to: 'receiver'
     end
 
     it 'parses insert at beginning' do
-      instance.current_mutation = double
+      instance.instance_variable_set(:@current_mutation, double)
       instance.current_node = double
-      expect(instance.current_mutation).to receive(:insert).with(instance.current_node, 'Foobar', at: 'beginning', to: nil)
+      expect(instance.instance_variable_get(:@current_mutation)).to receive(:insert).with(instance.current_node, 'Foobar', at: 'beginning', to: nil)
       instance.insert 'Foobar', at: 'beginning'
     end
 
     it 'parses insert_after' do
-      instance.current_mutation = double
+      instance.instance_variable_set(:@current_mutation, double)
       instance.current_node = double
       expect(NodeMutation).to receive_message_chain(:adapter, :get_start_loc, :column).and_return(2)
-      expect(instance.current_mutation).to receive(:insert).with(instance.current_node, "\n  Foobar", at: 'end', to: nil)
+      expect(instance.instance_variable_get(:@current_mutation)).to receive(:insert).with(instance.current_node, "\n  Foobar", at: 'end', to: nil)
       instance.insert_after 'Foobar'
     end
 
     it 'parses insert_before' do
-      instance.current_mutation = double
+      instance.instance_variable_set(:@current_mutation, double)
       instance.current_node = double
       expect(NodeMutation).to receive_message_chain(:adapter, :get_start_loc, :column).and_return(2)
-      expect(instance.current_mutation).to receive(:insert).with(instance.current_node, "Foobar\n  ", at: 'beginning', to: nil)
+      expect(instance.instance_variable_get(:@current_mutation)).to receive(:insert).with(instance.current_node, "Foobar\n  ", at: 'beginning', to: nil)
       instance.insert_before 'Foobar'
     end
 
     it 'parses replace_erb_stmt_with_expr' do
-      instance.current_mutation = double
+      instance.instance_variable_set(:@current_mutation, double)
       instance.current_node = double
       action = double
-      expect(instance.current_mutation).to receive(:actions).and_return([])
+      expect(instance.instance_variable_get(:@current_mutation)).to receive(:actions).and_return([])
       expect(Rewriter::ReplaceErbStmtWithExprAction).to receive(:new).with(instance.current_node).and_return(action)
       expect(action).to receive(:process)
       instance.replace_erb_stmt_with_expr
     end
 
     it 'parses replace_with' do
-      instance.current_mutation = double
+      instance.instance_variable_set(:@current_mutation, double)
       instance.current_node = double
-      expect(instance.current_mutation).to receive(:replace_with).with(instance.current_node, 'Foobar')
+      expect(instance.instance_variable_get(:@current_mutation)).to receive(:replace_with).with(instance.current_node, 'Foobar')
       instance.replace_with 'Foobar'
     end
 
     it 'parses replace with' do
-      instance.current_mutation = double
+      instance.instance_variable_set(:@current_mutation, double)
       instance.current_node = double
-      expect(instance.current_mutation).to receive(:replace).with(instance.current_node, :message, with: 'Foobar')
+      expect(instance.instance_variable_get(:@current_mutation)).to receive(:replace).with(instance.current_node, :message, with: 'Foobar')
       instance.replace :message, with: 'Foobar'
     end
 
     it 'parses remove' do
-      instance.current_mutation = double
+      instance.instance_variable_set(:@current_mutation, double)
       instance.current_node = double
-      expect(instance.current_mutation).to receive(:remove).with(instance.current_node, and_comma: true)
+      expect(instance.instance_variable_get(:@current_mutation)).to receive(:remove).with(instance.current_node, and_comma: true)
       instance.remove and_comma: true
     end
 
     it 'parses delete' do
-      instance.current_mutation = double
+      instance.instance_variable_set(:@current_mutation, double)
       instance.current_node = double
-      expect(instance.current_mutation).to receive(:delete).with(instance.current_node, :dot, :message, and_comma: true)
+      expect(instance.instance_variable_get(:@current_mutation)).to receive(:delete).with(instance.current_node, :dot, :message, and_comma: true)
       instance.delete :dot, :message, and_comma: true
     end
 
     it 'parses wrap with' do
-      instance.current_mutation = double
+      instance.instance_variable_set(:@current_mutation, double)
       instance.current_node = double
-      expect(instance.current_mutation).to receive(:wrap).with(instance.current_node, with: 'module Foobar')
+      expect(instance.instance_variable_get(:@current_mutation)).to receive(:wrap).with(instance.current_node, with: 'module Foobar')
       instance.wrap with: 'module Foobar'
     end
 
     it 'parses noop' do
-      instance.current_mutation = double
+      instance.instance_variable_set(:@current_mutation, double)
       instance.current_node = double
-      expect(instance.current_mutation).to receive(:noop).with(instance.current_node)
+      expect(instance.instance_variable_get(:@current_mutation)).to receive(:noop).with(instance.current_node)
       instance.noop
     end
 
@@ -197,8 +197,13 @@ module Synvert::Core
       instance.warn 'foobar'
     end
 
-    it 'parses any_value' do
-      expect(instance.any_value).to be_instance_of NodeQuery::AnyValue
+    it 'adds action' do
+      mutation = NodeMutation.new("")
+      instance.instance_variable_set(:@current_mutation, mutation)
+      action = double
+      expect(action).to receive(:process).and_return(action)
+      instance.add_action(action)
+      expect(mutation.actions).to eq [action]
     end
 
     describe '#process' do
@@ -206,7 +211,7 @@ module Synvert::Core
 
       it 'writes new code to file' do
         instance =
-          Rewriter::Instance.new rewriter, ['spec/**/*_spec.rb'] do
+          Rewriter::Instance.new rewriter, 'spec/models/post_spec.rb' do
             with_node type: 'send', receiver: 'FactoryGirl', message: 'create' do
               replace_with 'create {{arguments}}'
             end
@@ -225,7 +230,6 @@ module Synvert::Core
             assert post.valid?
           end
         EOS
-        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', encoding: 'UTF-8').and_return(input)
         expect(File).to receive(:write).with('./spec/models/post_spec.rb', output)
         instance.process
@@ -233,7 +237,7 @@ module Synvert::Core
 
       it 'does not write if file content is not changed' do
         instance =
-          Rewriter::Instance.new rewriter, ['spec/spec_helper.rb'] do
+          Rewriter::Instance.new rewriter, 'spec/spec_helper.rb' do
             with_node type: 'block', caller: { receiver: 'RSpec', message: 'configure' } do
               unless_exist_node type: 'send', message: 'include', arguments: ['FactoryGirl::Syntax::Methods'] do
                 insert '{{arguments.first}}.include FactoryGirl::Syntax::Methods'
@@ -250,7 +254,6 @@ module Synvert::Core
             config.include FactoryGirl::Syntax::Methods
           end
         EOS
-        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', encoding: 'UTF-8').and_return(input)
         expect(File).not_to receive(:write).with('./spec/spec_helper.rb', output)
         instance.process
@@ -258,7 +261,7 @@ module Synvert::Core
 
       it 'updates file_source and file_ast when writing a file' do
         instance =
-          Rewriter::Instance.new rewriter, ['spec/**/*_spec.rb'] do
+          Rewriter::Instance.new rewriter, 'spec/models/post_spec.rb' do
             with_node type: 'send', receiver: 'FactoryGirl', message: 'create' do
               replace_with 'create {{arguments}}'
             end
@@ -277,7 +280,6 @@ module Synvert::Core
             assert post.valid?
           end
         EOS
-        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', encoding: 'UTF-8').and_return(input)
         expect(File).to receive(:write).with('./spec/models/post_spec.rb', output)
         expect(File).to receive(:read).with('./spec/models/post_spec.rb', encoding: 'UTF-8').and_return(output)
@@ -292,7 +294,7 @@ module Synvert::Core
 
       it 'writes new code to file' do
         instance =
-          Rewriter::Instance.new rewriter, ['spec/**/*_spec.rb'] do
+          Rewriter::Instance.new rewriter, 'spec/models/post_spec.rb' do
             with_node type: 'send', receiver: 'FactoryGirl', message: 'create' do
               replace_with 'create {{arguments}}'
             end
@@ -304,11 +306,10 @@ module Synvert::Core
             assert post.valid?
           end
         EOS
-        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', encoding: 'UTF-8').and_return(input)
         results = instance.test
-        expect(results[0].file_path).to eq 'spec/models/post_spec.rb'
-        expect(results[0].actions).to eq [
+        expect(results.file_path).to eq 'spec/models/post_spec.rb'
+        expect(results.actions).to eq [
           OpenStruct.new(start: 35, end: 59, new_code: 'create :user'),
           OpenStruct.new(start: 69, end: 105, new_code: 'create :post, user: user')
         ]
@@ -316,7 +317,7 @@ module Synvert::Core
 
       it 'does not write if file content is not changed' do
         instance =
-          Rewriter::Instance.new rewriter, ['spec/spec_helper.rb'] do
+          Rewriter::Instance.new rewriter, 'spec/spec_helper.rb' do
             with_node type: 'block', caller: { receiver: 'RSpec', message: 'configure' } do
               unless_exist_node type: 'send', message: 'include', arguments: ['FactoryGirl::Syntax::Methods'] do
                 insert '{{arguments.first}}.include FactoryGirl::Syntax::Methods'
@@ -328,11 +329,10 @@ module Synvert::Core
             config.include FactoryGirl::Syntax::Methods
           end
         EOS
-        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', encoding: 'UTF-8').and_return(input)
         result = instance.test
-        expect(result[0].file_path).to eq 'spec/spec_helper.rb'
-        expect(result[0].actions).to eq []
+        expect(result.file_path).to eq 'spec/spec_helper.rb'
+        expect(result.actions).to eq []
       end
     end
 

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

@@ -7,7 +7,7 @@ module Synvert::Core
     subject {
       source = "def test\n  debugger\nend"
       send_node = Parser::CurrentRuby.parse(source).body.first
-      instance = double(current_node: send_node, current_file: 'app/test.rb')
+      instance = double(current_node: send_node, file_path: 'app/test.rb')
       Rewriter::Warning.new(instance, 'remove debugger')
     }
 

data/spec/synvert/core/rewriter_spec.rb

@@ -86,6 +86,7 @@ module Synvert::Core
       end
 
       it 'delegates process to instances if if_ruby matches' do
+        expect(Dir).to receive(:glob).with('config/routes.rb').and_return(['config/routes.rb'])
         expect(File).to receive(:exist?).with('./.ruby-version').and_return(true)
         expect(File).to receive(:read).with('./.ruby-version').and_return('2.0.0')
         expect_any_instance_of(Rewriter::Instance).to receive(:process)
@@ -111,6 +112,7 @@ module Synvert::Core
       end
 
       it 'delegates process to instances if if_gem matches' do
+        expect(Dir).to receive(:glob).with('config/routes.rb').and_return(['config/routes.rb'])
         expect_any_instance_of(Rewriter::GemSpec).to receive(:match?).and_return(true)
         expect_any_instance_of(Rewriter::Instance).to receive(:process)
         rewriter =
@@ -123,6 +125,7 @@ module Synvert::Core
       end
 
       it 'delegates process to instances if if_ruby and if_gem do not exist' do
+        expect(Dir).to receive(:glob).with('config/routes.rb').and_return(['config/routes.rb'])
         expect_any_instance_of(Rewriter::Instance).to receive(:process)
         rewriter =
           Rewriter.new 'group', 'name' do
@@ -221,7 +224,8 @@ module Synvert::Core
       end
 
       it 'adds snippet by http url' do
-        expect_any_instance_of(URI).to receive(:open).and_return(StringIO.new("Rewriter.new 'group', 'sub_rewriter' do\nend"))
+        expect(Utils).to receive(:remote_snippet_exists?).with(URI.parse('http://synvert.net/foo/bar.rb')).and_return(true)
+        expect_any_instance_of(URI::HTTP).to receive(:open).and_return(StringIO.new("Rewriter.new 'group', 'sub_rewriter' do\nend"))
         rewriter = Rewriter.new 'group', 'rewriter' do
           add_snippet 'http://synvert.net/foo/bar.rb'
         end

data/synvert-core-ruby.gemspec

@@ -21,9 +21,9 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency "activesupport", "< 7.0.0"
   spec.add_runtime_dependency "erubis"
-  spec.add_runtime_dependency "node_query", ">= 1.10.0"
-  spec.add_runtime_dependency "node_mutation", ">= 1.7.1"
+  spec.add_runtime_dependency "node_query", ">= 1.12.0"
+  spec.add_runtime_dependency "node_mutation", ">= 1.8.2"
   spec.add_runtime_dependency "parser"
-  spec.add_runtime_dependency "parser_node_ext", ">= 0.4.1"
+  spec.add_runtime_dependency "parser_node_ext", ">= 0.6.1"
   spec.add_runtime_dependency "parallel"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: synvert-core
 version: !ruby/object:Gem::Version
-  version: 1.15.0
+  version: 1.17.0
 platform: ruby
 authors:
 - Richard Huang
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-11-30 00:00:00.000000000 Z
+date: 2023-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -44,28 +44,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.10.0
+        version: 1.12.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.10.0
+        version: 1.12.0
 - !ruby/object:Gem::Dependency
   name: node_mutation
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.7.1
+        version: 1.8.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.7.1
+        version: 1.8.2
 - !ruby/object:Gem::Dependency
   name: parser
   requirement: !ruby/object:Gem::Requirement
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.1
+        version: 0.6.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.1
+        version: 0.6.1
 - !ruby/object:Gem::Dependency
   name: parallel
   requirement: !ruby/object:Gem::Requirement
@@ -188,7 +188,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
+rubygems_version: 3.4.1
 signing_key:
 specification_version: 4
 summary: convert ruby code to better syntax.