ruby2ruby 2.5.2 → 2.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c64f2d5a6bbdc7e93781d52bed2848dff7a5981dcfa69dcbb6f7e6018041fe67
-  data.tar.gz: 9d3edc0270776e1e0c51ee0a7e5c4d7f91221e044cbf1f3dc423de7e1337a7cf
+  metadata.gz: c6f7e4e4fcbd415175663732f01b2dbb0291578dc12e0121e8e777d73b9dbb90
+  data.tar.gz: 6282de7f06e33662c5d9f3b8fc531685cd32e90d74682f119f13f6d1d5e39702
 SHA512:
-  metadata.gz: f5c7711e43250ccf0378474f7967e65bc18674bfcd79d1a2f5a682c7b6355a0038b586595e4f50c2c83cd724dbb521c5019dacf40caa4a77f9eacb2d37077111
-  data.tar.gz: 38cf570d752fca4d6884a14601cb1508d544e6476af73ac55bddfd80a577875298cb2106cfa1945bccd2124c47aecca2fc5ec908f3b06ba10e4b3982610f0d3e
+  metadata.gz: a8d4ba7db3c8b768c659c0873e85037a98ba39d1008f91c3f84bc5f3d3ffa5e7efad9fc05d3c610dbab5f71239b1f068a8a727292dcbdc21311ab11ba7141d83
+  data.tar.gz: cace0a14c47e09fc9ef555b62207ebe630e958d51bcc0cdb9493c6e279065a0b23229c983c3e865c0ecd70aef3b779ea10f4426aa57a50880fe0163b9bf32574

data/History.rdoc

@@ -1,3 +1,15 @@
+=== 2.6.0 / 2025-12-24
+
+* 3 minor enhancements:
+
+  * Added prism as a development dependency.
+  * Bumped ruby_version to 3.2+.
+  * Removed ruby_parser as a runtime dependency.
+
+* 1 bug fix:
+
+  * Minor fixes to impl for comment processing. Prism returns chomped string.
+
 === 2.5.2 / 2025-03-25
 
 * 1 bug fix:

data/Rakefile

@@ -17,7 +17,11 @@ Hoe.spec 'ruby2ruby' do
   license "MIT"
 
   dependency "sexp_processor", "~> 4.6"
-  dependency "ruby_parser",    "~> 3.1"
+  dependency "prism",          "~> 1.7", :dev
+
+  require_ruby_version ">= 3.2"
+
+  self.isolate_multiruby = true
 end
 
 def process ruby, file="stdin"

data/lib/ruby2ruby.rb

@@ -31,7 +31,7 @@ end
 # Generate ruby code from a sexp.
 
 class Ruby2Ruby < SexpProcessor
-  VERSION = "2.5.2" # :nodoc:
+  VERSION = "2.6.0" # :nodoc:
 
   # cutoff for one-liners
   LINE_LENGTH = 78
@@ -350,8 +350,14 @@ class Ruby2Ruby < SexpProcessor
     end
   end
 
+  def comments exp # :nodoc:
+    comments = exp.comments
+    comments += "\n" unless comments.end_with?("\n") if comments
+    comments
+  end
+
   def process_class exp # :nodoc:
-    "#{exp.comments}class #{util_module_or_class(exp, true)}"
+    "#{comments exp}class #{util_module_or_class(exp, true)}"
   end
 
   def process_colon2 exp # :nodoc:
@@ -411,7 +417,7 @@ class Ruby2Ruby < SexpProcessor
   def process_defn(exp) # :nodoc:
     _, name, args, *body = exp
 
-    comm = exp.comments
+    comm = comments exp
     args = process args
     args = "" if args == "()"
 
@@ -887,7 +893,7 @@ class Ruby2Ruby < SexpProcessor
   end
 
   def process_module(exp) # :nodoc:
-    "#{exp.comments}module #{util_module_or_class(exp)}"
+    "#{comments exp}module #{util_module_or_class(exp)}"
   end
 
   def process_next(exp) # :nodoc:

data/test/test_ruby2ruby.rb

@@ -9,7 +9,21 @@ require "ruby2ruby"
 require "pt_testcase"
 require "fileutils"
 require "tmpdir"
-require "ruby_parser" if ENV["CHECK_SEXPS"]
+require "prism"
+
+class NotRubyParser < Prism::Translation::RubyParser
+  attr_accessor :scopes
+
+  def initialize scopes:nil
+    super()
+    self.scopes = [scopes] if scopes
+  end
+
+  # overridden from prism to add scopes arg
+  def parse(source, filepath = "(string)")
+    translate(Prism.parse(source, filepath:, partial_script: true, scopes:), filepath)
+  end
+end
 
 class R2RTestCase < ParseTreeTestCase
   def self.previous key
@@ -42,13 +56,8 @@ class TestRuby2Ruby < R2RTestCase
     @processor = Ruby2Ruby.new
   end
 
-  # some things don't work in earlier rubies... oh well.
-  def skip30
-    skip unless RUBY_VERSION > "3.0"
-  end
-
-  def skip31
-    skip unless RUBY_VERSION > "3.1"
+  def skip_prism
+    skip "not fully happy with prism yet"
   end
 
   def do_not_check_sexp!
@@ -183,11 +192,11 @@ class TestRuby2Ruby < R2RTestCase
   end
 
   def assert_str exp, src
-    assert_equal s(:str, exp), RubyParser.new.process(src)
+    assert_equal s(:str, exp), NotRubyParser.new.process(src)
   end
 
   def assert_dstr exp, int, src
-    assert_equal s(:dstr, exp, s(:evstr, int).compact), RubyParser.new.process(src)
+    assert_equal s(:dstr, exp, s(:evstr, int).compact), NotRubyParser.new.process(src)
   end
 
   def assert_r2r exp, sexp
@@ -195,7 +204,7 @@ class TestRuby2Ruby < R2RTestCase
   end
 
   def assert_rt src, exp = src.dup
-    assert_equal exp, Ruby2Ruby.new.process(RubyParser.new.parse(src))
+    assert_equal exp, Ruby2Ruby.new.process(NotRubyParser.new.parse(src))
   end
 
   def test_bug_033
@@ -441,7 +450,6 @@ class TestRuby2Ruby < R2RTestCase
   end
 
   def test_forward_args__call
-    skip31
 
     inn = s(:defn, :x, s(:args, s(:forward_args)), s(:call, nil, :y, s(:forward_args)))
     out = "def x(...)\n  y(...)\nend"
@@ -740,7 +748,12 @@ class TestRuby2Ruby < R2RTestCase
   end
 
   def test_case_in__array_pat_04
-    assert_case_in "[[:b, ^c], [:d, ^e]]", s(:array_pat, nil, s(:array_pat, nil, s(:lit, :b), s(:lvar, :c)), s(:array_pat, nil, s(:lit, :d), s(:lvar, :e)))
+    pt = s(:array_pat,
+           nil,
+           s(:array_pat, nil, s(:lit, :b), s(:lvar, :c)),
+           s(:array_pat, nil, s(:lit, :d), s(:lvar, :a)))
+
+    assert_case_in "[[:b, ^c], [:d, ^a]]", pt
   end
 
   def test_case_in__array_pat_06
@@ -768,22 +781,16 @@ class TestRuby2Ruby < R2RTestCase
   end
 
   def test_case_in__array_pat_19
-    skip31
-
     assert_case_in "[^@a, ^$b, ^@@c]", s(:array_pat, nil, s(:ivar, :@a), s(:gvar, :$b), s(:cvar, :@@c)) # HACK: really not sure about this one
   end
 
   def test_case_in__find_pat_1
-    skip30
-
     assert_case_in "[*a, :+, *b]", s(:find_pat, nil, :"*a",
                                      s(:lit, :+),
                                      :"*b")
   end
 
   def test_case_in__find_pat_2
-    skip30
-
     assert_case_in "[*, :b, ^c, *]", s(:find_pat, nil,
                                        :*,
                                        s(:lit, :b), s(:lvar, :c),
@@ -791,35 +798,30 @@ class TestRuby2Ruby < R2RTestCase
   end
 
   def test_case_in__find_pat_3
-    skip30
-
-    assert_case_in("Array(*b, n, { a: }, m, *a)",
+    assert_case_in("Array(*b, n, { a: }, m, *c)",
                    s(:find_pat,
                      s(:const, :Array),
                      :"*b",
                      s(:lasgn, :n),
                      s(:hash_pat, nil, s(:lit, :a), nil),
                      s(:lasgn, :m),
-                     :"*a"),
-                   "Array[*b, n, { a: }, m, *a]")
+                     :"*c"),
+                   "Array[*b, n, { a: }, m, *c]")
   end
 
   def test_case_in__find_pat_4
-    skip30
-
-    assert_case_in("*b, n, { a: }, m, *a", s(:find_pat,
-                                             nil,
-                                             :"*b",
-                                             s(:lasgn, :n),
-                                             s(:hash_pat, nil, s(:lit, :a), nil),
-                                             s(:lasgn, :m),
-                                             :"*a"),
-                   "[*b, n, { a: }, m, *a]")
+    assert_case_in("*b, n, { a: }, m, *c",
+                   s(:find_pat,
+                     nil,
+                     :"*b",
+                     s(:lasgn, :n),
+                     s(:hash_pat, nil, s(:lit, :a), nil),
+                     s(:lasgn, :m),
+                     :"*c"),
+                   "[*b, n, { a: }, m, *c]")
   end
 
   def test_case_in__find_pat_5
-    skip30
-
     assert_case_in("Array(*lhs, ^b, *rhs)", s(:find_pat,
                                               s(:const, :Array),
                                               :"*lhs",
@@ -943,10 +945,10 @@ class TestRuby2Ruby < R2RTestCase
            s(:array_pat,
              nil,
              s(:lit, :d),
-             s(:lvar, :e)),
+             s(:lvar, :a)),
           )
 
-    assert_case_in "[[:b, c], [:d, ^e]]", pt
+    assert_case_in "[[:b, c], [:d, ^a]]", pt
   end
 
   def test_case_in__hash_pat_00
@@ -1111,13 +1113,7 @@ class TestRuby2Ruby < R2RTestCase
   end
 
   def ruby_parser
-    parser = RubyParser.latest
-
-    %i[a b c d].each do |v|
-      parser.env[v] = :lvar
-    end
-
-    parser
+    NotRubyParser.new scopes: %i[a b c d]
   end
 
   def assert_parse sexp, expected_ruby, expected_eval = nil
@@ -1179,8 +1175,7 @@ ir2r = File.read("lib/ruby2ruby.rb")
 require "ruby_parser"
 
 def morph_and_eval src, from, to, processor
-  parser = RubyParser.latest
-  new_src = processor.new.process(parser.process(src.sub(from, to)))
+  new_src = processor.new.process(NotRubyParser.new.process(src.sub(from, to)))
 
   eval new_src
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby2ruby
 version: !ruby/object:Gem::Version
-  version: 2.5.2
+  version: 2.6.0
 platform: ruby
 authors:
 - Ryan Davis
@@ -28,7 +28,7 @@ cert_chain:
   bwfinv7Yp5fA6AysuZLhCykyfDuZVRrUp0Vb68YCKsLjJly/Theak+euNTxvHsB+
   al9oSgPPHICMEX65qvLywitx
   -----END CERTIFICATE-----
-date: 2025-03-25 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sexp_processor
@@ -45,19 +45,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '4.6'
 - !ruby/object:Gem::Dependency
-  name: ruby_parser
+  name: prism
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
-  type: :runtime
+        version: '1.7'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '1.7'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -84,14 +84,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '4.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '4.3'
 description: |-
   ruby2ruby provides a means of generating pure ruby code easily from
   RubyParser compatible Sexps. This makes making dynamic language
@@ -128,14 +128,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '3.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.3
+rubygems_version: 3.7.2
 specification_version: 4
 summary: ruby2ruby provides a means of generating pure ruby code easily from RubyParser
   compatible Sexps