synvert-core 0.54.2 → 0.56.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d76620f06a4691e9d494c0b8cdcca0906652f1bdf9e4c977085c9d649a272c3e
-  data.tar.gz: 7f6ef2fdc13be57264052f8a231fce3f33682f14234a13e520548190895ecb5c
+  metadata.gz: e60611e972f774c97a102f5db6bc171b024cb48aa4dcc94dd07e9de6d25506a2
+  data.tar.gz: 2a7f4da54b1ed5caeb7fea49dd07ca1cc9fad1aceef082d223e420b928825bb9
 SHA512:
-  metadata.gz: 592a9feb14d4f773c4e474af198c42e31418343fd84eab1851e41231c99ccc288efc968a7af082060546448069f6bd92058e81a621abd192f3f6fbedbfa84be7
-  data.tar.gz: a06e8ec70349dbf60026488700bdbd6acc2df2bcfe5cc795a208b6c30078cb18c2c78435f34c71593e9bc8623ab555d2c2caf97047a75435e820ca81b9121c37
+  metadata.gz: f2fa37ef33a1ec38afbf094715b239c46e35e92aa386f5fae635be4419da964a8543f07df36c4321408b9a5d80a9a252d68674ccb9040865191d0299d9775667
+  data.tar.gz: a31385980557ef6c6031365f1554c5e957e6933b3aaaa65d902011dc3920599c8d24ae80bde55227f36643ebcc6808ee55ff2f028ca4c92cab94eeb04e606413

data/CHANGELOG.md

@@ -1,11 +1,20 @@
 # CHANGELOG
 
-## 0.54.2 (2021-09-09)
+## 0.56.1 (2021-09-19)
 
-* Fix `nil` match
+* Compare ruby version in `.ruby-version` or `.rvmrc`
+* Abstract `squeeze_spaces` and `squeeze_lines`
+
+## 0.56.0 (2021-09-14)
 
-## 0.54.1 (2021-09-08)
+* Support `name` for `:lvar`, `:ivar`, `:cvar`
+* Delete one more space if two spaces left
 
+## 0.55.0 (2021-09-11)
+
+* Add `Configuration.show_run_process`
+* Fix remove action `begin_pos` and `end_pos`
+* Fix `nil` match
 * Rewrite `remove` action
 
 ## 0.54.0 (2021-08-28)

data/lib/synvert/core/configuration.rb

@@ -4,7 +4,7 @@ module Synvert::Core
   # Synvert global configuration.
   class Configuration
     class << self
-      attr_writer :path, :skip_files
+      attr_writer :path, :skip_files, :show_run_process
 
       def path
         @path || '.'
@@ -13,6 +13,10 @@ module Synvert::Core
       def skip_files
         @skip_files || []
       end
+
+      def show_run_process
+        @show_run_process || false
+      end
     end
   end
 end

data/lib/synvert/core/node_ext.rb

@@ -9,7 +9,7 @@ module Parser::AST
     # @raise [Synvert::Core::MethodNotSupported] if calls on other node.
     def name
       case type
-      when :class, :module, :def, :arg, :blockarg, :restarg
+      when :class, :module, :def, :arg, :blockarg, :restarg, :lvar, :ivar, :cvar
         children[0]
       when :defs, :const
         children[1]

data/lib/synvert/core/rewriter/action/delete_action.rb

@@ -12,7 +12,8 @@ module Synvert::Core
     #
     # @return [Integer] begin position.
     def begin_pos
-      @selectors.map { |selector| @node.child_node_range(selector) }.compact.map(&:begin_pos).min
+      pos = @selectors.map { |selector| @node.child_node_range(selector) }.compact.map(&:begin_pos).min
+      squeeze_spaces(pos, end_pos)
     end
 
     # End position of code to delete.

data/lib/synvert/core/rewriter/action/remove_action.rb

@@ -14,7 +14,8 @@ module Synvert::Core
       if take_whole_line?
         start_index
       else
-        @node.loc.expression.begin_pos
+        pos = @node.loc.expression.begin_pos
+        squeeze_spaces(pos, end_pos)
       end
     end
 
@@ -41,15 +42,14 @@ module Synvert::Core
     end
 
     def start_index
-      file_source[0..@node.loc.expression.begin_pos].rindex("\n") + "\n".length
+      index = file_source[0..@node.loc.expression.begin_pos].rindex("\n")
+      index ? index + "\n".length : @node.loc.expression.begin_pos
     end
 
     def end_index
-      file_source[@node.loc.expression.end_pos..-1].index("\n") + @node.loc.expression.end_pos + "\n".length
-    end
-
-    def file_source
-      @file_source ||= @instance.file_source
+      index = file_source[@node.loc.expression.end_pos..-1].index("\n")
+      pos = index ? @node.loc.expression.end_pos + index + "\n".length : @node.loc.expression.end_pos
+      squeeze_lines(pos, @node.loc.expression.first_line, @node.loc.expression.last_line)
     end
   end
 end

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

@@ -33,11 +33,37 @@ module Synvert::Core
       end
     end
 
+    protected
+
     # The rewritten source code.
     #
     # @return [String] rewritten source code.
     def rewritten_source
       @rewritten_source ||= @node.rewritten_source(@code)
     end
+
+    def squeeze_spaces(begin_pos, end_pos)
+      if file_source[begin_pos - 1] == ' ' && file_source[end_pos] == ' '
+        begin_pos - 1
+      else
+        begin_pos
+      end
+    end
+
+    def squeeze_lines(end_pos, begin_line, end_line)
+      lines = file_source.split("\n")
+      before_line_is_blank = begin_line == 1 || lines[begin_line - 2] == ''
+      after_line_is_blank = lines[end_line] == ''
+
+      if before_line_is_blank && after_line_is_blank
+        end_pos + "\n".length
+      else
+        end_pos
+      end
+    end
+
+    def file_source
+      @file_source ||= @instance.file_source
+    end
   end
 end

data/lib/synvert/core/rewriter/condition/if_only_exist_condition.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Synvert::Core
-  # IfExistCondition checks if node has only one child node and the child node matches rules.
+  # IfOnlyExistCondition checks if node has only one child node and the child node matches rules.
   class Rewriter::IfOnlyExistCondition < Rewriter::Condition
     # check if only have one child node and the child node matches rules.
     def match?

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

@@ -46,7 +46,7 @@ module Synvert::Core
       # @param source [String] file source
       def write_file(file_path, source)
         source = Engine::ERB.decode(source) if /\.erb/.match?(file_path)
-        File.write file_path, source.gsub(/ +\n/, "\n")
+        File.write(file_path, source.gsub(/ +\n/, "\n"))
         @file_source[file_path] = nil
         @file_ast[file_path] = nil
       end
@@ -92,6 +92,7 @@ module Synvert::Core
         next if Configuration.skip_files.include? file_path
 
         begin
+          puts file_path if Configuration.show_run_process
           conflict_actions = []
           source = +self.class.file_source(file_path)
           ast = self.class.file_ast(file_path)

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Synvert::Core
-  # GemSpec checks and compares gem version.
+  # GemSpec checks and compares ruby version.
   class Rewriter::RubyVersion
     attr_reader :version
 
@@ -16,7 +16,15 @@ module Synvert::Core
     #
     # @return [Boolean] true if matches, otherwise false.
     def match?
-      Gem::Version.new(RUBY_VERSION) >= Gem::Version.new(@version)
+      if File.exist?(File.join(Configuration.path, '.ruby-version'))
+        versionFile = '.ruby-version'
+      elsif File.exist?(File.join(Configuration.path, '.rvmrc'))
+        versionFile = '.rvmrc'
+      end
+      return true if !versionFile
+
+      version = File.read(File.join(Configuration.path, versionFile))
+      Gem::Version.new(version) >= Gem::Version.new(@version)
     end
   end
 end

data/lib/synvert/core/rewriter.rb

@@ -213,7 +213,7 @@ module Synvert::Core
       end
     end
 
-    # Parse if_ruby dal, it checks if ruby version if greater than or equal to the specified ruby version.
+    # Parse if_ruby dsl, it checks if ruby version if greater than or equal to the specified ruby version.
     #
     # @param version, [String] specified ruby version.
     def if_ruby(version)

data/lib/synvert/core/version.rb

@@ -2,6 +2,6 @@
 
 module Synvert
   module Core
-    VERSION = '0.54.2'
+    VERSION = '0.56.1'
   end
 end

data/spec/synvert/core/node_ext_spec.rb

@@ -42,6 +42,21 @@ describe Parser::AST::Node do
       expect(node.name).to eq :Synvert
     end
 
+    it 'gets for lvar node' do
+      node = parse("foo = 'bar'\nfoo").children[1]
+      expect(node.name).to eq :foo
+    end
+
+    it 'gets for ivar node' do
+      node = parse("@foo = 'bar'\n@foo").children[1]
+      expect(node.name).to eq :@foo
+    end
+
+    it 'gets for cvar node' do
+      node = parse("@@foo = 'bar'\n@@foo").children[1]
+      expect(node.name).to eq :@@foo
+    end
+
     it 'gets for mlhs node' do
       node = parse('var.each { |(param1, param2)| }')
       expect(node.arguments.first.name).to eq node.arguments.first

data/spec/synvert/core/rewriter/action/delete_action_spec.rb

@@ -7,7 +7,7 @@ module Synvert::Core
     subject {
       source = 'arr.map {}.flatten'
       node = Parser::CurrentRuby.parse(source)
-      instance = double(current_node: node)
+      instance = double(current_node: node, file_source: source)
       Rewriter::DeleteAction.new(instance, :dot, :message)
     }
 

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

@@ -4,6 +4,11 @@ require 'spec_helper'
 
 module Synvert::Core
   describe Rewriter::RubyVersion do
+    before do
+      expect(File).to receive(:exist?).with('./.ruby-version').and_return(true)
+      expect(File).to receive(:read).with('./.ruby-version').and_return('3.0.0')
+    end
+
     it 'returns true if ruby version is greater than 1.9' do
       ruby_version = Rewriter::RubyVersion.new('1.9')
       expect(ruby_version).to be_match

data/spec/synvert/core/rewriter_spec.rb

@@ -39,7 +39,8 @@ module Synvert::Core
 
     describe 'parses within_file' do
       it 'does nothing if if_ruby does not match' do
-        stub_const('RUBY_VERSION', '2.0.0')
+        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).not_to receive(:process)
         rewriter =
           Rewriter.new 'group', 'name' do
@@ -51,7 +52,8 @@ module Synvert::Core
       end
 
       it 'delegates process to instances if if_ruby matches' do
-        stub_const('RUBY_VERSION', '2.0.0')
+        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)
         rewriter =
           Rewriter.new 'group', 'name' do

metadata

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