synvert-core 1.17.0 → 1.18.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dd4c09ec590b3d1bce36465a50c319c4530aa2d28c08906fa008f33e72cccc55
-  data.tar.gz: 5591fd4d4a992ac99d5d523b958d7aa4e2caf56deaa5203dc8cf4ad537c3be32
+  metadata.gz: 036a5a2a642e96b611185e400b4f458be77f2622c3ef996bdac4bc0cbda1df70
+  data.tar.gz: 51ec847622d9018176f4dceb51a2a9ac623c1129abea3012d6e2faab650ee7f2
 SHA512:
-  metadata.gz: 5c24a6a380ad2b418639b834818100c8ebcb19255e33c78a19b99b299d2cf6ad24024a0e6d4543d205bee939f53646f3180db257cad05c96bb011334849e79ec
-  data.tar.gz: 1025d6ebfab92f0a04d939aa57b5e2170e957fec465d7996b36abc5f4e334996f615e5cfc5b7db0b9a9ae076de2eac3108fa6e7a7446640b5de1fd4929fc48a5
+  metadata.gz: 6c739ddf2691480f5d53fe0033eb24a5c0e784116fec98eff71a58d1d1745a853790121a89979b32624fcb65ea104b837a744b9353fde8ef74ef227433e9be7f
+  data.tar.gz: 95ad1ab6a96a33f0299aa012f7731915a7af3794b805b5e5743ddd2d11c48e29dc34019773a3948b96db94aea814d928558c0ee0409a750dae3e85c6d503ec67

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 # CHANGELOG
 
+## 1.18.1 (2023-02-05)
+
+* Fix glob with only paths
+
+## 1.18.0 (2023-02-01)
+
+* Remove `todo` dsl
+* Update `parser_node_ext` to 0.9.0
+
 ## 1.17.0 (2023-01-21)
 
 * Add `add_action` dsl

data/Gemfile.lock

@@ -1,19 +1,19 @@
 PATH
   remote: .
   specs:
-    synvert-core (1.17.0)
+    synvert-core (1.18.1)
       activesupport (< 7.0.0)
       erubis
       node_mutation (>= 1.8.2)
       node_query (>= 1.12.0)
       parallel
       parser
-      parser_node_ext (>= 0.6.1)
+      parser_node_ext (>= 0.9.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.1.7.1)
+    activesupport (6.1.7.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -21,7 +21,7 @@ GEM
       zeitwerk (~> 2.3)
     ast (2.4.2)
     coderay (1.1.3)
-    concurrent-ruby (1.1.10)
+    concurrent-ruby (1.2.0)
     diff-lcs (1.5.0)
     erubis (2.7.0)
     fakefs (1.8.0)
@@ -59,7 +59,7 @@ GEM
     parallel (1.22.1)
     parser (3.2.0.0)
       ast (~> 2.4.1)
-    parser_node_ext (0.6.1)
+    parser_node_ext (0.10.0)
       parser
     pry (0.14.1)
       coderay (~> 1.1)
@@ -83,7 +83,7 @@ GEM
     rspec-support (3.10.3)
     shellany (0.0.1)
     thor (1.2.1)
-    tzinfo (2.0.5)
+    tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     zeitwerk (2.6.6)
 

data/README.md

@@ -69,7 +69,6 @@ DSLs are as follows
 * [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:
@@ -93,7 +92,8 @@ Actions:
 * [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
+* [delete](https://xinminlabs.github.io/synvert-core-ruby/Synvert/Core/Rewriter/Instance.html#delete-instance_method) - delete the code in specified child nodes
+* [remove](https://xinminlabs.github.io/synvert-core-ruby/Synvert/Core/Rewriter/Instance.html#remove-instance_method) - remove the whole code of current node
 * [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

data/lib/synvert/core/rewriter.rb

@@ -330,28 +330,6 @@ module Synvert::Core
       @helpers << { name: name, block: block }
     end
 
-    # It sets todo of the rewriter.
-    # Or get todo.
-    # @example
-    #   Synvert::Rewriter.new 'rails', 'upgrade_3_2_to_4_0' do
-    #     todo <<~EOS
-    #       1. Rails 4.0 no longer supports loading plugins from vendor/plugins. You must replace any plugins by extracting them to gems and adding them to your Gemfile. If you choose not to make them gems, you can move them into, say, lib/my_plugin/* and add an appropriate initializer in config/initializers/my_plugin.rb.
-    #       2.  Make the following changes to your Gemfile.
-    #           gem 'sass-rails', '~> 4.0.0'
-    #           gem 'coffee-rails', '~> 4.0.0'
-    #           gem 'uglifier', '>= 1.3.0'
-    #     EOS
-    #   end
-    # @param todo [String] rewriter todo.
-    # @return [String] rewriter todo.
-    def todo(todo = nil)
-      if todo
-        @todo = todo
-      else
-        @todo
-      end
-    end
-
     # Rerun the snippet until no change.
     # @example
     #   Synvert::Rewriter.new 'ruby', 'nested_class_definition' do
@@ -369,46 +347,16 @@ module Synvert::Core
     # @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|
+        Parallel.map(Utils.glob(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|
+        Utils.glob(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/utils.rb

@@ -27,6 +27,18 @@ module Synvert::Core
         end
       end
 
+      # Glob file paths.
+      # @param file_patterns [Array<String>] file patterns
+      # @return [Array<String>] file paths
+      def glob(file_patterns)
+        Dir.chdir(Configuration.root_path) do
+          all_files = file_patterns.flat_map do |file_pattern|
+            Dir.glob(file_pattern)
+          end
+          filter_only_paths(all_files) - get_skip_files
+        end
+      end
+
       private
 
       def is_valid_url?(url)
@@ -65,6 +77,32 @@ module Synvert::Core
 
         url.sub('//github.com/', '//raw.githubusercontent.com/').sub('/blob/', '/')
       end
+
+      # Filter only paths with `Configuration.only_paths`.
+      # @return [Array<String>] filtered file paths
+      def filter_only_paths(all_files)
+        return all_files if Configuration.only_paths.size == 0
+
+        Configuration.only_paths.flat_map do |only_path|
+          all_files.filter { |file_path| file_path.starts_with?(only_path) }
+        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
     end
   end
 end

data/lib/synvert/core/version.rb

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

data/spec/synvert/core/rewriter_spec.rb

@@ -86,7 +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(Utils).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)
@@ -112,7 +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(Utils).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 =
@@ -125,7 +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(Utils).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
@@ -256,15 +256,6 @@ module Synvert::Core
       expect(instance.dynamic_helper('arg1', 'arg2')).to eq 'dynamic result'
     end
 
-    it 'parses todo' do
-      rewriter =
-        Rewriter.new 'group', 'name' do
-          todo "this rewriter doesn't do blah blah blah"
-        end
-      rewriter.process
-      expect(rewriter.todo).to eq "this rewriter doesn't do blah blah blah"
-    end
-
     it 'parses redo_until_no_change' do
       rewriter =
         Rewriter.new 'group', 'name' do

data/spec/synvert/core/utils_spec.rb

@@ -53,5 +53,30 @@ module Synvert::Core
         end
       end
     end
+
+    describe '.glob' do
+      before do
+        Configuration.only_paths = []
+        Configuration.skip_paths = []
+      end
+
+      it 'gets all files' do
+        expect(Dir).to receive(:glob).with('**/*.rb').and_return(['app/models/post.rb', 'app/controllers/posts_controller.rb'])
+        expect(described_class.glob(['**/*.rb'])).to eq(['app/models/post.rb', 'app/controllers/posts_controller.rb'])
+      end
+
+      it 'filters only paths' do
+        Configuration.only_paths = ['app/models']
+        expect(Dir).to receive(:glob).with('**/*.rb').and_return(['app/models/post.rb', 'app/controllers/posts_controller.rb'])
+        expect(described_class.glob(['**/*.rb'])).to eq(['app/models/post.rb'])
+      end
+
+      it 'skip files' do
+        Configuration.skip_paths = ['app/controllers/**/*']
+        expect(Dir).to receive(:glob).with('**/*.rb').and_return(['app/models/post.rb', 'app/controllers/posts_controller.rb'])
+        expect(Dir).to receive(:glob).with('app/controllers/**/*').and_return(['app/controllers/posts_controller.rb'])
+        expect(described_class.glob(['**/*.rb'])).to eq(['app/models/post.rb'])
+      end
+    end
   end
 end

data/synvert-core-ruby.gemspec

@@ -24,6 +24,6 @@ Gem::Specification.new do |spec|
   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.6.1"
+  spec.add_runtime_dependency "parser_node_ext", ">= 0.9.0"
   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.17.0
+  version: 1.18.1
 platform: ruby
 authors:
 - Richard Huang
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-21 00:00:00.000000000 Z
+date: 2023-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.1
+        version: 0.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.1
+        version: 0.9.0
 - !ruby/object:Gem::Dependency
   name: parallel
   requirement: !ruby/object:Gem::Requirement