synvert-core 1.32.0 → 1.33.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eba97ad9bc0ca05de1f79a1fcfeb5bca602d71117d1ec9bef2e540e0180cffb3
-  data.tar.gz: 92d790d50d7d11c4d726bf16e30de8de4874cfbfec00b1c28043190e888b4e3b
+  metadata.gz: 279c659ed3a5da5cda7a67c95ef3cc74601d2f64d7dc70ae29431ef8ec4a9929
+  data.tar.gz: 65caaa8ccc16f8789137b8269ad5ec45c6fe1c9d9198dc0b940b09ad3e3e06cd
 SHA512:
-  metadata.gz: 490772f30d18037ad305217bfa7ae5ddce828a8decdecac855c8666a52beb92e23786f1057f3f3528d93005eebe07d15cc550479c7116c8434e6b2f275248125
-  data.tar.gz: 92450dc3df3f69e664e1b95e98c17814a3ad9e1c700c5b73741703abb54fbc96a598f0e5cc4783331355f8fb153dbe08ef41bb098327520e5851724a6a103355
+  metadata.gz: f45bf64e55621191bfe3a17c689d337d0b25fd356217dd8965876540514bb4b5d04cabb25a834b0567dfba538c93095b12ba281cc02c90a596ec34f8b3dc9231
+  data.tar.gz: 45c5c88b22be8e616cda46e518ee304333d3a8973f58b174182950eef2b958b16ed880311085cf63dc022fe79f8ec3e45fab3a32d23891db829dc5ba8066e075

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 # CHANGELOG
 
+## 1.33.0 (2024-02-18)
+
+* Add `Configuration.respect_gitignore`
+* Glob files with `git check-ignore` if `Configuration.respect_gitignore` is true
+
+## 1.32.1 (2024-02-17)
+
+* Update `node_mutation` to 1.23.2
+* Update `node_query` to 1.15.1
+
 ## 1.32.0 (2024-02-11)
 
 * Support `prism`

data/Gemfile.lock

@@ -1,17 +1,17 @@
 PATH
   remote: .
   specs:
-    synvert-core (1.32.0)
+    synvert-core (1.33.0)
       activesupport (< 7.0.0)
-      node_mutation (>= 1.23.0)
-      node_query (>= 1.15.0)
+      node_mutation (>= 1.23.2)
+      node_query (>= 1.15.1)
       parallel
       parser
       parser_node_ext (>= 1.2.2)
       prism
-      prism_ext (>= 0.2.2)
+      prism_ext (>= 0.2.3)
       syntax_tree
-      syntax_tree_ext (>= 0.7.1)
+      syntax_tree_ext (>= 0.7.2)
 
 GEM
   remote: https://rubygems.org/
@@ -52,8 +52,8 @@ GEM
     method_source (1.0.0)
     minitest (5.22.2)
     nenv (0.3.0)
-    node_mutation (1.23.0)
-    node_query (1.15.0)
+    node_mutation (1.23.2)
+    node_query (1.15.1)
     notiffany (0.1.3)
       nenv (~> 0.1)
       shellany (~> 0.0)
@@ -64,8 +64,8 @@ GEM
     parser_node_ext (1.2.2)
       parser
     prettier_print (1.2.1)
-    prism (0.22.0)
-    prism_ext (0.2.2)
+    prism (0.24.0)
+    prism_ext (0.2.3)
       prism
     pry (0.14.1)
       coderay (~> 1.1)
@@ -91,7 +91,7 @@ GEM
     shellany (0.0.1)
     syntax_tree (6.2.0)
       prettier_print (>= 1.2.0)
-    syntax_tree_ext (0.7.1)
+    syntax_tree_ext (0.7.2)
       syntax_tree
     thor (1.2.1)
     tzinfo (2.0.6)

data/lib/synvert/core/configuration.rb

@@ -7,6 +7,7 @@ module Synvert::Core
       # @!attribute [w] root_path
       # @!attribute [w] skip_paths
       # @!attribute [w] only_paths
+      # @!attribute [w] respect_gitignore
       # @!attribute [w] show_run_process
       # @!attribute [w] number_of_workers
       # @!attribute [w] single_quote
@@ -16,6 +17,7 @@ module Synvert::Core
       attr_writer :root_path,
                   :skip_paths,
                   :only_paths,
+                  :respect_gitignore,
                   :show_run_process,
                   :number_of_workers,
                   :single_quote,
@@ -44,6 +46,13 @@ module Synvert::Core
         @only_paths || []
       end
 
+      # Check if respect .gitignore
+      #
+      # @return [Boolean] default is true
+      def respect_gitignore
+        @respect_gitignore.nil? ? true : @respect_gitignore
+      end
+
       # Check if show run process.
       #
       # @return [Boolean] default is false

data/lib/synvert/core/utils.rb

@@ -3,6 +3,7 @@
 require 'net/http'
 require 'uri'
 require 'open-uri'
+require 'open3'
 
 module Synvert::Core
   class Utils
@@ -35,11 +36,21 @@ module Synvert::Core
       # @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)
+          all_files = file_patterns.flat_map { |pattern| Dir.glob(pattern) }
+          ignored_files = []
+
+          if Configuration.respect_gitignore
+            Open3.popen3('git check-ignore --stdin') do |stdin, stdout, stderr, wait_thr|
+              stdin.puts(all_files.join("\n"))
+              stdin.close
+
+              ignored_files = stdout.read.split("\n")
             end
-          filter_only_paths(all_files) - get_skip_files
+          end
+
+          filtered_files = filter_only_paths(all_files - ignored_files)
+
+          filtered_files -= get_explicitly_skipped_files
         end
       end
 
@@ -85,16 +96,16 @@ module Synvert::Core
       # 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
+        return all_files if Configuration.only_paths.empty?
 
         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
+      # Get skipped files.
+      # @return [Array<String>] skipped files
+      def get_explicitly_skipped_files
         Configuration.skip_paths.flat_map do |skip_path|
           if File.directory?(skip_path)
             Dir.glob(File.join(skip_path, "**/*"))

data/lib/synvert/core/version.rb

@@ -2,6 +2,6 @@
 
 module Synvert
   module Core
-    VERSION = '1.32.0'
+    VERSION = '1.33.0'
   end
 end

data/spec/synvert/core/utils_spec.rb

@@ -58,16 +58,42 @@ module Synvert::Core
       before do
         Configuration.only_paths = []
         Configuration.skip_paths = []
+        Configuration.respect_gitignore = false
       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'])
+      context 'Configuration.respect_gitignore is false' do
+        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
+      end
+
+      context 'Configuration.respect_gitignore is true' do
+        before do
+          Configuration.respect_gitignore = true
+        end
+
+        it 'correctly filters out ignored files' do
+          file_patterns = ["**/*.rb"]
+          all_files = ["app/models/post.rb", "app/controllers/posts_controller.rb", "app/controllers/temp.tmp"]
+          not_ignored_files = ["app/models/post.rb", "app/controllers/posts_controller.rb"]
+          command_output = "app/controllers/temp.tmp\n"
+
+          allow(Open3).to receive(:popen3).with('git check-ignore --stdin').and_yield(
+            instance_double(IO, puts: nil, close: nil),
+            StringIO.new(command_output),
+            StringIO.new(''),
+            instance_double(Process::Waiter, value: instance_double(Process::Status, success?: true))
+          )
+          allow(Dir).to receive(:glob).and_return(all_files)
+
+          expect(described_class.glob(file_patterns)).to match_array(not_ignored_files)
+        end
       end
 
       it 'filters only paths' do

data/synvert-core-ruby.gemspec

@@ -20,13 +20,13 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_runtime_dependency "activesupport", "< 7.0.0"
-  spec.add_runtime_dependency "node_query", ">= 1.15.0"
-  spec.add_runtime_dependency "node_mutation", ">= 1.23.0"
+  spec.add_runtime_dependency "node_query", ">= 1.15.1"
+  spec.add_runtime_dependency "node_mutation", ">= 1.23.2"
   spec.add_runtime_dependency "parser"
   spec.add_runtime_dependency "parser_node_ext", ">= 1.2.2"
   spec.add_runtime_dependency "syntax_tree"
-  spec.add_runtime_dependency "syntax_tree_ext", ">= 0.7.1"
+  spec.add_runtime_dependency "syntax_tree_ext", ">= 0.7.2"
   spec.add_runtime_dependency "prism"
-  spec.add_runtime_dependency "prism_ext", ">= 0.2.2"
+  spec.add_runtime_dependency "prism_ext", ">= 0.2.3"
   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.32.0
+  version: 1.33.0
 platform: ruby
 authors:
 - Richard Huang
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-02-11 00:00:00.000000000 Z
+date: 2024-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -30,28 +30,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.15.0
+        version: 1.15.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.15.0
+        version: 1.15.1
 - !ruby/object:Gem::Dependency
   name: node_mutation
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.23.0
+        version: 1.23.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.23.0
+        version: 1.23.2
 - !ruby/object:Gem::Dependency
   name: parser
   requirement: !ruby/object:Gem::Requirement
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: 0.7.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: 0.7.2
 - !ruby/object:Gem::Dependency
   name: prism
   requirement: !ruby/object:Gem::Requirement
@@ -128,14 +128,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.2
+        version: 0.2.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.2
+        version: 0.2.3
 - !ruby/object:Gem::Dependency
   name: parallel
   requirement: !ruby/object:Gem::Requirement