ruby2ruby 2.5.0 → 2.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 81af7fc05fec7a9e31a0e7e0e707526277c4535d0b7a5b12f67ab524989bc355
-  data.tar.gz: df311f1adf30683d68b615494249bd903dfb962b52936031c02b1c3fe147e1eb
+  metadata.gz: c64f2d5a6bbdc7e93781d52bed2848dff7a5981dcfa69dcbb6f7e6018041fe67
+  data.tar.gz: 9d3edc0270776e1e0c51ee0a7e5c4d7f91221e044cbf1f3dc423de7e1337a7cf
 SHA512:
-  metadata.gz: 60363a4606501b46962382d2343a49e1687a85f608b039936b516619209f407292052da552b1328ae02c872d7972d7b839b2de4d28ca6c2945e2a77746046417
-  data.tar.gz: cb1f7cf0373c3f2f8ed7adfdd2688ad2cf9b262db3f058cf7f6bb43b195ba7a1e270b168039396a26923d0d21aa2a23233f4b0c8f2e2f5e49ce3ff87efcfd30b
+  metadata.gz: f5c7711e43250ccf0378474f7967e65bc18674bfcd79d1a2f5a682c7b6355a0038b586595e4f50c2c83cd724dbb521c5019dacf40caa4a77f9eacb2d37077111
+  data.tar.gz: 38cf570d752fca4d6884a14601cb1508d544e6476af73ac55bddfd80a577875298cb2106cfa1945bccd2124c47aecca2fc5ec908f3b06ba10e4b3982610f0d3e

data/History.rdoc

@@ -1,3 +1,15 @@
+=== 2.5.2 / 2025-03-25
+
+* 1 bug fix:
+
+  * Added support for 3 slot op_asgn (eg `a &= 1`)
+
+=== 2.5.1 / 2024-07-08
+
+* 1 bug fix:
+
+  * Fix errors created when string literals are frozen. (byroot + zenspider)
+
 === 2.5.0 / 2022-10-04
 
 * 5 minor enhancements:

data/lib/ruby2ruby.rb

@@ -31,7 +31,7 @@ end
 # Generate ruby code from a sexp.
 
 class Ruby2Ruby < SexpProcessor
-  VERSION = "2.5.0" # :nodoc:
+  VERSION = "2.5.2" # :nodoc:
 
   # cutoff for one-liners
   LINE_LENGTH = 78
@@ -475,7 +475,7 @@ class Ruby2Ruby < SexpProcessor
 
     options = re_opt rest.pop if Integer === rest.last
 
-    "/" << util_dthing(:dregx, s(:dregx, str, *rest)) << "/#{options}"
+    "/" + util_dthing(:dregx, s(:dregx, str, *rest)) << "/#{options}"
   end
 
   def process_dregx_once(exp) # :nodoc:
@@ -502,7 +502,7 @@ class Ruby2Ruby < SexpProcessor
     ens  = process(ens) || "# do nothing"
     ens = "begin\n#{ens}\nend\n" if ens =~ /(^|\n)rescue/
 
-    body.sub!(/\n\s*end\z/, "")
+    body = body.sub(/\n\s*end\z/, "")
     body = indent(body) unless body =~ /(^|\n)rescue/
 
     "#{body}\nensure\n#{indent ens}"
@@ -699,11 +699,12 @@ class Ruby2Ruby < SexpProcessor
         return r if r and (@indent + r).size < LINE_LENGTH and r !~ /\n/
       end
 
-      r = "if #{c} then\n#{indent(t)}\n"
+      r = []
+      r << "if #{c} then\n#{indent(t)}\n"
       r << "else\n#{indent(f)}\n" if f
       r << "end"
 
-      r
+      r.join
     elsif f
       unless expand then
         r = "#{f} unless #{c}"
@@ -745,7 +746,7 @@ class Ruby2Ruby < SexpProcessor
              %w[ do end ]
            end
 
-    iter.sub!(/\(\)$/, "")
+    iter = iter.sub(/\(\)$/, "")
 
     # REFACTOR: ugh
     result = []
@@ -915,11 +916,14 @@ class Ruby2Ruby < SexpProcessor
   end
 
   def process_op_asgn exp # :nodoc:
-    # [[:lvar, :x], [:call, nil, :z, [:lit, 1]], :y, :"||"]
-
     case exp.length
     when 4
-      raise "NOT YET: op_asgn 4"
+      _, lhs, op, rhs = exp
+
+      lhs = process lhs
+      rhs = process rhs
+
+      "#{lhs} #{op}= #{rhs}"
     when 5
       _, lhs, rhs, index, op = exp
 

data/test/test_ruby2ruby.rb

@@ -42,6 +42,15 @@ 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"
+  end
+
   def do_not_check_sexp!
     @check_sexp = false
   end
@@ -126,8 +135,6 @@ class TestRuby2Ruby < R2RTestCase
   end
 
   def test_hash_shorthand_invalid_key_type
-    do_not_check_sexp!
-
     inn = s(:hash, s(:str, 'k'), nil)
     out = '{ k: }'
     assert_raises do
@@ -320,8 +327,6 @@ class TestRuby2Ruby < R2RTestCase
   end
 
   def test_dregx_slash
-    do_not_check_sexp!
-
     inn = util_thingy(:dregx)
     out = '/a"b#{(1 + 1)}c"d\/e/'
     assert_parse inn, out, /a"b2c"d\/e/
@@ -340,8 +345,6 @@ class TestRuby2Ruby < R2RTestCase
   end
 
   def test_lit_regexp_slash
-    do_not_check_sexp! # dunno why on this one
-
     assert_parse s(:lit, /blah\/blah/), '/blah\/blah/', /blah\/blah/
   end
 
@@ -438,8 +441,10 @@ class TestRuby2Ruby < R2RTestCase
   end
 
   def test_forward_args__call
-    inn = s(:call, nil, :y, s(:forward_args))
-    out = "y(...)"
+    skip31
+
+    inn = s(:defn, :x, s(:args, s(:forward_args)), s(:call, nil, :y, s(:forward_args)))
+    out = "def x(...)\n  y(...)\nend"
 
     assert_parse inn, out
   end
@@ -763,16 +768,22 @@ 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),
@@ -780,6 +791,8 @@ class TestRuby2Ruby < R2RTestCase
   end
 
   def test_case_in__find_pat_3
+    skip30
+
     assert_case_in("Array(*b, n, { a: }, m, *a)",
                    s(:find_pat,
                      s(:const, :Array),
@@ -792,6 +805,8 @@ class TestRuby2Ruby < R2RTestCase
   end
 
   def test_case_in__find_pat_4
+    skip30
+
     assert_case_in("*b, n, { a: }, m, *a", s(:find_pat,
                                              nil,
                                              :"*b",
@@ -803,6 +818,8 @@ class TestRuby2Ruby < R2RTestCase
   end
 
   def test_case_in__find_pat_5
+    skip30
+
     assert_case_in("Array(*lhs, ^b, *rhs)", s(:find_pat,
                                               s(:const, :Array),
                                               :"*lhs",
@@ -1044,6 +1061,13 @@ class TestRuby2Ruby < R2RTestCase
     assert_parse inn, out
   end
 
+  def test_op_asgn_4
+    inn = s(:op_asgn, s(:colon3, :X), :"&", s(:lit, 1))
+
+    out = "::X &= 1"
+    assert_parse inn, out
+  end
+
   def test_rescue_block
     inn = s(:rescue,
             s(:call, nil, :alpha),
@@ -1073,7 +1097,7 @@ class TestRuby2Ruby < R2RTestCase
   end
 
   def test_unless_vs_if_not
-    do_not_check_sexp! # TODO: remove? dunno if that's possible w/ this one
+    do_not_check_sexp! # dunno if it's possible to remove this one
 
     rb1 = "a unless b"
     rb2 = "a if (not b)"
@@ -1087,7 +1111,7 @@ class TestRuby2Ruby < R2RTestCase
   end
 
   def ruby_parser
-    parser = RubyParser.for_current_ruby
+    parser = RubyParser.latest
 
     %i[a b c d].each do |v|
       parser.env[v] = :lvar
@@ -1155,7 +1179,7 @@ ir2r = File.read("lib/ruby2ruby.rb")
 require "ruby_parser"
 
 def morph_and_eval src, from, to, processor
-  parser = RubyParser.for_current_ruby rescue RubyParser.new
+  parser = RubyParser.latest
   new_src = processor.new.process(parser.process(src.sub(from, to)))
 
   eval new_src

metadata

@@ -1,18 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: ruby2ruby
 version: !ruby/object:Gem::Version
-  version: 2.5.0
+  version: 2.5.2
 platform: ruby
 authors:
 - Ryan Davis
-autorequire:
 bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDPjCCAiagAwIBAgIBBjANBgkqhkiG9w0BAQsFADBFMRMwEQYDVQQDDApyeWFu
+  MIIDPjCCAiagAwIBAgIBCTANBgkqhkiG9w0BAQsFADBFMRMwEQYDVQQDDApyeWFu
   ZC1ydWJ5MRkwFwYKCZImiZPyLGQBGRYJemVuc3BpZGVyMRMwEQYKCZImiZPyLGQB
-  GRYDY29tMB4XDTIxMTIyMzIzMTkwNFoXDTIyMTIyMzIzMTkwNFowRTETMBEGA1UE
+  GRYDY29tMB4XDTI1MDEwNjIzMjcwMVoXDTI2MDEwNjIzMjcwMVowRTETMBEGA1UE
   AwwKcnlhbmQtcnVieTEZMBcGCgmSJomT8ixkARkWCXplbnNwaWRlcjETMBEGCgmS
   JomT8ixkARkWA2NvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALda
   b9DCgK+627gPJkB6XfjZ1itoOQvpqH1EXScSaba9/S2VF22VYQbXU1xQXL/WzCkx
@@ -22,14 +21,14 @@ cert_chain:
   qhtV7HJxNKuPj/JFH0D2cswvzznE/a5FOYO68g+YCuFi5L8wZuuM8zzdwjrWHqSV
   gBEfoTEGr7Zii72cx+sCAwEAAaM5MDcwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAw
   HQYDVR0OBBYEFEfFe9md/r/tj/Wmwpy+MI8d9k/hMA0GCSqGSIb3DQEBCwUAA4IB
-  AQCKB5jfsuSnKb+t/Wrh3UpdkmX7TrEsjVmERC0pPqzQ5GQJgmEXDD7oMgaKXaAq
-  x2m+KSZDrqk7c8uho5OX6YMqg4KdxehfSLqqTZGoeV78qwf/jpPQZKTf+W9gUSJh
-  zsWpo4K50MP+QtdSbKXZwjAafpQ8hK0MnnZ/aeCsW9ov5vdXpYbf3dpg6ADXRGE7
-  lQY2y1tJ5/chqu6h7dQmnm2ABUqx9O+JcN9hbCYoA5i/EeubUEtFIh2w3SpO6YfB
-  JFmxn4h9YO/pVdB962BdBNNDia0kgIjI3ENnkLq0dKpYU3+F3KhEuTksLO0L6X/V
-  YsuyUzsMz6GQA4khyaMgKNSD
+  AQAC0WQJcPOWPFwkojhzweilRVjTJ19UiLhiBTw3C1wJO3LVdBkWDmnnhAmKuX4D
+  r7vjQvESlABGIPdutI1Yl7mrHQzTkfLfXvNN6MT0nLChPyIYauT6SZZxubwJrUfA
+  7R0c2CJTIboZ0XaGpLsXqHEF1c29H7TV1QvVuqKAN2mCjh4N82QVn+ZKtys28AwT
+  6GfQX2fqLoi4KSc7xIzHKaNzqxeOICmJofk9w5VZ2rRN6yes8jvFYwz9HR41wdj8
+  bwfinv7Yp5fA6AysuZLhCykyfDuZVRrUp0Vb68YCKsLjJly/Theak+euNTxvHsB+
+  al9oSgPPHICMEX65qvLywitx
   -----END CERTIFICATE-----
-date: 2022-10-05 00:00:00.000000000 Z
+date: 2025-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sexp_processor
@@ -85,14 +84,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.25'
+        version: '4.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.25'
+        version: '4.2'
 description: |-
   ruby2ruby provides a means of generating pure ruby code easily from
   RubyParser compatible Sexps. This makes making dynamic language
@@ -120,7 +119,6 @@ licenses:
 - MIT
 metadata:
   homepage_uri: https://github.com/seattlerb/ruby2ruby
-post_install_message:
 rdoc_options:
 - "--main"
 - README.rdoc
@@ -137,8 +135,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.12
-signing_key:
+rubygems_version: 3.6.3
 specification_version: 4
 summary: ruby2ruby provides a means of generating pure ruby code easily from RubyParser
   compatible Sexps