synvert-core 2.2.1 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a8de6e08c31aaa4768912559d7192f5eb447a5f7e4110f09b8bac0363e0df253
-  data.tar.gz: 57eb0b68bf973e02a83589ea9ae6b06b955aa07cd4400000604845f10cd8e4c3
+  metadata.gz: d217e429027267134087b0ff88ebb0f407b4f4b12834cc3561e45a4fec59355e
+  data.tar.gz: f94351f2512d862e01f45defc64fdc4fa11e597f0993d702390af1fa55b47e8e
 SHA512:
-  metadata.gz: 167371f72e5abf567047a57b9af8ac7765b34f9ffff99092094cf92635dd54345cc6dac800b928ab16223aa5ed003c4d16464f3b856810a822b19a65ee038a25
-  data.tar.gz: 31248d3db71575585065e364e5130d6313474d6df3e86bf3667b451b3a9ffdceea7a125bc8c995faf8162bc367f7571320187f5404d78e84836e4aa0c81b09d3
+  metadata.gz: 639e821a2f043b3714d98ce889d86eedbc0574df1f1faf7f2fd6f16b301b9179d0ee4f438911ce0ffb4c8cf82b62081f28124e0ceff107cfcd1924773cb6f77a
+  data.tar.gz: 0d200b63e29540f1999cb0284a3152248ffc7c5d6359194e19f0548a612cf9e2296a327f5d1ba8c832a5c2a39e76c67c5590e3c219c6f80d6748ad763c779c2e

data/.github/workflows/main.yml

@@ -11,10 +11,10 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby-version: ['2.7', '3.0', '3.1', '3.2', '3.3']
+        ruby-version: ['3.2', '3.3', '3.4', '4.0']
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:
@@ -26,15 +26,24 @@ jobs:
   deploy:
     runs-on: ubuntu-latest
     needs: test
+    if: github.ref == 'refs/heads/main' && github.event_name == 'push'
     name: Update gh-pages to docs
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: '3.2'
+          ruby-version: '4.0'
           bundler-cache: true
+      - name: Cache YARD gems
+        uses: actions/cache@v3
+        with:
+          path: vendor/bundle
+          key: ${{ runner.os }}-yard-gems-${{ hashFiles('**/Gemfile.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-yard-gems-
       - name: Install required gem dependencies
-        run: gem install yard redcarpet github-markup --no-document
+        run: |
+          gem install yard redcarpet github-markup --no-document
       - name: Build YARD Ruby Documentation
         run: yardoc --output-dir docs
       - name: Deploy

data/CHANGELOG.md

@@ -1,5 +1,16 @@
 # CHANGELOG
 
+## 2.3.0 (2025-12-30)
+
+* Support ruby 4.0
+* Drop ruby 2.7, 3.0 and 3.1 support
+* Update `node_query` to 1.17.0
+* Update `node_mutation` to 1.25.0
+
+## 2.2.2 (2024-12-27)
+
+* Do not restrict activesupport version
+
 ## 2.2.1 (2024-12-27)
 
 * Raise error to notify user instance method should not be called in rewriter

data/Gemfile

@@ -8,6 +8,8 @@ gemspec
 gem "fakefs", require: "fakefs/safe"
 gem "guard"
 gem "guard-rspec"
+gem "irb"
+gem "ostruct"
 gem "rake"
 gem "rspec"
 gem "rspec-mocks"

data/Gemfile.lock

@@ -1,10 +1,10 @@
 PATH
   remote: .
   specs:
-    synvert-core (2.2.1)
-      activesupport (= 7.1.3.4)
-      node_mutation (>= 1.24.4)
-      node_query (>= 1.15.4)
+    synvert-core (2.3.0)
+      activesupport
+      node_mutation (>= 1.25.0)
+      node_query (>= 1.17.0)
       node_visitor (>= 1.1.0)
       parallel
       parser
@@ -17,24 +17,30 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (7.1.3.4)
+    activesupport (8.1.1)
       base64
       bigdecimal
-      concurrent-ruby (~> 1.0, >= 1.0.2)
+      concurrent-ruby (~> 1.0, >= 1.3.1)
       connection_pool (>= 2.2.5)
       drb
       i18n (>= 1.6, < 2)
+      json
+      logger (>= 1.4.2)
       minitest (>= 5.1)
-      mutex_m
-      tzinfo (~> 2.0)
-    ast (2.4.2)
-    base64 (0.2.0)
-    bigdecimal (3.1.9)
+      securerandom (>= 0.3)
+      tzinfo (~> 2.0, >= 2.0.5)
+      uri (>= 0.13.1)
+    ast (2.4.3)
+    base64 (0.3.0)
+    bigdecimal (4.0.1)
     coderay (1.1.3)
-    concurrent-ruby (1.3.4)
-    connection_pool (2.4.1)
+    concurrent-ruby (1.3.6)
+    connection_pool (3.0.2)
+    date (3.5.1)
     diff-lcs (1.5.1)
-    drb (2.2.1)
+    docile (1.4.1)
+    drb (2.2.3)
+    erb (6.0.1)
     fakefs (2.4.0)
     ffi (1.16.3)
     formatador (1.1.0)
@@ -52,40 +58,60 @@ GEM
       guard (~> 2.1)
       guard-compat (~> 1.1)
       rspec (>= 2.99.0, < 4.0)
-    i18n (1.14.6)
+    i18n (1.14.8)
       concurrent-ruby (~> 1.0)
+    io-console (0.8.2)
+    irb (1.16.0)
+      pp (>= 0.6.0)
+      rdoc (>= 4.0.0)
+      reline (>= 0.4.2)
+    json (2.18.0)
     listen (3.9.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
+    logger (1.7.0)
     lumberjack (1.2.10)
     method_source (1.1.0)
-    minitest (5.25.4)
-    mutex_m (0.3.0)
+    minitest (6.0.1)
+      prism (~> 1.5)
     nenv (0.3.0)
-    node_mutation (1.24.4)
-    node_query (1.16.0)
+    node_mutation (1.25.0)
+    node_query (1.17.0)
     node_visitor (1.1.0)
     notiffany (0.1.3)
       nenv (~> 0.1)
       shellany (~> 0.0)
-    parallel (1.26.3)
-    parser (3.3.6.0)
+    ostruct (0.6.3)
+    parallel (1.27.0)
+    parser (3.3.10.0)
       ast (~> 2.4.1)
       racc
     parser_node_ext (1.4.2)
       parser
+    pp (0.6.3)
+      prettyprint
     prettier_print (1.2.1)
-    prism (1.3.0)
+    prettyprint (0.2.0)
+    prism (1.7.0)
     prism_ext (0.4.2)
       prism
     pry (0.14.2)
       coderay (~> 1.1)
       method_source (~> 1.0)
+    psych (5.3.1)
+      date
+      stringio
     racc (1.8.1)
     rake (13.0.6)
     rb-fsevent (0.11.2)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
+    rdoc (7.0.3)
+      erb
+      psych (>= 4.0.0)
+      tsort
+    reline (0.6.3)
+      io-console (~> 0.5)
     rspec (3.13.0)
       rspec-core (~> 3.13.0)
       rspec-expectations (~> 3.13.0)
@@ -99,14 +125,24 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
     rspec-support (3.13.1)
+    securerandom (0.4.1)
     shellany (0.0.1)
-    syntax_tree (6.2.0)
+    simplecov (0.22.0)
+      docile (~> 1.1)
+      simplecov-html (~> 0.11)
+      simplecov_json_formatter (~> 0.1)
+    simplecov-html (0.13.2)
+    simplecov_json_formatter (0.1.4)
+    stringio (3.2.0)
+    syntax_tree (6.3.0)
       prettier_print (>= 1.2.0)
     syntax_tree_ext (0.9.2)
       syntax_tree
     thor (1.3.1)
+    tsort (0.2.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
+    uri (1.1.1)
 
 PLATFORMS
   ruby
@@ -115,10 +151,13 @@ DEPENDENCIES
   fakefs
   guard
   guard-rspec
+  irb
+  ostruct
   rake
   rspec
   rspec-mocks
+  simplecov
   synvert-core!
 
 BUNDLED WITH
-   2.3.7
+   2.6.9

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

@@ -26,7 +26,7 @@ module Synvert::Core
     def match?
       return true unless Configuration.strict
 
-      gemfile_lock_path = File.expand_path(File.join(Configuration.root_path, 'Gemfile.lock'))
+      gemfile_lock_path = File.expand_path(File.join(Configuration.root_path, gemfile_lock_name))
 
       # if Gemfile.lock does not exist, just ignore this check
       return true unless File.exist?(gemfile_lock_path)
@@ -35,5 +35,13 @@ module Synvert::Core
       parser = Bundler::LockfileParser.new(File.read(gemfile_lock_path))
       parser.specs.any? { |spec| Gem::Dependency.new(@name, @version).match?(spec) }
     end
+
+    private
+
+    def gemfile_lock_name
+      return "#{File.basename(ENV['BUNDLE_GEMFILE'])}.lock" if File.exist?(ENV['BUNDLE_GEMFILE'])
+
+      'Gemfile.lock'
+    end
   end
 end

data/lib/synvert/core/version.rb

@@ -2,6 +2,6 @@
 
 module Synvert
   module Core
-    VERSION = '2.2.1'
+    VERSION = '2.3.0'
   end
 end

data/spec/spec_helper.rb

@@ -1,5 +1,12 @@
 # frozen_string_literal: true
 
+require 'simplecov'
+SimpleCov.start do
+  add_filter '/spec/'
+
+  add_group 'Core', 'lib/synvert/core'
+end
+
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 
 require 'pp' # rubocop:disable Lint/RedundantRequireStatement

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

@@ -15,49 +15,52 @@ module Synvert::Core
           rake (10.1.1)
           slop (3.4.7)
     EOS
-    let(:lock_path) { File.absolute_path('./Gemfile.lock') }
+    let(:gemfile_lock_path) { File.absolute_path('./Gemfile.lock') }
+    let(:gemfile_path) { File.absolute_path('./Gemfile') }
 
     before do
-      Configuration.root_path = File.dirname(lock_path)
-      allow(File).to receive(:exist?).with(File.join(ENV['HOME'])).and_return(true)
-      allow(File).to receive(:exist?).with(File.join(ENV['HOME'], '.gem')).and_return(false)
-      allow(File).to receive(:exist?).with(File.join(ENV['HOME'], '.gem/specs')).and_return(false)
+      Configuration.root_path = File.dirname(gemfile_lock_path)
+      @original_bundle_gemfile = ENV['BUNDLE_GEMFILE']
+      ENV['BUNDLE_GEMFILE'] = gemfile_path
     end
 
     after do
       Configuration.root_path = nil
+      ENV['BUNDLE_GEMFILE'] = @original_bundle_gemfile
     end
 
-    it 'returns true if version in Gemfile.lock is greater than definition' do
-      expect(File).to receive(:exist?).with(lock_path).and_return(true)
-      expect(File).to receive(:read).with(lock_path).and_return(gemfile_lock_content)
-      gem_spec = Rewriter::GemSpec.new('ast', '~> 1.1')
-      expect(gem_spec).to be_match
+    def mock_gemfile_and_lock(gemfile_path, gemfile_lock_path, exists: true)
+      if gemfile_path
+        expect(File).to receive(:exist?).with(gemfile_path).and_return(true)
+      else
+        expect(File).to receive(:exist?).with(nil).and_return(false)
+      end
+      expect(File).to receive(:exist?).with(gemfile_lock_path).and_return(exists)
+      expect(File).to receive(:read).with(gemfile_lock_path).and_return(gemfile_lock_content) if exists
     end
 
-    it 'returns true if version in Gemfile.lock is equal to definition' do
-      expect(File).to receive(:exist?).with(lock_path).and_return(true)
-      expect(File).to receive(:read).with(lock_path).and_return(gemfile_lock_content)
-      gem_spec = Rewriter::GemSpec.new('ast', '1.1.0')
-      expect(gem_spec).to be_match
+    shared_examples 'gem version matching' do |version, expected_match|
+      it "returns #{expected_match} for version #{version}" do
+        mock_gemfile_and_lock(gemfile_path, gemfile_lock_path)
+        gem_spec = Rewriter::GemSpec.new('ast', version)
+        expect(gem_spec).send(expected_match ? :to : :not_to, be_match)
+      end
     end
 
-    it 'returns false if version in Gemfile.lock is less than definition' do
-      expect(File).to receive(:exist?).with(lock_path).and_return(true)
-      expect(File).to receive(:read).with(lock_path).and_return(gemfile_lock_content)
-      gem_spec = Rewriter::GemSpec.new('ast', '> 1.2.0')
-      expect(gem_spec).not_to be_match
+    context 'when checking gem versions' do
+      include_examples 'gem version matching', '~> 1.1', true
+      include_examples 'gem version matching', '1.1.0', true
+      include_examples 'gem version matching', '> 1.2.0', false
     end
 
     it 'returns false if gem does not exist in Gemfile.lock' do
-      expect(File).to receive(:exist?).with(lock_path).and_return(true)
-      expect(File).to receive(:read).with(lock_path).and_return(gemfile_lock_content)
+      mock_gemfile_and_lock(gemfile_path, gemfile_lock_path)
       gem_spec = Rewriter::GemSpec.new('synvert', '1.0.0')
       expect(gem_spec).not_to be_match
     end
 
     it 'returns true if Gemfile.lock does not exist' do
-      expect(File).to receive(:exist?).with(lock_path).and_return(false)
+      mock_gemfile_and_lock(gemfile_path, gemfile_lock_path, exists: false)
       gem_spec = Rewriter::GemSpec.new('ast', '1.1.0')
       expect(gem_spec).to be_match
     end
@@ -68,5 +71,23 @@ module Synvert::Core
       expect(gem_spec).to be_match
       Configuration.strict = true
     end
+
+    describe 'gemfile lock name behavior' do
+      it 'uses default Gemfile.lock when BUNDLE_GEMFILE is not set' do
+        ENV['BUNDLE_GEMFILE'] = nil
+        mock_gemfile_and_lock(nil, gemfile_lock_path)
+        gem_spec = Rewriter::GemSpec.new('ast', '1.1.0')
+        expect(gem_spec).to be_match
+      end
+
+      it 'uses custom Gemfile lock name when BUNDLE_GEMFILE is set' do
+        custom_gemfile = File.absolute_path('./Gemfile.next')
+        custom_gemfile_lock_path = File.absolute_path('./Gemfile.next.lock')
+        ENV['BUNDLE_GEMFILE'] = custom_gemfile
+        mock_gemfile_and_lock(custom_gemfile, custom_gemfile_lock_path)
+        gem_spec = Rewriter::GemSpec.new('ast', '1.1.0')
+        expect(gem_spec).to be_match
+      end
+    end
   end
 end

data/synvert-core-ruby.gemspec

@@ -19,9 +19,9 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "activesupport", '7.1.3.4' # to support ruby 2.7
-  spec.add_runtime_dependency "node_query", ">= 1.15.4"
-  spec.add_runtime_dependency "node_mutation", ">= 1.24.4"
+  spec.add_runtime_dependency "activesupport"
+  spec.add_runtime_dependency "node_query", ">= 1.17.0"
+  spec.add_runtime_dependency "node_mutation", ">= 1.25.0"
   spec.add_runtime_dependency "node_visitor", ">= 1.1.0"
   spec.add_runtime_dependency "parser"
   spec.add_runtime_dependency "parser_node_ext", ">= 1.4.2"
@@ -30,4 +30,6 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "prism"
   spec.add_runtime_dependency "prism_ext", ">= 0.4.2"
   spec.add_runtime_dependency "parallel"
+
+  spec.add_development_dependency "simplecov"
 end

metadata

@@ -1,57 +1,56 @@
 --- !ruby/object:Gem::Specification
 name: synvert-core
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.3.0
 platform: ruby
 authors:
 - Richard Huang
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-12-27 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 7.1.3.4
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 7.1.3.4
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: node_query
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.15.4
+        version: 1.17.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.15.4
+        version: 1.17.0
 - !ruby/object:Gem::Dependency
   name: node_mutation
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.24.4
+        version: 1.25.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.24.4
+        version: 1.25.0
 - !ruby/object:Gem::Dependency
   name: node_visitor
   requirement: !ruby/object:Gem::Requirement
@@ -164,6 +163,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: convert ruby code to better syntax automatically.
 email:
 - flyerhzm@gmail.com
@@ -235,7 +248,6 @@ homepage: https://github.com/synvert-hq/synvert-core-ruby
 licenses:
 - MIT
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -250,8 +262,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.22
-signing_key:
+rubygems_version: 4.0.3
 specification_version: 4
 summary: convert ruby code to better syntax.
 test_files: