synvert-core 0.56.0 → 0.56.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5d9026b58fc968fd19fb6bcfb02a7235ba90fa2dee89b74c4707191ddbe892e7
-  data.tar.gz: 80b9f33e6c34e9b575a1dfac6b89adc8e5362cca7506a0b64b86047e3e27afbf
+  metadata.gz: e60611e972f774c97a102f5db6bc171b024cb48aa4dcc94dd07e9de6d25506a2
+  data.tar.gz: 2a7f4da54b1ed5caeb7fea49dd07ca1cc9fad1aceef082d223e420b928825bb9
 SHA512:
-  metadata.gz: 40638d3f2674232745f15810f9f5d12d7f2f5f9b99dc353f7fc568812cad747c24b502aec3c50b1952dfba14db034545719e8f14792658bdd44c7ec7db6e05be
-  data.tar.gz: 3d9dc8284d401ec5453c8023a23b0b5096c38d8d9581155dca7069f57c25999315f5a075c1d6eff4b802b8f4d2cc4d8a037ce0c0cf33cd8e2c225781e7790b00
+  metadata.gz: f2fa37ef33a1ec38afbf094715b239c46e35e92aa386f5fae635be4419da964a8543f07df36c4321408b9a5d80a9a252d68674ccb9040865191d0299d9775667
+  data.tar.gz: a31385980557ef6c6031365f1554c5e957e6933b3aaaa65d902011dc3920599c8d24ae80bde55227f36643ebcc6808ee55ff2f028ca4c92cab94eeb04e606413

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # CHANGELOG
 
+## 0.56.1 (2021-09-19)
+
+* Compare ruby version in `.ruby-version` or `.rvmrc`
+* Abstract `squeeze_spaces` and `squeeze_lines`
+
 ## 0.56.0 (2021-09-14)
 
 * Support `name` for `:lvar`, `:ivar`, `:cvar`

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

@@ -13,11 +13,7 @@ module Synvert::Core
     # @return [Integer] begin position.
     def begin_pos
       pos = @selectors.map { |selector| @node.child_node_range(selector) }.compact.map(&:begin_pos).min
-      if @instance.file_source[pos - 1] == ' ' && @instance.file_source[end_pos] == ' '
-        pos - 1
-      else
-        pos
-      end
+      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
 
@@ -47,11 +48,8 @@ module Synvert::Core
 
     def end_index
       index = file_source[@node.loc.expression.end_pos..-1].index("\n")
-      index ? @node.loc.expression.end_pos + index + "\n".length : @node.loc.expression.end_pos
-    end
-
-    def file_source
-      @file_source ||= @instance.file_source
+      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/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.56.0'
+    VERSION = '0.56.1'
   end
 end

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.56.0
+  version: 0.56.1
 platform: ruby
 authors:
 - Richard Huang
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-14 00:00:00.000000000 Z
+date: 2021-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport