ruby2ruby 2.6.0 → 2.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c6f7e4e4fcbd415175663732f01b2dbb0291578dc12e0121e8e777d73b9dbb90
-  data.tar.gz: 6282de7f06e33662c5d9f3b8fc531685cd32e90d74682f119f13f6d1d5e39702
+  metadata.gz: cee6fe46eb20e38e57a40e6b6e9547f23952190bf25fe5ae824d2d4b3584dfa8
+  data.tar.gz: 55273740bb6683b3a41a53d9ec0648a5f8d9bcee5db57c331d55ee885bde9864
 SHA512:
-  metadata.gz: a8d4ba7db3c8b768c659c0873e85037a98ba39d1008f91c3f84bc5f3d3ffa5e7efad9fc05d3c610dbab5f71239b1f068a8a727292dcbdc21311ab11ba7141d83
-  data.tar.gz: cace0a14c47e09fc9ef555b62207ebe630e958d51bcc0cdb9493c6e279065a0b23229c983c3e865c0ecd70aef3b779ea10f4426aa57a50880fe0163b9bf32574
+  metadata.gz: 18c448df0eafe9e9ccabf9ece81b6126e2d8abf93c0a1c0e8e339d888133ec5b802f37578b438789e7f4acb0b102652fc7a8bd886fe30ecba3a3a9e55f2a5907
+  data.tar.gz: fda3b373d94fefa0d7bfd46d386f67e0c62ca979fcea2ab6ae8371583ce6b47ae73026ee6685d18792da94d9b3a5e98c8c499b9c4f660b936ac4cda74e0ef68c

data/History.rdoc

@@ -1,3 +1,16 @@
+=== 2.6.2 / 2026-09-19
+
+* 2 bug fixes:
+
+  * Fixed block lvar processing for it, _1, etc.
+  * Fixed variable references in pattern match body. (ofedoren)
+
+=== 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:

data/Rakefile

@@ -4,12 +4,12 @@ require 'rubygems'
 require 'hoe'
 
 Hoe.add_include_dirs("lib",
-                     "../../ruby_parser/dev/lib",
                      "../../sexp_processor/dev/lib")
 
 Hoe.plugin :seattlerb
 Hoe.plugin :isolate
 Hoe.plugin :rdoc
+Hoe.plugin :cov
 
 Hoe.spec 'ruby2ruby' do
   developer 'Ryan Davis', 'ryand-ruby@zenspider.com'
@@ -25,10 +25,13 @@ Hoe.spec 'ruby2ruby' do
 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
@@ -44,7 +47,6 @@ end
 
 task :stress do
   $: << "lib"
-  $: << "../../ruby_parser/dev/lib"
   require "pp"
 
   files = Dir["../../*/dev/**/*.rb"].reject { |s| s =~ %r%/gems/% }
@@ -84,10 +86,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.6.0" # :nodoc:
+  VERSION = "2.6.2" # :nodoc:
 
   # cutoff for one-liners
   LINE_LENGTH = 78
@@ -411,7 +411,11 @@ 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:
@@ -605,7 +609,11 @@ class Ruby2Ruby < SexpProcessor
     _, lhs, *rhs = exp
 
     cond = process lhs
-    body = rhs.compact.map { |sexp| indent process sexp }
+    body = rhs.compact.map { |sexp|
+      in_context :in_body do
+        indent process sexp
+      end
+    }
 
     body << indent("# do nothing") if body.empty?
     body = body.join "\n"

data/test/test_ruby2ruby.rb

@@ -10,8 +10,23 @@ require "pt_testcase"
 require "fileutils"
 require "tmpdir"
 require "prism"
+require "timeout" # remove once upstreamed
+require "prism/translation/ruby_parser" # not until upstreamed
 
-class NotRubyParser < Prism::Translation::RubyParser
+class Prism::Translation::RubyParser
+  module TweakIt
+    def visit_it_local_variable_read_node(node) # TODO: upstream
+      s(node, :lvar, :it)
+    end
+
+    def visit_local_variable_read_node(node)
+      s(node, :lvar, node.name)
+    end
+  end
+  Compiler.prepend TweakIt
+end
+
+class NotRubyParser < Prism::Translation::RubyParser # remove once upstreamed
   attr_accessor :scopes
 
   def initialize scopes:nil
@@ -56,10 +71,6 @@ class TestRuby2Ruby < R2RTestCase
     @processor = Ruby2Ruby.new
   end
 
-  def skip_prism
-    skip "not fully happy with prism yet"
-  end
-
   def do_not_check_sexp!
     @check_sexp = false
   end
@@ -207,6 +218,18 @@ class TestRuby2Ruby < R2RTestCase
     assert_equal exp, Ruby2Ruby.new.process(NotRubyParser.new.parse(src))
   end
 
+  def test_block__lvar_it
+    inn = s(:iter, s(:call, nil, :fn), 0, s(:call, nil, :puts, s(:lvar, :it)))
+    out = "fn { puts(it) }"
+    assert_parse inn, out
+  end
+
+  def test_block__lvar__1
+    inn = s(:iter, s(:call, nil, :fn), 0, s(:call, nil, :puts, s(:lvar, :_1)))
+    out = "fn { puts(_1) }"
+    assert_parse inn, out
+  end
+
   def test_bug_033
     # gentle reminder to keep some sanity
     #
@@ -691,6 +714,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"
@@ -994,6 +1023,16 @@ class TestRuby2Ruby < R2RTestCase
     assert_case_in "Object[b: 1]", s(:hash_pat, s(:const, :Object), s(:lit, :b), s(:lit, 1))
   end
 
+  def test_case_in_body_does_not_pin_variables
+    inn = s(:case, s(:call, nil, :x),
+            s(:in,
+              s(:array_pat, nil, s(:lasgn, :a), s(:lasgn, :b)),
+              s(:lvar, :a)),
+            nil)
+    out = "case x\nin [a, b] then\n  a\nend"
+    assert_parse inn, out
+  end
+
   def test_interpolation_and_escapes
     # log_entry = "  \e[#{message_color}m#{message}\e[0m   "
     inn = s(:lasgn, :log_entry,
@@ -1172,8 +1211,6 @@ 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
   new_src = processor.new.process(NotRubyParser.new.process(src.sub(from, to)))
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby2ruby
 version: !ruby/object:Gem::Version
-  version: 2.6.0
+  version: 2.6.2
 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,12 +21,12 @@ 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: 1980-01-02 00:00:00.000000000 Z
 dependencies:
@@ -64,38 +64,52 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '7.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7'
+        version: '9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '7.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7'
+        version: '9'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.21'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.21'
 - !ruby/object:Gem::Dependency
   name: hoe
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.3'
+        version: '4.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.3'
-description: |-
-  ruby2ruby provides a means of generating pure ruby code easily from
-  RubyParser compatible Sexps. This makes making dynamic language
-  processors in ruby easier than ever!
+        version: '4.7'
+description: "ruby2ruby provides a means of generating pure ruby code easily from\nRubyParser
+  compatible Sexps. This makes making dynamic language\nprocessors in ruby easier
+  than ever!\n\n== Features/Problems:\n  \n* Clean, simple SexpProcessor generates
+  ruby code from RubyParser compatible sexps."
 email:
 - ryand-ruby@zenspider.com
 executables:
@@ -103,7 +117,6 @@ executables:
 extensions: []
 extra_rdoc_files:
 - History.rdoc
-- Manifest.txt
 - README.rdoc
 files:
 - ".autotest"
@@ -119,6 +132,7 @@ licenses:
 - MIT
 metadata:
   homepage_uri: https://github.com/seattlerb/ruby2ruby
+  documentation_uri: http://docs.seattlerb.org/ruby2ruby
 rdoc_options:
 - "--main"
 - README.rdoc