synvert-core 1.7.0 → 1.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4e0e8e77a7f85aa23300c28aaf44fca1d6b0a7ffad9177bc9925cfd7541f4e65
-  data.tar.gz: eb1b9267dbf8264a9c5978dd019dc0c26fcc6613cf0413b767c8fdf4c763cb00
+  metadata.gz: 6007d28c9a4371057b72bfbd4e73c23163cf52c384e7cef0a3fcdcd71b384fcd
+  data.tar.gz: 5b43685d36948aaf52dd313fdf0e6198eefa73ff12813853d1f289577f58da07
 SHA512:
-  metadata.gz: 26a85edf49b07f5afc0688152bf63bf65966e72f15d58da615b8e4b6575e28a74978113a9dbbed78f0cf076e0d0a5d54d486ef83af6a46a0ce7e1b69547b33c1
-  data.tar.gz: 21bb822480bd6ea79725d27eabb48c3306da71dec81fb817c8d94027b7457e5ae1ed3d78d9d5d870c103f173e2a3bc00e8b45273c66bbd4dfcb259e2ada254bc
+  metadata.gz: bc762494a28bc325231e1903130fbd14056442646b463b2e336426e59830f2ee8216fb6caa29c50960fed82a75bc320d4196919b0bffb9ab2547674f19bc89ac
+  data.tar.gz: 60e6b882a9b039c42acecb27581fca198482eeef15628ac9123daf4e08dd0bc109ebff3a1e5c2c7ac62ad8fd4fc7e6fdf65871d83b98a3a90c32b71702ff4057

data/CHANGELOG.md

@@ -1,5 +1,16 @@
 # CHANGELOG
 
+## 1.8.1 (2022-09-17)
+
+* Fix test snippet, return test results
+
+## 1.8.0 (2022-09-17)
+
+* Rename config `path` to `root_path`
+* Rename config `skip_files` to `skip_paths`
+* Add config `only_paths`
+* Change dir to `root_path`
+
 ## 1.7.0 (2022-09-16)
 
 * Add `Rewriter#test`

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    synvert-core (1.7.0)
+    synvert-core (1.8.1)
       activesupport (< 7.0.0)
       erubis
       node_mutation

data/lib/synvert/core/configuration.rb

@@ -4,23 +4,31 @@ module Synvert::Core
   # Synvert global configuration.
   class Configuration
     class << self
-      # @!attribute [w] path
-      # @!attribute [w] skip_files
+      # @!attribute [w] root_path
+      # @!attribute [w] skip_paths
+      # @!attribute [w] only_paths
       # @!attribute [w] show_run_process
-      attr_writer :path, :skip_files, :show_run_process
+      attr_writer :root_path, :skip_paths, :only_paths, :show_run_process
 
       # Get the path.
       #
       # @return [String] default is '.'
-      def path
-        @path || '.'
+      def root_path
+        @root_path || '.'
       end
 
-      # Get a list of skip files.
+      # Get a list of skip paths.
       #
       # @return [Array<String>] default is [].
-      def skip_files
-        @skip_files || []
+      def skip_paths
+        @skip_paths || []
+      end
+
+      # Get a list of only paths.
+      #
+      # @return [Array<String>] default is [].
+      def only_paths
+        @only_paths || []
       end
 
       # Check if show run process.

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

@@ -22,12 +22,12 @@ module Synvert::Core
     #
     # @return [Boolean] true if matches, otherwise false.
     def match?
-      gemfile_lock_path = File.expand_path(File.join(Configuration.path, 'Gemfile.lock'))
+      gemfile_lock_path = File.expand_path(File.join(Configuration.root_path, 'Gemfile.lock'))
 
       # if Gemfile.lock does not exist, just ignore this check
       return true unless File.exist?(gemfile_lock_path)
 
-      ENV['BUNDLE_GEMFILE'] = Configuration.path # make sure bundler reads Gemfile.lock in the correct path
+      ENV['BUNDLE_GEMFILE'] = Configuration.root_path # make sure bundler reads Gemfile.lock in the correct path
       parser = Bundler::LockfileParser.new(File.read(gemfile_lock_path))
       parser.specs.any? { |spec| Gem::Dependency.new(@name, @version).match?(spec) }
     end

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

@@ -32,12 +32,8 @@ module Synvert::Core
     # 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
-      @file_patterns.each do |file_pattern|
-        Dir.glob(File.join(Configuration.path, file_pattern)).each do |file_path|
-          next if Configuration.skip_files.include?(file_path)
-
-          process_file(file_path)
-        end
+      get_file_paths.each do |file_path|
+        process_file(file_path)
       end
     end
 
@@ -45,13 +41,7 @@ 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
-      paths = @file_patterns.flat_map do |file_pattern|
-        Dir.glob(File.join(Configuration.path, file_pattern))
-      end
-
-      paths.uniq.map do |file_path|
-        next if Configuration.skip_files.include?(file_path)
-
+      get_file_paths.map do |file_path|
         test_file(file_path)
       end
     end
@@ -424,6 +414,36 @@ module Synvert::Core
       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) - get_skip_files
+          end
+        end
+      end
+    end
+
+    # Get skip files.
+    # @return [Array<String>] skip files
+    def get_skip_files
+      @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/ruby_version.rb

@@ -16,14 +16,14 @@ module Synvert::Core
     #
     # @return [Boolean] true if matches, otherwise false.
     def match?
-      if File.exist?(File.join(Configuration.path, '.ruby-version'))
+      if File.exist?(File.join(Configuration.root_path, '.ruby-version'))
         version_file = '.ruby-version'
-      elsif File.exist?(File.join(Configuration.path, '.rvmrc'))
+      elsif File.exist?(File.join(Configuration.root_path, '.rvmrc'))
         version_file = '.rvmrc'
       end
       return true unless version_file
 
-      version = File.read(File.join(Configuration.path, version_file))
+      version = File.read(File.join(Configuration.root_path, version_file))
       Gem::Version.new(version) >= Gem::Version.new(@version)
     end
   end

data/lib/synvert/core/rewriter.rb

@@ -76,7 +76,7 @@ module Synvert::Core
       # @option options [Boolean] :run_instance (true) process the instance.
       # @return [Synvert::Core::Rewriter] the registered rewriter.
       # @raise [Synvert::Core::RewriterNotFound] if the registered rewriter is not found.
-      def call(group, name, options = {})
+      def call(group, name, options = { run_instance: true })
         rewriter = fetch(group, name)
         if options[:run_instance]
           rewriter.process
@@ -274,7 +274,7 @@ module Synvert::Core
     def add_file(filename, content)
       return unless @options[:run_instance]
 
-      filepath = File.join(Configuration.path, filename)
+      filepath = File.join(Configuration.root_path, filename)
       if File.exist?(filepath)
         puts "File #{filepath} already exists."
         return
@@ -293,7 +293,7 @@ module Synvert::Core
     def remove_file(filename)
       return unless @options[:run_instance]
 
-      file_path = File.join(Configuration.path, filename)
+      file_path = File.join(Configuration.root_path, filename)
       File.delete(file_path) if File.exist?(file_path)
     end
 

data/lib/synvert/core/version.rb

@@ -2,6 +2,6 @@
 
 module Synvert
   module Core
-    VERSION = '1.7.0'
+    VERSION = '1.8.1'
   end
 end

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

@@ -205,7 +205,7 @@ 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(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
@@ -230,7 +230,7 @@ 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(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
@@ -257,7 +257,7 @@ 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(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)
@@ -284,7 +284,7 @@ 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(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'
@@ -308,7 +308,7 @@ 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(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'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: synvert-core
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.8.1
 platform: ruby
 authors:
 - Richard Huang
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-09-16 00:00:00.000000000 Z
+date: 2022-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport