ruby2ruby 2.5.2 → 2.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c64f2d5a6bbdc7e93781d52bed2848dff7a5981dcfa69dcbb6f7e6018041fe67
-  data.tar.gz: 9d3edc0270776e1e0c51ee0a7e5c4d7f91221e044cbf1f3dc423de7e1337a7cf
+  metadata.gz: 47b02eac6d9da093ec8d57bd84e3b6d4d9e18120280b21de3265fa6e65cd87ae
+  data.tar.gz: ad4413f10e596d3e6f7130c80f9dbda8e27c6899009f5c3a1da3b9f1cd59b249
 SHA512:
-  metadata.gz: f5c7711e43250ccf0378474f7967e65bc18674bfcd79d1a2f5a682c7b6355a0038b586595e4f50c2c83cd724dbb521c5019dacf40caa4a77f9eacb2d37077111
-  data.tar.gz: 38cf570d752fca4d6884a14601cb1508d544e6476af73ac55bddfd80a577875298cb2106cfa1945bccd2124c47aecca2fc5ec908f3b06ba10e4b3982610f0d3e
+  metadata.gz: 06adf0bca90a2226800500f505de13a9432139d3472996f68377614c0eaca0a8e893055ca2fc8584e68dbdc8c8043eef7f9f91bd1b7c446c935803bcc5e101ba
+  data.tar.gz: ac08f4635b66aca9005ab9f1c04d8f3a4b9a8aab863e250e6348ace8bb913858f7ca44385f82ca91bce4ac6b7bc08bbf790b983bb92a772131b8944d9709cb16

data/History.rdoc

@@ -1,3 +1,21 @@
+=== 2.6.1 / 2026-01-26
+
+* 1 bug fix:
+
+  * Fixed handling of defined? in certain contexts. (triskweline)
+
+=== 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

@@ -4,7 +4,6 @@ require 'rubygems'
 require 'hoe'
 
 Hoe.add_include_dirs("lib",
-                     "../../ruby_parser/dev/lib",
                      "../../sexp_processor/dev/lib")
 
 Hoe.plugin :seattlerb
@@ -17,14 +16,21 @@ 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"
-  require "ruby_parser"
+  require "prism"
+  require "prism/translation/ruby_parser"
   require "ruby2ruby"
 
-  parser    = RubyParser.new
+  not_ruby_parser = Class.new Prism::Translation::RubyParser
+
+  parser    = not_ruby_parser.new
   ruby2ruby = Ruby2Ruby.new
 
   begin
@@ -40,7 +46,6 @@ end
 
 task :stress do
   $: << "lib"
-  $: << "../../ruby_parser/dev/lib"
   require "pp"
 
   files = Dir["../../*/dev/**/*.rb"].reject { |s| s =~ %r%/gems/% }
@@ -80,10 +85,13 @@ task :debug => :isolate do
 end
 
 task :parse => :isolate do
-  require "ruby_parser"
+  require "prism"
+  require "prism/translation/ruby_parser"
   require "pp"
 
-  parser = RubyParser.for_current_ruby
+  not_ruby_parser = Class.new Prism::Translation::RubyParser
+
+  parser = not_ruby_parser.new
 
   file = ENV["F"]
   ruby = ENV["R"]

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.1" # :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:
@@ -405,13 +411,17 @@ class Ruby2Ruby < SexpProcessor
 
   def process_defined exp # :nodoc:
     _, rhs = exp
-    "defined? #{process rhs}"
+    if context[1] == :if then # HACK?
+      "defined?(#{process rhs})"
+    else
+      "defined? #{process rhs}"
+    end
   end
 
   def process_defn(exp) # :nodoc:
     _, name, args, *body = exp
 
-    comm = exp.comments
+    comm = comments exp
     args = process args
     args = "" if args == "()"
 
@@ -887,7 +897,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,23 @@ require "ruby2ruby"
 require "pt_testcase"
 require "fileutils"
 require "tmpdir"
-require "ruby_parser" if ENV["CHECK_SEXPS"]
+require "prism"
+require "timeout" # remove once upstreamed
+# require "prism/translation/ruby_parser" # not until upstreamed
+
+class NotRubyParser < Prism::Translation::RubyParser # remove once upstreamed
+  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 +58,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 +194,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 +206,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 +452,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"
@@ -683,6 +693,12 @@ class TestRuby2Ruby < R2RTestCase
     assert_parse inn, out
   end
 
+  def test_if_defined
+    inn = s(:if, s(:defined, s(:const, :Foo)), s(:lit, 1), s(:lit, 2))
+    out = "defined?(Foo) ? (1) : (2)" # TODO: remove parens on 1/2
+    assert_parse inn, out
+  end
+
   def test_if_empty
     inn = s(:if, s(:call, nil, :x), nil, nil)
     out = "if x then\n  # do nothing\nend"
@@ -740,7 +756,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 +789,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 +806,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 +953,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 +1121,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
@@ -1176,11 +1180,8 @@ end
 tr2r = File.read(__FILE__).lines[start + 1..__LINE__ - 2].join
 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.1
 platform: ruby
 authors:
 - Ryan Davis
@@ -9,9 +9,9 @@ bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDPjCCAiagAwIBAgIBCTANBgkqhkiG9w0BAQsFADBFMRMwEQYDVQQDDApyeWFu
+  MIIDPjCCAiagAwIBAgIBCjANBgkqhkiG9w0BAQsFADBFMRMwEQYDVQQDDApyeWFu
   ZC1ydWJ5MRkwFwYKCZImiZPyLGQBGRYJemVuc3BpZGVyMRMwEQYKCZImiZPyLGQB
-  GRYDY29tMB4XDTI1MDEwNjIzMjcwMVoXDTI2MDEwNjIzMjcwMVowRTETMBEGA1UE
+  GRYDY29tMB4XDTI2MDEwNzAxMDkxNFoXDTI3MDEwNzAxMDkxNFowRTETMBEGA1UE
   AwwKcnlhbmQtcnVieTEZMBcGCgmSJomT8ixkARkWCXplbnNwaWRlcjETMBEGCgmS
   JomT8ixkARkWA2NvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALda
   b9DCgK+627gPJkB6XfjZ1itoOQvpqH1EXScSaba9/S2VF22VYQbXU1xQXL/WzCkx
@@ -21,14 +21,14 @@ cert_chain:
   qhtV7HJxNKuPj/JFH0D2cswvzznE/a5FOYO68g+YCuFi5L8wZuuM8zzdwjrWHqSV
   gBEfoTEGr7Zii72cx+sCAwEAAaM5MDcwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAw
   HQYDVR0OBBYEFEfFe9md/r/tj/Wmwpy+MI8d9k/hMA0GCSqGSIb3DQEBCwUAA4IB
-  AQAC0WQJcPOWPFwkojhzweilRVjTJ19UiLhiBTw3C1wJO3LVdBkWDmnnhAmKuX4D
-  r7vjQvESlABGIPdutI1Yl7mrHQzTkfLfXvNN6MT0nLChPyIYauT6SZZxubwJrUfA
-  7R0c2CJTIboZ0XaGpLsXqHEF1c29H7TV1QvVuqKAN2mCjh4N82QVn+ZKtys28AwT
-  6GfQX2fqLoi4KSc7xIzHKaNzqxeOICmJofk9w5VZ2rRN6yes8jvFYwz9HR41wdj8
-  bwfinv7Yp5fA6AysuZLhCykyfDuZVRrUp0Vb68YCKsLjJly/Theak+euNTxvHsB+
-  al9oSgPPHICMEX65qvLywitx
+  AQA/X8/PKTTc/IkYQEUL6XWtfK8fAfbuLJzmLcz6f2ZWrtBvPsYvqRuwI1bWUtil
+  2ibJEfIuSIHX6BsUTX18+hlaIussf6EWq/YkE7e2BKmgQE42vSOZMce0kCEAPbx0
+  rQtqonfWTHQ8UbQ7GqCL3gDQ0QDD2B+HUlb4uaCZ2icxqa/eOtxMvHC2tj+h0xKY
+  xL84ipM5kr0bHGf9/MRZJWcw51urueNycBXu1Xh+pEN8qBmYsFRR4SIODLClybAO
+  6cbm2PyPQgKNiqE4H+IQrDVHd9bJs1XgLElk3qoaJBWXc/5fy0J1imYb25UqmiHG
+  snGe1hrppvBRdcyEzvhfIPjI
   -----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,53 +45,53 @@ 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
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '6.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7'
+        version: '8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '6.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7'
+        version: '8'
 - !ruby/object:Gem::Dependency
   name: hoe
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '4.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '4.5'
 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