synvert-core 1.9.0 → 1.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aa46b311ec4eb71e3a23d060e1a23dcceffe1b0ddea066a64043aea29635d143
-  data.tar.gz: 7dd8b27cfc88e3d98a876da7592e1df466e00a6c1b79309d34abc475e287b5a7
+  metadata.gz: 737e801df5a1d686045b99ff8038cd64bd2d39e96813fec4abdedb4473b6f943
+  data.tar.gz: 4adcef7e1eaff7297f35ce5b4df40a3d3edbe447c1354c2a0e7c5e279ec2b60f
 SHA512:
-  metadata.gz: 46b2babf63c196c428173cac102fc55d7968e8bfee9ba484a8c25ffa3c2da711502c172a5c60ae84155e0fef7ab1e2bcad1b70367f36612550bceee010f2ac43
-  data.tar.gz: ca19136ae935ab915d498ab71fb286b9cf30469dbc4503e5f5fb754863cefaa290e1a833b35cedfa0b2533bf64d55987d031514be60b32884145b8df8cc42de7
+  metadata.gz: 1ad2b3a8e7baa9d158e9a7bdbb0dbc9f46b5924ccd7c18867c41ba40192b2e3b57ae500e25edfdf7d0735161abb953bdb833aacbb0e2403321d692c1ae070dd1
+  data.tar.gz: aafdeaa9f19a732c6386bec43c3fafbd56398d9f543e316875d3fa7038a91b1fdc153c1d2c530259a2b8fb137fcecd1ff9ab936723d5bfbdd0cf71d7fd175d28

data/.github/workflows/main.yml

@@ -1,17 +1,10 @@
-# This workflow uses actions that are not certified by GitHub.
-# They are provided by a third-party and are governed by
-# separate terms of service, privacy policy, and support
-# documentation.
-# This workflow will download a prebuilt Ruby version, install dependencies and run tests with Rake
-# For more information see: https://github.com/marketplace/actions/setup-ruby-jruby-and-truffleruby
-
-name: CI
+name: Test & deploy documentation
 
 on:
   push:
-    branches: [ master ]
+    branches: [ main ]
   pull_request:
-    branches: [ master ]
+    branches: [ main ]
 
 jobs:
   test:
@@ -29,3 +22,22 @@ jobs:
         bundler-cache: true
     - name: Run tests
       run: bundle exec rake
+
+  deploy:
+    runs-on: ubuntu-latest
+    needs: test
+    name: Update gh-pages to docs
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-ruby@v1
+        with:
+          ruby-version: '3.1'
+      - name: Install required gem dependencies
+        run: gem install yard redcarpet github-markup --no-document
+      - name: Build YARD Ruby Documentation
+        run: yardoc --output-dir docs
+      - name: Deploy
+        uses: peaceiris/actions-gh-pages@v3
+        with:
+          deploy_key: ${{ secrets.ACTIONS_DEPLOY_KEY }}
+          publish_dir: ./docs

data/.yardopts

@@ -0,0 +1,2 @@
+--markup-provider=redcarpet
+--markup=markdown

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # CHANGELOG
 
+## 1.9.2 (2022-10-03)
+
+* Fix `test` in sub_snippets
+
+## 1.9.1 (2022-09-23)
+
+* Read / write absolute path
+
 ## 1.9.0 (2022-09-20)
 
 * Add `noop` dsl

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    synvert-core (1.9.0)
+    synvert-core (1.9.2)
       activesupport (< 7.0.0)
       erubis
       node_mutation
@@ -49,10 +49,10 @@ GEM
     method_source (1.0.0)
     minitest (5.16.3)
     nenv (0.3.0)
-    node_mutation (1.4.0)
+    node_mutation (1.4.4)
       activesupport (< 7.0.0)
       erubis
-    node_query (1.6.0)
+    node_query (1.7.0)
       activesupport (< 7.0.0)
     notiffany (0.1.3)
       nenv (~> 0.1)
@@ -85,7 +85,7 @@ GEM
     thor (1.2.1)
     tzinfo (2.0.5)
       concurrent-ruby (~> 1.0)
-    zeitwerk (2.6.0)
+    zeitwerk (2.6.1)
 
 PLATFORMS
   ruby

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

@@ -356,9 +356,9 @@ module Synvert::Core
     def process_file(file_path)
       puts file_path if Configuration.show_run_process
 
-      @current_file = file_path
+      @current_file = File.join(Configuration.root_path, file_path)
       while true
-        source = read_source(file_path)
+        source = read_source(@current_file)
         @current_mutation = NodeMutation.new(source)
         begin
           node = parse_code(file_path, source)
@@ -378,7 +378,7 @@ module Synvert::Core
           result = @current_mutation.process
           if result.affected?
             @rewriter.add_affected_file(file_path)
-            write_source(file_path, result.new_source)
+            write_source(@current_file, result.new_source)
           end
           break unless result.conflicted?
         rescue Parser::SyntaxError
@@ -392,11 +392,11 @@ module Synvert::Core
     #
     # @param file_path [String]
     def test_file(file_path)
-      @current_file = file_path
-      source = read_source(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(file_path, source)
+        node = parse_code(@current_file, source)
 
         process_with_node(node) do
           instance_eval(&@block)

data/lib/synvert/core/rewriter.rb

@@ -74,11 +74,14 @@ module Synvert::Core
       # @param name [String] the rewriter name.
       # @param options [Hash]
       # @option options [Boolean] :run_instance (true) process the instance.
+      # @option options [String] :execute_command ('process') process or test the rewriter
       # @return [Synvert::Core::Rewriter] the registered rewriter.
       # @raise [Synvert::Core::RewriterNotFound] if the registered rewriter is not found.
-      def call(group, name, options = { run_instance: true })
+      def call(group, name, options = { run_instance: true, execute_command: 'process' })
         rewriter = fetch(group, name)
-        if options[:run_instance]
+        if options[:execute_command] == 'test'
+          rewriter.test
+        elsif options[:run_instance]
           rewriter.process
         else
           rewriter.process_with_sandbox
@@ -121,7 +124,9 @@ module Synvert::Core
     #   @return [Rewriter::RubyVersion] the ruby version
     # @!attribute [r] gem_spec
     #   @return [Rewriter::GemSpec] the gem spec
-    attr_reader :group, :name, :sub_snippets, :helpers, :warnings, :affected_files, :ruby_version, :gem_spec
+    # @!attribute [r] test_results
+    #   @return [Object] the test results
+    attr_reader :group, :name, :sub_snippets, :helpers, :warnings, :affected_files, :ruby_version, :gem_spec, :test_results
 
     # Initialize a Rewriter.
     # When a rewriter is initialized, it is already registered.
@@ -138,7 +143,7 @@ module Synvert::Core
       @warnings = []
       @affected_files = Set.new
       @redo_until_no_change = false
-      @options = { run_instance: true, write_to_file: true }
+      @options = { run_instance: true, execute_command: 'process', write_to_file: true }
       @test_results = []
       self.class.register(@group, @name, self)
     end
@@ -165,6 +170,7 @@ module Synvert::Core
 
     def test
       @options[:write_to_file] = false
+      @options[:execute_command] = 'test'
       begin
         @affected_files = Set.new
         instance_eval(&@block)
@@ -174,6 +180,7 @@ module Synvert::Core
         end
       ensure
         @options[:write_to_file] = true
+        @options[:execute_command] = 'process'
       end
       @test_results
     end

data/lib/synvert/core/version.rb

@@ -2,6 +2,6 @@
 
 module Synvert
   module Core
-    VERSION = '1.9.0'
+    VERSION = '1.9.2'
   end
 end

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

@@ -213,8 +213,8 @@ module Synvert::Core
           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)
+        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
       end
 
@@ -238,8 +238,8 @@ module Synvert::Core
           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)
+        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
       end
 
@@ -265,9 +265,9 @@ module Synvert::Core
           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)
+        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)
         instance.process
         instance.process
         expect(rewriter.affected_files).to be_include('spec/models/post_spec.rb')
@@ -292,7 +292,7 @@ module Synvert::Core
           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(: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 [
@@ -316,7 +316,7 @@ module Synvert::Core
           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).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 []

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: synvert-core
 version: !ruby/object:Gem::Version
-  version: 1.9.0
+  version: 1.9.2
 platform: ruby
 authors:
 - Richard Huang
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-09-20 00:00:00.000000000 Z
+date: 2022-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -104,6 +104,7 @@ files:
 - ".github/workflows/main.yml"
 - ".gitignore"
 - ".rspec"
+- ".yardopts"
 - CHANGELOG.md
 - Gemfile
 - Gemfile.lock